Merge branch 'main' into main_apps_cmd_process_instances

Author: jochenehret

.github/ops-files/increase-max-service-credential-bindings.yml

@@ -0,0 +1,6 @@
+# Enable service binding rotation feature
+# See https://github.com/cloudfoundry/community/blob/main/toc/rfc/rfc-0040-service-binding-rotation.md#cf-cli
+---
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/max_service_credential_bindings_per_app_service_instance?
+  value: 2

.github/workflows/create-bosh-lite.yml

@@ -151,6 +151,7 @@ jobs:
           -o ${GITHUB_WORKSPACE}/cli/.github/ops-files/add-uaa-client-credentials.yml \
           -o ${GITHUB_WORKSPACE}/cli/.github/ops-files/increase-route-registration-interval.yml \
           -o ${GITHUB_WORKSPACE}/cli/.github/ops-files/add-oidc-provider.yml ${additional_args} \
+          -o ${GITHUB_WORKSPACE}/cli/.github/ops-files/increase-max-service-credential-bindings.yml \
           -v client-secret="${{ secrets.CLIENT_SECRET }}" \
           -v system_domain=${SYSTEM_DOMAIN} \
           > ./director.yml

actor/v7action/cloud_controller_client.go

@@ -138,7 +138,7 @@ type CloudControllerClient interface {
 	GetAppFeature(appGUID string, featureName string) (resources.ApplicationFeature, ccv3.Warnings, error)
 	GetStacks(query ...ccv3.Query) ([]resources.Stack, ccv3.Warnings, error)
 	GetStagingSecurityGroups(spaceGUID string, queries ...ccv3.Query) ([]resources.SecurityGroup, ccv3.Warnings, error)
-	UpdateStack(stackGUID string, state string) (resources.Stack, ccv3.Warnings, error)
+	UpdateStack(stackGUID string, state string, reason string) (resources.Stack, ccv3.Warnings, error)
 	GetTask(guid string) (resources.Task, ccv3.Warnings, error)
 	GetUser(userGUID string) (resources.User, ccv3.Warnings, error)
 	GetUsers(query ...ccv3.Query) ([]resources.User, ccv3.Warnings, error)

actor/v7action/stack.go

@@ -47,8 +47,8 @@ func (actor Actor) GetStacks(labelSelector string) ([]resources.Stack, Warnings,
 	return stacks, Warnings(warnings), nil
 }
 
-func (actor Actor) UpdateStack(stackGUID string, state string) (resources.Stack, Warnings, error) {
-	stack, warnings, err := actor.CloudControllerClient.UpdateStack(stackGUID, state)
+func (actor Actor) UpdateStack(stackGUID string, state string, reason string) (resources.Stack, Warnings, error) {
+	stack, warnings, err := actor.CloudControllerClient.UpdateStack(stackGUID, state, reason)
 	if err != nil {
 		return resources.Stack{}, Warnings(warnings), err
 	}

actor/v7action/stack_test.go

@@ -238,6 +238,7 @@ var _ = Describe("Stack", func() {
 		var (
 			stackGUID  string
 			state      string
+			reason     string
 			stack      resources.Stack
 			warnings   Warnings
 			executeErr error
@@ -246,10 +247,11 @@ var _ = Describe("Stack", func() {
 		BeforeEach(func() {
 			stackGUID = "some-stack-guid"
 			state = "DEPRECATED"
+			reason = ""
 		})
 
 		JustBeforeEach(func() {
-			stack, warnings, executeErr = actor.UpdateStack(stackGUID, state)
+			stack, warnings, executeErr = actor.UpdateStack(stackGUID, state, reason)
 		})
 
 		When("the cloud controller request is successful", func() {
@@ -277,9 +279,10 @@ var _ = Describe("Stack", func() {
 				}))
 
 				Expect(fakeCloudControllerClient.UpdateStackCallCount()).To(Equal(1))
-				actualGUID, actualState := fakeCloudControllerClient.UpdateStackArgsForCall(0)
+				actualGUID, actualState, actualReason := fakeCloudControllerClient.UpdateStackArgsForCall(0)
 				Expect(actualGUID).To(Equal(stackGUID))
 				Expect(actualState).To(Equal(state))
+				Expect(actualReason).To(Equal(reason))
 			})
 		})
 

actor/v7action/v7actionfakes/fake_cloud_controller_client.go

@@ -22,18 +22,19 @@ func (client *Client) GetStacks(query ...Query) ([]resources.Stack, Warnings, er
 	return stacks, warnings, err
 }
 
-// UpdateStack updates a stack's state.
-func (client *Client) UpdateStack(stackGUID string, state string) (resources.Stack, Warnings, error) {
+// UpdateStack updates a stack's state and optionally its state reason.
+func (client *Client) UpdateStack(stackGUID string, state string, reason string) (resources.Stack, Warnings, error) {
 	var responseStack resources.Stack
 
 	type StackUpdate struct {
-		State string `json:"state"`
+		State       string `json:"state"`
+		StateReason string `json:"state_reason,omitempty"`
 	}
 
 	_, warnings, err := client.MakeRequest(RequestParams{
 		RequestName:  internal.PatchStackRequest,
 		URIParams:    internal.Params{"stack_guid": stackGUID},
-		RequestBody:  StackUpdate{State: state},
+		RequestBody:  StackUpdate{State: state, StateReason: reason},
 		ResponseBody: &responseStack,
 	})
 

api/cloudcontroller/ccv3/stack.go

@@ -148,6 +148,7 @@ var _ = Describe("Stacks", func() {
 		var (
 			stackGUID string
 			state     string
+			reason    string
 			stack     resources.Stack
 			warnings  Warnings
 			err       error
@@ -156,10 +157,11 @@ var _ = Describe("Stacks", func() {
 		BeforeEach(func() {
 			stackGUID = "some-stack-guid"
 			state = "DEPRECATED"
+			reason = ""
 		})
 
 		JustBeforeEach(func() {
-			stack, warnings, err = client.UpdateStack(stackGUID, state)
+			stack, warnings, err = client.UpdateStack(stackGUID, state, reason)
 		})
 
 		When("the request succeeds", func() {
@@ -192,6 +194,40 @@ var _ = Describe("Stacks", func() {
 			})
 		})
 
+		When("a reason is provided", func() {
+			BeforeEach(func() {
+				reason = "Use cflinuxfs4 instead"
+				server.AppendHandlers(
+					CombineHandlers(
+						VerifyRequest(http.MethodPatch, "/v3/stacks/some-stack-guid"),
+						VerifyJSONRepresenting(map[string]string{
+							"state":        "DEPRECATED",
+							"state_reason": "Use cflinuxfs4 instead",
+						}),
+						RespondWith(http.StatusOK, `{
+						"guid": "some-stack-guid",
+						"name": "some-stack",
+						"description": "some description",
+						"state": "DEPRECATED",
+						"state_reason": "Use cflinuxfs4 instead"
+					}`, http.Header{"X-Cf-Warnings": {"this is a warning"}}),
+					),
+				)
+			})
+
+			It("returns the updated stack with reason and warnings", func() {
+				Expect(err).ToNot(HaveOccurred())
+				Expect(warnings).To(ConsistOf("this is a warning"))
+				Expect(stack).To(Equal(resources.Stack{
+					GUID:        "some-stack-guid",
+					Name:        "some-stack",
+					Description: "some description",
+					State:       "DEPRECATED",
+					StateReason: "Use cflinuxfs4 instead",
+				}))
+			})
+		})
+
 		When("the cloud controller returns an error", func() {
 			BeforeEach(func() {
 				server.AppendHandlers(

api/cloudcontroller/ccv3/stack_test.go

@@ -19,7 +19,7 @@ const (
 
 	MinVersionServiceBindingStrategy = "3.205.0"
 
-	MinVersionUpdateStack = "3.210.0"
-
 	MinVersionEmbeddedProcessInstances = "3.211.0"
+
+	MinVersionUpdateStack = "3.211.0"
 )

api/cloudcontroller/ccversion/minimum_version.go

@@ -179,7 +179,7 @@ type Actor interface {
 	GetStackByName(stackName string) (resources.Stack, v7action.Warnings, error)
 	GetStackLabels(stackName string) (map[string]types.NullString, v7action.Warnings, error)
 	GetStacks(string) ([]resources.Stack, v7action.Warnings, error)
-	UpdateStack(stackGUID string, state string) (resources.Stack, v7action.Warnings, error)
+	UpdateStack(stackGUID string, state string, reason string) (resources.Stack, v7action.Warnings, error)
 	GetStreamingLogsForApplicationByNameAndSpace(appName string, spaceGUID string, client sharedaction.LogCacheClient) (<-chan sharedaction.LogMessage, <-chan error, context.CancelFunc, v7action.Warnings, error)
 	GetTaskBySequenceIDAndApplication(sequenceID int, appGUID string) (resources.Task, v7action.Warnings, error)
 	GetUAAAPIVersion() (string, error)