Fix: resolve space name reference only when provided

Author: dwlou

apis/resources/v1alpha1/serviceinstance_types.go

@@ -61,6 +61,10 @@ func findSpaceRole(ctx context.Context, client Role, spec v1alpha1.SpaceRolePara
 
 // newSpaceRoleListOptions returns a list options for the given SpaceRoleParameters
 func newSpaceRoleListOptions(spec v1alpha1.SpaceRoleParameters) (*cfv3.RoleListOptions, error) {
+	if spec.Space == nil {
+		return nil, errors.New(ErrSpaceNotSpecified)
+	}
+
 	opts := cfv3.NewRoleListOptions()
 	opts.WithSpaceRoleType(SpaceRoleType(spec.Type))
 

internal/clients/role/spacerole.go

@@ -181,6 +181,10 @@ func (c *Client) createUserProvided(ctx context.Context, spec v1alpha1.ServiceIn
 		return nil, errors.New("Missing or invalid credentials")
 	}
 
+	// throw error if no space is provided
+	if spec.Space == nil {
+		return nil, errors.New("no space reference provided")
+	}
 	// create the service instance
 	opt := resource.NewServiceInstanceCreateUserProvided(*spec.Name, *spec.Space)
 	si, err := c.ServiceInstance.CreateUserProvided(ctx, opt)

internal/clients/serviceinstance/serviceinstance.go

@@ -16,33 +16,30 @@ type SpaceScoped interface {
 	GetSpaceRef() *v1alpha1.SpaceReference
 }
 
-// / Initialize implements the Initializer interface
+// ResolveByName resolves the space reference by name.
 func ResolveByName(ctx context.Context, clientFn clients.ClientFn, mg resource.Managed) error {
 	cr, ok := mg.(SpaceScoped)
 	if !ok {
 		return errors.New("Cannot resolve space name. The resource does not implement SpaceScoped")
 	}
 
-	// if external-name is not set, search by Name and Space
 	sr := cr.GetSpaceRef()
-	if sr == nil || sr.SpaceName == nil {
-		if sr.Space != nil { // space GUID is directly set, so we do not need to use names.
-			return nil
+	// resolve space by name only if spaceName and orgName are set
+	if sr != nil && sr.SpaceName != nil && sr.OrgName != nil {
+		cf, err := clientFn(mg)
+		if err != nil {
+			return errors.Wrap(err, "Could not connect to Cloud Foundry")
+		}
+		spaceClient, _, orgClient := NewClient(cf)
+		spaceGUID, err := GetGUID(ctx, orgClient, spaceClient, *sr.OrgName, *sr.SpaceName)
+		if err != nil {
+			return errors.Wrap(err, "Cannot resolve space reference by name")
 		}
-		return errors.New("Unknown space. Please specify `spaceRef` or `spaceSelector` or using `spaceName` and `orgNames`. ")
+		sr.Space = spaceGUID
+		return nil
 	}
 
-	// spaceName and orgName are set, always retrieve space GUID
-	cf, err := clientFn(mg)
-	if err != nil {
-		return errors.Wrap(err, "Could not connect to Cloud Foundry")
-	}
-	spaceClient, _, orgClient := NewClient(cf)
-	spaceGUID, err := GetGUID(ctx, orgClient, spaceClient, *sr.OrgName, *sr.SpaceName)
-	if err != nil {
-		return errors.Wrap(err, "Cannot resolve space reference by name")
-	}
-	sr.Space = spaceGUID
+	// nothing to resolve.
 	return nil
 }