fix[114]: fixing ServiceInstance creation without credentials

Author: Mykhailo Pechkurov

internal/clients/serviceinstance/serviceinstance.go

@@ -152,7 +152,7 @@ func (c *Client) Create(ctx context.Context, spec v1alpha1.ServiceInstanceParame
 		return c.createManaged(ctx, spec, creds)
 
 	case v1alpha1.UserProvidedService:
-		return c.createUserProvided(ctx, spec)
+		return c.createUserProvided(ctx, spec, creds)
 	default:
 		return nil, errors.New("unknown service instance type")
 	}
@@ -185,7 +185,7 @@ func (c *Client) createManaged(ctx context.Context, spec v1alpha1.ServiceInstanc
 }
 
 // createUserProvided creates a user-provided service instance according to CR's ForProvider spec
-func (c *Client) createUserProvided(ctx context.Context, spec v1alpha1.ServiceInstanceParameters) (*resource.ServiceInstance, error) {
+func (c *Client) createUserProvided(ctx context.Context, spec v1alpha1.ServiceInstanceParameters, creds json.RawMessage) (*resource.ServiceInstance, error) {
 	// throw error if no space is provided
 	if spec.Space == nil {
 		return nil, errors.New("no space reference provided")
@@ -198,8 +198,11 @@ func (c *Client) createUserProvided(ctx context.Context, spec v1alpha1.ServiceIn
 	}
 
 	// workaround: cf-goclient supports few ups options at creation time.
-	upt := resource.NewServiceInstanceUserProvidedUpdate().
-		WithRouteServiceURL(spec.RouteServiceURL).
+	upt := resource.NewServiceInstanceUserProvidedUpdate()
+	if creds != nil {
+		upt.WithCredentials(creds)
+	}
+	upt.WithRouteServiceURL(spec.RouteServiceURL).
 		WithSyslogDrainURL(spec.SyslogDrainURL)
 
 	return c.ServiceInstance.UpdateUserProvided(ctx, si.GUID, upt)
@@ -259,15 +262,15 @@ func (c *Client) updateManaged(ctx context.Context, observed *resource.ServiceIn
 func (c *Client) updateUserProvided(ctx context.Context, observed *resource.ServiceInstance, desired *v1alpha1.ServiceInstanceParameters, creds json.RawMessage) (*resource.ServiceInstance, error) {
 	upd := resource.NewServiceInstanceUserProvidedUpdate()
 
-	if creds == nil {
-		return nil, errors.New("Missing or invalid credentials")
-
-	}
 	if observed.Name != *desired.Name {
 		upd.WithName(*desired.Name)
 	}
 
-	upd.WithRouteServiceURL(desired.RouteServiceURL).WithSyslogDrainURL(desired.SyslogDrainURL).WithCredentials(creds)
+	if creds != nil {
+		upd.WithCredentials(creds)
+	}
+	upd.WithRouteServiceURL(desired.RouteServiceURL).
+		WithSyslogDrainURL(desired.SyslogDrainURL)
 
 	return c.ServiceInstance.UpdateUserProvided(ctx, observed.GUID, upd)
 }

test/e2e/crs/service/ups_no_credentials.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   forProvider:
     type: user-provided
-    name: 2e-ups-no-credentials
+    name: e2e-ups-no-credentials
     routeServiceUrl: https://e2e-route-service.example.com
     syslogDrainUrl: syslog-tls://example.log-aggregator.com:6514
     spaceRef: