Merge branch 'master' into subacc-tech-access

# Conflicts:
#	internal/cmd/broker/delete_broker.go
#	internal/cmd/broker/delete_broker_test.go
#	internal/cmd/broker/register_broker.go
#	internal/cmd/label/label.go
#	internal/cmd/label/label_test.go
#	internal/cmd/offering/list_offerings_test.go
#	internal/cmd/platform/delete_platform.go
#	internal/cmd/platform/delete_platform_test.go
#	internal/cmd/visibility/delete_visibility_test.go
#	pkg/smclient/client.go
#	pkg/smclient/client_test.go
#	pkg/smclient/smclientfakes/fake_client.go

Gopkg.toml

@@ -60,7 +60,7 @@ required = ["gopkg.in/fsnotify.v1"]
 
 [[constraint]]
   name = "github.com/Peripli/service-manager"
-  version = "0.4.3"
+  branch = "master"
 
 # Refer to issue https://github.com/golang/dep/issues/1799
  [[override]]

internal/cmd/broker/delete_broker.go

@@ -20,10 +20,13 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 
 	"github.com/Peripli/service-manager-cli/internal/output"
 	"github.com/Peripli/service-manager-cli/pkg/errors"
 
+	"github.com/Peripli/service-manager-cli/internal/util"
+
 	"github.com/spf13/cobra"
 
 	"github.com/Peripli/service-manager-cli/internal/cmd"
@@ -59,12 +62,11 @@ func (dbc *DeleteBrokerCmd) Validate(args []string) error {
 // Run runs the command's logic
 func (dbc *DeleteBrokerCmd) Run() error {
 	dbc.Parameters.FieldQuery = append(dbc.Parameters.FieldQuery, fmt.Sprintf("name = %s", dbc.name))
-
-	err := dbc.Client.DeleteBrokers(&dbc.Parameters)
-	if respErr, ok := err.(errors.ResponseError); ok && respErr.StatusCode == http.StatusNotFound {
-		output.PrintMessage(dbc.Output, "Service Broker(s) not found.\n")
-		return nil
-	} else if err != nil {
+	if err := dbc.Client.DeleteBrokers(&dbc.Parameters); err != nil {
+		if strings.Contains(err.Error(), "StatusCode: 404") {
+			output.PrintMessage(dbc.Output, "Service Broker(s) not found.\n")
+			return nil
+		}
 		output.PrintMessage(dbc.Output, "Could not delete broker(s). Reason: ")
 		return err
 	}

internal/cmd/broker/delete_broker_test.go

@@ -1,6 +1,8 @@
 package broker
 
 import (
+	"github.com/Peripli/service-manager/pkg/util"
+	"io/ioutil"
 	"net/http"
 	"testing"
 
@@ -10,7 +12,6 @@ import (
 	"bytes"
 
 	"github.com/Peripli/service-manager-cli/internal/cmd"
-	"github.com/Peripli/service-manager-cli/pkg/errors"
 	"github.com/Peripli/service-manager-cli/pkg/smclient/smclientfakes"
 	"github.com/Peripli/service-manager-cli/pkg/types"
 )
@@ -92,7 +93,8 @@ var _ = Describe("Delete brokers command test", func() {
 
 	Context("when non-existing brokers are being deleted", func() {
 		It("should return message", func() {
-			expectedError := errors.ResponseError{StatusCode: http.StatusNotFound}
+			body := ioutil.NopCloser(bytes.NewReader([]byte("")))
+			expectedError := util.HandleResponseError(&http.Response{Body: body, StatusCode: http.StatusNotFound})
 			client.DeleteBrokersReturns(expectedError)
 			err := executeWithArgs([]string{"non-existing-name", "-f"})
 
@@ -103,7 +105,8 @@ var _ = Describe("Delete brokers command test", func() {
 
 	Context("when SM returns error", func() {
 		It("should return error message", func() {
-			expectedError := errors.ResponseError{StatusCode: http.StatusInternalServerError}
+			body := ioutil.NopCloser(bytes.NewReader([]byte("")))
+			expectedError := util.HandleResponseError(&http.Response{Body: body, StatusCode: http.StatusInternalServerError})
 			client.DeleteBrokersReturns(expectedError)
 			err := executeWithArgs([]string{"name", "-f"})