Process remarks.

Signed-off-by: Vasil Sirakov <[email protected]>
mondoohq · Nov 12, 2024 · aaa666d · aaa666d
1 parent 4f67b6c
commit aaa666d
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 35 deletions.
diff --git a/cli/providers/providers.go b/cli/providers/providers.go
@@ -220,30 +220,34 @@ func attachConnectorCmd(provider *plugin.Provider, connector *plugin.Connector,
 	setConnector(provider, connector, cmd.Run, res)
 }
 
-func genBuiltinFlags(supportedDiscoveries ...string) []plugin.Flag {
-	flags := []plugin.Flag{}
+func genBuiltinFlags(discoveries ...string) []plugin.Flag {
+	supportedDiscoveries := append([]string{"all", "auto"}, discoveries...)
 
-	if len(supportedDiscoveries) > 0 {
-		flags = append(flags, plugin.Flag{
+	return []plugin.Flag{
+		// flags for providers:
+		{
 			Long: "discover",
 			Type: plugin.FlagType_List,
 			Desc: "Enable the discovery of nested assets. Supports: " + strings.Join(supportedDiscoveries, ","),
-		})
+		},
+		{
+			Long:   "pretty",
+			Type:   plugin.FlagType_Bool,
+			Desc:   "Pretty-print JSON",
+			Option: plugin.FlagOption_Hidden,
+		},
+		// runtime-only flags:
+		{
+			Long: "record",
+			Type: plugin.FlagType_String,
+			Desc: "Record all resource calls and use resources in the recording",
+		},
+		{
+			Long: "use-recording",
+			Type: plugin.FlagType_String,
+			Desc: "Use a recording to inject resource data (read-only)",
+		},
 	}
-	return append(flags, plugin.Flag{
-		Long:   "pretty",
-		Type:   plugin.FlagType_Bool,
-		Desc:   "Pretty-print JSON",
-		Option: plugin.FlagOption_Hidden,
-	}, plugin.Flag{
-		Long: "record",
-		Type: plugin.FlagType_String,
-		Desc: "Record all resource calls and use resources in the recording",
-	}, plugin.Flag{
-		Long: "use-recording",
-		Type: plugin.FlagType_String,
-		Desc: "Use a recording to inject resource data (read-only)",
-	})
 }
 
 // the following flags are not processed by providers

diff --git a/providers/atlassian/config/config.go b/providers/atlassian/config/config.go
@@ -6,6 +6,7 @@ package config
 import (
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
+	"go.mondoo.com/cnquery/v11/providers/atlassian/connection"
 	"go.mondoo.com/cnquery/v11/providers/atlassian/connection/confluence"
 	"go.mondoo.com/cnquery/v11/providers/atlassian/provider"
 )
@@ -49,7 +50,7 @@ Notes:
   Atlassian provides these values when you set up an identity provider.
 `,
 			MaxArgs:   2,
-			Discovery: []string{},
+			Discovery: []string{connection.DiscoveryOrganization},
 			Flags: []plugin.Flag{
 				{
 					Long:    "admin-token",

diff --git a/providers/atlassian/connection/connection.go b/providers/atlassian/connection/connection.go
@@ -13,6 +13,10 @@ import (
 	"go.mondoo.com/cnquery/v11/providers/atlassian/connection/shared"
 )
 
+const (
+	DiscoveryOrganization = "organization"
+)
+
 const (
 	Admin shared.ConnectionType = "atlassian"
 )

diff --git a/providers/aws/config/config.go b/providers/aws/config/config.go
@@ -55,8 +55,6 @@ Notes:
 			MinArgs: 0,
 			MaxArgs: 4,
 			Discovery: []string{
-				resources.DiscoveryAll,
-				resources.DiscoveryAuto,
 				resources.DiscoveryAccounts,
 
 				resources.DiscoveryInstances,

diff --git a/providers/azure/config/config.go b/providers/azure/config/config.go
@@ -27,8 +27,6 @@ var Config = plugin.Provider{
 			MinArgs: 0,
 			MaxArgs: 8,
 			Discovery: []string{
-				resources.DiscoveryAuto,
-				resources.DiscoveryAll,
 				resources.DiscoverySubscriptions,
 				resources.DiscoveryInstances,
 				resources.DiscoveryInstancesApi,

diff --git a/providers/gcp/config/config.go b/providers/gcp/config/config.go
@@ -26,8 +26,7 @@ var Config = plugin.Provider{
 			Short:   "a Google Cloud project or folder",
 			MaxArgs: 2,
 			Discovery: []string{
-				resources.DiscoveryAll,
-				resources.DiscoveryAuto,
+				resources.DiscoveryOrganization,
 				resources.DiscoveryFolders,
 				resources.DiscoveryInstances,
 				resources.DiscoveryProjects,

diff --git a/providers/gcp/resources/discovery.go b/providers/gcp/resources/discovery.go
@@ -24,6 +24,7 @@ const (
 	// Discovery flags
 	DiscoveryAuto               = "auto"
 	DiscoveryAll                = "all"
+	DiscoveryOrganization       = "organization"
 	DiscoveryFolders            = "folders"
 	DiscoveryInstances          = "instances"
 	DiscoveryProjects           = "projects"

diff --git a/providers/github/config/config.go b/providers/github/config/config.go
@@ -42,8 +42,6 @@ Notes:
 			MinArgs: 2,
 			MaxArgs: 2,
 			Discovery: []string{
-				connection.DiscoveryAll,
-				connection.DiscoveryAuto,
 				connection.DiscoveryRepos,
 				connection.DiscoveryUsers,
 				connection.DiscoveryOrganization,

diff --git a/providers/gitlab/config/config.go b/providers/gitlab/config/config.go
@@ -24,7 +24,6 @@ var Config = plugin.Provider{
 			Use:   "gitlab",
 			Short: "a GitLab group or project",
 			Discovery: []string{
-				provider.DiscoveryAuto,
 				provider.DiscoveryGroup,
 				provider.DiscoveryProject,
 				provider.DiscoveryTerraform,

diff --git a/providers/k8s/config/config.go b/providers/k8s/config/config.go
@@ -24,8 +24,6 @@ var Config = plugin.Provider{
 			MinArgs: 0,
 			MaxArgs: 1,
 			Discovery: []string{
-				resources.DiscoveryAll,
-				resources.DiscoveryAuto,
 				resources.DiscoveryAdmissionReviews,
 				resources.DiscoveryClusters,
 				resources.DiscoveryContainerImages,

diff --git a/providers/shodan/config/config.go b/providers/shodan/config/config.go
@@ -31,8 +31,6 @@ Examples:
 			MinArgs: 0,
 			MaxArgs: 2,
 			Discovery: []string{
-				connection.DiscoveryAll,
-				connection.DiscoveryAuto,
 				connection.DiscoveryHosts,
 			},
 			Flags: []plugin.Flag{

diff --git a/providers/vsphere/config/config.go b/providers/vsphere/config/config.go
@@ -21,8 +21,6 @@ var Config = plugin.Provider{
 			Use:   "vsphere user@host",
 			Short: "a VMware vSphere installation",
 			Discovery: []string{
-				resources.DiscoveryAll,
-				resources.DiscoveryAuto,
 				resources.DiscoveryApi,
 				resources.DiscoveryInstances,
 				resources.DiscoveryHostMachines,