🛑 remove v9 from ID of providers

We don't want it in the ID, since they have a separate version info. Having the ID in the name makes it much trickier to update a provider (technically).
mondoohq · Jan 12, 2024 · d7ed6a1 · d7ed6a1
1 parent 061256f
commit d7ed6a1
Show file tree

Hide file tree

Showing 45 changed files with 68 additions and 90 deletions.
diff --git a/providers/arista/config/config.go b/providers/arista/config/config.go
@@ -10,7 +10,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:            "arista",
-	ID:              "go.mondoo.com/cnquery/v9/providers/arista",
+	ID:              "go.mondoo.com/cnquery/providers/arista",
 	Version:         "9.1.15",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{

diff --git a/providers/arista/resources/arista.lr b/providers/arista/resources/arista.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/v9/providers/arista"
+option provider = "go.mondoo.com/cnquery/providers/arista"
 option go_package = "go.mondoo.com/cnquery/v9/providers/arista/resources"
 
 // Arista EOS resource

diff --git a/providers/atlassian/config/config.go b/providers/atlassian/config/config.go
@@ -10,7 +10,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:    "atlassian",
-	ID:      "go.mondoo.com/cnquery/v9/providers/atlassian",
+	ID:      "go.mondoo.com/cnquery/providers/atlassian",
 	Version: "9.1.15",
 	ConnectionTypes: []string{
 		provider.DefaultConnectionType,

diff --git a/providers/aws/config/config.go b/providers/aws/config/config.go
@@ -12,7 +12,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:            "aws",
-	ID:              "go.mondoo.com/cnquery/v9/providers/aws",
+	ID:              "go.mondoo.com/cnquery/providers/aws",
 	Version:         "9.1.25",
 	ConnectionTypes: []string{provider.DefaultConnectionType, string(awsec2ebsconn.EBSConnectionType)},
 	Connectors: []plugin.Connector{

diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr
@@ -4,7 +4,7 @@
 import "../../network/resources/network.lr"
 
 
-option provider = "go.mondoo.com/cnquery/v9/providers/aws"
+option provider = "go.mondoo.com/cnquery/providers/aws"
 option go_package = "go.mondoo.com/cnquery/v9/providers/aws/resources"
 
 // AWS resource

diff --git a/providers/azure/config/config.go b/providers/azure/config/config.go
@@ -12,7 +12,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:    "azure",
-	ID:      "go.mondoo.com/cnquery/v9/providers/azure",
+	ID:      "go.mondoo.com/cnquery/providers/azure",
 	Version: "9.2.1",
 	ConnectionTypes: []string{
 		provider.ConnectionType,

diff --git a/providers/azure/resources/azure.lr b/providers/azure/resources/azure.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/v9/providers/azure"
+option provider = "go.mondoo.com/cnquery/providers/azure"
 option go_package = "go.mondoo.com/cnquery/v9/providers/azure/resources"
 
 // Azure resource

diff --git a/providers/core/config/config.go b/providers/core/config/config.go
@@ -7,7 +7,7 @@ import "go.mondoo.com/cnquery/v9/providers-sdk/v1/plugin"
 
 var Config = plugin.Provider{
 	Name:       "core",
-	ID:         "go.mondoo.com/cnquery/v9/providers/core",
+	ID:         "go.mondoo.com/cnquery/providers/core",
 	Version:    "9.1.8",
 	Connectors: []plugin.Connector{},
 }
diff --git a/providers/core/resources/core.lr b/providers/core/resources/core.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/v9/providers/core"
+option provider = "go.mondoo.com/cnquery/providers/core"
 option go_package = "go.mondoo.com/cnquery/v9/providers/core/resources"
 
 // Contextual information about MQL runtime and environment

diff --git a/providers/defaults.go b/providers/defaults.go
@@ -11,14 +11,12 @@ import "go.mondoo.com/cnquery/v9/providers-sdk/v1/plugin"
 // to tell users what providers are used for common connections, when there
 // is no other way to find out.
 var DefaultProviders Providers = map[string]*Provider{
-
 	"arista": {
 		Provider: &plugin.Provider{
 			Name:            "arista",
-			ID:              "go.mondoo.com/cnquery/v9/providers/arista",
+			ID:              "go.mondoo.com/cnquery/providers/arista",
 			ConnectionTypes: []string{"arista"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "arista",
 					Use:   "arista user@host",
@@ -34,7 +32,6 @@ var DefaultProviders Providers = map[string]*Provider{
 			ID:              "go.mondoo.com/cnquery/providers/atlassian",
 			ConnectionTypes: []string{"atlassian", "jira", "admin", "confluence", "scim"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "atlassian",
 					Use:   "atlassian",
@@ -47,10 +44,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"aws": {
 		Provider: &plugin.Provider{
 			Name:            "aws",
-			ID:              "go.mondoo.com/cnquery/v9/providers/aws",
+			ID:              "go.mondoo.com/cnquery/providers/aws",
 			ConnectionTypes: []string{"aws", "ebs"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "aws",
 					Use:   "aws",
@@ -63,10 +59,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"azure": {
 		Provider: &plugin.Provider{
 			Name:            "azure",
-			ID:              "go.mondoo.com/cnquery/v9/providers/azure",
+			ID:              "go.mondoo.com/cnquery/providers/azure",
 			ConnectionTypes: []string{"azure"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "azure",
 					Use:   "azure",
@@ -79,7 +74,7 @@ var DefaultProviders Providers = map[string]*Provider{
 	"core": {
 		Provider: &plugin.Provider{
 			Name:            "core",
-			ID:              "go.mondoo.com/cnquery/v9/providers/core",
+			ID:              "go.mondoo.com/cnquery/providers/core",
 			ConnectionTypes: []string(nil),
 			Connectors:      []plugin.Connector{},
 		},
@@ -88,10 +83,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"equinix": {
 		Provider: &plugin.Provider{
 			Name:            "equinix",
-			ID:              "go.mondoo.com/cnquery/v9/providers/equinix",
+			ID:              "go.mondoo.com/cnquery/providers/equinix",
 			ConnectionTypes: []string{"equinix"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "equinix",
 					Use:   "equinix [org <org id>] [project <project-id>] [--token <token>]",
@@ -104,10 +98,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"gcp": {
 		Provider: &plugin.Provider{
 			Name:            "gcp",
-			ID:              "go.mondoo.com/cnquery/v9/providers/gcp",
+			ID:              "go.mondoo.com/cnquery/providers/gcp",
 			ConnectionTypes: []string{"gcp", "gcp-snapshot"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "gcp",
 					Use:   "gcp",
@@ -120,10 +113,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"github": {
 		Provider: &plugin.Provider{
 			Name:            "github",
-			ID:              "go.mondoo.com/cnquery/v9/providers/github",
+			ID:              "go.mondoo.com/cnquery/providers/github",
 			ConnectionTypes: []string{"github"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "github",
 					Use:   "github",
@@ -136,10 +128,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"gitlab": {
 		Provider: &plugin.Provider{
 			Name:            "gitlab",
-			ID:              "go.mondoo.com/cnquery/v9/providers/gitlab",
+			ID:              "go.mondoo.com/cnquery/providers/gitlab",
 			ConnectionTypes: []string{"gitlab", "gitlab-group", "gitlab-project"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "gitlab",
 					Use:   "gitlab",
@@ -152,10 +143,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"google-workspace": {
 		Provider: &plugin.Provider{
 			Name:            "google-workspace",
-			ID:              "go.mondoo.com/cnquery/v9/providers/google-workspace",
+			ID:              "go.mondoo.com/cnquery/providers/google-workspace",
 			ConnectionTypes: []string{"google-workspace"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "google-workspace",
 					Use:   "google-workspace [--credentials-path <credentials-path>] [--customer-id <customer-id>] [--impersonated-user-email <impersonated-user-email>]",
@@ -168,10 +158,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"ipmi": {
 		Provider: &plugin.Provider{
 			Name:            "ipmi",
-			ID:              "go.mondoo.com/cnquery/v9/providers/ipmi",
+			ID:              "go.mondoo.com/cnquery/providers/ipmi",
 			ConnectionTypes: []string{"ipmi"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "ipmi",
 					Use:   "ipmi user@host",
@@ -184,10 +173,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"k8s": {
 		Provider: &plugin.Provider{
 			Name:            "k8s",
-			ID:              "go.mondoo.com/cnquery/v9/providers/k8s",
+			ID:              "go.mondoo.com/cnquery/providers/k8s",
 			ConnectionTypes: []string{"k8s"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "k8s",
 					Use:   "k8s (optional MANIFEST path)",
@@ -200,10 +188,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"ms365": {
 		Provider: &plugin.Provider{
 			Name:            "ms365",
-			ID:              "go.mondoo.com/cnquery/v9/providers/ms365",
+			ID:              "go.mondoo.com/cnquery/providers/ms365",
 			ConnectionTypes: []string{"ms365"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "ms365",
 					Use:   "ms365",
@@ -216,10 +203,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"network": {
 		Provider: &plugin.Provider{
 			Name:            "network",
-			ID:              "go.mondoo.com/cnquery/v9/providers/network",
+			ID:              "go.mondoo.com/cnquery/providers/network",
 			ConnectionTypes: []string{"host"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "host",
 					Use:   "host HOST",
@@ -232,10 +218,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"oci": {
 		Provider: &plugin.Provider{
 			Name:            "oci",
-			ID:              "go.mondoo.com/cnquery/v9/providers/oci",
+			ID:              "go.mondoo.com/cnquery/providers/oci",
 			ConnectionTypes: []string{"oci"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "oci",
 					Use:   "oci",
@@ -248,10 +233,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"okta": {
 		Provider: &plugin.Provider{
 			Name:            "okta",
-			ID:              "go.mondoo.com/cnquery/v9/providers/okta",
+			ID:              "go.mondoo.com/cnquery/providers/okta",
 			ConnectionTypes: []string{"okta"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "okta",
 					Use:   "okta",
@@ -264,10 +248,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"opcua": {
 		Provider: &plugin.Provider{
 			Name:            "opcua",
-			ID:              "go.mondoo.com/cnquery/v9/providers/opcua",
+			ID:              "go.mondoo.com/cnquery/providers/opcua",
 			ConnectionTypes: []string{"opcua"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "opcua",
 					Use:   "opcua [--endpoint <endpoint>]",
@@ -280,10 +263,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"os": {
 		Provider: &plugin.Provider{
 			Name:            "os",
-			ID:              "go.mondoo.com/cnquery/v9/providers/os",
+			ID:              "go.mondoo.com/cnquery/providers/os",
 			ConnectionTypes: []string{"local", "ssh", "tar", "docker-snapshot", "vagrant", "docker-image", "docker-container", "docker-registry", "container-registry", "registry-image", "filesystem"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "local",
 					Use:   "local",
@@ -332,10 +314,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"slack": {
 		Provider: &plugin.Provider{
 			Name:            "slack",
-			ID:              "go.mondoo.com/cnquery/v9/providers/slack",
+			ID:              "go.mondoo.com/cnquery/providers/slack",
 			ConnectionTypes: []string{"slack"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "slack",
 					Use:   "slack",
@@ -348,10 +329,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"terraform": {
 		Provider: &plugin.Provider{
 			Name:            "terraform",
-			ID:              "go.mondoo.com/cnquery/v9/providers/terraform",
+			ID:              "go.mondoo.com/cnquery/providers/terraform",
 			ConnectionTypes: []string{"terraform-state", "terraform-plan", "terraform-hcl", "terraform-hcl-git"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "terraform",
 					Use:   "terraform PATH",
@@ -364,10 +344,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"vcd": {
 		Provider: &plugin.Provider{
 			Name:            "vcd",
-			ID:              "go.mondoo.com/cnquery/v9/providers/vcd",
+			ID:              "go.mondoo.com/cnquery/providers/vcd",
 			ConnectionTypes: []string{"vcd"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "vcd",
 					Use:   "vcd [--user <user>] [--host <host>] [--organization <organization>] [--ask-pass] [--password <password>]",
@@ -380,10 +359,9 @@ var DefaultProviders Providers = map[string]*Provider{
 	"vsphere": {
 		Provider: &plugin.Provider{
 			Name:            "vsphere",
-			ID:              "go.mondoo.com/cnquery/v9/providers/vsphere",
+			ID:              "go.mondoo.com/cnquery/providers/vsphere",
 			ConnectionTypes: []string{"vsphere"},
 			Connectors: []plugin.Connector{
-
 				{
 					Name:  "vsphere",
 					Use:   "vsphere user@host",

diff --git a/providers/equinix/config/config.go b/providers/equinix/config/config.go
@@ -10,7 +10,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:            "equinix",
-	ID:              "go.mondoo.com/cnquery/v9/providers/equinix",
+	ID:              "go.mondoo.com/cnquery/providers/equinix",
 	Version:         "9.1.16",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{

diff --git a/providers/equinix/resources/equinix.lr b/providers/equinix/resources/equinix.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/v9/providers/equinix"
+option provider = "go.mondoo.com/cnquery/providers/equinix"
 option go_package = "go.mondoo.com/cnquery/v9/providers/equinix/resources"
 
 // Equinix Metal project

diff --git a/providers/gcp/config/config.go b/providers/gcp/config/config.go
@@ -12,7 +12,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:    "gcp",
-	ID:      "go.mondoo.com/cnquery/v9/providers/gcp",
+	ID:      "go.mondoo.com/cnquery/providers/gcp",
 	Version: "9.1.18",
 	ConnectionTypes: []string{
 		provider.ConnectionType,

diff --git a/providers/gcp/resources/gcp.lr b/providers/gcp/resources/gcp.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/v9/providers/gcp"
+option provider = "go.mondoo.com/cnquery/providers/gcp"
 option go_package = "go.mondoo.com/cnquery/v9/providers/gcp/resources"
 
 alias gcloud.organization = gcp.organization

diff --git a/providers/github/config/config.go b/providers/github/config/config.go
@@ -10,7 +10,7 @@ import (
 
 var Config = plugin.Provider{
 	Name:            "github",
-	ID:              "go.mondoo.com/cnquery/v9/providers/github",
+	ID:              "go.mondoo.com/cnquery/providers/github",
 	Version:         "9.1.19",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{

diff --git a/providers/github/resources/github.lr b/providers/github/resources/github.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/v9/providers/github"
+option provider = "go.mondoo.com/cnquery/providers/github"
 option go_package = "go.mondoo.com/cnquery/v9/providers/github/resources"
 
 // Git commit