Skip to content

Commit

Permalink
Revert "Add support for X-Broker-API-Request-Identity" (#149)
Browse files Browse the repository at this point in the history
This reverts commit a8fb8a8.

Wrong PR was commited
  • Loading branch information
FelisiaM authored Mar 31, 2021
1 parent a8fb8a8 commit c9c9e91
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 76 deletions.
10 changes: 1 addition & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,10 @@ func (sb *ServiceBrokerImplementation) Provision(ctx context.Context,

The request context for every request contains the unparsed
`X-Broker-API-Originating-Identity` header under the key
`originatingIdentity`. More details on how the Open Service Broker API
`originatingIdentityKey`. More details on how the Open Service Broker API
manages request originating identity is available
[here](https://github.com/openservicebrokerapi/servicebroker/blob/master/spec.md#originating-identity).

## Request Identity

The request context for every request contains the unparsed
`X-Broker-API-Request-Identity` header under the key
`requestIdentity`. More details on how the Open Service Broker API
manages request originating identity is available
[here](https://github.com/openservicebrokerapi/servicebroker/blob/master/spec.md#request-identity).

## Example Service Broker

You can see the
Expand Down
1 change: 0 additions & 1 deletion api.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func New(serviceBroker ServiceBroker, logger lager.Logger, brokerCredentials Bro
router.Use(middlewares.AddOriginatingIdentityToContext)
router.Use(apiVersionMiddleware.ValidateAPIVersionHdr)
router.Use(middlewares.AddInfoLocationToContext)
router.Use(middlewares.AddRequestIdentityToContext)

return router
}
Expand Down
50 changes: 0 additions & 50 deletions api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,56 +305,6 @@ var _ = Describe("Service Broker API", func() {
})
})

Describe("RequestIdentityHeader", func() {

var (
fakeServiceBroker *fakes.AutoFakeServiceBroker
req *http.Request
testServer *httptest.Server
)

BeforeEach(func() {
fakeServiceBroker = new(fakes.AutoFakeServiceBroker)
brokerAPI = brokerapi.New(fakeServiceBroker, brokerLogger, credentials)

testServer = httptest.NewServer(brokerAPI)
var err error
req, err = http.NewRequest("GET", testServer.URL+"/v2/catalog", nil)
Expect(err).NotTo(HaveOccurred())
req.Header.Add("X-Broker-API-Version", "2.14")
req.SetBasicAuth(credentials.Username, credentials.Password)
})

AfterEach(func() {
testServer.Close()
})

When("X-Broker-API-Request-Identity is passed", func() {
It("Adds it to the context", func() {
const requestIdentity = "Request Identity Name"
req.Header.Add("X-Broker-API-Request-Identity", requestIdentity)

_, err := http.DefaultClient.Do(req)
Expect(err).NotTo(HaveOccurred())

Expect(fakeServiceBroker.ServicesCallCount()).To(Equal(1), "Services was not called")
ctx := fakeServiceBroker.ServicesArgsForCall(0)
Expect(ctx.Value("requestIdentity")).To(Equal(requestIdentity))

})
})
When("X-Broker-API-Request-Identity is not passed", func() {
It("Adds empty requestIdentity to the context", func() {
_, err := http.DefaultClient.Do(req)
Expect(err).NotTo(HaveOccurred())

Expect(fakeServiceBroker.ServicesCallCount()).To(Equal(1), "Services was not called")
ctx := fakeServiceBroker.ServicesArgsForCall(0)
Expect(ctx.Value("requestIdentity")).To(Equal(""))
})
})
})

Describe("catalog endpoint", func() {
makeCatalogRequest := func(apiVersion string, fail bool) *httptest.ResponseRecorder {
recorder := httptest.NewRecorder()
Expand Down
16 changes: 0 additions & 16 deletions middlewares/request_identity_header.go

This file was deleted.

0 comments on commit c9c9e91

Please sign in to comment.