Skip to content

Commit 85a7270

Browse files
joaopapereirajoaopapereira
committed
Remove direct requirement of github.com/tedsuo/rata
Signed-off-by: João Pereira <joao.pereira@broadcom.com>
1 parent fbb00f3 commit 85a7270

63 files changed

Lines changed: 408 additions & 345 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/cloudcontroller/ccv3/application.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package ccv3
22

33
import (
44
"code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
5-
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
5+
ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
6+
"code.cloudfoundry.org/cli/api/internal"
67
"code.cloudfoundry.org/cli/resources"
78
)
89

@@ -11,7 +12,7 @@ func (client *Client) CreateApplication(app resources.Application) (resources.Ap
1112
var responseBody resources.Application
1213

1314
_, warnings, err := client.MakeRequest(RequestParams{
14-
RequestName: internal.PostApplicationRequest,
15+
RequestName: ccv3internal.PostApplicationRequest,
1516
RequestBody: app,
1617
ResponseBody: &responseBody,
1718
})
@@ -42,7 +43,7 @@ func (client *Client) GetApplications(query ...Query) ([]resources.Application,
4243
var apps []resources.Application
4344

4445
_, warnings, err := client.MakeListRequest(RequestParams{
45-
RequestName: internal.GetApplicationsRequest,
46+
RequestName: ccv3internal.GetApplicationsRequest,
4647
Query: query,
4748
ResponseBody: resources.Application{},
4849
AppendToList: func(item interface{}) error {
@@ -59,7 +60,7 @@ func (client *Client) UpdateApplication(app resources.Application) (resources.Ap
5960
var responseBody resources.Application
6061

6162
_, warnings, err := client.MakeRequest(RequestParams{
62-
RequestName: internal.PatchApplicationRequest,
63+
RequestName: ccv3internal.PatchApplicationRequest,
6364
URIParams: internal.Params{"app_guid": app.GUID},
6465
RequestBody: app,
6566
ResponseBody: &responseBody,
@@ -72,7 +73,7 @@ func (client *Client) UpdateApplication(app resources.Application) (resources.Ap
7273
func (client *Client) UpdateApplicationName(newAppName string, appGUID string) (resources.Application, Warnings, error) {
7374
var responseBody resources.Application
7475
_, warnings, err := client.MakeRequest(RequestParams{
75-
RequestName: internal.PatchApplicationRequest,
76+
RequestName: ccv3internal.PatchApplicationRequest,
7677
URIParams: internal.Params{"app_guid": appGUID},
7778
RequestBody: resources.ApplicationNameOnly{Name: newAppName},
7879
ResponseBody: &responseBody,
@@ -86,7 +87,7 @@ func (client *Client) UpdateApplicationRestart(appGUID string) (resources.Applic
8687
var responseBody resources.Application
8788

8889
_, warnings, err := client.MakeRequest(RequestParams{
89-
RequestName: internal.PostApplicationActionRestartRequest,
90+
RequestName: ccv3internal.PostApplicationActionRestartRequest,
9091
URIParams: internal.Params{"app_guid": appGUID},
9192
ResponseBody: &responseBody,
9293
})
@@ -99,7 +100,7 @@ func (client *Client) UpdateApplicationStart(appGUID string) (resources.Applicat
99100
var responseBody resources.Application
100101

101102
_, warnings, err := client.MakeRequest(RequestParams{
102-
RequestName: internal.PostApplicationActionStartRequest,
103+
RequestName: ccv3internal.PostApplicationActionStartRequest,
103104
URIParams: internal.Params{"app_guid": appGUID},
104105
ResponseBody: &responseBody,
105106
})
@@ -112,7 +113,7 @@ func (client *Client) UpdateApplicationStop(appGUID string) (resources.Applicati
112113
var responseBody resources.Application
113114

114115
_, warnings, err := client.MakeRequest(RequestParams{
115-
RequestName: internal.PostApplicationActionStopRequest,
116+
RequestName: ccv3internal.PostApplicationActionStopRequest,
116117
URIParams: internal.Params{"app_guid": appGUID},
117118
ResponseBody: &responseBody,
118119
})

‎api/cloudcontroller/ccv3/application_feature.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ccv3
22

33
import (
4-
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
4+
ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
5+
"code.cloudfoundry.org/cli/api/internal"
56
"code.cloudfoundry.org/cli/resources"
67
)
78

@@ -14,7 +15,7 @@ func (client *Client) GetAppFeature(appGUID string, featureName string) (resourc
1415
var responseBody resources.ApplicationFeature
1516

1617
_, warnings, err := client.MakeRequest(RequestParams{
17-
RequestName: internal.GetApplicationFeaturesRequest,
18+
RequestName: ccv3internal.GetApplicationFeaturesRequest,
1819
URIParams: internal.Params{"app_guid": appGUID, "name": featureName},
1920
ResponseBody: &responseBody,
2021
})
@@ -26,7 +27,7 @@ func (client *Client) GetSSHEnabled(appGUID string) (SSHEnabled, Warnings, error
2627
var responseBody SSHEnabled
2728

2829
_, warnings, err := client.MakeRequest(RequestParams{
29-
RequestName: internal.GetSSHEnabled,
30+
RequestName: ccv3internal.GetSSHEnabled,
3031
URIParams: internal.Params{"app_guid": appGUID},
3132
ResponseBody: &responseBody,
3233
})
@@ -37,7 +38,7 @@ func (client *Client) GetSSHEnabled(appGUID string) (SSHEnabled, Warnings, error
3738
// UpdateAppFeature enables/disables the ability to ssh for a given application.
3839
func (client *Client) UpdateAppFeature(appGUID string, enabled bool, featureName string) (Warnings, error) {
3940
_, warnings, err := client.MakeRequest(RequestParams{
40-
RequestName: internal.PatchApplicationFeaturesRequest,
41+
RequestName: ccv3internal.PatchApplicationFeaturesRequest,
4142
RequestBody: struct {
4243
Enabled bool `json:"enabled"`
4344
}{Enabled: enabled},

‎api/cloudcontroller/ccv3/application_test.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
. "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
99
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes"
1010
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
11-
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
11+
ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
12+
"code.cloudfoundry.org/cli/api/internal"
1213
"code.cloudfoundry.org/cli/resources"
1314
"code.cloudfoundry.org/cli/types"
1415
. "github.com/onsi/ginkgo/v2"
@@ -279,7 +280,7 @@ var _ = Describe("Application", func() {
279280
It("makes the correct request", func() {
280281
Expect(requester.MakeRequestCallCount()).To(Equal(1))
281282
actualParams := requester.MakeRequestArgsForCall(0)
282-
Expect(actualParams.RequestName).To(Equal(internal.PostApplicationRequest))
283+
Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationRequest))
283284
Expect(actualParams.RequestBody).To(Equal(appToCreate))
284285
_, ok := actualParams.ResponseBody.(*resources.Application)
285286
Expect(ok).To(BeTrue())
@@ -365,7 +366,7 @@ var _ = Describe("Application", func() {
365366
It("makes the correct request", func() {
366367
Expect(requester.MakeListRequestCallCount()).To(Equal(1))
367368
actualParams := requester.MakeListRequestArgsForCall(0)
368-
Expect(actualParams.RequestName).To(Equal(internal.GetApplicationsRequest))
369+
Expect(actualParams.RequestName).To(Equal(ccv3internal.GetApplicationsRequest))
369370
Expect(actualParams.Query).To(Equal([]Query{
370371
{Key: NameFilter, Values: []string{"some-app-name"}},
371372
{Key: SpaceGUIDFilter, Values: []string{"some-space-guid"}},
@@ -467,7 +468,7 @@ var _ = Describe("Application", func() {
467468
It("makes the correct request", func() {
468469
Expect(requester.MakeListRequestCallCount()).To(Equal(1))
469470
actualParams := requester.MakeListRequestArgsForCall(0)
470-
Expect(actualParams.RequestName).To(Equal(internal.GetApplicationsRequest))
471+
Expect(actualParams.RequestName).To(Equal(ccv3internal.GetApplicationsRequest))
471472
Expect(actualParams.Query).To(Equal(filters))
472473
_, ok := actualParams.ResponseBody.(resources.Application)
473474
Expect(ok).To(BeTrue())
@@ -562,7 +563,7 @@ var _ = Describe("Application", func() {
562563
It("makes the correct request", func() {
563564
Expect(requester.MakeRequestCallCount()).To(Equal(1))
564565
actualParams := requester.MakeRequestArgsForCall(0)
565-
Expect(actualParams.RequestName).To(Equal(internal.PatchApplicationRequest))
566+
Expect(actualParams.RequestName).To(Equal(ccv3internal.PatchApplicationRequest))
566567
Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
567568
Expect(actualParams.RequestBody).To(Equal(appToUpdate))
568569
_, ok := actualParams.ResponseBody.(*resources.Application)
@@ -660,7 +661,7 @@ var _ = Describe("Application", func() {
660661
It("makes the correct request", func() {
661662
Expect(requester.MakeRequestCallCount()).To(Equal(1))
662663
actualParams := requester.MakeRequestArgsForCall(0)
663-
Expect(actualParams.RequestName).To(Equal(internal.PatchApplicationRequest))
664+
Expect(actualParams.RequestName).To(Equal(ccv3internal.PatchApplicationRequest))
664665
Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
665666
Expect(actualParams.RequestBody).To(Equal(resources.ApplicationNameOnly{Name: newAppName}))
666667
_, ok := actualParams.ResponseBody.(*resources.Application)
@@ -749,7 +750,7 @@ var _ = Describe("Application", func() {
749750
It("makes the correct request", func() {
750751
Expect(requester.MakeRequestCallCount()).To(Equal(1))
751752
actualParams := requester.MakeRequestArgsForCall(0)
752-
Expect(actualParams.RequestName).To(Equal(internal.PostApplicationActionStopRequest))
753+
Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationActionStopRequest))
753754
Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
754755
_, ok := actualParams.ResponseBody.(*resources.Application)
755756
Expect(ok).To(BeTrue())
@@ -832,7 +833,7 @@ var _ = Describe("Application", func() {
832833
It("makes the correct request", func() {
833834
Expect(requester.MakeRequestCallCount()).To(Equal(1))
834835
actualParams := requester.MakeRequestArgsForCall(0)
835-
Expect(actualParams.RequestName).To(Equal(internal.PostApplicationActionStartRequest))
836+
Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationActionStartRequest))
836837
Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
837838
_, ok := actualParams.ResponseBody.(*resources.Application)
838839
Expect(ok).To(BeTrue())
@@ -915,7 +916,7 @@ var _ = Describe("Application", func() {
915916
It("makes the correct request", func() {
916917
Expect(requester.MakeRequestCallCount()).To(Equal(1))
917918
actualParams := requester.MakeRequestArgsForCall(0)
918-
Expect(actualParams.RequestName).To(Equal(internal.PostApplicationActionRestartRequest))
919+
Expect(actualParams.RequestName).To(Equal(ccv3internal.PostApplicationActionRestartRequest))
919920
Expect(actualParams.URIParams).To(Equal(internal.Params{"app_guid": "some-app-guid"}))
920921
_, ok := actualParams.ResponseBody.(*resources.Application)
921922
Expect(ok).To(BeTrue())

‎api/cloudcontroller/ccv3/build.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ccv3
22

33
import (
4-
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
4+
apiinternal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
5+
"code.cloudfoundry.org/cli/api/internal"
56
"code.cloudfoundry.org/cli/resources"
67
)
78

@@ -11,7 +12,7 @@ func (client *Client) CreateBuild(build resources.Build) (resources.Build, Warni
1112
var responseBody resources.Build
1213

1314
_, warnings, err := client.MakeRequest(RequestParams{
14-
RequestName: internal.PostBuildRequest,
15+
RequestName: apiinternal.PostBuildRequest,
1516
RequestBody: build,
1617
ResponseBody: &responseBody,
1718
})
@@ -24,7 +25,7 @@ func (client *Client) GetBuild(guid string) (resources.Build, Warnings, error) {
2425
var responseBody resources.Build
2526

2627
_, warnings, err := client.MakeRequest(RequestParams{
27-
RequestName: internal.GetBuildRequest,
28+
RequestName: apiinternal.GetBuildRequest,
2829
URIParams: internal.Params{"build_guid": guid},
2930
ResponseBody: &responseBody,
3031
})

‎api/cloudcontroller/ccv3/buildpack.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package ccv3
33
import (
44
"io"
55

6-
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
6+
ccv3internal "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
77
"code.cloudfoundry.org/cli/api/cloudcontroller/uploads"
8+
"code.cloudfoundry.org/cli/api/internal"
89
"code.cloudfoundry.org/cli/resources"
910
)
1011

@@ -14,7 +15,7 @@ func (client *Client) CreateBuildpack(bp resources.Buildpack) (resources.Buildpa
1415
var responseBody resources.Buildpack
1516

1617
_, warnings, err := client.MakeRequest(RequestParams{
17-
RequestName: internal.PostBuildpackRequest,
18+
RequestName: ccv3internal.PostBuildpackRequest,
1819
RequestBody: bp,
1920
ResponseBody: &responseBody,
2021
})
@@ -25,7 +26,7 @@ func (client *Client) CreateBuildpack(bp resources.Buildpack) (resources.Buildpa
2526
// DeleteBuildpack deletes the buildpack with the provided guid.
2627
func (client Client) DeleteBuildpack(buildpackGUID string) (JobURL, Warnings, error) {
2728
jobURL, warnings, err := client.MakeRequest(RequestParams{
28-
RequestName: internal.DeleteBuildpackRequest,
29+
RequestName: ccv3internal.DeleteBuildpackRequest,
2930
URIParams: internal.Params{"buildpack_guid": buildpackGUID},
3031
})
3132

@@ -37,7 +38,7 @@ func (client *Client) GetBuildpacks(query ...Query) ([]resources.Buildpack, Warn
3738
var buildpacks []resources.Buildpack
3839

3940
_, warnings, err := client.MakeListRequest(RequestParams{
40-
RequestName: internal.GetBuildpacksRequest,
41+
RequestName: ccv3internal.GetBuildpacksRequest,
4142
Query: query,
4243
ResponseBody: resources.Buildpack{},
4344
AppendToList: func(item interface{}) error {
@@ -53,7 +54,7 @@ func (client Client) UpdateBuildpack(buildpack resources.Buildpack) (resources.B
5354
var responseBody resources.Buildpack
5455

5556
_, warnings, err := client.MakeRequest(RequestParams{
56-
RequestName: internal.PatchBuildpackRequest,
57+
RequestName: ccv3internal.PatchBuildpackRequest,
5758
URIParams: internal.Params{"buildpack_guid": buildpack.GUID},
5859
RequestBody: buildpack,
5960
ResponseBody: &responseBody,
@@ -73,7 +74,7 @@ func (client *Client) UploadBuildpack(buildpackGUID string, buildpackPath string
7374
contentType, body, writeErrors := uploads.CreateMultipartBodyAndHeader(buildpack, buildpackPath, "bits")
7475

7576
responseLocation, warnings, err := client.MakeRequestUploadAsync(
76-
internal.PostBuildpackBitsRequest,
77+
ccv3internal.PostBuildpackBitsRequest,
7778
internal.Params{"buildpack_guid": buildpackGUID},
7879
contentType,
7980
body,

‎api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go‎

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)