enable serviceinstance adapter with refactoring

add service instance

Author: dwlou

cmd/importer/cmd/subcmd/import.go

@@ -63,10 +63,11 @@ var ImportCMD = &cobra.Command{
 		// Create adapters
 		clientAdapter := &adapters.CFClientAdapter{}
 		resourceAdapters := map[string]resource.ResourceAdapter{
-			v1alpha1.Space_Kind: &adapterv1alpha1.CFSpaceAdapter{},
-			v1alpha1.Org_Kind:   &adapterv1alpha1.CFOrganizationAdapter{},
-			v1alpha1.App_Kind:   &adapterv1alpha1.CFAppAdapter{},
-			v1alpha1.RouteKind:  &adapterv1alpha1.CFRouteAdapter{},
+			v1alpha1.Space_Kind:           &adapterv1alpha1.CFSpaceAdapter{},
+			v1alpha1.Org_Kind:             &adapterv1alpha1.CFOrganizationAdapter{},
+			v1alpha1.App_Kind:             &adapterv1alpha1.CFAppAdapter{},
+			v1alpha1.RouteKind:            &adapterv1alpha1.CFRouteAdapter{},
+			v1alpha1.ServiceInstance_Kind: &adapterv1alpha1.CFServiceInstanceAdapter{},
 		}
 		configParser := &adapters.CFConfigParser{}
 

cmd/importer/config.yaml

@@ -1,24 +1,26 @@
 resources:
   - org:
-      name: TodoCompany
+      name: cf-dev
       managementPolicies: [Observe]
   - space:
       name: .*
-      orgRef: TodoCompany
+      orgRef: cf-dev
       managementPolicies: [Observe]
   - app:
       name: .*
-      spaceRef: Production
+      spaceRef: my-demo-space
       managementPolicies: [Observe]
-  - app:
-      name: .*
-      spaceRef: Testing
-      managementPolicies: ["Observe"]
   - route:
       name: .*
-      spaceRef: Testing
-      domainRef: Testing
+      spaceRef: space-app
+      domainRef: test-domain
+      managementPolicies: [Observe]
+  - serviceInstance:
+      name: .*
+      spaceRef: my-demo-space
+      type: managed
       managementPolicies: [Observe]
 providerConfigRef:
   name: default
   namespace: default
+

examples/resources/org.yaml

@@ -7,17 +7,7 @@ metadata:
 spec:
   managementPolicies: ["Observe"]
   forProvider: 
-    name: cf-dev
+    name: complex-org-cf
   providerConfigRef:
     name: default
 
----
-apiVersion: cloudfoundry.crossplane.io/v1alpha1
-kind: Organization
-metadata:
-  namespace: default
-  name: my-org-dev
-  annotations:
-    crossplane.io/external-name: cf-dev
-spec:
-  forProvider: {}

examples/resources/orgrole.yaml

@@ -6,8 +6,8 @@ metadata:
   name: my-org-auditor-daniel
 spec:
   forProvider:
-    type: "Auditor"
+    type: "Manager"
     orgRef:
       name: my-org
-    username: "1@example.com"
+    username: "daniel.lou@sap.com"
     origin: sap.ids

internal/cli/adapters/client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strconv"
 
 	cfv3 "github.com/cloudfoundry/go-cfclient/v3/client"
 	cfconfig "github.com/cloudfoundry/go-cfclient/v3/config"
@@ -64,6 +65,8 @@ func (c *CFClient) GetResourcesByType(ctx context.Context, resourceType string,
 		return c.getApps(ctx, filter)
 	case v1alpha1.RouteKind:
 		return c.getRoutes(ctx, filter)
+	case v1alpha1.ServiceInstance_Kind:
+		return c.getServiceInstances(ctx, filter)
 	default:
 		return nil, fmt.Errorf("unsupported resource type: %s", resourceType)
 	}
@@ -146,28 +149,43 @@ func (c *CFClient) getOrganizations(ctx context.Context, filter map[string]strin
 	return results, nil
 }
 
+// getSpaceReference retrieves a space reference by name
+func (c *CFClient) getSpaceReference(ctx context.Context, filter map[string]string) (string, error) {
+	spaceName, ok := filter["space"]
+	if !ok {
+		return "", fmt.Errorf("space-reference filter is required")
+	}
+
+	spaceRefFilter := cfv3.SpaceListOptions{Names: cfv3.Filter{Values: []string{spaceName}}}
+	spaceRef, err := c.client.Spaces.ListAll(ctx, &spaceRefFilter)
+	if err != nil {
+		return "", fmt.Errorf("%s: %w", errGetSpaceReference, err)
+	}
+
+	if len(spaceRef) == 0 || spaceRef[0].GUID == "" {
+		return "", fmt.Errorf("%s: space %s not found", errGetSpaceReference, spaceName)
+	}
+
+	return spaceRef[0].GUID, nil
+}
+
 func (c *CFClient) getApps(ctx context.Context, filter map[string]string) ([]interface{}, error) {
+
 	// Get name filter
 	name, ok := filter["name"]
 	if !ok {
 		return nil, fmt.Errorf("name filter is required for apps")
 	}
-	spaceName, ok := filter["space"]
-	if !ok {
-		return nil, fmt.Errorf("org-reference filter is required for apps")
-	}
 
 	// get referenced space
-	spaceRefFilter := cfv3.SpaceListOptions{Names: cfv3.Filter{Values: []string{spaceName}}}
-	spaceRef, err := c.client.Spaces.ListAll(ctx, &spaceRefFilter)
-	kingpin.FatalIfError(err, "%s", errGetSpaceReference)
-
-	if spaceRef[0].GUID == "" {
-		kingpin.FatalIfError(fmt.Errorf("organization %s not found", spaceName), "%s", errGetOrgReference)
+	spaceGUID, err := c.getSpaceReference(ctx, filter)
+	if err != nil {
+		return nil, err
 	}
 
+	utils.PrintLine("Fetching apps in space:", spaceGUID, 30)
 	// define filter-option with spaceRef for query
-	opt := &cfv3.AppListOptions{SpaceGUIDs: cfv3.Filter{Values: []string{spaceRef[0].GUID}}}
+	opt := &cfv3.AppListOptions{SpaceGUIDs: cfv3.Filter{Values: []string{spaceGUID}}}
 
 	// Get apps from CF
 	responseCollection, err := c.client.Applications.ListAll(ctx, opt)
@@ -193,22 +211,15 @@ func (c *CFClient) getRoutes(ctx context.Context, filter map[string]string) ([]i
 	if !ok {
 		return nil, fmt.Errorf("host filter is required for routes")
 	}
-	spaceName, ok := filter["space"]
-	if !ok {
-		return nil, fmt.Errorf("space-reference filter is required for routes")
-	}
 	domainName, ok := filter["domain"]
 	if !ok {
 		return nil, fmt.Errorf("domain-reference filter is required for routes")
 	}
 
 	// get referenced space
-	spaceRefFilter := cfv3.SpaceListOptions{Names: cfv3.Filter{Values: []string{spaceName}}}
-	spaceRef, err := c.client.Spaces.ListAll(ctx, &spaceRefFilter)
-	kingpin.FatalIfError(err, "%s", errGetSpaceReference)
-
-	if spaceRef[0].GUID == "" {
-		kingpin.FatalIfError(fmt.Errorf("space %s not found", spaceName), "%s", errGetSpaceReference)
+	spaceGUID, err := c.getSpaceReference(ctx, filter)
+	if err != nil {
+		return nil, err
 	}
 
 	// get referenced domain
@@ -222,7 +233,7 @@ func (c *CFClient) getRoutes(ctx context.Context, filter map[string]string) ([]i
 
 	// define filter-option with spaceRef for query
 	opt := &cfv3.RouteListOptions{
-		SpaceGUIDs:  cfv3.Filter{Values: []string{spaceRef[0].GUID}},
+		SpaceGUIDs:  cfv3.Filter{Values: []string{spaceGUID}},
 		DomainGUIDs: cfv3.Filter{Values: []string{domainRef[0].GUID}},
 	}
 
@@ -244,6 +255,84 @@ func (c *CFClient) getRoutes(ctx context.Context, filter map[string]string) ([]i
 	return results, nil
 }
 
+func (c *CFClient) getServiceInstances(ctx context.Context, filter map[string]string) ([]interface{}, error) {
+
+	// Get name filter
+	name, ok := filter["name"]
+	if !ok {
+		return nil, fmt.Errorf("name filter is required for service instances")
+	}
+
+	utils.PrintLine("Fetching service instances:", name, 30)
+	// get referenced space
+	spaceGUID, err := c.getSpaceReference(ctx, filter)
+	if err != nil {
+		return nil, err
+	}
+	utils.PrintLine("Fetching service instances in space ...", spaceGUID, 30)
+
+	// define filter-option with spaceRef for query
+	opt := &cfv3.ServiceInstanceListOptions{SpaceGUIDs: cfv3.Filter{Values: []string{spaceGUID}}}
+
+	if serviceType, ok := filter["type"]; ok {
+		opt.Type = serviceType
+	}
+
+	// Get service instances from CF
+	responseCollection, err := c.client.ServiceInstances.ListAll(ctx, opt)
+	if err != nil {
+		return nil, err
+	}
+
+	utils.PrintLine("# service instances", strconv.Itoa(len(responseCollection)), 30)
+
+	// Filter service instances by name
+	var results []interface{}
+	for _, serviceInstance := range responseCollection {
+		if utils.IsFullMatch(name, serviceInstance.Name) {
+			results = append(results, serviceInstance)
+		}
+	}
+
+	return results, nil
+}
+
+func (c *CFClient) GetServicePlan(ctx context.Context, guid string) (*v1alpha1.ServicePlanParameters, error) {
+	sp, err := c.client.ServicePlans.Get(ctx, guid)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get service plan: %w", err)
+	}
+
+	// Get service offering details
+	so, err := c.client.ServiceOfferings.Get(ctx, sp.Relationships.ServiceOffering.Data.GUID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get service offering: %w", err)
+	}
+
+	return &v1alpha1.ServicePlanParameters{
+		ID:       &sp.GUID,
+		Offering: &so.Name,
+		Plan:     &sp.Name,
+	}, nil
+}
+
+func (c *CFClient) GetServiceCredentials(ctx context.Context, guid string, serviceType string) (*json.RawMessage, error) {
+	// Get credentials based on service type
+	if serviceType == "managed" {
+		params, err := c.client.ServiceInstances.GetManagedParameters(ctx, guid)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get managed service parameters: %w", err)
+		}
+		return params, nil
+	} else {
+		creds, err := c.client.ServiceInstances.GetUserProvidedCredentials(ctx, guid)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get user-provided service credentials: %w", err)
+		}
+		return creds, nil
+	}
+}
+
 // CFClientAdapter implements the ClientAdapter interface
 type CFClientAdapter struct{}
 

internal/cli/adapters/config.go

@@ -9,6 +9,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/SAP/crossplane-provider-cloudfoundry/apis/resources/v1alpha1"
+	"github.com/SAP/crossplane-provider-cloudfoundry/internal/cli/pkg/utils"
 	"github.com/SAP/crossplane-provider-cloudfoundry/internal/crossplaneimport/client"
 	"github.com/SAP/crossplane-provider-cloudfoundry/internal/crossplaneimport/config"
 	"github.com/SAP/crossplane-provider-cloudfoundry/internal/crossplaneimport/resource"
@@ -21,9 +22,10 @@ type Config struct {
 }
 
 type Resource struct {
-	Space        Space        `yaml:"space"`
-	Organization Organization `yaml:"org"`
-	App          App          `yaml:"app"`
+	Space           Space           `yaml:"space"`
+	Organization    Organization    `yaml:"org"`
+	App             App             `yaml:"app"`
+	ServiceInstance ServiceInstance `yaml:"serviceInstance"`
 	// add more resources here
 }
 
@@ -44,6 +46,13 @@ type App struct {
 	ManagementPolicies []ManagementPolicy `yaml:"managementPolicies"`
 }
 
+type ServiceInstance struct {
+	Name               string             `yaml:"name"`
+	SpaceRef           string             `yaml:"spaceRef"`
+	Type               string             `yaml:"type"`
+	ManagementPolicies []ManagementPolicy `yaml:"managementPolicies"`
+}
+
 type ManagementPolicy string
 
 // CFResourceFilter implements the ResourceFilter interface
@@ -52,6 +61,7 @@ type CFResourceFilter struct {
 	Space              *SpaceFilter
 	Organization       *OrganizationFilter
 	App                *AppFilter
+	ServiceInstance    *ServiceInstanceFilter
 	ManagementPolicies []v1.ManagementAction
 }
 
@@ -76,6 +86,12 @@ func (f *CFResourceFilter) GetFilterCriteria() map[string]string {
 		criteria["space"] = f.App.SpaceRef
 	}
 
+	if f.ServiceInstance != nil {
+		criteria["name"] = f.ServiceInstance.Name
+		criteria["space"] = f.ServiceInstance.SpaceRef
+		criteria["type"] = f.ServiceInstance.Type
+	}
+
 	return criteria
 }
 
@@ -97,6 +113,12 @@ type AppFilter struct {
 	SpaceRef string
 }
 
+type ServiceInstanceFilter struct {
+	Name     string
+	SpaceRef string
+	Type     string
+}
+
 // CFConfig implements the ProviderConfig interface
 type CFConfig struct {
 	Resources         []Resource
@@ -123,6 +145,11 @@ func (c *CFConfig) resourceIsValid(resource Resource) bool {
 		fmt.Println(resource.App.Name + "is not a valid app configuration")
 		return false
 	}
+	// check for empty service instance names
+	if resource.ServiceInstance.Name != "" && (resource.ServiceInstance.ManagementPolicies == nil || resource.ServiceInstance.SpaceRef == "" || resource.ServiceInstance.Type == "") {
+		fmt.Println(resource.ServiceInstance.Name + "is not a valid service instance configuration")
+		return false
+	}
 	return true
 }
 
@@ -203,6 +230,7 @@ func (p *CFConfigParser) ParseConfig(configPath string) (config.ProviderConfig,
 		}
 
 		if res.App.Name != "" {
+			utils.PrintLine("add app  ...", res.App.Name, 30)
 			var policies []v1.ManagementAction
 			for _, policy := range res.App.ManagementPolicies {
 				policies = append(policies, v1.ManagementAction(policy))
@@ -217,6 +245,25 @@ func (p *CFConfigParser) ParseConfig(configPath string) (config.ProviderConfig,
 				ManagementPolicies: policies,
 			})
 		}
+
+		if res.ServiceInstance.Name != "" {
+			utils.PrintLine("add service instances  ...", res.ServiceInstance.Name, 30)
+
+			var policies []v1.ManagementAction
+			for _, policy := range res.ServiceInstance.ManagementPolicies {
+				policies = append(policies, v1.ManagementAction(policy))
+			}
+
+			filters = append(filters, &CFResourceFilter{
+				Type: v1alpha1.ServiceInstance_Kind,
+				ServiceInstance: &ServiceInstanceFilter{
+					Name:     res.ServiceInstance.Name,
+					SpaceRef: res.ServiceInstance.SpaceRef,
+					Type:     res.ServiceInstance.Type,
+				},
+				ManagementPolicies: policies,
+			})
+		}
 	}
 
 	return cfConfig, filters, nil