Implement creation of managed service instances

fixes #3288 fixes #3439 Co-authored-by: Yusmen Zabanov <[email protected]> Co-authored-by: Georgi Sabev <[email protected]>
cloudfoundry · Sep 9, 2024 · e62b4d6 · e62b4d6
1 parent 9fb4745
commit e62b4d6
Show file tree

Hide file tree

Showing 65 changed files with 4,294 additions and 1,278 deletions.
diff --git a/api/handlers/fake/cfservice_instance_repository.go b/api/handlers/fake/cfservice_instance_repository.go
diff --git a/api/handlers/job.go b/api/handlers/job.go
@@ -17,19 +17,19 @@ import (
 )
 
 const (
-	JobPath                    = "/v3/jobs/{guid}"
-	syncSpaceJobType           = "space.apply_manifest"
-	AppDeleteJobType           = "app.delete"
-	OrgDeleteJobType           = "org.delete"
-	RouteDeleteJobType         = "route.delete"
-	SpaceDeleteJobType         = "space.delete"
-	DomainDeleteJobType        = "domain.delete"
-	RoleDeleteJobType          = "role.delete"
-	ServiceBrokerCreateJobType = "service_broker.create"
-	ServiceBrokerUpdateJobType = "service_broker.update"
-	ServiceBrokerDeleteJobType = "service_broker.delete"
-
-	JobTimeoutDuration = 120.0
+	JobPath                             = "/v3/jobs/{guid}"
+	syncSpaceJobType                    = "space.apply_manifest"
+	AppDeleteJobType                    = "app.delete"
+	OrgDeleteJobType                    = "org.delete"
+	RouteDeleteJobType                  = "route.delete"
+	SpaceDeleteJobType                  = "space.delete"
+	DomainDeleteJobType                 = "domain.delete"
+	RoleDeleteJobType                   = "role.delete"
+	ServiceBrokerCreateJobType          = "service_broker.create"
+	ServiceBrokerUpdateJobType          = "service_broker.update"
+	ServiceBrokerDeleteJobType          = "service_broker.delete"
+	ManagedServiceInstanceCreateJobType = "managed_service_instance.create"
+	JobTimeoutDuration                  = 120.0
 )
 
 const JobResourceType = "Job"

diff --git a/api/handlers/service_instance.go b/api/handlers/service_instance.go
@@ -27,7 +27,8 @@ const (
 
 //counterfeiter:generate -o fake -fake-name CFServiceInstanceRepository . CFServiceInstanceRepository
 type CFServiceInstanceRepository interface {
-	CreateServiceInstance(context.Context, authorization.Info, repositories.CreateServiceInstanceMessage) (repositories.ServiceInstanceRecord, error)
+	CreateUserProvidedServiceInstance(context.Context, authorization.Info, repositories.CreateUPSIMessage) (repositories.ServiceInstanceRecord, error)
+	CreateManagedServiceInstance(context.Context, authorization.Info, repositories.CreateManagedSIMessage) (repositories.ServiceInstanceRecord, error)
 	PatchServiceInstance(context.Context, authorization.Info, repositories.PatchServiceInstanceMessage) (repositories.ServiceInstanceRecord, error)
 	ListServiceInstances(context.Context, authorization.Info, repositories.ListServiceInstanceMessage) ([]repositories.ServiceInstanceRecord, error)
 	GetServiceInstance(context.Context, authorization.Info, string) (repositories.ServiceInstanceRecord, error)
@@ -82,9 +83,37 @@ func (h *ServiceInstance) create(r *http.Request) (*routing.Response, error) {
 		)
 	}
 
-	serviceInstanceRecord, err := h.serviceInstanceRepo.CreateServiceInstance(r.Context(), authInfo, payload.ToServiceInstanceCreateMessage())
+	if payload.Type == "managed" {
+		return h.createManagedServiceInstance(r.Context(), logger, authInfo, payload)
+	}
+
+	return h.createUserProvidedServiceInstance(r.Context(), logger, authInfo, payload)
+}
+
+func (h *ServiceInstance) createManagedServiceInstance(
+	ctx context.Context,
+	logger logr.Logger,
+	authInfo authorization.Info,
+	payload payloads.ServiceInstanceCreate,
+) (*routing.Response, error) {
+	serviceInstanceRecord, err := h.serviceInstanceRepo.CreateManagedServiceInstance(ctx, authInfo, payload.ToManagedSICreateMessage())
+	if err != nil {
+		return nil, apierrors.LogAndReturn(logger, err, "Failed to create managed service instance", "Service Instance Name", payload.Name)
+	}
+
+	return routing.NewResponse(http.StatusAccepted).
+		WithHeader("Location", presenter.JobURLForRedirects(serviceInstanceRecord.GUID, presenter.ManagedServiceInstanceCreateOperation, h.serverURL)), nil
+}
+
+func (h *ServiceInstance) createUserProvidedServiceInstance(
+	ctx context.Context,
+	logger logr.Logger,
+	authInfo authorization.Info,
+	payload payloads.ServiceInstanceCreate,
+) (*routing.Response, error) {
+	serviceInstanceRecord, err := h.serviceInstanceRepo.CreateUserProvidedServiceInstance(ctx, authInfo, payload.ToUPSICreateMessage())
 	if err != nil {
-		return nil, apierrors.LogAndReturn(logger, err, "Failed to create service instance", "Service Instance Name", serviceInstanceRecord.Name)
+		return nil, apierrors.LogAndReturn(logger, err, "Failed to create user provided service instance", "Service Instance Name", payload.Name)
 	}
 
 	return routing.NewResponse(http.StatusCreated).WithBody(presenter.ForServiceInstance(serviceInstanceRecord, h.serverURL)), nil