fix: skip task type plugins to create discovery jobs

Author: Arta Asadi

assets/postgres-backup/dex.bak

@@ -21,12 +21,14 @@ import (
 
 // This map seems unchanged between branches in the non-conflicting part
 var migrations = map[string]types.Migration{
+	"auth":          auth.Migration{},
 	"elasticsearch": elasticsearch.Migration{},
 	"manifest":      manifest.Migration{},
 }
 
 // This order seems unchanged between branches in the non-conflicting part
 var Order = []string{
+	"auth",
 	"elasticsearch",
 	"manifest",
 }

jobs/post-install-job/job/migration_list.go

@@ -158,14 +158,23 @@ func (a *API) GetResourceTypeFromTableName(c echo.Context) error {
 func (a *API) GetConfiguration(c echo.Context) error {
 	integrationType := c.Param("integration_type")
 
+	plugin, err := a.database.GetPluginByID(integrationType)
+	if err != nil {
+		a.logger.Error("failed to get integration plugin", zap.String("integrationType", string(integrationType)), zap.Error(err))
+		return echo.NewHTTPError(500, "failed to get integration plugin")
+	}
+
 	rtMap := a.typeManager.GetIntegrationTypeMap()
 	if value, ok := rtMap[a.typeManager.ParseType(integrationType)]; ok {
 		conf, err := value.GetConfiguration()
 		if err != nil {
 			return echo.NewHTTPError(500, err.Error())
 		}
 
-		return c.JSON(200, conf)
+		return c.JSON(200, models.IntegrationTypeConfiguration{
+			IntegrationConfiguration: conf,
+			DiscoveryType:            string(plugin.DiscoveryType),
+		})
 	} else {
 		return echo.NewHTTPError(404, "integration type not found")
 	}

services/integration/api/integration-types/api.go

@@ -52,3 +52,8 @@ type GetResourceTypesByLabelsResponse struct {
 type ListTablesResponse struct {
 	Tables map[string][]interfaces.CloudQLColumn `json:"tables"`
 }
+
+type IntegrationTypeConfiguration struct {
+	interfaces.IntegrationConfiguration
+	DiscoveryType string `json:"discovery_type"`
+}

services/integration/api/models/integration_type.go

@@ -16,7 +16,7 @@ type IntegrationServiceClient interface {
 	GetResourceTypeFromTableName(ctx *httpclient.Context, integrationType string, tableName string) (string, error)
 	GetResourceTypesByLabels(ctx *httpclient.Context, integrationType string, labels map[string]string, integrationID *string) ([]interfaces.ResourceTypeConfiguration, error)
 	GetIntegrationTypeTables(ctx *httpclient.Context, integrationType string) (map[string][]interfaces.CloudQLColumn, error)
-	GetIntegrationConfiguration(ctx *httpclient.Context, integrationType string) (interfaces.IntegrationConfiguration, error)
+	GetIntegrationConfiguration(ctx *httpclient.Context, integrationType string) (models.IntegrationTypeConfiguration, error)
 	GetIntegration(ctx *httpclient.Context, integrationID string) (*models.Integration, error)
 	ListIntegrations(ctx *httpclient.Context, integrationTypes []string) (*models.ListIntegrationsResponse, error)
 	ListIntegrationsByFilters(ctx *httpclient.Context, req models.ListIntegrationsRequest) (*models.ListIntegrationsResponse, error)
@@ -102,9 +102,9 @@ func (c *integrationClient) GetIntegrationTypeTables(ctx *httpclient.Context, in
 	return response.Tables, nil
 }
 
-func (c *integrationClient) GetIntegrationConfiguration(ctx *httpclient.Context, integrationType string) (interfaces.IntegrationConfiguration, error) {
+func (c *integrationClient) GetIntegrationConfiguration(ctx *httpclient.Context, integrationType string) (models.IntegrationTypeConfiguration, error) {
 	url := fmt.Sprintf("%s/api/v1/integration-types/%s/configuration", c.baseURL, integrationType)
-	var response interfaces.IntegrationConfiguration
+	var response models.IntegrationTypeConfiguration
 
 	if statusCode, err := httpclient.DoRequest(ctx.Ctx, http.MethodGet, url, ctx.ToHeaders(), nil, &response); err != nil {
 		if 400 <= statusCode && statusCode < 500 {

services/integration/client/integration.go

@@ -206,6 +206,14 @@ func (s *Scheduler) scheduleDescribeJob(ctx context.Context) {
 	}
 
 	for _, integration := range integrations.Integrations {
+		plugin, err := s.integrationClient.GetIntegrationConfiguration(&httpclient.Context{UserRole: apiAuth.AdminRole}, integration.IntegrationType.String())
+		if err != nil {
+			s.logger.Error("failed to get integration configuration", zap.String("spot", "GetIntegrationConfiguration"), zap.Error(err))
+			continue
+		}
+		if plugin.DiscoveryType == "task" {
+			continue
+		}
 		if integration.State == models.IntegrationStateSample || integration.State == models.IntegrationStateInactive {
 			continue
 		}