update OSB client to 2.13 (openshift#1392)

* change alpha resources to non-alpha versions

* update OSB client to 2.13

Author: kibbles-n-bytes

glide.lock

@@ -88,4 +88,4 @@ import:
 - package: code.cloudfoundry.org/lager
   version: dfcbcba2dd4a5228c43b0292d219d5c010daed3a
 - package: github.com/pmorie/go-open-service-broker-client
-  version: 962a416798366b37a20a06fdb0a09180589ca964
+  version: 530248ec023d52217c43db2f06fa03ce844c40cc

glide.yaml

@@ -584,7 +584,7 @@ func convertClusterServicePlans(plans []osb.Plan, serviceClassID string) ([]*v1b
 			servicePlans[i].Spec.ExternalMetadata = &runtime.RawExtension{Raw: metadata}
 		}
 
-		if schemas := plan.AlphaParameterSchemas; schemas != nil {
+		if schemas := plan.ParameterSchemas; schemas != nil {
 			if instanceSchemas := schemas.ServiceInstances; instanceSchemas != nil {
 				if instanceCreateSchema := instanceSchemas.Create; instanceCreateSchema != nil && instanceCreateSchema.Parameters != nil {
 					schema, err := json.Marshal(instanceCreateSchema.Parameters)

pkg/controller/controller.go

@@ -1743,7 +1743,7 @@ func TestReconcileBindingUsingOriginatingIdentity(t *testing.T) {
 				t.Errorf("%v: unexpected request type; expected %T, got %T", tc.name, &osb.BindRequest{}, actualRequest)
 				return
 			}
-			var expectedOriginatingIdentity *osb.AlphaOriginatingIdentity
+			var expectedOriginatingIdentity *osb.OriginatingIdentity
 			if tc.expectedOriginatingIdentity {
 				expectedOriginatingIdentity = testOriginatingIdentity
 			}
@@ -1794,7 +1794,7 @@ func TestReconcileBindingDeleteUsingOriginatingIdentity(t *testing.T) {
 				t.Errorf("%v: unexpected request type; expected %T, got %T", tc.name, &osb.UnbindRequest{}, actualRequest)
 				return
 			}
-			var expectedOriginatingIdentity *osb.AlphaOriginatingIdentity
+			var expectedOriginatingIdentity *osb.OriginatingIdentity
 			if tc.expectedOriginatingIdentity {
 				expectedOriginatingIdentity = testOriginatingIdentity
 			}

pkg/controller/controller_binding_test.go

@@ -692,7 +692,7 @@ func (c *controller) reconcileServiceInstance(instance *v1beta1.ServiceInstance)
 		UserInfo:                       instance.Spec.UserInfo,
 	}
 
-	var originatingIdentity *osb.AlphaOriginatingIdentity
+	var originatingIdentity *osb.OriginatingIdentity
 	if utilfeature.DefaultFeatureGate.Enabled(scfeatures.OriginatingIdentity) {
 		originatingIdentity, err = buildOriginatingIdentity(instance.Spec.UserInfo)
 		if err != nil {

pkg/controller/controller_instance.go

@@ -2716,7 +2716,7 @@ func TestReconcileInstanceUsingOriginatingIdentity(t *testing.T) {
 				t.Errorf("%v: unexpected request type; expected %T, got %T", tc.name, &osb.ProvisionRequest{}, actualRequest)
 				return
 			}
-			var expectedOriginatingIdentity *osb.AlphaOriginatingIdentity
+			var expectedOriginatingIdentity *osb.OriginatingIdentity
 			if tc.expectedOriginatingIdentity {
 				expectedOriginatingIdentity = testOriginatingIdentity
 			}
@@ -2770,7 +2770,7 @@ func TestReconcileInstanceDeleteUsingOriginatingIdentity(t *testing.T) {
 				t.Errorf("%v: unexpected request type; expected %T, got %T", tc.name, &osb.DeprovisionRequest{}, actualRequest)
 				return
 			}
-			var expectedOriginatingIdentity *osb.AlphaOriginatingIdentity
+			var expectedOriginatingIdentity *osb.OriginatingIdentity
 			if tc.expectedOriginatingIdentity {
 				expectedOriginatingIdentity = testOriginatingIdentity
 			}
@@ -2817,7 +2817,7 @@ func TestPollInstanceUsingOriginatingIdentity(t *testing.T) {
 				t.Errorf("%v: unexpected request type; expected %T, got %T", tc.name, &osb.LastOperationRequest{}, actualRequest)
 				return
 			}
-			var expectedOriginatingIdentity *osb.AlphaOriginatingIdentity
+			var expectedOriginatingIdentity *osb.OriginatingIdentity
 			if tc.expectedOriginatingIdentity {
 				expectedOriginatingIdentity = testOriginatingIdentity
 			}

pkg/controller/controller_instance_test.go

@@ -350,7 +350,7 @@ const testOriginatingIdentityValue = `{
 	"fakekey": ["fakevalue"]
 }`
 
-var testOriginatingIdentity = &osb.AlphaOriginatingIdentity{
+var testOriginatingIdentity = &osb.OriginatingIdentity{
 	Platform: originatingIdentityPlatform,
 	Value:    testOriginatingIdentityValue,
 }
@@ -775,7 +775,7 @@ func TestCatalogConversion(t *testing.T) {
 	checkPlan(servicePlans[1], "0f4008b5-XXXX-XXXX-XXXX-dace631cd648", "fake-plan-2", "Shared fake Server, 5tb persistent disk, 40 max concurrent connections. 100 async", t)
 }
 
-func TestCatalogConversionWithAlphaParameterSchemas(t *testing.T) {
+func TestCatalogConversionWithParameterSchemas(t *testing.T) {
 	catalog := &osb.CatalogResponse{}
 	err := json.Unmarshal([]byte(alphaParameterSchemaCatalogBytes), &catalog)
 	if err != nil {
@@ -2473,7 +2473,7 @@ func assertUnbind(t *testing.T, action fakeosb.Action, request *osb.UnbindReques
 	}
 }
 
-func assertOriginatingIdentity(t *testing.T, expected *osb.AlphaOriginatingIdentity, actual *osb.AlphaOriginatingIdentity) {
+func assertOriginatingIdentity(t *testing.T, expected *osb.OriginatingIdentity, actual *osb.OriginatingIdentity) {
 	if e, a := expected, actual; (e != nil) != (a != nil) {
 		fatalf(t, "unexpected originating identity in request: expected %q, got %q", e, a)
 	}

pkg/controller/controller_test.go

@@ -30,7 +30,7 @@ const (
 	originatingIdentityGroups   = "groups"
 )
 
-func buildOriginatingIdentity(userInfo *v1beta1.UserInfo) (*osb.AlphaOriginatingIdentity, error) {
+func buildOriginatingIdentity(userInfo *v1beta1.UserInfo) (*osb.OriginatingIdentity, error) {
 	if userInfo == nil {
 		return nil, nil
 	}
@@ -45,7 +45,7 @@ func buildOriginatingIdentity(userInfo *v1beta1.UserInfo) (*osb.AlphaOriginating
 	if err != nil {
 		return nil, err
 	}
-	oi := &osb.AlphaOriginatingIdentity{
+	oi := &osb.OriginatingIdentity{
 		Platform: originatingIdentityPlatform,
 		Value:    string(oiValue),
 	}