Adapt v7action CloudControllerClient accordingly to ccv3 modifications

cloudfoundry-community · Dec 20, 2023 · daaf08e · daaf08e
1 parent dacef5d
commit daaf08e
Show file tree

Hide file tree

Showing 44 changed files with 990 additions and 956 deletions.
diff --git a/actor/v7action/application.go b/actor/v7action/application.go
@@ -1,6 +1,7 @@
 package v7action
 
 import (
+	"code.cloudfoundry.org/cli/resources"
 	"time"
 
 	"code.cloudfoundry.org/cli/actor/actionerror"
@@ -105,14 +106,12 @@ func (actor Actor) GetApplicationsBySpace(spaceGUID string) ([]Application, Warn
 // name in the given space.
 func (actor Actor) CreateApplicationInSpace(app Application, spaceGUID string) (Application, Warnings, error) {
 	createdApp, warnings, err := actor.CloudControllerClient.CreateApplication(
-		ccv3.Application{
+		resources.Application{
 			LifecycleType:       app.LifecycleType,
 			LifecycleBuildpacks: app.LifecycleBuildpacks,
 			StackName:           app.StackName,
 			Name:                app.Name,
-			Relationships: ccv3.Relationships{
-				constant.RelationshipTypeSpace: ccv3.Relationship{GUID: spaceGUID},
-			},
+			SpaceGUID:           spaceGUID,
 		})
 
 	if err != nil {
@@ -219,12 +218,12 @@ func (actor Actor) PollStart(appGUID string) (Warnings, error) {
 
 // UpdateApplication updates the buildpacks on an application
 func (actor Actor) UpdateApplication(app Application) (Application, Warnings, error) {
-	ccApp := ccv3.Application{
+	ccApp := resources.Application{
 		GUID:                app.GUID,
 		StackName:           app.StackName,
 		LifecycleType:       app.LifecycleType,
 		LifecycleBuildpacks: app.LifecycleBuildpacks,
-		Metadata:            (*ccv3.Metadata)(app.Metadata),
+		Metadata:            (*resources.Metadata)(app.Metadata),
 	}
 
 	updatedApp, warnings, err := actor.CloudControllerClient.UpdateApplication(ccApp)
@@ -235,7 +234,7 @@ func (actor Actor) UpdateApplication(app Application) (Application, Warnings, er
 	return actor.convertCCToActorApplication(updatedApp), Warnings(warnings), nil
 }
 
-func (Actor) convertCCToActorApplication(app ccv3.Application) Application {
+func (Actor) convertCCToActorApplication(app resources.Application) Application {
 	return Application{
 		GUID:                app.GUID,
 		StackName:           app.StackName,
@@ -247,7 +246,7 @@ func (Actor) convertCCToActorApplication(app ccv3.Application) Application {
 	}
 }
 
-func (actor Actor) shouldContinuePollingProcessStatus(process ccv3.Process) (bool, Warnings, error) {
+func (actor Actor) shouldContinuePollingProcessStatus(process resources.Process) (bool, Warnings, error) {
 	ccInstances, ccWarnings, err := actor.CloudControllerClient.GetProcessInstances(process.GUID)
 	instances := ProcessInstances(ccInstances)
 	warnings := Warnings(ccWarnings)

diff --git a/actor/v7action/application_manifest_test.go b/actor/v7action/application_manifest_test.go
@@ -1,6 +1,7 @@
 package v7action_test
 
 import (
+	"code.cloudfoundry.org/cli/resources"
 	"errors"
 
 	"code.cloudfoundry.org/cli/actor/actionerror"
@@ -58,7 +59,7 @@ var _ = Describe("Application Manifest Actions", func() {
 				When("the app exists", func() {
 					BeforeEach(func() {
 						fakeCloudControllerClient.GetApplicationsReturns(
-							[]ccv3.Application{{GUID: "app-1-guid"}},
+							[]resources.Application{{GUID: "app-1-guid"}},
 							ccv3.Warnings{"app-1-warning"},
 							nil,
 						)
@@ -224,7 +225,7 @@ var _ = Describe("Application Manifest Actions", func() {
 		When("getting the application is successful", func() {
 			BeforeEach(func() {
 				fakeCloudControllerClient.GetApplicationsReturns(
-					[]ccv3.Application{
+					[]resources.Application{
 						{Name: appName, GUID: "some-app-guid"},
 					},
 					ccv3.Warnings{"get-application-warning"},

diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go
@@ -1,6 +1,7 @@
 package v7action_test
 
 import (
+	"code.cloudfoundry.org/cli/resources"
 	"errors"
 
 	"code.cloudfoundry.org/cli/actor/v2action"
@@ -91,7 +92,7 @@ var _ = Describe("Application Summary Actions", func() {
 			When("retrieving the application is successful", func() {
 				BeforeEach(func() {
 					fakeCloudControllerClient.GetApplicationsReturns(
-						[]ccv3.Application{
+						[]resources.Application{
 							{
 								Name:  "some-app-name",
 								GUID:  "some-app-guid",
@@ -105,7 +106,7 @@ var _ = Describe("Application Summary Actions", func() {
 
 				When("retrieving the process information is successful", func() {
 					BeforeEach(func() {
-						listedProcesses := []ccv3.Process{
+						listedProcesses := []resources.Process{
 							{
 								GUID:       "some-process-guid",
 								Type:       "some-type",
@@ -161,9 +162,9 @@ var _ = Describe("Application Summary Actions", func() {
 					When("app has droplet", func() {
 						BeforeEach(func() {
 							fakeCloudControllerClient.GetApplicationDropletCurrentReturns(
-								ccv3.Droplet{
+								resources.Droplet{
 									Stack: "some-stack",
-									Buildpacks: []ccv3.DropletBuildpack{
+									Buildpacks: []resources.DropletBuildpack{
 										{
 											Name: "some-buildpack",
 										},
@@ -262,7 +263,7 @@ var _ = Describe("Application Summary Actions", func() {
 							BeforeEach(func() {
 								expectedErr = errors.New("some error")
 								fakeCloudControllerClient.GetApplicationDropletCurrentReturns(
-									ccv3.Droplet{},
+									resources.Droplet{},
 									ccv3.Warnings{"some-droplet-warning"},
 									expectedErr,
 								)
@@ -278,7 +279,7 @@ var _ = Describe("Application Summary Actions", func() {
 					When("app does not have current droplet", func() {
 						BeforeEach(func() {
 							fakeCloudControllerClient.GetApplicationDropletCurrentReturns(
-								ccv3.Droplet{},
+								resources.Droplet{},
 								ccv3.Warnings{"some-droplet-warning"},
 								ccerror.DropletNotFoundError{},
 							)
@@ -344,7 +345,7 @@ var _ = Describe("Application Summary Actions", func() {
 
 					BeforeEach(func() {
 						fakeCloudControllerClient.GetApplicationProcessesReturns(
-							[]ccv3.Process{
+							[]resources.Process{
 								{
 									GUID: "some-process-guid",
 									Type: "some-type",
@@ -355,7 +356,7 @@ var _ = Describe("Application Summary Actions", func() {
 						)
 
 						fakeCloudControllerClient.GetApplicationProcessByTypeReturns(
-							ccv3.Process{},
+							resources.Process{},
 							ccv3.Warnings{"get-process-by-type-warning"},
 							nil,
 						)
@@ -380,7 +381,7 @@ var _ = Describe("Application Summary Actions", func() {
 
 				BeforeEach(func() {
 					fakeCloudControllerClient.GetApplicationsReturns(
-						[]ccv3.Application{
+						[]resources.Application{
 							{
 								Name:  "some-app-name",
 								GUID:  "some-app-guid",
@@ -393,7 +394,7 @@ var _ = Describe("Application Summary Actions", func() {
 
 					expectedErr = errors.New("some error")
 					fakeCloudControllerClient.GetApplicationProcessesReturns(
-						[]ccv3.Process{{Type: constant.ProcessTypeWeb}},
+						[]resources.Process{{Type: constant.ProcessTypeWeb}},
 						ccv3.Warnings{"some-process-warning"},
 						expectedErr,
 					)
@@ -409,7 +410,7 @@ var _ = Describe("Application Summary Actions", func() {
 		When("passed with a routeActor", func() {
 			BeforeEach(func() {
 				fakeCloudControllerClient.GetApplicationsReturns(
-					[]ccv3.Application{
+					[]resources.Application{
 						{
 							Name:  "some-app-name",
 							GUID:  "some-app-guid",