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

fix: auto generate files

Author: mohamadch91

discovery/pkg/runable/resource_type/main.go

@@ -55,13 +55,13 @@ func main() {
 	// Define the template with Labels and Annotations included
 	tmpl, err := template.New("").Parse(fmt.Sprintf(`
 	"{{ .ResourceName }}": {
-		IntegrationType:      configs.IntegrationName,
+		IntegrationType:      IntegrationName,
 		ResourceName:         "{{ .ResourceName }}",
 		Tags:                 {{ .TagsString }},
 		Labels:               {{ .LabelsString }},
 		Annotations:          {{ .AnnotationsString }},
-		ListDescriber:        {{ .ListDescriber }},
-		GetDescriber:         {{ if .GetDescriber }}{{ .GetDescriber }}{{ else }}nil{{ end }},
+		ListDescriber:        provider.{{ .ListDescriber }},
+		GetDescriber:         {{ if .GetDescriber }}provider.{{ .GetDescriber }}{{ else }}nil{{ end }},
 	},
 `))
 	if err != nil {
@@ -70,7 +70,7 @@ func main() {
 
 	// Set default output paths if not provided
 	if output == nil || len(*output) == 0 {
-		v := "provider/provider_resource_types.go"
+		v := "global/maps/provider_resource_types.go"
 		output = &v
 	}
 
@@ -81,14 +81,19 @@ func main() {
 
 	// Initialize a strings.Builder to construct the output file content
 	b := &strings.Builder{}
-	b.WriteString(fmt.Sprintf(`package provider
+	b.WriteString(fmt.Sprintf(`package maps
 import (
-	"%[1]s/provider/describer"
-	"%[1]s/provider/configs"
-	model "github.com/opengovern/og-describer-%[2]s/pkg/models"
+	"%[1]s/discovery/describers"
+	"%[1]s/discovery/provider"
+	model "github.com/opengovern/og-describer-%[2]s/discovery/pkg/models"
+	 "github.com/opengovern/og-util/pkg/integration"
+)
+
+const (
+	IntegrationName      = integration.Type("%[3]s")          
 )
 var ResourceTypes = map[string]model.ResourceType{
-`, global.OGPluginRepoURL, global.IntegrationTypeLower))
+`, global.OGPluginRepoURL, global.IntegrationTypeLower,global.IntegrationName))
 
 	// Iterate over each resource type to build its string representations
 	for _, resourceType := range resourceTypes {

discovery/pkg/runable/steampipe_es_client_generator/main.go

@@ -23,7 +23,7 @@ var (
 	pluginPath        = flag.String("pluginPath", "", "Location of the steampipe plugin")
 )
 
-const PluginPath = "../../../../steampipe-plugin-github/github"
+var PluginPath = fmt.Sprintf("../../../../cloudql/"+global.IntegrationTypeLower)
 
 type IntegrationType struct {
 	Name            string
@@ -47,7 +47,7 @@ func main() {
 		output = &v
 	}
 	if file == nil || len(*file) == 0 {
-		v := "../../../../provider/model/model.go"
+		v := "../../../provider/model.go"
 		file = &v
 	}
 
@@ -404,7 +404,7 @@ func Get{{ .Name }}(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateD
 			essdk "github.com/opengovern/og-util/pkg/opengovernance-es-sdk"
 			steampipesdk "github.com/opengovern/og-util/pkg/steampipe"
 			"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
-			`+global.IntegrationTypeLower+` "`+global.OGPluginRepoURL+`/provider/model"
+			`+global.IntegrationTypeLower+` "`+global.OGPluginRepoURL+`/discovery/provider"
             "runtime"
 		)
 

discovery/pkg/runable/steampipe_index_map/main.go

@@ -36,12 +36,12 @@ func main() {
 	var resourceTypes []ResourceType
 
 	if resourceTypesFile == nil || len(*resourceTypesFile) == 0 {
-		rt := "provider/resource-types.json"
+		rt := "global/maps/resource-types.json"
 		resourceTypesFile = &rt
 	}
 
 	if indexMap == nil || len(*indexMap) == 0 {
-		v := "steampipe/table_index_map.go"
+		v := "global/maps/table_index_map.go"
 		indexMap = &v
 	}
 
@@ -56,10 +56,10 @@ func main() {
 
 	// Generate the index map file as before
 	b := &strings.Builder{}
-	b.WriteString(fmt.Sprintf(`package steampipe
+	b.WriteString(fmt.Sprintf(`package maps
 
 import (
-	"%[1]s/pkg/sdk/es"
+	"%[1]s/discovery/pkg/es"
 )
 
 var Map = map[string]string{