move to plugin (#2465)

* fix: pointer * fix: pointer * fix: pointer
opengovern · Jan 15, 2025 · 78c4995 · 78c4995
1 parent fa64fc7
commit 78c4995
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 43 deletions.
diff --git a/services/integration/api/integrations/api.go b/services/integration/api/integrations/api.go
@@ -45,7 +45,6 @@ type API struct {
 }
 
 const (
-	UiSpecsPath                     string = "/ui-specs"
 	TemplateDeploymentPath          string = "/integrations/deployment-template.yaml"
 	TemplateManualsDeploymentPath   string = "/integrations/deployment-template-manuals.yaml"
 	TemplateScaledObjectPath        string = "/integrations/scaled-object-template.yaml"
@@ -1698,7 +1697,7 @@ func (h API) ListIntegrationTypeResourceTypes(c echo.Context) error {
 			return echo.NewHTTPError(http.StatusInternalServerError, "failed to list integration type resource types")
 		}
 		for rt, rtConfig := range resourceTypes {
-			if rtConfig != nil {
+			if !rtConfig.IsEmpty() {
 				items = append(items, rtConfig.ToAPI())
 			} else {
 				items = append(items, models.ResourceTypeConfiguration{
@@ -1752,7 +1751,7 @@ func (h API) GetIntegrationTypeResourceType(c echo.Context) error {
 			return echo.NewHTTPError(http.StatusInternalServerError, "failed to list integration type resource types")
 		}
 		if rt, ok := resourceTypes[resourceType]; ok {
-			if rt != nil {
+			if !rt.IsEmpty() {
 				return c.JSON(http.StatusOK, rt.ToAPI())
 			} else {
 				return c.JSON(http.StatusOK, models.ResourceTypeConfiguration{

diff --git a/services/integration/integration-type/aws-account/aws_account.go b/services/integration/integration-type/aws-account/aws_account.go
@@ -106,14 +106,14 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
 	resourceTypes := configs.ResourceTypesList
 	if labels["integration/aws/organization-master"] == "true" {
 		resourceTypes = append(resourceTypes, configs.OrganizationMasterResourceTypesList...)
 	}
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range resourceTypes {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/azure-subscription/azure_subscription.go b/services/integration/integration-type/azure-subscription/azure_subscription.go
@@ -76,10 +76,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/cloudflare-account/cloudflare_account.go b/services/integration/integration-type/cloudflare-account/cloudflare_account.go
@@ -75,10 +75,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/cohereai-project/cohere_project.go b/services/integration/integration-type/cohereai-project/cohere_project.go
@@ -80,10 +80,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/digitalocean-team/digitalocean-team.go b/services/integration/integration-type/digitalocean-team/digitalocean-team.go
@@ -64,10 +64,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	}, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/doppler-account/doppler_account.go b/services/integration/integration-type/doppler-account/doppler_account.go
@@ -74,10 +74,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/entra-id-directory/entra_id_directory.go b/services/integration/integration-type/entra-id-directory/entra_id_directory.go
@@ -75,10 +75,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/github-account/integration-plugin b/services/integration/integration-type/github-account/integration-plugin
diff --git a/services/integration/integration-type/google-workspace-account/google_workspace_account.go b/services/integration/integration-type/google-workspace-account/google_workspace_account.go
@@ -77,10 +77,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/integrations.go b/services/integration/integration-type/integrations.go
@@ -99,6 +99,7 @@ func NewIntegrationTypeManager(logger *zap.Logger, integrationTypeDb *gorm.DB) *
 			Plugins:         map[string]plugin.Plugin{pluginName: &interfaces.IntegrationTypePlugin{}},
 			Cmd:             exec.Command(pluginPath),
 			Logger:          hcLogger,
+			Managed:         true,
 		})
 
 		rpcClient, err := client.Client()

diff --git a/services/integration/integration-type/interfaces/integration.go b/services/integration/integration-type/interfaces/integration.go
@@ -31,7 +31,7 @@ type IntegrationConfiguration struct {
 type IntegrationType interface {
 	GetIntegrationType() integration.Type
 	GetConfiguration() IntegrationConfiguration
-	GetResourceTypesByLabels(map[string]string) (map[string]*ResourceTypeConfiguration, error)
+	GetResourceTypesByLabels(map[string]string) (map[string]ResourceTypeConfiguration, error)
 	HealthCheck(jsonData []byte, providerId string, labels map[string]string, annotations map[string]string) (bool, error)
 	DiscoverIntegrations(jsonData []byte) ([]models.Integration, error)
 	GetResourceTypeFromTableName(tableName string) string
@@ -62,8 +62,8 @@ func (i *IntegrationTypeRPC) GetConfiguration() IntegrationConfiguration {
 	return configuration
 }
 
-func (i *IntegrationTypeRPC) GetResourceTypesByLabels(labels map[string]string) (map[string]*ResourceTypeConfiguration, error) {
-	var resourceTypes map[string]*ResourceTypeConfiguration
+func (i *IntegrationTypeRPC) GetResourceTypesByLabels(labels map[string]string) (map[string]ResourceTypeConfiguration, error) {
+	var resourceTypes map[string]ResourceTypeConfiguration
 	err := i.client.Call("Plugin.GetResourceTypesByLabels", labels, &resourceTypes)
 	return resourceTypes, err
 }
@@ -115,7 +115,7 @@ func (i *IntegrationTypeRPCServer) GetConfiguration(_ struct{}, configuration *I
 	return nil
 }
 
-func (i *IntegrationTypeRPCServer) GetResourceTypesByLabels(labels map[string]string, resourceTypes *map[string]*ResourceTypeConfiguration) error {
+func (i *IntegrationTypeRPCServer) GetResourceTypesByLabels(labels map[string]string, resourceTypes *map[string]ResourceTypeConfiguration) error {
 	var err error
 	*resourceTypes, err = i.Impl.GetResourceTypesByLabels(labels)
 	return err

diff --git a/services/integration/integration-type/interfaces/resource_type.go b/services/integration/integration-type/interfaces/resource_type.go
@@ -32,6 +32,10 @@ func (c *ResourceTypeConfiguration) ToAPI() models.ResourceTypeConfiguration {
 	}
 }
 
+func (p *ResourceTypeConfiguration) IsEmpty() bool {
+	return p.Name == "" && p.Description == "" && len(p.Params) == 0 && p.IntegrationType == ""
+}
+
 func (p *Param) ToAPI() models.Param {
 	return models.Param{
 		Name:        p.Name,

diff --git a/services/integration/integration-type/linode-account/linode_account.go b/services/integration/integration-type/linode-account/linode_account.go
@@ -73,10 +73,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/oci-repository/oci-repository.go b/services/integration/integration-type/oci-repository/oci-repository.go
@@ -103,10 +103,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return nil, fmt.Errorf("unknown registry type: %s", credentials.GetRegistryType())
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/openai-integration/openai_integration.go b/services/integration/integration-type/openai-integration/openai_integration.go
@@ -75,10 +75,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(labels map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }

diff --git a/services/integration/integration-type/render-account/render_account.go b/services/integration/integration-type/render-account/render_account.go
@@ -59,10 +59,10 @@ func (i *Integration) DiscoverIntegrations(jsonData []byte) ([]models.Integratio
 	return integrations, nil
 }
 
-func (i *Integration) GetResourceTypesByLabels(map[string]string) (map[string]*interfaces.ResourceTypeConfiguration, error) {
-	resourceTypesMap := make(map[string]*interfaces.ResourceTypeConfiguration)
+func (i *Integration) GetResourceTypesByLabels(map[string]string) (map[string]interfaces.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]interfaces.ResourceTypeConfiguration)
 	for _, resourceType := range configs.ResourceTypesList {
-		resourceTypesMap[resourceType] = nil
+		resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
 	}
 	return resourceTypesMap, nil
 }