Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 return v9 portion in provider IDs #3053

Merged
merged 3 commits into from
Jan 18, 2024
Merged

🐛 return v9 portion in provider IDs #3053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab2e15f
🐛 return v9 portion in provider IDs
arlimus Jan 18, 2024
696a220
🟢 return versions to providers in unit test recordings
arlimus Jan 18, 2024
1cc2293
🟢 fix core provider versioning
arlimus Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion providers/arista/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/arista/resources/arista.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/atlassian/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion providers/atlassian/resources/atlassian.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/aws/resources/aws.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/resources/azure.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/core/resources/core.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/equinix/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/equinix/resources/equinix.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/gcp/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion providers/gcp/resources/gcp.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/github/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/github/resources/github.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/gitlab/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion providers/gitlab/resources/gitlab.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/google-workspace/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/google-workspace/resources/google-workspace.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/ipmi/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/ipmi/resources/ipmi.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/k8s/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/k8s/resources/k8s.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/ms365/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/ms365/resources/ms365.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/network/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/network/resources/network.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/oci/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/oci/resources/oci.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/okta/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/okta/resources/okta.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/opcua/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/opcua/resources/opcua.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/os/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion providers/os/resources/os.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions providers/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
// ^^
}

Expand Down
2 changes: 1 addition & 1 deletion providers/slack/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/slack/resources/slack.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/terraform/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion providers/terraform/resources/terraform.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/vcd/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion providers/vcd/resources/vcd.lr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion providers/vsphere/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading
Loading