Merge pull request #2482 from opengovern/fix-integration-plugins

fix: add integration plugins apis
opengovern · Jan 17, 2025 · 2683f90 · 2683f90
2 parents 925225c + 98b7823
commit 2683f90
Show file tree

Hide file tree

Showing 11 changed files with 532 additions and 44 deletions.
diff --git a/jobs/cloudql-init-job/job.go b/jobs/cloudql-init-job/job.go
@@ -6,8 +6,8 @@ import (
 	"github.com/opengovern/og-util/pkg/httpclient"
 	"github.com/opengovern/og-util/pkg/postgres"
 	"github.com/opengovern/og-util/pkg/steampipe"
-	"github.com/opengovern/opencomply/jobs/post-install-job/job/migrations/integration-type/models"
 	"github.com/opengovern/opencomply/services/integration/client"
+	"github.com/opengovern/opencomply/services/integration/models"
 	"go.uber.org/zap"
 	"os"
 	"os/exec"
@@ -41,13 +41,13 @@ func (j *Job) Run(ctx context.Context) error {
 		return err
 	}
 
-	var integrations []models.IntegrationTypeBinaries
+	var integrations []models.IntegrationPlugin
 	err = db.Find(&integrations).Error
 	if err != nil {
 		j.logger.Error("failed to get integration binaries", zap.Error(err))
 		return err
 	}
-	var integrationMap = make(map[string]*models.IntegrationTypeBinaries)
+	var integrationMap = make(map[string]*models.IntegrationPlugin)
 	for _, integration := range integrations {
 		integration := integration
 		integrationMap[integration.IntegrationType.String()] = &integration

diff --git a/jobs/post-install-job/job/migrations/integration-type/git_parser.go b/jobs/post-install-job/job/migrations/integration-type/git_parser.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/opengovern/og-util/pkg/integration"
 	"github.com/opengovern/opencomply/jobs/post-install-job/config"
-	"github.com/opengovern/opencomply/jobs/post-install-job/job/migrations/integration-type/models"
+	"github.com/opengovern/opencomply/services/integration/models"
 	"go.uber.org/zap"
 	"os"
 )
@@ -56,7 +56,7 @@ func (g *GitParser) ExtractIntegrations(logger *zap.Logger) error {
 	return nil
 }
 
-func (g *GitParser) ExtractIntegrationBinaries(logger *zap.Logger, iPlugin IntegrationPlugin) (*models.IntegrationTypeBinaries, error) {
+func (g *GitParser) ExtractIntegrationBinaries(logger *zap.Logger, iPlugin IntegrationPlugin) (*models.IntegrationPlugin, error) {
 	baseDir := "/integration-types"
 
 	// create tmp directory if not exists
@@ -117,7 +117,7 @@ func (g *GitParser) ExtractIntegrationBinaries(logger *zap.Logger, iPlugin Integ
 	}
 
 	logger.Info("done reading files", zap.String("url", url), zap.String("integrationType", iPlugin.IntegrationType.String()), zap.Int("integrationPluginSize", len(integrationPlugin)), zap.Int("cloudqlPluginSize", len(cloudqlPlugin)))
-	return &models.IntegrationTypeBinaries{
+	return &models.IntegrationPlugin{
 		IntegrationType:   iPlugin.IntegrationType,
 		URL:               url,
 		IntegrationPlugin: integrationPlugin,

diff --git a/jobs/post-install-job/job/migrations/integration-type/migrator.go b/jobs/post-install-job/job/migrations/integration-type/migrator.go
@@ -6,7 +6,7 @@ import (
 	"github.com/opengovern/og-util/pkg/postgres"
 	"github.com/opengovern/opencomply/jobs/post-install-job/config"
 	"github.com/opengovern/opencomply/jobs/post-install-job/db"
-	"github.com/opengovern/opencomply/jobs/post-install-job/job/migrations/integration-type/models"
+	"github.com/opengovern/opencomply/services/integration/models"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@@ -36,7 +36,7 @@ func (m Migration) Run(ctx context.Context, conf config.MigratorConfig, logger *
 	}
 	dbm := db.Database{ORM: orm}
 
-	err = dbm.ORM.AutoMigrate(&models.IntegrationTypeBinaries{})
+	err = dbm.ORM.AutoMigrate(&models.IntegrationPlugin{})
 	if err != nil {
 		logger.Error("failed to auto migrate integration binaries", zap.Error(err))
 		return err
@@ -49,7 +49,7 @@ func (m Migration) Run(ctx context.Context, conf config.MigratorConfig, logger *
 	}
 
 	err = dbm.ORM.Transaction(func(tx *gorm.DB) error {
-		err := tx.Model(&models.IntegrationTypeBinaries{}).Where("1 = 1").Unscoped().Delete(&models.IntegrationTypeBinaries{}).Error
+		err := tx.Model(&models.IntegrationPlugin{}).Where("1 = 1").Unscoped().Delete(&models.IntegrationPlugin{}).Error
 		if err != nil {
 			logger.Error("failed to delete integration binaries", zap.Error(err))
 			return err

diff --git a/jobs/post-install-job/job/migrations/integration-type/models/integration_types.go b/jobs/post-install-job/job/migrations/integration-type/models/integration_types.go
diff --git a/services/integration/api/api.go b/services/integration/api/api.go
@@ -46,7 +46,7 @@ func New(
 func (api *API) Register(e *echo.Echo) {
 	integrationsApi := integrations.New(api.vault, api.database, api.logger, api.steampipeConn, api.kubeClient, api.typeManager)
 	cred := credentials.New(api.vault, api.database, api.logger)
-	integrationType := integration_type2.New(api.logger, api.typeManager)
+	integrationType := integration_type2.New(api.typeManager, api.database, api.logger)
 
 	integrationsApi.Register(e.Group("/api/v1/integrations"))
 	cred.Register(e.Group("/api/v1/credentials"))