Simplify CCV3 internal router

- Now, we don't need to hit `/v3` before every command to populate the router. Instead, we have just written the resource names directly into the routes file. - Refactor the routes file to be a map keyed by route name, instead of an array of routes that gets later converted into a map on the fly. - The `GetInfo()` method now does not return `ccv3.ResourceLinks`, because we don't hit `/v3`. Slack discussion where we asked if anyone knew why it was so complicated (and nobody really knew): https://cloudfoundry.slack.com/archives/C032824SM/p1594316115396400 Co-authored-by: Merric De Launey <mdelauney@pivotal.io> Co-authored-by: Reid Mitchell <rmitchell@pivotal.io>
sleungcy-sap · Jul 15, 2020 · ad36825 · ad36825
1 parent 9654e26
commit ad36825
Show file tree

Hide file tree

Showing 23 changed files with 243 additions and 536 deletions.
diff --git a/actor/v3action/cloud_controller_client.go b/actor/v3action/cloud_controller_client.go
@@ -39,7 +39,7 @@ type CloudControllerClient interface {
 	GetDeployments(query ...ccv3.Query) ([]ccv3.Deployment, ccv3.Warnings, error)
 	GetDroplet(guid string) (resources.Droplet, ccv3.Warnings, error)
 	GetDroplets(query ...ccv3.Query) ([]resources.Droplet, ccv3.Warnings, error)
-	GetInfo() (ccv3.Info, ccv3.ResourceLinks, ccv3.Warnings, error)
+	GetInfo() (ccv3.Info, ccv3.Warnings, error)
 	GetIsolationSegment(guid string) (ccv3.IsolationSegment, ccv3.Warnings, error)
 	GetIsolationSegmentOrganizations(isolationSegmentGUID string) ([]resources.Organization, ccv3.Warnings, error)
 	GetIsolationSegments(query ...ccv3.Query) ([]ccv3.IsolationSegment, ccv3.Warnings, error)

diff --git a/actor/v3action/logcache.go b/actor/v3action/logcache.go
@@ -9,7 +9,7 @@ import (
 // This works around the bug logged in story https://www.pivotaltracker.com/story/show/170138644
 
 func (actor Actor) LogCacheURL() string {
-	info, _, _, err := actor.CloudControllerClient.GetInfo()
+	info, _, err := actor.CloudControllerClient.GetInfo()
 	if err == nil {
 		logCacheURL := info.LogCache()
 		if logCacheURL != "" {

diff --git a/actor/v3action/logcache_test.go b/actor/v3action/logcache_test.go
@@ -37,7 +37,7 @@ var _ = Describe("LogCacheURL", func() {
 					Links: ccv3.InfoLinks{
 						LogCache: ccv3.APILink{
 							HREF: configuredLogcacheURL,
-						}}}, ccv3.ResourceLinks{}, ccv3.Warnings{}, nil)
+						}}}, ccv3.Warnings{}, nil)
 			})
 			It("uses it", func() {
 				Expect(actualLogCacheURL).To(Equal(configuredLogcacheURL))
@@ -48,7 +48,7 @@ var _ = Describe("LogCacheURL", func() {
 			BeforeEach(func() {
 				fakeCloudControllerClient.GetInfoReturns(ccv3.Info{
 					Links: ccv3.InfoLinks{},
-				}, ccv3.ResourceLinks{}, ccv3.Warnings{}, nil)
+				}, ccv3.Warnings{}, nil)
 			})
 			It("uses the target", func() {
 				if ccversion.MinSupportedV2ClientVersion != "2.128.0" {
@@ -63,7 +63,7 @@ var _ = Describe("LogCacheURL", func() {
 		BeforeEach(func() {
 			fakeCloudControllerClient.GetInfoReturns(ccv3.Info{
 				Links: ccv3.InfoLinks{},
-			}, ccv3.ResourceLinks{}, ccv3.Warnings{}, errors.New("awf splatz!"))
+			}, ccv3.Warnings{}, errors.New("awf splatz!"))
 		})
 		It("uses the target", func() {
 			Expect(actualLogCacheURL).To(Equal("https://log-cache.the-best-domain.com"))

diff --git a/actor/v3action/v3actionfakes/fake_cloud_controller_client.go b/actor/v3action/v3actionfakes/fake_cloud_controller_client.go
diff --git a/actor/v7action/cloud_controller_client.go b/actor/v7action/cloud_controller_client.go
@@ -80,9 +80,9 @@ type CloudControllerClient interface {
 	GetDroplets(query ...ccv3.Query) ([]resources.Droplet, ccv3.Warnings, error)
 	GetEnvironmentVariableGroup(group constant.EnvironmentVariableGroupName) (ccv3.EnvironmentVariables, ccv3.Warnings, error)
 	GetEvents(query ...ccv3.Query) ([]ccv3.Event, ccv3.Warnings, error)
-	GetFeatureFlag(featureFlagName string) (resources.FeatureFlag, ccv3.Warnings, error)
-	GetFeatureFlags() ([]resources.FeatureFlag, ccv3.Warnings, error)
-	GetInfo() (ccv3.Info, ccv3.ResourceLinks, ccv3.Warnings, error)
+	GetFeatureFlag(featureFlagName string) (ccv3.FeatureFlag, ccv3.Warnings, error)
+	GetFeatureFlags() ([]ccv3.FeatureFlag, ccv3.Warnings, error)
+	GetInfo() (ccv3.Info, ccv3.Warnings, error)
 	GetIsolationSegment(guid string) (ccv3.IsolationSegment, ccv3.Warnings, error)
 	GetIsolationSegmentOrganizations(isolationSegmentGUID string) ([]resources.Organization, ccv3.Warnings, error)
 	GetIsolationSegments(query ...ccv3.Query) ([]ccv3.IsolationSegment, ccv3.Warnings, error)

diff --git a/actor/v7action/info.go b/actor/v7action/info.go
@@ -1,7 +1,7 @@
 package v7action
 
 func (actor Actor) GetLogCacheEndpoint() (string, Warnings, error) {
-	info, _, warnings, err := actor.CloudControllerClient.GetInfo()
+	info, warnings, err := actor.CloudControllerClient.GetInfo()
 	if err != nil {
 		return "", Warnings(warnings), err
 	}

diff --git a/actor/v7action/info_test.go b/actor/v7action/info_test.go
@@ -30,7 +30,6 @@ var _ = Describe("Info Actions", func() {
 							LogCache: ccv3.APILink{HREF: "some-log-cache-url"},
 						},
 					},
-					nil,
 					ccv3.Warnings{"warning-1", "warning-2"},
 					nil,
 				)
@@ -54,7 +53,6 @@ var _ = Describe("Info Actions", func() {
 				expectedErr = errors.New("I am a CloudControllerClient Error")
 				fakeCloudControllerClient.GetInfoReturns(
 					ccv3.Info{},
-					nil,
 					ccv3.Warnings{"warning-1", "warning-2"},
 					expectedErr,
 				)

diff --git a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go
diff --git a/api/cloudcontroller/ccv3/ccv3_suite_test.go b/api/cloudcontroller/ccv3/ccv3_suite_test.go
@@ -102,100 +102,4 @@ func SetupV3Response() {
 			RespondWith(http.StatusOK, rootResponse),
 		),
 	)
-
-	v3Response := strings.Replace(`{
-		"links": {
-			"self": {
-				"href": "SERVER_URL/v3"
-			},
-			"apps": {
-				"href": "SERVER_URL/v3/apps"
-			},
-			"tasks": {
-				"href": "SERVER_URL/v3/tasks"
-			},
-			"isolation_segments": {
-				"href": "SERVER_URL/v3/isolation_segments"
-			},
-			"builds": {
-				"href": "SERVER_URL/v3/builds"
-			},
-			"organizations": {
-				"href": "SERVER_URL/v3/organizations"
-			},
-			"organization_quotas": {
-				"href": "SERVER_URL/v3/organization_quotas"
-			},
-			"security_groups": {
-				"href": "SERVER_URL/v3/security_groups"
-			},
-			"service_brokers": {
-				"href": "SERVER_URL/v3/service_brokers"
-			},
-			"service_instances": {
-				"href": "SERVER_URL/v3/service_instances"
-			},
-			"service_offerings": {
-				"href": "SERVER_URL/v3/service_offerings"
-			},
-			"service_plans": {
-				"href": "SERVER_URL/v3/service_plans"
-			},
-			"spaces": {
-				"href": "SERVER_URL/v3/spaces"
-			},
-			"space_quotas": {
-				"href": "SERVER_URL/v3/space_quotas"
-			},
-			"packages": {
-				"href": "SERVER_URL/v3/packages"
-			},
-			"processes": {
-				"href": "SERVER_URL/v3/processes"
-			},
-			"droplets": {
-				"href": "SERVER_URL/v3/droplets"
-			},
-			"audit_events": {
-				"href": "SERVER_URL/v3/audit_events"
-			},
-            "domains": {
-              "href": "SERVER_URL/v3/domains"
-            },
-			"deployments": {
-				"href": "SERVER_URL/v3/deployments"
-			},
-			"stacks": {
-				"href": "SERVER_URL/v3/stacks"
-			},
-			"buildpacks": {
-				"href": "SERVER_URL/v3/buildpacks"
-			},
-			"feature_flags": {
-				"href": "SERVER_URL/v3/feature_flags"
-			},
-			"resource_matches": {
-				"href": "SERVER_URL/v3/resource_matches"
-			},
-            "roles": {
-                "href": "SERVER_URL/v3/roles"
-            },
-            "routes": {
-                "href": "SERVER_URL/v3/routes"
-            },
-            "users": {
-                "href": "SERVER_URL/v3/users"
-            },
-            "environment_variable_groups": {
-                "href": "SERVER_URL/v3/environment_variable_groups"
-            }
-		}
-	}`, "SERVER_URL", serverURL, -1)
-
-	server.AppendHandlers(
-		CombineHandlers(
-			VerifyRequest(http.MethodGet, "/v3"),
-			RespondWith(http.StatusOK, v3Response),
-		),
-	)
 }