Skip to content

Commit a3a3413

Browse files
authored
fix: Replace CAPI v2 requests with v3 requests (#816)
The CAPI v2 is deprecated and will be deactivated in the cf-deployment. Therefore an update is needed to use the newer CAPI v3.
1 parent b374666 commit a3a3413

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/rlp-gateway/internal/auth/capi_client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (c *CAPIClient) IsAuthorized(sourceID, token string) bool {
8383
return true
8484
}
8585

86-
uri = fmt.Sprintf("%s/v2/service_instances/%s", c.externalCapi, sourceID)
86+
uri = fmt.Sprintf("%s/v3/service_instances/%s", c.externalCapi, sourceID)
8787
req, err = http.NewRequest(http.MethodGet, uri, nil)
8888
if err != nil {
8989
log.Printf("failed to build authorize service instance access request: %s", err)
@@ -149,7 +149,7 @@ func (c *CAPIClient) AvailableSourceIDs(token string) []string {
149149
sourceIDs = append(sourceIDs, v.Guid)
150150
}
151151

152-
req, err = http.NewRequest(http.MethodGet, c.externalCapi+"/v2/service_instances", nil)
152+
req, err = http.NewRequest(http.MethodGet, c.externalCapi+"/v3/service_instances", nil)
153153
if err != nil {
154154
log.Printf("failed to build authorize service instance access request: %s", err)
155155
return nil
@@ -169,7 +169,7 @@ func (c *CAPIClient) AvailableSourceIDs(token string) []string {
169169
}(resp)
170170

171171
if resp.StatusCode != http.StatusOK {
172-
log.Printf("CAPI request failed (/v2/service_instances): %d", resp.StatusCode)
172+
log.Printf("CAPI request failed (/v3/service_instances): %d", resp.StatusCode)
173173
return nil
174174
}
175175

src/rlp-gateway/internal/auth/capi_client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var _ = Describe("CAPIClient", func() {
5151
r = capiClient.requests[1]
5252

5353
Expect(r.Method).To(Equal(http.MethodGet))
54-
Expect(r.URL.String()).To(Equal("http://external.capi.com/v2/service_instances/some-id"))
54+
Expect(r.URL.String()).To(Equal("http://external.capi.com/v3/service_instances/some-id"))
5555
Expect(r.Header.Get("Authorization")).To(Equal("some-token"))
5656
})
5757

@@ -121,7 +121,7 @@ var _ = Describe("CAPIClient", func() {
121121

122122
servicesReq := capiClient.requests[1]
123123
Expect(servicesReq.Method).To(Equal(http.MethodGet))
124-
Expect(servicesReq.URL.String()).To(Equal("http://external.capi.com/v2/service_instances"))
124+
Expect(servicesReq.URL.String()).To(Equal("http://external.capi.com/v3/service_instances"))
125125
Expect(servicesReq.Header.Get("Authorization")).To(Equal("some-token"))
126126
})
127127

0 commit comments

Comments
 (0)