Revert "enable serviceinstance adapter with refactoring"

This reverts commit 0eeaa8e.

Author: dwlou

cmd/importer/cmd/subcmd/import.go

@@ -63,11 +63,10 @@ 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.ServiceInstance_Kind: &adapterv1alpha1.CFServiceInstanceAdapter{},
+			v1alpha1.Space_Kind: &adapterv1alpha1.CFSpaceAdapter{},
+			v1alpha1.Org_Kind:   &adapterv1alpha1.CFOrganizationAdapter{},
+			v1alpha1.App_Kind:   &adapterv1alpha1.CFAppAdapter{},
+			v1alpha1.RouteKind:  &adapterv1alpha1.CFRouteAdapter{},
 		}
 		configParser := &adapters.CFConfigParser{}
 

cmd/importer/config.yaml

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

examples/resources/org.yaml

@@ -7,7 +7,17 @@ metadata:
 spec:
   managementPolicies: ["Observe"]
   forProvider: 
-    name: complex-org-cf
+    name: cf-dev
   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: "Manager"
+    type: "Auditor"
     orgRef:
       name: my-org
-    username: "daniel.lou@sap.com"
+    username: "1@example.com"
     origin: sap.ids

internal/cli/adapters/client.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"strconv"
 
 	cfv3 "github.com/cloudfoundry/go-cfclient/v3/client"
 	cfconfig "github.com/cloudfoundry/go-cfclient/v3/config"
@@ -65,8 +64,6 @@ 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)
 	}
@@ -149,43 +146,28 @@ 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
-	spaceGUID, err := c.getSpaceReference(ctx, filter)
-	if err != nil {
-		return nil, err
+	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)
 	}
 
-	utils.PrintLine("Fetching apps in space:", spaceGUID, 30)
 	// define filter-option with spaceRef for query
-	opt := &cfv3.AppListOptions{SpaceGUIDs: cfv3.Filter{Values: []string{spaceGUID}}}
+	opt := &cfv3.AppListOptions{SpaceGUIDs: cfv3.Filter{Values: []string{spaceRef[0].GUID}}}
 
 	// Get apps from CF
 	responseCollection, err := c.client.Applications.ListAll(ctx, opt)
@@ -211,15 +193,22 @@ 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
-	spaceGUID, err := c.getSpaceReference(ctx, filter)
-	if err != nil {
-		return nil, err
+	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)
 	}
 
 	// get referenced domain
@@ -233,7 +222,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{spaceGUID}},
+		SpaceGUIDs:  cfv3.Filter{Values: []string{spaceRef[0].GUID}},
 		DomainGUIDs: cfv3.Filter{Values: []string{domainRef[0].GUID}},
 	}
 
@@ -255,84 +244,6 @@ 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,7 +9,6 @@ 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"
@@ -22,10 +21,9 @@ type Config struct {
 }
 
 type Resource struct {
-	Space           Space           `yaml:"space"`
-	Organization    Organization    `yaml:"org"`
-	App             App             `yaml:"app"`
-	ServiceInstance ServiceInstance `yaml:"serviceInstance"`
+	Space        Space        `yaml:"space"`
+	Organization Organization `yaml:"org"`
+	App          App          `yaml:"app"`
 	// add more resources here
 }
 
@@ -46,13 +44,6 @@ 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
@@ -61,7 +52,6 @@ type CFResourceFilter struct {
 	Space              *SpaceFilter
 	Organization       *OrganizationFilter
 	App                *AppFilter
-	ServiceInstance    *ServiceInstanceFilter
 	ManagementPolicies []v1.ManagementAction
 }
 
@@ -86,12 +76,6 @@ 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
 }
 
@@ -113,12 +97,6 @@ type AppFilter struct {
 	SpaceRef string
 }
 
-type ServiceInstanceFilter struct {
-	Name     string
-	SpaceRef string
-	Type     string
-}
-
 // CFConfig implements the ProviderConfig interface
 type CFConfig struct {
 	Resources         []Resource
@@ -145,11 +123,6 @@ 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
 }
 
@@ -230,7 +203,6 @@ 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))
@@ -245,25 +217,6 @@ 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