Remove direct requirement of github.com/tedsuo/rata

Signed-off-by: João Pereira <[email protected]>

api/cloudcontroller/ccv3/application.go

@@ -2,7 +2,8 @@ package ccv3
 
 import (
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	"code.cloudfoundry.org/cli/api/internal"
 	"code.cloudfoundry.org/cli/resources"
 )
 
@@ -11,7 +12,7 @@ func (client *Client) CreateApplication(app resources.Application) (resources.Ap
 	var responseBody resources.Application
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PostApplicationRequest,
+		RequestName:  ccv3internal.PostApplicationRequest,
 		RequestBody:  app,
 		ResponseBody: &responseBody,
 	})
@@ -42,7 +43,7 @@ func (client *Client) GetApplications(query ...Query) ([]resources.Application,
 	var apps []resources.Application
 
 	_, warnings, err := client.MakeListRequest(RequestParams{
-		RequestName:  internal.GetApplicationsRequest,
+		RequestName:  ccv3internal.GetApplicationsRequest,
 		Query:        query,
 		ResponseBody: resources.Application{},
 		AppendToList: func(item interface{}) error {
@@ -59,7 +60,7 @@ func (client *Client) UpdateApplication(app resources.Application) (resources.Ap
 	var responseBody resources.Application
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PatchApplicationRequest,
+		RequestName:  ccv3internal.PatchApplicationRequest,
 		URIParams:    internal.Params{"app_guid": app.GUID},
 		RequestBody:  app,
 		ResponseBody: &responseBody,
@@ -72,7 +73,7 @@ func (client *Client) UpdateApplication(app resources.Application) (resources.Ap
 func (client *Client) UpdateApplicationName(newAppName string, appGUID string) (resources.Application, Warnings, error) {
 	var responseBody resources.Application
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PatchApplicationRequest,
+		RequestName:  ccv3internal.PatchApplicationRequest,
 		URIParams:    internal.Params{"app_guid": appGUID},
 		RequestBody:  resources.ApplicationNameOnly{Name: newAppName},
 		ResponseBody: &responseBody,
@@ -86,7 +87,7 @@ func (client *Client) UpdateApplicationRestart(appGUID string) (resources.Applic
 	var responseBody resources.Application
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PostApplicationActionRestartRequest,
+		RequestName:  ccv3internal.PostApplicationActionRestartRequest,
 		URIParams:    internal.Params{"app_guid": appGUID},
 		ResponseBody: &responseBody,
 	})
@@ -99,7 +100,7 @@ func (client *Client) UpdateApplicationStart(appGUID string) (resources.Applicat
 	var responseBody resources.Application
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PostApplicationActionStartRequest,
+		RequestName:  ccv3internal.PostApplicationActionStartRequest,
 		URIParams:    internal.Params{"app_guid": appGUID},
 		ResponseBody: &responseBody,
 	})
@@ -112,7 +113,7 @@ func (client *Client) UpdateApplicationStop(appGUID string) (resources.Applicati
 	var responseBody resources.Application
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PostApplicationActionStopRequest,
+		RequestName:  ccv3internal.PostApplicationActionStopRequest,
 		URIParams:    internal.Params{"app_guid": appGUID},
 		ResponseBody: &responseBody,
 	})

api/cloudcontroller/ccv3/application_feature.go

@@ -1,7 +1,8 @@
 package ccv3
 
 import (
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	"code.cloudfoundry.org/cli/api/internal"
 	"code.cloudfoundry.org/cli/resources"
 )
 
@@ -14,7 +15,7 @@ func (client *Client) GetAppFeature(appGUID string, featureName string) (resourc
 	var responseBody resources.ApplicationFeature
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.GetApplicationFeaturesRequest,
+		RequestName:  ccv3internal.GetApplicationFeaturesRequest,
 		URIParams:    internal.Params{"app_guid": appGUID, "name": featureName},
 		ResponseBody: &responseBody,
 	})
@@ -26,7 +27,7 @@ func (client *Client) GetSSHEnabled(appGUID string) (SSHEnabled, Warnings, error
 	var responseBody SSHEnabled
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.GetSSHEnabled,
+		RequestName:  ccv3internal.GetSSHEnabled,
 		URIParams:    internal.Params{"app_guid": appGUID},
 		ResponseBody: &responseBody,
 	})
@@ -37,7 +38,7 @@ func (client *Client) GetSSHEnabled(appGUID string) (SSHEnabled, Warnings, error
 // UpdateAppFeature enables/disables the ability to ssh for a given application.
 func (client *Client) UpdateAppFeature(appGUID string, enabled bool, featureName string) (Warnings, error) {
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName: internal.PatchApplicationFeaturesRequest,
+		RequestName: ccv3internal.PatchApplicationFeaturesRequest,
 		RequestBody: struct {
 			Enabled bool `json:"enabled"`
 		}{Enabled: enabled},

api/cloudcontroller/ccv3/application_test.go

@@ -8,7 +8,8 @@ import (
 	. "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	"code.cloudfoundry.org/cli/api/internal"
 	"code.cloudfoundry.org/cli/resources"
 	"code.cloudfoundry.org/cli/types"
 	. "github.com/onsi/ginkgo/v2"
@@ -279,7 +280,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.PostApplicationRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationRequest))
 				Expect(actualParams.RequestBody).To(Equal(appToCreate))
 				_, ok := actualParams.ResponseBody.(*resources.Application)
 				Expect(ok).To(BeTrue())
@@ -365,7 +366,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeListRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeListRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.GetApplicationsRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.GetApplicationsRequest))
 				Expect(actualParams.Query).To(Equal([]Query{
 					{Key: NameFilter, Values: []string{"some-app-name"}},
 					{Key: SpaceGUIDFilter, Values: []string{"some-space-guid"}},
@@ -467,7 +468,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeListRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeListRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.GetApplicationsRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.GetApplicationsRequest))
 				Expect(actualParams.Query).To(Equal(filters))
 				_, ok := actualParams.ResponseBody.(resources.Application)
 				Expect(ok).To(BeTrue())
@@ -562,7 +563,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.PatchApplicationRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.PatchApplicationRequest))
 				Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
 				Expect(actualParams.RequestBody).To(Equal(appToUpdate))
 				_, ok := actualParams.ResponseBody.(*resources.Application)
@@ -660,7 +661,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.PatchApplicationRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.PatchApplicationRequest))
 				Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
 				Expect(actualParams.RequestBody).To(Equal(resources.ApplicationNameOnly{Name: newAppName}))
 				_, ok := actualParams.ResponseBody.(*resources.Application)
@@ -749,7 +750,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.PostApplicationActionStopRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationActionStopRequest))
 				Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
 				_, ok := actualParams.ResponseBody.(*resources.Application)
 				Expect(ok).To(BeTrue())
@@ -832,7 +833,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.PostApplicationActionStartRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationActionStartRequest))
 				Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
 				_, ok := actualParams.ResponseBody.(*resources.Application)
 				Expect(ok).To(BeTrue())
@@ -915,7 +916,7 @@ var _ = Describe("Application", func() {
 			It("makes the correct request", func() {
 				Expect(requester.MakeRequestCallCount()).To(Equal(1))
 				actualParams := requester.MakeRequestArgsForCall(0)
-				Expect(actualParams.RequestName).To(Equal(internal.PostApplicationActionRestartRequest))
+				Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationActionRestartRequest))
 				Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
 				_, ok := actualParams.ResponseBody.(*resources.Application)
 				Expect(ok).To(BeTrue())

api/cloudcontroller/ccv3/build.go

@@ -1,7 +1,8 @@
 package ccv3
 
 import (
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	apiinternal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	"code.cloudfoundry.org/cli/api/internal"
 	"code.cloudfoundry.org/cli/resources"
 )
 
@@ -11,7 +12,7 @@ func (client *Client) CreateBuild(build resources.Build) (resources.Build, Warni
 	var responseBody resources.Build
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PostBuildRequest,
+		RequestName:  apiinternal.PostBuildRequest,
 		RequestBody:  build,
 		ResponseBody: &responseBody,
 	})
@@ -24,7 +25,7 @@ func (client *Client) GetBuild(guid string) (resources.Build, Warnings, error) {
 	var responseBody resources.Build
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.GetBuildRequest,
+		RequestName:  apiinternal.GetBuildRequest,
 		URIParams:    internal.Params{"build_guid": guid},
 		ResponseBody: &responseBody,
 	})

api/cloudcontroller/ccv3/buildpack.go

@@ -3,8 +3,9 @@ package ccv3
 import (
 	"io"
 
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
+	ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/uploads"
+	"code.cloudfoundry.org/cli/api/internal"
 	"code.cloudfoundry.org/cli/resources"
 )
 
@@ -14,7 +15,7 @@ func (client *Client) CreateBuildpack(bp resources.Buildpack) (resources.Buildpa
 	var responseBody resources.Buildpack
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PostBuildpackRequest,
+		RequestName:  ccv3internal.PostBuildpackRequest,
 		RequestBody:  bp,
 		ResponseBody: &responseBody,
 	})
@@ -25,7 +26,7 @@ func (client *Client) CreateBuildpack(bp resources.Buildpack) (resources.Buildpa
 // DeleteBuildpack deletes the buildpack with the provided guid.
 func (client Client) DeleteBuildpack(buildpackGUID string) (JobURL, Warnings, error) {
 	jobURL, warnings, err := client.MakeRequest(RequestParams{
-		RequestName: internal.DeleteBuildpackRequest,
+		RequestName: ccv3internal.DeleteBuildpackRequest,
 		URIParams:   internal.Params{"buildpack_guid": buildpackGUID},
 	})
 
@@ -37,7 +38,7 @@ func (client *Client) GetBuildpacks(query ...Query) ([]resources.Buildpack, Warn
 	var buildpacks []resources.Buildpack
 
 	_, warnings, err := client.MakeListRequest(RequestParams{
-		RequestName:  internal.GetBuildpacksRequest,
+		RequestName:  ccv3internal.GetBuildpacksRequest,
 		Query:        query,
 		ResponseBody: resources.Buildpack{},
 		AppendToList: func(item interface{}) error {
@@ -53,7 +54,7 @@ func (client Client) UpdateBuildpack(buildpack resources.Buildpack) (resources.B
 	var responseBody resources.Buildpack
 
 	_, warnings, err := client.MakeRequest(RequestParams{
-		RequestName:  internal.PatchBuildpackRequest,
+		RequestName:  ccv3internal.PatchBuildpackRequest,
 		URIParams:    internal.Params{"buildpack_guid": buildpack.GUID},
 		RequestBody:  buildpack,
 		ResponseBody: &responseBody,
@@ -73,7 +74,7 @@ func (client *Client) UploadBuildpack(buildpackGUID string, buildpackPath string
 	contentType, body, writeErrors := uploads.CreateMultipartBodyAndHeader(buildpack, buildpackPath, "bits")
 
 	responseLocation, warnings, err := client.MakeRequestUploadAsync(
-		internal.PostBuildpackBitsRequest,
+		ccv3internal.PostBuildpackBitsRequest,
 		internal.Params{"buildpack_guid": buildpackGUID},
 		contentType,
 		body,