Add API version check for bind-service "--strategy" parameter

* and complete "help" docu integration tests

Author: jochenehret

command/flag/service_binding_strategy.go

@@ -9,6 +9,7 @@ import (
 
 type ServiceBindingStrategy struct {
 	Strategy resources.BindingStrategyType
+	IsSet    bool
 }
 
 func (ServiceBindingStrategy) Complete(prefix string) []flags.Completion {
@@ -20,6 +21,7 @@ func (h *ServiceBindingStrategy) UnmarshalFlag(val string) error {
 	switch valLower {
 	case "single", "multiple":
 		h.Strategy = resources.BindingStrategyType(valLower)
+		h.IsSet = true
 	default:
 		return &flags.Error{
 			Type:    flags.ErrRequired,

command/flag/service_binding_strategy_test.go

@@ -35,11 +35,18 @@ var _ = Describe("ServiceBindingStrategy", 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),

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"
@@ -24,6 +26,13 @@ func (cmd BindServiceCommand) Execute(args []string) error {
 		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
 	}

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

@@ -38,7 +38,7 @@ 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" (default) or "multiple"
+	// Strategy can be "single" or "multiple" (if empty, "single" is set as default by backend)
 	Strategy BindingStrategyType `jsonry:"strategy,omitempty"`
 }