Services and Plans APIs (Peripli#187)

Gopkg.toml

@@ -93,6 +93,14 @@
   name = "github.com/DATA-DOG/go-sqlmock"
   revision = "852fc940e4b9b895dc144b88ee8f6e39228127b0"
 
+[[constraint]]
+  name = "github.com/tidwall/gjson"
+  version = "v1.1.3"
+
+[[constraint]]
+  name = "github.com/tidwall/sjson"
+  version = "v1.0.2"
+
 # Refer to issue https://github.com/golang/dep/issues/1799
 [[override]]
 name = "gopkg.in/fsnotify.v1"

api/api.go

@@ -23,12 +23,16 @@ import (
 	"net/http"
 
 	"github.com/Peripli/service-manager/api/broker"
+	"github.com/Peripli/service-manager/api/platform"
+
+	"github.com/Peripli/service-manager/api/service_offering"
+	"github.com/Peripli/service-manager/api/service_plan"
+
 	"github.com/Peripli/service-manager/api/filters"
 	"github.com/Peripli/service-manager/api/filters/authn/basic"
 	"github.com/Peripli/service-manager/api/filters/authn/oauth"
 	"github.com/Peripli/service-manager/api/info"
 	"github.com/Peripli/service-manager/api/osb"
-	"github.com/Peripli/service-manager/api/platform"
 	"github.com/Peripli/service-manager/pkg/health"
 	"github.com/Peripli/service-manager/pkg/security"
 	secfilters "github.com/Peripli/service-manager/pkg/security/filters"
@@ -65,7 +69,6 @@ func DefaultSettings() *Settings {
 		ClientID:          "",
 		SkipSSLValidation: false,
 	}
-
 }
 
 // Validate validates the API settings
@@ -77,41 +80,45 @@ func (s *Settings) Validate() error {
 }
 
 // New returns the minimum set of REST APIs needed for the Service Manager
-func New(ctx context.Context, store storage.Storage, settings *Settings, encrypter security.Encrypter) (*web.API, error) {
+func New(ctx context.Context, repository storage.Repository, settings *Settings, encrypter security.Encrypter) (*web.API, error) {
 	bearerAuthnFilter, err := oauth.NewFilter(ctx, settings.TokenIssuerURL, settings.ClientID)
 	if err != nil {
 		return nil, err
 	}
-	healthRegistry := health.NewDefaultRegistry()
-	healthRegistry.AddHealthIndicator(&storage.HealthIndicator{Storage: store})
 	return &web.API{
 		// Default controllers - more filters can be registered using the relevant API methods
 		Controllers: []web.Controller{
 			&broker.Controller{
-				BrokerStorage:       store.Broker(),
+				Repository:          repository,
 				OSBClientCreateFunc: newOSBClient(settings.SkipSSLValidation),
 				Encrypter:           encrypter,
 			},
 			&platform.Controller{
-				PlatformStorage: store.Platform(),
+				PlatformStorage: repository.Platform(),
 				Encrypter:       encrypter,
 			},
+			&service_offering.Controller{
+				ServiceOfferingStorage: repository.ServiceOffering(),
+			},
+			&service_plan.Controller{
+				ServicePlanStorage: repository.ServicePlan(),
+			},
 			&info.Controller{
 				TokenIssuer: settings.TokenIssuerURL,
 			},
 			osb.NewController(&osb.StorageBrokerFetcher{
-				BrokerStorage: store.Broker(),
+				BrokerStorage: repository.Broker(),
 				Encrypter:     encrypter,
 			}, http.DefaultTransport),
 		},
 		// Default filters - more filters can be registered using the relevant API methods
 		Filters: []web.Filter{
 			&filters.Logging{},
-			basic.NewFilter(store.Credentials(), encrypter),
+			basic.NewFilter(repository.Credentials(), encrypter),
 			bearerAuthnFilter,
 			secfilters.NewRequiredAuthnFilter(),
 		},
-		Registry: healthRegistry,
+		Registry: health.NewDefaultRegistry(),
 	}, nil
 }
 

api/broker/broker.go

@@ -45,7 +45,7 @@ func (c *Controller) Routes() []web.Route {
 				Method: http.MethodGet,
 				Path:   web.BrokersURL,
 			},
-			Handler: c.getAllBrokers,
+			Handler: c.listBrokers,
 		},
 		{
 			Endpoint: web.Endpoint{