Merge pull request #32 from opengovern/fix-folder-reorganization

fix: builds

Author: mohamadch91

.github/workflows/build.yaml

@@ -136,7 +136,7 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository_owner }}/steampipe-plugin-github:0.0.1
             ghcr.io/${{ github.repository_owner }}/steampipe-plugin-github:${{ needs.build.outputs.latest_tag }}
-          file: plugin/cloudql/docker/Dockerfile
+          file: cloudql/docker/Dockerfile
           context: .
   deploy-local-describer:
     needs:
@@ -170,7 +170,7 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository_owner }}/og-describer-github:local-latest
             ghcr.io/${{ github.repository_owner }}/og-describer-github:local-${{ needs.build.outputs.latest_tag }}
-          file: describer/DockerFile
+          file: discovery/DockerFile
           context: .
   release-integration-plugin:
     needs:

global/maps/resource_types.go

@@ -2,19 +2,32 @@ package maps
 
 import (
 	"github.com/opengovern/og-util/pkg/integration"
-	"github.com/opengovern/opencomply/services/integration/integration-type/interfaces"
 )
 
 const (
 	IntegrationTypeGithubAccount = integration.Type("github_account") // example: aws_cloud, azure_subscription
 )
 
-var ResourceTypeConfigs = map[string]*interfaces.ResourceTypeConfiguration{
+type ResourceTypeConfiguration struct {
+	Name            string           `json:"name"`
+	IntegrationType integration.Type `json:"integration_type"`
+	Description     string           `json:"description"`
+	Params          []Param          `json:"params"`
+}
+
+type Param struct {
+	Name        string  `json:"name"`
+	Description string  `json:"description"`
+	Required    bool    `json:"required"`
+	Default     *string `json:"default"`
+}
+
+var ResourceTypeConfigs = map[string]*ResourceTypeConfiguration{
 	"Github/Container/Package": {
 		Name:            "Github/Container/Package",
 		IntegrationType: IntegrationTypeGithubAccount,
 		Description:     "",
-		Params: []interfaces.Param{
+		Params: []Param{
 			{
 				Name:        "organization",
 				Description: `Please provide the organization name`,
@@ -26,7 +39,7 @@ var ResourceTypeConfigs = map[string]*interfaces.ResourceTypeConfiguration{
 		Name:            "Github/Repository",
 		IntegrationType: IntegrationTypeGithubAccount,
 		Description:     "",
-		Params: []interfaces.Param{
+		Params: []Param{
 			{
 				Name:        "repository",
 				Description: `Please provide the repo name (i.e. "internal-tools")`,
@@ -43,7 +56,7 @@ var ResourceTypeConfigs = map[string]*interfaces.ResourceTypeConfiguration{
 		Name:            "Github/Artifact/DockerFile",
 		IntegrationType: IntegrationTypeGithubAccount,
 		Description:     "",
-		Params: []interfaces.Param{
+		Params: []Param{
 			{
 				Name:        "repository",
 				Description: `Please provide the repo name (i.e. "internal-tools")`,
@@ -60,7 +73,7 @@ var ResourceTypeConfigs = map[string]*interfaces.ResourceTypeConfiguration{
 		Name:            "Github/Actions/WorkflowRun",
 		IntegrationType: IntegrationTypeGithubAccount,
 		Description:     "",
-		Params: []interfaces.Param{
+		Params: []Param{
 			{
 				Name:        "repository",
 				Description: `Please provide the repo name (i.e. "internal-tools")`,

platform/integration.go

@@ -2,19 +2,39 @@ package main
 
 import (
 	"encoding/json"
+	"strconv"
+
+	"github.com/hashicorp/go-plugin"
 	"github.com/jackc/pgtype"
 	"github.com/opengovern/og-describer-github/global"
 	"github.com/opengovern/og-describer-github/global/maps"
 	"github.com/opengovern/og-util/pkg/integration"
-	"github.com/opengovern/opencomply/services/integration/integration-type/interfaces"
 	"github.com/opengovern/opencomply/services/integration/models"
-	"strconv"
+	"net/rpc"
+
 )
 
 type Integration struct{}
 
-func (i *Integration) GetConfiguration() interfaces.IntegrationConfiguration {
-	return interfaces.IntegrationConfiguration{
+
+
+
+type IntegrationConfiguration struct {
+	NatsScheduledJobsTopic   string
+	NatsManualJobsTopic      string
+	NatsStreamName           string
+	NatsConsumerGroup        string
+	NatsConsumerGroupManuals string
+
+	SteampipePluginName string
+
+	UISpec []byte
+
+	DescriberDeploymentName string
+	DescriberRunCommand     string
+}
+func (i *Integration) GetConfiguration() IntegrationConfiguration {
+	return IntegrationConfiguration{
 		NatsScheduledJobsTopic:   global.JobQueueTopic,
 		NatsManualJobsTopic:      global.JobQueueTopicManuals,
 		NatsStreamName:           global.StreamName,
@@ -83,13 +103,13 @@ 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]maps.ResourceTypeConfiguration, error) {
+	resourceTypesMap := make(map[string]maps.ResourceTypeConfiguration)
 	for _, resourceType := range maps.ResourceTypesList {
 		if v, ok := maps.ResourceTypeConfigs[resourceType]; ok {
 			resourceTypesMap[resourceType] = *v
 		} else {
-			resourceTypesMap[resourceType] = interfaces.ResourceTypeConfiguration{}
+			resourceTypesMap[resourceType] = maps.ResourceTypeConfiguration{}
 		}
 	}
 	return resourceTypesMap, nil
@@ -120,3 +140,78 @@ func (i *Integration) ListAllTables() map[string][]string {
 
 	return tables
 }
+var HandshakeConfig = plugin.HandshakeConfig{
+	ProtocolVersion:  1,
+	MagicCookieKey:   "platform-integration-plugin",
+	MagicCookieValue: "integration",
+}
+
+type IntegrationTypePlugin struct {
+	Impl IntegrationType
+}
+type IntegrationType interface {
+	GetIntegrationType() integration.Type
+	GetConfiguration() IntegrationConfiguration
+	GetResourceTypesByLabels(map[string]string) (map[string]maps.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
+	ListAllTables() map[string][]string
+}
+type IntegrationTypeRPCServer struct {
+	Impl IntegrationType
+}
+type IntegrationTypeRPC struct {
+	client *rpc.Client
+}
+func (p *IntegrationTypePlugin) Server(*plugin.MuxBroker) (any, error) {
+	return &IntegrationTypeRPCServer{Impl: p.Impl}, nil
+}
+
+func (IntegrationTypePlugin) Client(b *plugin.MuxBroker, c *rpc.Client) (any, error) {
+	return &IntegrationTypeRPC{client: c}, nil
+}
+
+
+func (i *IntegrationTypeRPCServer) GetIntegrationType(_ struct{}, integrationType *integration.Type) error {
+	*integrationType = i.Impl.GetIntegrationType()
+	return nil
+}
+
+func (i *IntegrationTypeRPCServer) GetConfiguration(_ struct{}, configuration *IntegrationConfiguration) error {
+	*configuration = i.Impl.GetConfiguration()
+	return nil
+}
+
+func (i *IntegrationTypeRPCServer) GetResourceTypesByLabels(labels map[string]string, resourceTypes *map[string]maps.ResourceTypeConfiguration) error {
+	var err error
+	*resourceTypes, err = i.Impl.GetResourceTypesByLabels(labels)
+	return err
+}
+type HealthCheckRequest struct {
+	JsonData    []byte
+	ProviderId  string
+	Labels      map[string]string
+	Annotations map[string]string
+}
+func (i *IntegrationTypeRPCServer) HealthCheck(request HealthCheckRequest, result *bool) error {
+	var err error
+	*result, err = i.Impl.HealthCheck(request.JsonData, request.ProviderId, request.Labels, request.Annotations)
+	return err
+}
+
+func (i *IntegrationTypeRPCServer) DiscoverIntegrations(jsonData []byte, integrations *[]models.Integration) error {
+	var err error
+	*integrations, err = i.Impl.DiscoverIntegrations(jsonData)
+	return err
+}
+
+func (i *IntegrationTypeRPCServer) GetResourceTypeFromTableName(tableName string, resourceType *string) error {
+	*resourceType = i.Impl.GetResourceTypeFromTableName(tableName)
+	return nil
+}
+
+func (i *IntegrationTypeRPCServer) ListAllTables(_ struct{}, tables *map[string][]string) error {
+	*tables = i.Impl.ListAllTables()
+	return nil
+}

platform/main.go

@@ -3,10 +3,10 @@ package main
 import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
-	"github.com/opengovern/opencomply/services/integration/integration-type/interfaces"
 	"os"
 )
 
+
 func main() {
 	i := Integration{}
 	logger := hclog.New(&hclog.LoggerOptions{
@@ -16,11 +16,11 @@ func main() {
 	})
 
 	var pluginMap = map[string]plugin.Plugin{
-		IntegrationTypeGithubAccount.String(): &interfaces.IntegrationTypePlugin{Impl: &i},
+		IntegrationTypeGithubAccount.String(): &IntegrationTypePlugin{Impl: &i},
 	}
 
 	plugin.Serve(&plugin.ServeConfig{
-		HandshakeConfig: interfaces.HandshakeConfig,
+		HandshakeConfig: HandshakeConfig,
 		Plugins:         pluginMap,
 		Logger:          logger,
 	})