[v8] Add "--strategy" parameter to "bind-service" command

actor/v7action/service_app_binding.go

@@ -15,6 +15,7 @@ type CreateServiceAppBindingParams struct {
 	AppName             string
 	BindingName         string
 	Parameters          types.OptionalObject
+	Strategy            resources.BindingStrategyType
 }
 
 type DeleteServiceAppBindingParams struct {
@@ -41,7 +42,7 @@ func (actor Actor) CreateServiceAppBinding(params CreateServiceAppBindingParams)
 			return
 		},
 		func() (warnings ccv3.Warnings, err error) {
-			jobURL, warnings, err = actor.createServiceAppBinding(serviceInstance.GUID, app.GUID, params.BindingName, params.Parameters)
+			jobURL, warnings, err = actor.createServiceAppBinding(serviceInstance.GUID, app.GUID, params.BindingName, params.Parameters, params.Strategy)
 			return
 		},
 		func() (warnings ccv3.Warnings, err error) {
@@ -102,13 +103,14 @@ func (actor Actor) DeleteServiceAppBinding(params DeleteServiceAppBindingParams)
 	}
 }
 
-func (actor Actor) createServiceAppBinding(serviceInstanceGUID, appGUID, bindingName string, parameters types.OptionalObject) (ccv3.JobURL, ccv3.Warnings, error) {
+func (actor Actor) createServiceAppBinding(serviceInstanceGUID, appGUID, bindingName string, parameters types.OptionalObject, strategy resources.BindingStrategyType) (ccv3.JobURL, ccv3.Warnings, error) {
 	jobURL, warnings, err := actor.CloudControllerClient.CreateServiceCredentialBinding(resources.ServiceCredentialBinding{
 		Type:                resources.AppBinding,
 		Name:                bindingName,
 		ServiceInstanceGUID: serviceInstanceGUID,
 		AppGUID:             appGUID,
 		Parameters:          parameters,
+		Strategy:            strategy,
 	})
 	switch err.(type) {
 	case nil:

actor/v7action/service_app_binding_test.go

@@ -35,6 +35,7 @@ var _ = Describe("Service App Binding Action", func() {
 			bindingName         = "fake-binding-name"
 			spaceGUID           = "fake-space-guid"
 			fakeJobURL          = ccv3.JobURL("fake-job-url")
+			strategy            = "single"
 		)
 
 		var (
@@ -87,6 +88,7 @@ var _ = Describe("Service App Binding Action", func() {
 				Parameters: types.NewOptionalObject(map[string]interface{}{
 					"foo": "bar",
 				}),
+				Strategy: resources.SingleBindingStrategy,
 			}
 		})
 
@@ -202,6 +204,7 @@ var _ = Describe("Service App Binding Action", func() {
 					Parameters: types.NewOptionalObject(map[string]interface{}{
 						"foo": "bar",
 					}),
+					Strategy: strategy,
 				}))
 			})
 

api/cloudcontroller/ccversion/minimum_version.go

@@ -22,4 +22,6 @@ const (
 	MinVersionPerRouteOpts = "3.183.0"
 
 	MinVersionCanarySteps = "3.189.0"
+
+	MinVersionServiceBindingStrategy = "3.205.0"
 )

command/flag/service_binding_strategy.go

@@ -0,0 +1,32 @@
+package flag
+
+import (
+	"strings"
+
+	"code.cloudfoundry.org/cli/v8/resources"
+	flags "github.com/jessevdk/go-flags"
+)
+
+type ServiceBindingStrategy struct {
+	Strategy resources.BindingStrategyType
+	IsSet    bool
+}
+
+func (ServiceBindingStrategy) Complete(prefix string) []flags.Completion {
+	return completions([]string{"single", "multiple"}, prefix, false)
+}
+
+func (h *ServiceBindingStrategy) UnmarshalFlag(val string) error {
+	valLower := strings.ToLower(val)
+	switch valLower {
+	case "single", "multiple":
+		h.Strategy = resources.BindingStrategyType(valLower)
+		h.IsSet = true
+	default:
+		return &flags.Error{
+			Type:    flags.ErrRequired,
+			Message: `STRATEGY must be "single" or "multiple"`,
+		}
+	}
+	return nil
+}

command/flag/service_binding_strategy_test.go

@@ -0,0 +1,68 @@
+package flag_test
+
+import (
+	. "code.cloudfoundry.org/cli/v8/command/flag"
+	"code.cloudfoundry.org/cli/v8/resources"
+	flags "github.com/jessevdk/go-flags"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("ServiceBindingStrategy", func() {
+	var sbs ServiceBindingStrategy
+
+	Describe("Complete", func() {
+		DescribeTable("returns list of completions",
+			func(prefix string, matches []flags.Completion) {
+				completions := sbs.Complete(prefix)
+				Expect(completions).To(Equal(matches))
+			},
+			Entry("returns 'single' when passed 's'", "s",
+				[]flags.Completion{{Item: "single"}}),
+			Entry("returns 'single' when passed 'S'", "S",
+				[]flags.Completion{{Item: "single"}}),
+			Entry("returns 'multiple' when passed 'm'", "m",
+				[]flags.Completion{{Item: "multiple"}}),
+			Entry("returns 'multiple' when passed 'M'", "M",
+				[]flags.Completion{{Item: "multiple"}}),
+			Entry("returns 'single' and 'multiple' when passed ''", "",
+				[]flags.Completion{{Item: "single"}, {Item: "multiple"}}),
+		)
+	})
+
+	Describe("UnmarshalFlag", func() {
+		BeforeEach(func() {
+			sbs = ServiceBindingStrategy{}
+		})
+
+		When("unmarshal has not been called", func() {
+			It("is marked as not set", func() {
+				Expect(sbs.IsSet).To(BeFalse())
+			})
+		})
+
+		DescribeTable("downcases and sets strategy",
+			func(input string, expected resources.BindingStrategyType) {
+				err := sbs.UnmarshalFlag(input)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(sbs.Strategy).To(Equal(expected))
+				Expect(sbs.IsSet).To(BeTrue())
+			},
+			Entry("sets 'single' when passed 'single'", "single", resources.SingleBindingStrategy),
+			Entry("sets 'single' when passed 'sInGlE'", "sInGlE", resources.SingleBindingStrategy),
+			Entry("sets 'multiple' when passed 'multiple'", "multiple", resources.MultipleBindingStrategy),
+			Entry("sets 'multiple' when passed 'MuLtIpLe'", "MuLtIpLe", resources.MultipleBindingStrategy),
+		)
+
+		When("passed anything else", func() {
+			It("returns an error", func() {
+				err := sbs.UnmarshalFlag("banana")
+				Expect(err).To(MatchError(&flags.Error{
+					Type:    flags.ErrRequired,
+					Message: `STRATEGY must be "single" or "multiple"`,
+				}))
+				Expect(sbs.Strategy).To(BeEmpty())
+			})
+		})
+	})
+})

command/v7/bind_service_command.go

@@ -3,6 +3,8 @@ package v7
 import (
 	"code.cloudfoundry.org/cli/v8/actor/actionerror"
 	"code.cloudfoundry.org/cli/v8/actor/v7action"
+	"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion"
+	"code.cloudfoundry.org/cli/v8/command"
 	"code.cloudfoundry.org/cli/v8/command/flag"
 	"code.cloudfoundry.org/cli/v8/command/v7/shared"
 	"code.cloudfoundry.org/cli/v8/types"
@@ -11,18 +13,26 @@ import (
 type BindServiceCommand struct {
 	BaseCommand
 
-	RequiredArgs     flag.BindServiceArgs          `positional-args:"yes"`
-	BindingName      flag.BindingName              `long:"binding-name" description:"Name to expose service instance to app process with (Default: service instance name)"`
-	ParametersAsJSON flag.JSONOrFileWithValidation `short:"c" description:"Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file. For a list of supported configuration parameters, see documentation for the particular service offering."`
-	Wait             bool                          `short:"w" long:"wait" description:"Wait for the operation to complete"`
-	relatedCommands  interface{}                   `related_commands:"services"`
+	RequiredArgs           flag.BindServiceArgs          `positional-args:"yes"`
+	BindingName            flag.BindingName              `long:"binding-name" description:"Name to expose service instance to app process with (Default: service instance name)"`
+	ParametersAsJSON       flag.JSONOrFileWithValidation `short:"c" description:"Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file. For a list of supported configuration parameters, see documentation for the particular service offering."`
+	ServiceBindingStrategy flag.ServiceBindingStrategy   `long:"strategy" description:"Service binding strategy. Valid values are 'single' (default) and 'multiple'."`
+	Wait                   bool                          `short:"w" long:"wait" description:"Wait for the operation to complete"`
+	relatedCommands        interface{}                   `related_commands:"services"`
 }
 
 func (cmd BindServiceCommand) Execute(args []string) error {
 	if err := cmd.SharedActor.CheckTarget(true, true); err != nil {
 		return err
 	}
 
+	if cmd.ServiceBindingStrategy.IsSet {
+		err := command.MinimumCCAPIVersionCheck(cmd.Config.APIVersion(), ccversion.MinVersionServiceBindingStrategy, "--strategy")
+		if err != nil {
+			return err
+		}
+	}
+
 	if err := cmd.displayIntro(); err != nil {
 		return err
 	}
@@ -33,6 +43,7 @@ func (cmd BindServiceCommand) Execute(args []string) error {
 		AppName:             cmd.RequiredArgs.AppName,
 		BindingName:         cmd.BindingName.Value,
 		Parameters:          types.OptionalObject(cmd.ParametersAsJSON),
+		Strategy:            cmd.ServiceBindingStrategy.Strategy,
 	})
 	cmd.UI.DisplayWarnings(warnings)
 
@@ -82,7 +93,12 @@ Example of valid JSON object:
 
 Optionally provide a binding name for the association between an app and a service instance:
 
-CF_NAME bind-service APP_NAME SERVICE_INSTANCE --binding-name BINDING_NAME`
+CF_NAME bind-service APP_NAME SERVICE_INSTANCE --binding-name BINDING_NAME
+
+Optionally provide the binding strategy type. Valid options are 'single' (default) and 'multiple'. The 'multiple' strategy allows multiple bindings between the same app and service instance.
+This is useful for credential rotation scenarios.
+
+CF_NAME bind-service APP_NAME SERVICE_INSTANCE --strategy multiple`
 }
 
 func (cmd BindServiceCommand) Examples() string {

command/v7/bind_service_command_test.go

@@ -6,8 +6,10 @@ import (
 	"code.cloudfoundry.org/cli/v8/actor/actionerror"
 	"code.cloudfoundry.org/cli/v8/actor/v7action"
 	"code.cloudfoundry.org/cli/v8/command/commandfakes"
+	"code.cloudfoundry.org/cli/v8/command/translatableerror"
 	v7 "code.cloudfoundry.org/cli/v8/command/v7"
 	"code.cloudfoundry.org/cli/v8/command/v7/v7fakes"
+	"code.cloudfoundry.org/cli/v8/resources"
 	"code.cloudfoundry.org/cli/v8/types"
 	"code.cloudfoundry.org/cli/v8/util/configv3"
 	"code.cloudfoundry.org/cli/v8/util/ui"
@@ -39,6 +41,7 @@ var _ = Describe("bind-service Command", func() {
 	BeforeEach(func() {
 		testUI = ui.NewTestUI(NewBuffer(), NewBuffer(), NewBuffer())
 		fakeConfig = new(commandfakes.FakeConfig)
+		fakeConfig.APIVersionReturns("3.205.0")
 		fakeSharedActor = new(commandfakes.FakeSharedActor)
 		fakeActor = new(v7fakes.FakeActor)
 
@@ -110,6 +113,30 @@ var _ = Describe("bind-service Command", func() {
 		})
 	})
 
+	When("strategy flag is set", func() {
+		BeforeEach(func() {
+			setFlag(&cmd, "--strategy", "multiple")
+		})
+
+		It("passes the strategy to the actor", func() {
+			Expect(executeErr).NotTo(HaveOccurred())
+			Expect(fakeActor.CreateServiceAppBindingCallCount()).To(Equal(1))
+			Expect(fakeActor.CreateServiceAppBindingArgsForCall(0).Strategy).
+				To(Equal(resources.MultipleBindingStrategy))
+		})
+
+		It("fails when the cc version is below the minimum", func() {
+			fakeConfig.APIVersionReturns("3.204.0")
+			executeErr = cmd.Execute(nil)
+
+			Expect(executeErr).To(MatchError(translatableerror.MinimumCFAPIVersionNotMetError{
+				Command:        "--strategy",
+				CurrentVersion: "3.204.0",
+				MinimumVersion: "3.205.0",
+			}))
+		})
+	})
+
 	When("binding already exists", func() {
 		BeforeEach(func() {
 			fakeActor.CreateServiceAppBindingReturns(

integration/v7/isolated/bind_service_command_test.go

@@ -41,6 +41,10 @@ var _ = Describe("bind-service command", func() {
 			Say(`\n`),
 			Say(`\s+cf bind-service APP_NAME SERVICE_INSTANCE --binding-name BINDING_NAME\n`),
 			Say(`\n`),
+			Say(`\s+Optionally provide the binding strategy type. Valid options are 'single' \(default\) and 'multiple'. The 'multiple' strategy allows multiple bindings between the same app and service instance.\n`),
+			Say(`\s+This is useful for credential rotation scenarios.\n`),
+			Say(`\n`),
+			Say(`\s+cf bind-service APP_NAME SERVICE_INSTANCE --strategy multiple\n`),
 			Say(`EXAMPLES:\n`),
 			Say(`\s+Linux/Mac:\n`),
 			Say(`\s+cf bind-service myapp mydb -c '\{"permissions":"read-only"\}'\n`),
@@ -59,6 +63,7 @@ var _ = Describe("bind-service command", func() {
 			Say(`OPTIONS:\n`),
 			Say(`\s+--binding-name\s+Name to expose service instance to app process with \(Default: service instance name\)\n`),
 			Say(`\s+-c\s+Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file. For a list of supported configuration parameters, see documentation for the particular service offering.\n`),
+			Say(`\s+--strategy\s+Service binding strategy. Valid values are 'single' \(default\) and 'multiple'.\n`),
 			Say(`\s+--wait, -w\s+Wait for the operation to complete\n`),
 			Say(`\n`),
 			Say(`SEE ALSO:\n`),

resources/service_credential_binding_resource.go

@@ -12,6 +12,13 @@ const (
 	KeyBinding ServiceCredentialBindingType = "key"
 )
 
+type BindingStrategyType string
+
+const (
+	SingleBindingStrategy   BindingStrategyType = "single"
+	MultipleBindingStrategy BindingStrategyType = "multiple"
+)
+
 type ServiceCredentialBinding struct {
 	// Type is either "app" or "key"
 	Type ServiceCredentialBindingType `jsonry:"type,omitempty"`
@@ -31,6 +38,8 @@ type ServiceCredentialBinding struct {
 	LastOperation LastOperation `jsonry:"last_operation"`
 	// Parameters can be specified when creating a binding
 	Parameters types.OptionalObject `jsonry:"parameters"`
+	// Strategy can be "single" or "multiple" (if empty, "single" is set as default by backend)
+	Strategy BindingStrategyType `jsonry:"strategy,omitempty"`
 }
 
 func (s ServiceCredentialBinding) MarshalJSON() ([]byte, error) {

resources/service_credential_binding_resource_test.go

@@ -60,6 +60,15 @@ var _ = Describe("service credential binding resource", func() {
 				}
 			}`,
 		),
+		Entry(
+			"strategy",
+			ServiceCredentialBinding{
+				Strategy: SingleBindingStrategy,
+			},
+			`{
+				"strategy": "single"
+			}`,
+		),
 		Entry(
 			"everything",
 			ServiceCredentialBinding{
@@ -71,6 +80,7 @@ var _ = Describe("service credential binding resource", func() {
 				Parameters: types.NewOptionalObject(map[string]interface{}{
 					"foo": "bar",
 				}),
+				Strategy: MultipleBindingStrategy,
 			},
 			`{
 				"type": "app",
@@ -90,7 +100,8 @@ var _ = Describe("service credential binding resource", func() {
 				},
 				"parameters": {
 					"foo": "bar"
-				}
+				},
+				"strategy": "multiple"
 			}`,
 		),
 	)