From d7ed6a155a96d17c3c174b50f530717ada58c303 Mon Sep 17 00:00:00 2001 From: Dominik Richter Date: Sat, 6 Jan 2024 15:33:31 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=91=20remove=20v9=20from=20ID=20of=20p?= =?UTF-8?q?roviders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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). --- providers/arista/config/config.go | 2 +- providers/arista/resources/arista.lr | 2 +- providers/atlassian/config/config.go | 2 +- providers/aws/config/config.go | 2 +- providers/aws/resources/aws.lr | 2 +- providers/azure/config/config.go | 2 +- providers/azure/resources/azure.lr | 2 +- providers/core/config/config.go | 2 +- providers/core/resources/core.lr | 2 +- providers/defaults.go | 64 ++++++------------- providers/equinix/config/config.go | 2 +- providers/equinix/resources/equinix.lr | 2 +- providers/gcp/config/config.go | 2 +- providers/gcp/resources/gcp.lr | 2 +- providers/github/config/config.go | 2 +- providers/github/resources/github.lr | 2 +- providers/gitlab/config/config.go | 2 +- providers/gitlab/resources/gitlab.lr | 2 +- providers/google-workspace/config/config.go | 2 +- .../resources/google-workspace.lr | 2 +- providers/ipmi/config/config.go | 2 +- providers/ipmi/resources/ipmi.lr | 2 +- providers/k8s/config/config.go | 2 +- providers/k8s/resources/k8s.lr | 2 +- providers/ms365/config/config.go | 2 +- providers/ms365/resources/ms365.lr | 2 +- providers/network/config/config.go | 8 +-- providers/network/resources/network.lr | 2 +- providers/oci/config/config.go | 2 +- providers/oci/resources/oci.lr | 2 +- providers/okta/config/config.go | 2 +- providers/okta/resources/okta.lr | 2 +- providers/opcua/config/config.go | 2 +- providers/opcua/resources/opcua.lr | 2 +- providers/os/config/config.go | 2 +- providers/os/resources/os.lr | 2 +- providers/runtime.go | 2 +- providers/slack/config/config.go | 2 +- providers/slack/resources/slack.lr | 2 +- providers/terraform/config/config.go | 2 +- providers/terraform/resources/terraform.lr | 2 +- providers/vcd/config/config.go | 2 +- providers/vcd/resources/vcd.lr | 2 +- providers/vsphere/config/config.go | 2 +- providers/vsphere/resources/vsphere.lr | 2 +- 45 files changed, 68 insertions(+), 90 deletions(-) diff --git a/providers/arista/config/config.go b/providers/arista/config/config.go index e67eb8cc9d..13e2fe95bf 100644 --- 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 index e9c7bb2570..42ab64eb51 100644 --- 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 index 8d7c4e369d..50b5083558 100644 --- 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 index 83a351de67..55434f3e74 100644 --- 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 index 725ba89254..e9665f50de 100644 --- 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 index 1471988b83..6affaee7ec 100644 --- 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 index ecd5bd077f..c51f749174 100644 --- 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 index 75fdf7bf7f..b902245157 100644 --- 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 index 8f84ecdb08..21d89ffa49 100644 --- 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 index 38ca867258..727d6d0c26 100644 --- 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 ] [project ] [--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 ] [--customer-id ] [--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 ]", @@ -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 ] [--host ] [--organization ] [--ask-pass] [--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 index 069920c0bc..abfccce094 100644 --- 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 index 9bf38bbc2d..746d328f99 100644 --- 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 index f95220694e..a07f147954 100644 --- 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 index b3b3e2df72..ea7d7917ba 100644 --- 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 index 30b745b313..1f78bffe50 100644 --- 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 index fd30dc2466..1c8ecabb4d 100644 --- 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 diff --git a/providers/gitlab/config/config.go b/providers/gitlab/config/config.go index 33a8df7bd6..3deb05eb1e 100644 --- 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/v9/providers/gitlab", + ID: "go.mondoo.com/cnquery/providers/gitlab", Version: "9.1.16", ConnectionTypes: []string{ provider.ConnectionType, diff --git a/providers/gitlab/resources/gitlab.lr b/providers/gitlab/resources/gitlab.lr index 97a80ab1f3..e8a73d62fb 100644 --- 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/v9/providers/gitlab" +option provider = "go.mondoo.com/cnquery/providers/gitlab" option go_package = "go.mondoo.com/cnquery/v9/providers/gitlab/resources" // GitLab group diff --git a/providers/google-workspace/config/config.go b/providers/google-workspace/config/config.go index 647bd043e0..cf80cb81f9 100644 --- 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/v9/providers/google-workspace", + ID: "go.mondoo.com/cnquery/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 index d914a21d00..ab03d9edfa 100644 --- 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/v9/providers/google-workspace" +option provider = "go.mondoo.com/cnquery/providers/google-workspace" option go_package = "go.mondoo.com/cnquery/v9/providers/google-workspace/resources" // Google Workspace diff --git a/providers/ipmi/config/config.go b/providers/ipmi/config/config.go index 81cd5608e9..56711483b7 100644 --- 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/v9/providers/ipmi", + ID: "go.mondoo.com/cnquery/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 index c99b12b824..18fe480b97 100644 --- 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/v9/providers/ipmi" +option provider = "go.mondoo.com/cnquery/providers/ipmi" option go_package = "go.mondoo.com/cnquery/v9/providers/ipmi/resources" // Intelligent Platform Management Interface (IPMI) resource diff --git a/providers/k8s/config/config.go b/providers/k8s/config/config.go index ecde908263..37c87f6930 100644 --- 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/v9/providers/k8s", + ID: "go.mondoo.com/cnquery/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 index e799425010..282c435b11 100644 --- 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/v9/providers/k8s" +option provider = "go.mondoo.com/cnquery/providers/k8s" option go_package = "go.mondoo.com/cnquery/v9/providers/k8s/resources" // Kubernetes cluster diff --git a/providers/ms365/config/config.go b/providers/ms365/config/config.go index a8800aa32f..6dca22b202 100644 --- 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/v9/providers/ms365", + ID: "go.mondoo.com/cnquery/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 index a3b56a9e0d..9fa728779d 100644 --- 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/v9/providers/ms365" +option provider = "go.mondoo.com/cnquery/providers/ms365" option go_package = "go.mondoo.com/cnquery/v9/providers/ms365/resources" // Microsoft diff --git a/providers/network/config/config.go b/providers/network/config/config.go index 33f9dfc63a..6f944ccc8e 100644 --- a/providers/network/config/config.go +++ b/providers/network/config/config.go @@ -10,13 +10,13 @@ import ( var Config = plugin.Provider{ Name: "network", - ID: "go.mondoo.com/cnquery/v9/providers/network", + ID: "go.mondoo.com/cnquery/providers/network", Version: "9.1.8", ConnectionTypes: []string{provider.HostConnectionType}, CrossProviderTypes: []string{ - "go.mondoo.com/cnquery/v9/providers/os", - "go.mondoo.com/cnquery/v9/providers/k8s", - "go.mondoo.com/cnquery/v9/providers/aws", + "go.mondoo.com/cnquery/providers/os", + "go.mondoo.com/cnquery/providers/k8s", + "go.mondoo.com/cnquery/providers/aws", }, Connectors: []plugin.Connector{ { diff --git a/providers/network/resources/network.lr b/providers/network/resources/network.lr index 0f55cffdbd..497827dada 100644 --- 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/v9/providers/network" +option provider = "go.mondoo.com/cnquery/providers/network" option go_package = "go.mondoo.com/cnquery/v9/providers/network/resources" // Socket diff --git a/providers/oci/config/config.go b/providers/oci/config/config.go index dc818ee3eb..04b382ab0a 100644 --- 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/v9/providers/oci", + ID: "go.mondoo.com/cnquery/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 index 5f74c4af1b..cfa2455c3b 100644 --- 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/v9/providers/oci" +option provider = "go.mondoo.com/cnquery/providers/oci" option go_package = "go.mondoo.com/cnquery/v9/providers/oci/resources" // Oracle Cloud Infrastructure (OCI) tenancy diff --git a/providers/okta/config/config.go b/providers/okta/config/config.go index 7b16ac0e79..cf4a4f5c2d 100644 --- 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/v9/providers/okta", + ID: "go.mondoo.com/cnquery/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 index 6bb1e64c04..843e8495b7 100644 --- 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/v9/providers/okta" +option provider = "go.mondoo.com/cnquery/providers/okta" option go_package = "go.mondoo.com/cnquery/v9/providers/okta/resources" // Okta diff --git a/providers/opcua/config/config.go b/providers/opcua/config/config.go index 813e5732b6..b7f23870a4 100644 --- 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/v9/providers/opcua", + ID: "go.mondoo.com/cnquery/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 index 5b736d3399..e2866641a7 100644 --- 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/v9/providers/opcua" +option provider = "go.mondoo.com/cnquery/providers/opcua" option go_package = "go.mondoo.com/cnquery/v9/providers/opcua/resources" // OPC UA diff --git a/providers/os/config/config.go b/providers/os/config/config.go index f979958d8c..3833d1c411 100644 --- 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/v9/providers/os", + ID: "go.mondoo.com/cnquery/providers/os", Version: "9.1.20", ConnectionTypes: []string{ provider.LocalConnectionType, diff --git a/providers/os/resources/os.lr b/providers/os/resources/os.lr index 0f1ffc18d2..ae2739e81e 100644 --- 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/v9/providers/os" +option provider = "go.mondoo.com/cnquery/providers/os" option go_package = "go.mondoo.com/cnquery/v9/providers/os/resources" alias os.base.command = command diff --git a/providers/runtime.go b/providers/runtime.go index 9a3fdb4c17..b1b4f03390 100644 --- a/providers/runtime.go +++ b/providers/runtime.go @@ -576,7 +576,7 @@ func (r *Runtime) lookupResourceProvider(resource string) (*ConnectedProvider, * } providerConn := r.Provider.Instance.ID - if info.Provider != providerConn && info.Provider != "go.mondoo.com/cnquery/v9/providers/core" && info.Provider != "go.mondoo.com/cnquery/v9/providers/network" { + if info.Provider != providerConn && info.Provider != "go.mondoo.com/cnquery/providers/core" && info.Provider != "go.mondoo.com/cnquery/providers/network" { return nil, nil, errors.New("incorrect provider for asset, not adding") } diff --git a/providers/slack/config/config.go b/providers/slack/config/config.go index cb1989ad26..a18d8ce874 100644 --- 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/v9/providers/slack", + ID: "go.mondoo.com/cnquery/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 index 0cc8138353..793cf95f1a 100644 --- 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/v9/providers/slack" +option provider = "go.mondoo.com/cnquery/providers/slack" option go_package = "go.mondoo.com/cnquery/v9/providers/slack/resources" // Slack diff --git a/providers/terraform/config/config.go b/providers/terraform/config/config.go index a7c8dbde98..3ec27c0bd1 100644 --- 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/v9/providers/terraform", + ID: "go.mondoo.com/cnquery/providers/terraform", Version: "9.1.15", ConnectionTypes: []string{ provider.StateConnectionType, diff --git a/providers/terraform/resources/terraform.lr b/providers/terraform/resources/terraform.lr index dd90d96a35..017c3fb5ad 100644 --- 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/v9/providers/terraform" +option provider = "go.mondoo.com/cnquery/providers/terraform" option go_package = "go.mondoo.com/cnquery/v9/providers/terraform/resources" // Terraform configuration files diff --git a/providers/vcd/config/config.go b/providers/vcd/config/config.go index 77f46898fe..00f899ac49 100644 --- 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/v9/providers/vcd", + ID: "go.mondoo.com/cnquery/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 index 467ad55c9d..8535feb9ab 100644 --- 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/v9/providers/vcd" +option provider = "go.mondoo.com/cnquery/providers/vcd" option go_package = "go.mondoo.com/cnquery/v9/providers/vcd/resources" // VMware Cloud Director diff --git a/providers/vsphere/config/config.go b/providers/vsphere/config/config.go index 5deecb53bf..1357eeda2a 100644 --- 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/v9/providers/vsphere", + ID: "go.mondoo.com/cnquery/providers/vsphere", Version: "9.1.18", ConnectionTypes: []string{provider.ConnectionType}, Connectors: []plugin.Connector{ diff --git a/providers/vsphere/resources/vsphere.lr b/providers/vsphere/resources/vsphere.lr index f41f752114..26325f1667 100644 --- a/providers/vsphere/resources/vsphere.lr +++ b/providers/vsphere/resources/vsphere.lr @@ -1,7 +1,7 @@ // Copyright (c) Mondoo, Inc. // SPDX-License-Identifier: BUSL-1.1 -option provider = "go.mondoo.com/cnquery/v9/providers/vsphere" +option provider = "go.mondoo.com/cnquery/providers/vsphere" option go_package = "go.mondoo.com/cnquery/v9/providers/vsphere/resources" // vSphere asset resource