Use k8s NewUUID method exclusively (#1836)

* Use only k8s uuid generator. Fixes #1686.

* Fix uuid creation call.

Author: n3wscott

Gopkg.lock

@@ -22,7 +22,8 @@ import (
 	"net/http"
 
 	"github.com/kubernetes-incubator/service-catalog/contrib/pkg/brokerapi"
-	uuid "github.com/satori/go.uuid"
+
+	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 // Client implements a fake (./pkg/brokerapi).BrokerClient. The implementation is 100% in-memory
@@ -176,9 +177,9 @@ func (i *InstanceClient) exists(id string) bool {
 
 func convertInstanceRequest(req *brokerapi.CreateServiceInstanceRequest) *brokerapi.ServiceInstance {
 	return &brokerapi.ServiceInstance{
-		ID:               uuid.NewV4().String(),
+		ID:               string(uuid.NewUUID()),
 		DashboardURL:     "https://github.com/kubernetes-incubator/service-catalog",
-		InternalID:       uuid.NewV4().String(),
+		InternalID:       string(uuid.NewUUID()),
 		ServiceID:        req.ServiceID,
 		PlanID:           req.PlanID,
 		OrganizationGUID: req.OrgID,
@@ -249,7 +250,7 @@ func (b *BindingClient) exists(instanceID, bindingID string) bool {
 
 func convertBindingRequest(req *brokerapi.BindingRequest) *brokerapi.ServiceBinding {
 	return &brokerapi.ServiceBinding{
-		ID:            uuid.NewV4().String(),
+		ID:            string(uuid.NewUUID()),
 		ServiceID:     req.ServiceID,
 		ServicePlanID: req.PlanID,
 		Parameters:    req.Parameters,

contrib/pkg/brokerapi/fake/fake.go

@@ -23,12 +23,13 @@ import (
 	"fmt"
 	"github.com/google/gofuzz"
 	"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog"
-	"github.com/satori/go.uuid"
+
 	"k8s.io/apimachinery/pkg/api/testing/fuzzer"
 	genericfuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 type serviceMetadata struct {
@@ -99,7 +100,7 @@ func servicecatalogFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
 		},
 		func(is *servicecatalog.ServiceInstanceSpec, c fuzz.Continue) {
 			c.FuzzNoCustom(is)
-			is.ExternalID = uuid.NewV4().String()
+			is.ExternalID = string(uuid.NewUUID())
 			parameters, err := createParameter(c)
 			if err != nil {
 				panic(fmt.Sprintf("Failed to create parameter object: %v", err))
@@ -108,7 +109,7 @@ func servicecatalogFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
 		},
 		func(bs *servicecatalog.ServiceBindingSpec, c fuzz.Continue) {
 			c.FuzzNoCustom(bs)
-			bs.ExternalID = uuid.NewV4().String()
+			bs.ExternalID = string(uuid.NewUUID())
 			// Don't allow the SecretName to be an empty string because
 			// the defaulter for this object (on the server) will set it to
 			// a non-empty string, which means the round-trip checking will

pkg/apis/servicecatalog/testing/fuzzer.go

@@ -28,12 +28,12 @@ import (
 	"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/testapi"
 	sctesting "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/testing"
 
-	"github.com/satori/go.uuid"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/testing/fuzzer"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apimachinery/pkg/util/json"
+	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 // doUnstructuredRoundTrip performs the following round-tripping on a fuzzed
@@ -62,12 +62,12 @@ func doUnstructuredRoundTrip(t *testing.T, group testapi.TestGroup, kind string)
 		// experience some reordering during unstructured roundtripping.
 		func(is *servicecatalog.ServiceInstanceSpec, c fuzz.Continue) {
 			c.FuzzNoCustom(is)
-			is.ExternalID = uuid.NewV4().String()
+			is.ExternalID = string(uuid.NewUUID())
 			is.Parameters = nil
 		},
 		func(bs *servicecatalog.ServiceBindingSpec, c fuzz.Continue) {
 			c.FuzzNoCustom(bs)
-			bs.ExternalID = uuid.NewV4().String()
+			bs.ExternalID = string(uuid.NewUUID())
 			// Don't allow the SecretName to be an empty string because
 			// the defaulter for this object (on the server) will set it to
 			// a non-empty string, which means the round-trip checking will

pkg/apis/servicecatalog/unstructured_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/satori/go.uuid"
+	"time"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"time"
+	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
@@ -39,13 +40,13 @@ func SetDefaults_ClusterServiceBrokerSpec(spec *ClusterServiceBrokerSpec) {
 
 func SetDefaults_ServiceInstanceSpec(spec *ServiceInstanceSpec) {
 	if spec.ExternalID == "" {
-		spec.ExternalID = uuid.NewV4().String()
+		spec.ExternalID = string(uuid.NewUUID())
 	}
 }
 
 func SetDefaults_ServiceBindingSpec(spec *ServiceBindingSpec) {
 	if spec.ExternalID == "" {
-		spec.ExternalID = uuid.NewV4().String()
+		spec.ExternalID = string(uuid.NewUUID())
 	}
 }