correct serialisation of tsb json schemas

Author: Jim Minter

pkg/openservicebroker/api/types.go

@@ -1,7 +1,7 @@
 package api
 
 // from https://github.com/openservicebrokerapi/servicebroker/blob/1d301105c66187b5aa2e061a1264ecf3cbc3d2a0/_spec.md
-// and https://github.com/avade/servicebroker/blob/9ef94ce96ca65bfc9ce482d5ea5be0ad62643a84/_spec.md
+// and https://github.com/avade/servicebroker/blob/8c340c610c6085c1aa32144faef0d1600c21576c/_spec.md
 
 import (
 	jsschema "github.com/lestrrat/go-jsschema"
@@ -42,8 +42,8 @@ type Plan struct {
 }
 
 type Schema struct {
-	ServiceInstances ServiceInstances `json:"service-instances,omitempty"`
-	ServiceBindings  ServiceBindings  `json:"service-bindings,omitempty"`
+	ServiceInstance ServiceInstances `json:"service_instance,omitempty"`
+	ServiceBinding  ServiceBindings  `json:"service_binding,omitempty"`
 }
 
 type ServiceInstances struct {

pkg/template/servicebroker/catalog.go

@@ -77,7 +77,7 @@ func serviceFromTemplate(template *templateapi.Template) *api.Service {
 		Free:        true,
 		Bindable:    true,
 		Schemas: api.Schema{
-			ServiceInstances: api.ServiceInstances{
+			ServiceInstance: api.ServiceInstances{
 				Create: map[string]*jsschema.Schema{
 					"parameters": {
 						SchemaRef:  jsschema.SchemaURL,
@@ -87,7 +87,7 @@ func serviceFromTemplate(template *templateapi.Template) *api.Service {
 					},
 				},
 			},
-			ServiceBindings: api.ServiceBindings{
+			ServiceBinding: api.ServiceBindings{
 				Create: map[string]*jsschema.Schema{
 					"parameters": {
 						SchemaRef: jsschema.SchemaURL,

pkg/template/servicebroker/catalog_test.go

@@ -61,7 +61,7 @@ func TestServiceFromTemplate(t *testing.T) {
 				Free:        true,
 				Bindable:    true,
 				Schemas: api.Schema{
-					ServiceInstances: api.ServiceInstances{
+					ServiceInstance: api.ServiceInstances{
 						Create: map[string]*schema.Schema{
 							"parameters": {
 								Type:      schema.PrimitiveTypes{schema.ObjectType},
@@ -94,7 +94,7 @@ func TestServiceFromTemplate(t *testing.T) {
 							},
 						},
 					},
-					ServiceBindings: api.ServiceBindings{
+					ServiceBinding: api.ServiceBindings{
 						Create: map[string]*schema.Schema{
 							"parameters": {
 								Type:      schema.PrimitiveTypes{schema.ObjectType},