Skip to content

Commit 7be4b2a

Browse files
joaopapereirajoaopapereira
committed
Remove direct requirement of github.com/tedsuo/rata
Signed-off-by: João Pereira <[email protected]>
1 parent 6b87db8 commit 7be4b2a

Some content is hidden

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

51 files changed

+278
-235
lines changed

‎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/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/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ package ccv3
7777
import (
7878
"time"
7979

80-
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal"
80+
"code.cloudfoundry.org/cli/api/internal"
8181
)
8282

8383
// Warnings are a collection of warnings that the Cloud Controller can return

‎api/cloudcontroller/ccv3/deployment.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
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

89
func (client *Client) ContinueDeployment(deploymentGUID string) (Warnings, error) {
910
_, warnings, err := client.MakeRequest(RequestParams{
10-
RequestName: internal.PostApplicationDeploymentActionContinueRequest,
11+
RequestName: ccv3internal.PostApplicationDeploymentActionContinueRequest,
1112
URIParams: internal.Params{"deployment_guid": deploymentGUID},
1213
})
1314

@@ -16,7 +17,7 @@ func (client *Client) ContinueDeployment(deploymentGUID string) (Warnings, error
1617

1718
func (client *Client) CancelDeployment(deploymentGUID string) (Warnings, error) {
1819
_, warnings, err := client.MakeRequest(RequestParams{
19-
RequestName: internal.PostApplicationDeploymentActionCancelRequest,
20+
RequestName: ccv3internal.PostApplicationDeploymentActionCancelRequest,
2021
URIParams: internal.Params{"deployment_guid": deploymentGUID},
2122
})
2223

@@ -28,7 +29,7 @@ func (client *Client) CreateApplicationDeployment(dep resources.Deployment) (str
2829
var responseBody resources.Deployment
2930

3031
_, warnings, err := client.MakeRequest(RequestParams{
31-
RequestName: internal.PostApplicationDeploymentRequest,
32+
RequestName: ccv3internal.PostApplicationDeploymentRequest,
3233
RequestBody: dep,
3334
ResponseBody: &responseBody,
3435
})
@@ -40,7 +41,7 @@ func (client *Client) GetDeployment(deploymentGUID string) (resources.Deployment
4041
var responseBody resources.Deployment
4142

4243
_, warnings, err := client.MakeRequest(RequestParams{
43-
RequestName: internal.GetDeploymentRequest,
44+
RequestName: ccv3internal.GetDeploymentRequest,
4445
URIParams: internal.Params{"deployment_guid": deploymentGUID},
4546
ResponseBody: &responseBody,
4647
})
@@ -52,7 +53,7 @@ func (client *Client) GetDeployments(query ...Query) ([]resources.Deployment, Wa
5253
var deployments []resources.Deployment
5354

5455
_, warnings, err := client.MakeListRequest(RequestParams{
55-
RequestName: internal.GetDeploymentsRequest,
56+
RequestName: ccv3internal.GetDeploymentsRequest,
5657
Query: query,
5758
ResponseBody: resources.Deployment{},
5859
AppendToList: func(item interface{}) error {

‎api/cloudcontroller/ccv3/domain.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55
"fmt"
66

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

@@ -79,7 +80,7 @@ func (client Client) CheckRoute(domainGUID string, hostname string, path string,
7980
}
8081

8182
_, warnings, err := client.MakeRequest(RequestParams{
82-
RequestName: internal.GetDomainRouteReservationsRequest,
83+
RequestName: ccv3internal.GetDomainRouteReservationsRequest,
8384
URIParams: internal.Params{"domain_guid": domainGUID},
8485
Query: query,
8586
ResponseBody: &responseBody,
@@ -92,7 +93,7 @@ func (client Client) CreateDomain(domain resources.Domain) (resources.Domain, Wa
9293
var responseBody resources.Domain
9394

9495
_, warnings, err := client.MakeRequest(RequestParams{
95-
RequestName: internal.PostDomainRequest,
96+
RequestName: ccv3internal.PostDomainRequest,
9697
RequestBody: domain,
9798
ResponseBody: &responseBody,
9899
})
@@ -102,7 +103,7 @@ func (client Client) CreateDomain(domain resources.Domain) (resources.Domain, Wa
102103

103104
func (client Client) DeleteDomain(domainGUID string) (JobURL, Warnings, error) {
104105
jobURL, warnings, err := client.MakeRequest(RequestParams{
105-
RequestName: internal.DeleteDomainRequest,
106+
RequestName: ccv3internal.DeleteDomainRequest,
106107
URIParams: internal.Params{"domain_guid": domainGUID},
107108
})
108109

@@ -114,7 +115,7 @@ func (client *Client) GetDomain(domainGUID string) (resources.Domain, Warnings,
114115
var responseBody resources.Domain
115116

116117
_, warnings, err := client.MakeRequest(RequestParams{
117-
RequestName: internal.GetDomainRequest,
118+
RequestName: ccv3internal.GetDomainRequest,
118119
URIParams: internal.Params{"domain_guid": domainGUID},
119120
ResponseBody: &responseBody,
120121
})
@@ -126,7 +127,7 @@ func (client Client) GetDomains(query ...Query) ([]resources.Domain, Warnings, e
126127
var domains []resources.Domain
127128

128129
_, warnings, err := client.MakeListRequest(RequestParams{
129-
RequestName: internal.GetDomainsRequest,
130+
RequestName: ccv3internal.GetDomainsRequest,
130131
Query: query,
131132
ResponseBody: resources.Domain{},
132133
AppendToList: func(item interface{}) error {
@@ -143,7 +144,7 @@ func (client Client) GetOrganizationDomains(orgGUID string, query ...Query) ([]r
143144

144145
_, warnings, err := client.MakeListRequest(RequestParams{
145146
URIParams: internal.Params{"organization_guid": orgGUID},
146-
RequestName: internal.GetOrganizationDomainsRequest,
147+
RequestName: ccv3internal.GetOrganizationDomainsRequest,
147148
Query: query,
148149
ResponseBody: resources.Domain{},
149150
AppendToList: func(item interface{}) error {
@@ -157,7 +158,7 @@ func (client Client) GetOrganizationDomains(orgGUID string, query ...Query) ([]r
157158

158159
func (client Client) SharePrivateDomainToOrgs(domainGuid string, sharedOrgs SharedOrgs) (Warnings, error) {
159160
_, warnings, err := client.MakeRequest(RequestParams{
160-
RequestName: internal.SharePrivateDomainRequest,
161+
RequestName: ccv3internal.SharePrivateDomainRequest,
161162
URIParams: internal.Params{"domain_guid": domainGuid},
162163
RequestBody: sharedOrgs,
163164
})
@@ -167,7 +168,7 @@ func (client Client) SharePrivateDomainToOrgs(domainGuid string, sharedOrgs Shar
167168

168169
func (client Client) UnsharePrivateDomainFromOrg(domainGuid string, orgGUID string) (Warnings, error) {
169170
_, warnings, err := client.MakeRequest(RequestParams{
170-
RequestName: internal.DeleteSharedOrgFromDomainRequest,
171+
RequestName: ccv3internal.DeleteSharedOrgFromDomainRequest,
171172
URIParams: internal.Params{"domain_guid": domainGuid, "org_guid": orgGUID},
172173
})
173174

0 commit comments

Comments
 (0)