Expose ServicePlan SB schema via ui-api-layer (#933)

components/ui-api-layer/internal/domain/servicecatalog/serviceplan_converter.go

@@ -28,12 +28,20 @@ func (p *servicePlanConverter) ToGQL(item *v1beta1.ServicePlan) (*gqlschema.Serv
 
 	var instanceCreateParameterSchema *gqlschema.JSON
 	if item.Spec.ServiceInstanceCreateParameterSchema != nil {
-		unpackedSchema, err := p.unpackInstanceCreateParameterSchema(item.Spec.ServiceInstanceCreateParameterSchema.Raw)
+		unpackedSchema, err := p.unpackCreateParameterSchema(item.Spec.ServiceInstanceCreateParameterSchema.Raw)
 		if err != nil {
-			return nil, p.wrapConversionError(err, item.Name)
+			return nil, errors.Wrapf(err, "while unpacking service instance create parameter schema from ServicePlan [%s]", item.Name)
 		}
 		instanceCreateParameterSchema = &unpackedSchema
 	}
+	var bindingCreateParameterSchema *gqlschema.JSON
+	if item.Spec.ServiceBindingCreateParameterSchema != nil {
+		unpackedSchema, err := p.unpackCreateParameterSchema(item.Spec.ServiceBindingCreateParameterSchema.Raw)
+		if err != nil {
+			return nil, errors.Wrapf(err, "while unpacking service binding create parameter schema from ServicePlan [%s]", item.Name)
+		}
+		bindingCreateParameterSchema = &unpackedSchema
+	}
 
 	displayName := resource.ToStringPtr(externalMetadata["displayName"])
 	plan := gqlschema.ServicePlan{
@@ -44,6 +52,7 @@ func (p *servicePlanConverter) ToGQL(item *v1beta1.ServicePlan) (*gqlschema.Serv
 		Description:                   item.Spec.Description,
 		RelatedServiceClassName:       item.Spec.ServiceClassRef.Name,
 		InstanceCreateParameterSchema: instanceCreateParameterSchema,
+		BindingCreateParameterSchema:  bindingCreateParameterSchema,
 	}
 
 	return &plan, nil
@@ -68,26 +77,26 @@ func (p *servicePlanConverter) wrapConversionError(err error, name string) error
 	return errors.Wrapf(err, "while converting item %s to ServicePlan", name)
 }
 
-func (p *servicePlanConverter) unpackInstanceCreateParameterSchema(raw []byte) (gqlschema.JSON, error) {
+func (p *servicePlanConverter) unpackCreateParameterSchema(raw []byte) (gqlschema.JSON, error) {
 	if len(raw) == 0 {
 		return nil, nil
 	}
 
 	decoded := make([]byte, base64.StdEncoding.DecodedLen(len(raw)))
 	_, err := base64.StdEncoding.Decode(decoded, raw)
 	if err != nil {
-		return p.extractInstanceCreateSchema(raw)
+		return p.extractCreateSchema(raw)
 	}
 
-	return p.extractInstanceCreateSchema(decoded)
+	return p.extractCreateSchema(decoded)
 }
 
-func (p *servicePlanConverter) extractInstanceCreateSchema(raw []byte) (map[string]interface{}, error) {
+func (p *servicePlanConverter) extractCreateSchema(raw []byte) (map[string]interface{}, error) {
 	extracted := make(map[string]interface{})
 
 	err := json.Unmarshal(raw, &extracted)
 	if err != nil {
-		return nil, errors.Wrap(err, "while extracting instance creation parameter schema")
+		return nil, errors.Wrap(err, "while extracting creation parameter schema")
 	}
 
 	return extracted, nil

components/ui-api-layer/internal/domain/servicecatalog/serviceplan_converter_test.go

@@ -48,6 +48,9 @@ func TestServicePlanConverter_ToGQL(t *testing.T) {
 					ServiceInstanceCreateParameterSchema: &runtime.RawExtension{
 						Raw: encodedParameterSchemaBytes,
 					},
+					ServiceBindingCreateParameterSchema: &runtime.RawExtension{
+						Raw: encodedParameterSchemaBytes,
+					},
 				},
 				ServiceClassRef: v1beta1.LocalObjectReference{
 					Name: "serviceClassRef",
@@ -65,6 +68,7 @@ func TestServicePlanConverter_ToGQL(t *testing.T) {
 			DisplayName:                   &displayName,
 			ExternalName:                  "ExampleExternalName",
 			InstanceCreateParameterSchema: parameterSchemaJSON,
+			BindingCreateParameterSchema:  parameterSchemaJSON,
 		}
 
 		result, err := converter.ToGQL(&clusterServicePlan)
@@ -156,6 +160,9 @@ func fixServicePlan(t require.TestingT) *v1beta1.ServicePlan {
 				ServiceInstanceCreateParameterSchema: &runtime.RawExtension{
 					Raw: encodedParameterSchemaBytes,
 				},
+				ServiceBindingCreateParameterSchema: &runtime.RawExtension{
+					Raw: encodedParameterSchemaBytes,
+				},
 			},
 			ServiceClassRef: v1beta1.LocalObjectReference{
 				Name: "serviceClassRef",

components/ui-api-layer/internal/gqlschema/schema.graphql

@@ -146,6 +146,7 @@ type ServicePlan {
     description: String!
     relatedServiceClassName: String!
     instanceCreateParameterSchema: JSON
+    bindingCreateParameterSchema: JSON
 }
 
 type ClusterServicePlan {