🐛 return v9 portion in provider IDs

We have a bug in cnquery/cnspec v9 where differences in the ID can cause a crash: ``` panic: shell flag redefined: sudo goroutine 1 [running]: github.com/spf13/pflag.(*FlagSet).AddFlag(0xc000516200, 0xc000debb80) /home/runner/go/pkg/mod/github.com/spf13/pflag@v1.0.6-0.20201009195203-85dd5c8bc61c/flag.go:855 +0x5ec github.com/spf13/pflag.(*FlagSet).VarPF(0x10?, {0x22dbdc8, 0xc000afe960}, {0xc0006e72c8, 0x4}, {0x0, 0x0}, {0xc00005b2c0, 0x1d}) /home/runner/go/pkg/mod/github.com/spf13/pflag@v1.0.6-0.20201009195203-85dd5c8bc61c/flag.go:838 +0x14f github.com/spf13/pflag.(*FlagSet).BoolVarP(0xc000afe938?, 0x5?, {0xc0006e72c8?, 0x1946360?}, {0x0?, 0x1dbe006?}, 0x33?, {0xc00005b2c0?, 0x3167bc0?}) /home/runner/go/pkg/mod/github.com/spf13/pflag@v1.0.6-0.20201009195203-85dd5c8bc61c/bool.go:55 +0x3e github.com/spf13/pflag.(*FlagSet).BoolP(...) /home/runner/go/pkg/mod/github.com/spf13/pflag@v1.0.6-0.20201009195203-85dd5c8bc61c/bool.go:80 github.com/spf13/pflag.(*FlagSet).Bool(...) /home/runner/go/pkg/mod/github.com/spf13/pflag@v1.0.6-0.20201009195203-85dd5c8bc61c/bool.go:74 go.mondoo.com/cnquery/v9/cli/providers.attachFlag(0x0?, {{0xc0006e72c8, 0x4}, {0x0, 0x0}, {0xc0006e72d0, 0x5}, {0xc00005b2c0, 0x1d}, 0x1, ...}) ``` This happens when e.g.: ``` → /home/zero/.config/mondoo/providers (found 1 providers) os 10.0.0 with connectors: local, ssh, winrm, vagrant, container, docker, filesystem → /opt/mondoo/providers (found 1 providers) os 9.1.17 with connectors: local, ssh, winrm, vagrant, container, docker, filesystem ``` i.e. when we have an old-style provider ID (in v9.1.17) and a new-style provider ID (which we tried to introduce with this version). As soon as the ID is restored to be the same, this continue to work with cnquery/cnspec v9.x. We will keep the old version tag in each provider for the duration of v9.x support and remove the version indication from the ID once it is sunset (i.e. when we release v11.0). This may only be an edge-case with an easy solution/workaround, but it is an annoying experience. We will suffer with a confusing ID for a little bit until we can comfortably clean it up. Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
mondoohq · Jan 18, 2024 · ab2e15f · ab2e15f
1 parent 0501c83
commit ab2e15f
Show file tree

Hide file tree

Showing 44 changed files with 49 additions and 47 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/providers/arista",
+	ID:              "go.mondoo.com/cnquery/v9/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/providers/arista"
+option provider = "go.mondoo.com/cnquery/v9/providers/arista"
 option go_package = "go.mondoo.com/cnquery/v10/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/providers/atlassian",
+	ID:      "go.mondoo.com/cnquery/v9/providers/atlassian",
 	Version: "9.1.15",
 	ConnectionTypes: []string{
 		provider.DefaultConnectionType,

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

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/providers/aws",
+	ID:              "go.mondoo.com/cnquery/v9/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/providers/aws"
+option provider = "go.mondoo.com/cnquery/v9/providers/aws"
 option go_package = "go.mondoo.com/cnquery/v10/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/providers/azure",
+	ID:      "go.mondoo.com/cnquery/v9/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/providers/azure"
+option provider = "go.mondoo.com/cnquery/v9/providers/azure"
 option go_package = "go.mondoo.com/cnquery/v10/providers/azure/resources"
 
 // Azure resource

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/providers/core"
+option provider = "go.mondoo.com/cnquery/v9/providers/core"
 option go_package = "go.mondoo.com/cnquery/v10/providers/core/resources"
 
 // Contextual information about MQL runtime and environment

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/providers/equinix",
+	ID:              "go.mondoo.com/cnquery/v9/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/providers/equinix"
+option provider = "go.mondoo.com/cnquery/v9/providers/equinix"
 option go_package = "go.mondoo.com/cnquery/v10/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/providers/gcp",
+	ID:      "go.mondoo.com/cnquery/v9/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/providers/gcp"
+option provider = "go.mondoo.com/cnquery/v9/providers/gcp"
 option go_package = "go.mondoo.com/cnquery/v10/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/providers/github",
+	ID:              "go.mondoo.com/cnquery/v9/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/providers/github"
+option provider = "go.mondoo.com/cnquery/v9/providers/github"
 option go_package = "go.mondoo.com/cnquery/v10/providers/github/resources"
 
 // Git commit

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

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

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

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

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

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

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

diff --git a/providers/k8s/resources/k8s.lr b/providers/k8s/resources/k8s.lr
@@ -4,7 +4,7 @@
 import "../../os/resources/os.lr"
 import "../../network/resources/network.lr"
 
-option provider = "go.mondoo.com/cnquery/providers/k8s"
+option provider = "go.mondoo.com/cnquery/v9/providers/k8s"
 option go_package = "go.mondoo.com/cnquery/v10/providers/k8s/resources"
 
 // Kubernetes cluster

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

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

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

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

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

diff --git a/providers/oci/resources/oci.lr b/providers/oci/resources/oci.lr
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-option provider = "go.mondoo.com/cnquery/providers/oci"
+option provider = "go.mondoo.com/cnquery/v9/providers/oci"
 option go_package = "go.mondoo.com/cnquery/v10/providers/oci/resources"
 
 // Oracle Cloud Infrastructure (OCI) tenancy

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

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

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

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

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

diff --git a/providers/os/resources/os.lr b/providers/os/resources/os.lr
@@ -4,7 +4,7 @@
 import "../../core/resources/core.lr"
 import "../../network/resources/network.lr"
 
-option provider = "go.mondoo.com/cnquery/providers/os"
+option provider = "go.mondoo.com/cnquery/v9/providers/os"
 option go_package = "go.mondoo.com/cnquery/v10/providers/os/resources"
 
 alias os.base.command = command

diff --git a/providers/runtime.go b/providers/runtime.go
@@ -581,11 +581,13 @@ func (r *Runtime) lookupResourceProvider(resource string) (*ConnectedProvider, *
 		"go.mondoo.com/cnquery/providers/core",
 		"go.mondoo.com/cnquery/providers/network",
 		// FIXME: DEPRECATED, remove in v12.0 vv
-		// Until v10 providers had a version indication in their ID. With v10
-		// this is no longer the case. Once we get far enough away from legacy
+		// Providers traditionally had a version indication in their ID. With v10
+		// this is no longer necessary (but still supported due to a bug,
+		// see https://github.com/mondoohq/cnquery/pull/3053).
+		// Once we get far enough away from legacy
 		// version support, we can safely remove this.
-		"go.mondoo.com/cnquery/v9/providers/core",    // for backwards compatibility
-		"go.mondoo.com/cnquery/v9/providers/network", // for backwards compatibility
+		"go.mondoo.com/cnquery/v9/providers/core",
+		"go.mondoo.com/cnquery/v9/providers/network",
 		// ^^
 	}
 

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

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

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

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

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

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

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