Broker API response now returns "service_brokers" instead of "brokers" (

#223)
Peripli · Feb 4, 2019 · 89b183d · 89b183d
1 parent 67dcd67
commit 89b183d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/pkg/types/broker.go b/pkg/types/broker.go
@@ -28,7 +28,7 @@ import (
 
 // Brokers struct
 type Brokers struct {
-	Brokers []*Broker `json:"brokers"`
+	Brokers []*Broker `json:"service_brokers"`
 }
 
 // Broker broker struct

diff --git a/test/broker_test/broker_test.go b/test/broker_test/broker_test.go
@@ -771,7 +771,7 @@ var _ = test.DescribeTestsFor(test.TestCase{
 							ctx.SMWithOAuth.GET("/v1/service_brokers").
 								Expect().
 								Status(http.StatusOK).
-								JSON().Object().Value("brokers").Array().First().Object().
+								JSON().Object().Value("service_brokers").Array().First().Object().
 								ContainsMap(expectedBrokerResponse)
 
 							assertInvocationCount(brokerServer.CatalogEndpointRequests, 1)

diff --git a/test/common/common.go b/test/common/common.go
@@ -188,7 +188,7 @@ func MapContains(actual Object, expected Object) {
 }
 
 func RemoveAllBrokers(SM *httpexpect.Expect) {
-	removeAll(SM, "brokers", "/v1/service_brokers")
+	removeAll(SM, "service_brokers", "/v1/service_brokers")
 }
 
 func RemoveAllPlatforms(SM *httpexpect.Expect) {

diff --git a/test/delete_list.go b/test/delete_list.go
@@ -285,12 +285,7 @@ func DescribeDeleteListFor(ctx *common.TestContext, t TestCase) bool {
 	}
 
 	verifyDeleteListOpHelper := func(deleteListOpEntry deleteOpEntry, query string) {
-
-		// workaround for brokers api
 		jsonArrayKey := strings.Replace(t.API, "/v1/", "", 1)
-		if jsonArrayKey == "service_brokers" {
-			jsonArrayKey = "brokers"
-		}
 
 		expectedAfterOpIDs := make([]string, 0)
 		unexpectedAfterOpIDs := make([]string, 0)

diff --git a/test/list.go b/test/list.go
@@ -273,11 +273,7 @@ func DescribeListTestsFor(ctx *common.TestContext, t TestCase) bool {
 		expectedAfterOpIDs = common.ExtractResourceIDs(listOpEntry.resourcesToExpectAfterOp)
 		unexpectedAfterOpIDs = common.ExtractResourceIDs(listOpEntry.resourcesNotToExpectAfterOp)
 
-		// workaround for brokers api
 		jsonArrayKey := strings.Replace(t.API, "/v1/", "", 1)
-		if jsonArrayKey == "service_brokers" {
-			jsonArrayKey = "brokers"
-		}
 
 		By(fmt.Sprintf("[TEST]: Verifying expected %s before operation after present", t.API))
 		beforeOpArray := ctx.SMWithOAuth.GET(t.API).