Merge pull request #434 from Peripli/master-smaap

Service manager as a platform

.travis.yml

@@ -13,8 +13,10 @@ services:
   - postgresql
 
 script:
+  - while sleep 9m; do echo "=====[already running for $SECONDS ...]====="; done &
   - make precommit
   - goveralls -coverprofile profile.cov -service=travis-ci
+  - kill %1
 
 
 notifications:

Makefile

@@ -44,7 +44,7 @@ GO_BUILD 		= env CGO_ENABLED=0 GOOS=$(PLATFORM) GOARCH=$(ARCH) \
            		$(GO) build $(GO_FLAGS) -ldflags '-s -w $(BUILD_LDFLAGS) $(VERSION_FLAGS)'
 
 # TEST_FLAGS - extra "go test" flags to use
-GO_INT_TEST 	= $(GO) test -p 1 -race -coverpkg $(shell go list ./... | egrep -v "fakes|test|cmd|parser" | paste -sd "," -) \
+GO_INT_TEST 	= $(GO) test -p 1 -timeout 30m -race -coverpkg $(shell go list ./... | egrep -v "fakes|test|cmd|parser" | paste -sd "," -) \
 				./test/... $(TEST_FLAGS) -coverprofile=$(INT_TEST_PROFILE)
 
 GO_UNIT_TEST 	= $(GO) test -p 1 -race -coverpkg $(shell go list ./... | egrep -v "fakes|test|cmd|parser" | paste -sd "," -) \

api/api.go

@@ -93,19 +93,22 @@ func New(ctx context.Context, e env.Environment, options *Options) (*web.API, er
 	return &web.API{
 		// Default controllers - more filters can be registered using the relevant API methods
 		Controllers: []web.Controller{
-			NewAsyncController(ctx, options, web.ServiceBrokersURL, types.ServiceBrokerType, func() types.Object {
+			NewAsyncController(ctx, options, web.ServiceBrokersURL, types.ServiceBrokerType, false, func() types.Object {
 				return &types.ServiceBroker{}
 			}),
-			NewController(options, web.PlatformsURL, types.PlatformType, func() types.Object {
+			NewController(ctx, options, web.PlatformsURL, types.PlatformType, func() types.Object {
 				return &types.Platform{}
 			}),
-			NewController(options, web.VisibilitiesURL, types.VisibilityType, func() types.Object {
+			NewController(ctx, options, web.VisibilitiesURL, types.VisibilityType, func() types.Object {
 				return &types.Visibility{}
 			}),
+			NewServiceInstanceController(ctx, options),
+			NewServiceBindingController(ctx, options),
 			apiNotifications.NewController(ctx, options.Repository, options.WSSettings, options.Notificator),
-			NewServiceOfferingController(options),
-			NewServicePlanController(options),
-			NewServiceInstanceController(options),
+
+			NewServiceOfferingController(ctx, options),
+			NewServicePlanController(ctx, options),
+
 			&info.Controller{
 				TokenIssuer:    options.APISettings.TokenIssuerURL,
 				TokenBasicAuth: options.APISettings.TokenBasicAuth,
@@ -130,6 +133,10 @@ func New(ctx context.Context, e env.Environment, options *Options) (*web.API, er
 			&filters.Logging{},
 			&filters.SelectionCriteria{},
 			filters.NewProtectedLabelsFilter(options.APISettings.ProtectedLabels),
+			&filters.ProtectedSMPlatformFilter{},
+			&filters.ServiceInstanceFilter{},
+			&filters.ServiceInstanceStripFilter{},
+			&filters.ServiceBindingStripFilter{},
 			&filters.PlatformAwareVisibilityFilter{},
 			&filters.PatchOnlyLabelsFilter{},
 			filters.NewPlansFilterByVisibility(options.Repository),