-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into globalaccountstool-imprv1
- Loading branch information
Showing
15 changed files
with
314 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,32 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "io" | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| "github.com/google/uuid" | ||
| "github.com/pivotal-cf/brokerapi/v8/domain" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| type ErrorResponse struct { | ||
| Description string `json:"description"` | ||
| } | ||
|
|
||
| func TestBinding(t *testing.T) { | ||
| // given | ||
| suite := NewBrokerSuiteTest(t) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
| bid := uuid.New().String() | ||
|
|
||
| resp := suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| resp := suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
|
|
@@ -37,7 +45,7 @@ func TestBinding(t *testing.T) { | |
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
|
|
||
| // when | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15" | ||
|
|
@@ -47,13 +55,13 @@ func TestBinding(t *testing.T) { | |
| suite.Log(string(b)) | ||
| suite.Log(resp.Status) | ||
|
|
||
| respRuntimes := suite.CallAPI("GET", "/runtimes?bindings=true", "") | ||
| respRuntimes := suite.CallAPI(http.MethodGet, "/runtimes?bindings=true", "") | ||
| b, _ = io.ReadAll(respRuntimes.Body) | ||
| suite.Log(string(b)) | ||
| suite.Log(resp.Status) | ||
|
|
||
| t.Run("should return 400 when expiration seconds parameter is string instead of int", func(t *testing.T) { | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
|
|
@@ -62,19 +70,28 @@ func TestBinding(t *testing.T) { | |
| } | ||
| }`) | ||
| assert.Equal(t, http.StatusBadRequest, resp.StatusCode) | ||
|
|
||
| b, err := io.ReadAll(resp.Body) | ||
| assert.NoError(t, err) | ||
|
|
||
| var apiError ErrorResponse | ||
| err = json.Unmarshal(b, &apiError) | ||
| assert.NoError(t, err) | ||
|
|
||
| assert.Equal(t, "failed to unmarshal parameters: cannot unmarshal string into expiration_seconds of type int", apiError.Description) | ||
| }) | ||
|
|
||
| t.Run("should return 200 when creating a second binding with the same id and params as an existing one", func(t *testing.T) { | ||
| bid = uuid.New().String() | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
| "parameters": { | ||
| "expiration_seconds": 600 | ||
| } | ||
| }`) | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
|
|
@@ -85,7 +102,7 @@ func TestBinding(t *testing.T) { | |
| assert.Equal(t, http.StatusOK, resp.StatusCode) | ||
|
|
||
| // "expiration_seconds": 600 is a default value from the config in tests | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15" | ||
|
|
@@ -95,15 +112,15 @@ func TestBinding(t *testing.T) { | |
|
|
||
| t.Run("should return 409 when creating a second binding with the same id as an existing one but different params", func(t *testing.T) { | ||
| bid = uuid.New().String() | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
| "parameters": { | ||
| "expiration_seconds": 900 | ||
| } | ||
| }`) | ||
| resp = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| resp = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
|
|
@@ -116,3 +133,131 @@ func TestBinding(t *testing.T) { | |
| }) | ||
|
|
||
| } | ||
|
|
||
| func TestDeprovisioningWithExistingBindings(t *testing.T) { | ||
| // given | ||
| cfg := fixConfig() | ||
| // Disable EDP to have all steps successfully executed | ||
| cfg.EDP.Disabled = true | ||
| suite := NewBrokerSuiteTestWithConfig(t, cfg) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
| bindingID1 := uuid.New().String() | ||
| bindingID2 := uuid.New().String() | ||
|
|
||
| response := suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "subaccount_id": "sub-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "name": "testing-cluster", | ||
| "region": "eu-central-1" | ||
| } | ||
| }`) | ||
| opID := suite.DecodeOperationID(response) | ||
| suite.processProvisioningByOperationID(opID) | ||
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
|
|
||
| // when we create two bindings | ||
| response = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bindingID1), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15" | ||
| }`) | ||
| require.Equal(t, http.StatusCreated, response.StatusCode) | ||
|
|
||
| response = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bindingID2), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "361c511f-f939-4621-b228-d0fb79a1fe15" | ||
| }`) | ||
| require.Equal(t, http.StatusCreated, response.StatusCode) | ||
|
|
||
| // when we deprovision successfully | ||
| response = suite.CallAPI(http.MethodDelete, fmt.Sprintf("oauth/v2/service_instances/%s?accepts_incomplete=true&plan_id=361c511f-f939-4621-b228-d0fb79a1fe15&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid), | ||
| ``) | ||
| deprovisioningID := suite.DecodeOperationID(response) | ||
| suite.FinishDeprovisioningOperationByProvisioner(deprovisioningID) | ||
| suite.WaitForInstanceRemoval(iid) | ||
|
|
||
| // when we remove bindings and the instance is already removed | ||
| response = suite.CallAPI(http.MethodDelete, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s?plan_id=361c511f-f939-4621-b228-d0fb79a1fe15&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid, bindingID1), "") | ||
| assert.Equal(t, http.StatusGone, response.StatusCode) | ||
| response = suite.CallAPI(http.MethodDelete, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s?plan_id=361c511f-f939-4621-b228-d0fb79a1fe15&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid, bindingID2), "") | ||
| assert.Equal(t, http.StatusGone, response.StatusCode) | ||
|
|
||
| // then expect bindings to be removed | ||
| suite.AssertBindingRemoval(iid, bindingID1) | ||
| suite.AssertBindingRemoval(iid, bindingID2) | ||
| } | ||
|
|
||
| func TestRemoveBindingsFromSuspended(t *testing.T) { | ||
| // given | ||
| cfg := fixConfig() | ||
| cfg.Broker.Binding.BindablePlans = []string{"trial"} | ||
| suite := NewBrokerSuiteTestWithConfig(t, cfg) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
| bindingID1 := uuid.New().String() | ||
| bindingID2 := uuid.New().String() | ||
|
|
||
| response := suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true&plan_id=7d55d31d-35ae-4438-bf13-6ffdfa107d9f&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "7d55d31d-35ae-4438-bf13-6ffdfa107d9f", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "subaccount_id": "sub-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "name": "testing-cluster" | ||
| } | ||
| }`) | ||
| opID := suite.DecodeOperationID(response) | ||
| suite.processProvisioningByOperationID(opID) | ||
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
|
|
||
| //then we create two bindings | ||
| response = suite.CallAPI(http.MethodPut, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bindingID1), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "7d55d31d-35ae-4438-bf13-6ffdfa107d9f" | ||
| }`) | ||
| require.Equal(t, http.StatusCreated, response.StatusCode) | ||
|
|
||
| response = suite.CallAPI("PUT", fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s", iid, bindingID2), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "7d55d31d-35ae-4438-bf13-6ffdfa107d9f" | ||
| }`) | ||
| require.Equal(t, http.StatusCreated, response.StatusCode) | ||
|
|
||
| //when we suspend Service instance - OSB context update | ||
| response = suite.CallAPI(http.MethodPatch, fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "7d55d31d-35ae-4438-bf13-6ffdfa107d9f", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "user_id": "[email protected]", | ||
| "active": false | ||
| } | ||
| }`) | ||
| assert.Equal(t, http.StatusOK, response.StatusCode) | ||
| suspensionOpID := suite.WaitForLastOperation(iid, domain.InProgress) | ||
|
|
||
| suite.FinishDeprovisioningOperationByProvisioner(suspensionOpID) | ||
| suite.WaitForOperationState(suspensionOpID, domain.Succeeded) | ||
|
|
||
| // when we remove bindings we just return OK | ||
| response = suite.CallAPI(http.MethodDelete, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s?plan_id=361c511f-f939-4621-b228-d0fb79a1fe15&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid, bindingID1), "") | ||
| assert.Equal(t, http.StatusOK, response.StatusCode) | ||
| response = suite.CallAPI(http.MethodDelete, fmt.Sprintf("oauth/v2/service_instances/%s/service_bindings/%s?plan_id=361c511f-f939-4621-b228-d0fb79a1fe15&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid, bindingID2), "") | ||
| assert.Equal(t, http.StatusOK, response.StatusCode) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.