diff --git a/.github/.goreleaser-edge.yml b/.github/.goreleaser-edge.yml index f4ed4a87..4bc46253 100644 --- a/.github/.goreleaser-edge.yml +++ b/.github/.goreleaser-edge.yml @@ -26,8 +26,8 @@ builds: - -tags="production netgo" ldflags: - "-extldflags=-static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} checksum: name_template: '{{ .ProjectName }}_v{{ .Version }}_SHA256SUMS' algorithm: sha256 diff --git a/.github/.goreleaser-unstable.yml b/.github/.goreleaser-unstable.yml index af138eaa..67f82c94 100644 --- a/.github/.goreleaser-unstable.yml +++ b/.github/.goreleaser-unstable.yml @@ -26,8 +26,8 @@ builds: - -tags="production netgo" ldflags: - "-extldflags=-static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} - id: macos main: ./apps/cnspec/cnspec.go binary: cnspec @@ -39,8 +39,8 @@ builds: flags: -tags production ldflags: # clang + macos does not support static: - -extldflags "-static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} hooks: post: - cmd: /tmp/quill sign-and-notarize "{{ .Path }}" -vv @@ -58,8 +58,8 @@ builds: flags: -tags production -buildmode exe ldflags: - "-extldflags -static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} hooks: post: - cmd: jsign --storetype DIGICERTONE --alias "{{ .Env.SM_CERT_ALIAS }}" --storepass "{{ .Env.SM_API_KEY }}|{{ .Env.SM_CLIENT_CERT_FILE}}|{{ .Env.SM_CLIENT_CERT_PASSWORD }}" --tsaurl "http://timestamp.digicert.com" '{{ .Path }}' diff --git a/.goreleaser.yml b/.goreleaser.yml index 15339374..f0b5e286 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -26,8 +26,8 @@ builds: - -tags="production netgo" ldflags: - "-extldflags=-static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} - id: macos main: ./apps/cnspec/cnspec.go binary: cnspec @@ -39,8 +39,8 @@ builds: flags: -tags production ldflags: # clang + macos does not support static: - -extldflags "-static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} hooks: post: - cmd: /tmp/quill sign-and-notarize "{{ .Path }}" -vv @@ -58,8 +58,8 @@ builds: flags: -tags production -buildmode exe ldflags: - "-extldflags -static" - - -s -w -X go.mondoo.com/cnspec/v9.Version={{.Version}} -X go.mondoo.com/cnspec/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v9.Date={{.Date}} - - -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}} + - -s -w -X go.mondoo.com/cnspec/v10.Version={{.Version}} -X go.mondoo.com/cnspec/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v10.Date={{.Date}} + - -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}} hooks: post: - cmd: jsign --storetype DIGICERTONE --alias "{{ .Env.SM_CERT_ALIAS }}" --storepass "{{ .Env.SM_API_KEY }}|{{ .Env.SM_CLIENT_CERT_FILE}}|{{ .Env.SM_CLIENT_CERT_PASSWORD }}" --tsaurl "http://timestamp.digicert.com" '{{ .Path }}' diff --git a/Makefile b/Makefile index 2592173b..113919da 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ ifndef VERSION VERSION=${LATEST_VERSION_TAG}+$(shell git rev-list --count HEAD) endif -LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnspec/v9.Version=${VERSION} -X go.mondoo.com/cnspec/v9.Build=${TAG}" # -linkmode external -extldflags=-static -LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnspec/v9.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnspec/v9.Build=${TAG} -s -w" +LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnspec/v10.Version=${VERSION} -X go.mondoo.com/cnspec/v10.Build=${TAG}" # -linkmode external -extldflags=-static +LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnspec/v10.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnspec/v10.Build=${TAG} -s -w" .PHONY: info/ldflags info/ldflags: diff --git a/apps/cnspec/cmd/backgroundjob/checkin.go b/apps/cnspec/cmd/backgroundjob/checkin.go index d87a2b7f..562b6c4e 100644 --- a/apps/cnspec/cmd/backgroundjob/checkin.go +++ b/apps/cnspec/cmd/backgroundjob/checkin.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/sysinfo" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/sysinfo" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" "go.mondoo.com/ranger-rpc" "go.mondoo.com/ranger-rpc/plugins/scope" ) diff --git a/apps/cnspec/cmd/backgroundjob/serve_windows.go b/apps/cnspec/cmd/backgroundjob/serve_windows.go index b33f8b1d..d61b4a36 100644 --- a/apps/cnspec/cmd/backgroundjob/serve_windows.go +++ b/apps/cnspec/cmd/backgroundjob/serve_windows.go @@ -11,7 +11,7 @@ import ( "time" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/logger/eventlog" + "go.mondoo.com/cnquery/v10/logger/eventlog" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" ) diff --git a/apps/cnspec/cmd/bundle.go b/apps/cnspec/cmd/bundle.go index 673ea340..a11ddc48 100644 --- a/apps/cnspec/cmd/bundle.go +++ b/apps/cnspec/cmd/bundle.go @@ -10,11 +10,11 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9/cli/config" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnspec/v9/internal/bundle" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/config" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v10/internal/bundle" + "go.mondoo.com/cnspec/v10/policy" ) func init() { diff --git a/apps/cnspec/cmd/config/config.go b/apps/cnspec/cmd/config/config.go index e6d656bd..18dca3d3 100644 --- a/apps/cnspec/cmd/config/config.go +++ b/apps/cnspec/cmd/config/config.go @@ -6,7 +6,7 @@ package config import ( "github.com/cockroachdb/errors" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9/cli/config" + "go.mondoo.com/cnquery/v10/cli/config" ) func ReadConfig() (*CliConfig, error) { diff --git a/apps/cnspec/cmd/login.go b/apps/cnspec/cmd/login.go index 92303992..9a33b385 100644 --- a/apps/cnspec/cmd/login.go +++ b/apps/cnspec/cmd/login.go @@ -4,7 +4,7 @@ package cmd import ( - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/logout.go b/apps/cnspec/cmd/logout.go index 5f0faacc..3a577d85 100644 --- a/apps/cnspec/cmd/logout.go +++ b/apps/cnspec/cmd/logout.go @@ -4,7 +4,7 @@ package cmd import ( - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/policy.go b/apps/cnspec/cmd/policy.go index 41c2d646..37a4ec83 100644 --- a/apps/cnspec/cmd/policy.go +++ b/apps/cnspec/cmd/policy.go @@ -15,14 +15,14 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9/cli/config" - "go.mondoo.com/cnquery/v9/cli/theme" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - "go.mondoo.com/cnspec/v9/internal/bundle" - "go.mondoo.com/cnspec/v9/policy" - cnspec_upstream "go.mondoo.com/cnspec/v9/upstream" + "go.mondoo.com/cnquery/v10/cli/config" + "go.mondoo.com/cnquery/v10/cli/theme" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnspec/v10/internal/bundle" + "go.mondoo.com/cnspec/v10/policy" + cnspec_upstream "go.mondoo.com/cnspec/v10/upstream" mondoogql "go.mondoo.com/mondoo-go" "gopkg.in/yaml.v3" "k8s.io/utils/ptr" diff --git a/apps/cnspec/cmd/providers.go b/apps/cnspec/cmd/providers.go index 0c1b582b..885fe63d 100644 --- a/apps/cnspec/cmd/providers.go +++ b/apps/cnspec/cmd/providers.go @@ -4,7 +4,7 @@ package cmd import ( - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/root.go b/apps/cnspec/cmd/root.go index 7a562759..a883f1f8 100644 --- a/apps/cnspec/cmd/root.go +++ b/apps/cnspec/cmd/root.go @@ -16,16 +16,16 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9" - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" - "go.mondoo.com/cnquery/v9/cli/config" - cli_errors "go.mondoo.com/cnquery/v9/cli/errors" - "go.mondoo.com/cnquery/v9/cli/providers" - "go.mondoo.com/cnquery/v9/cli/theme" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/sysinfo" - "go.mondoo.com/cnspec/v9" + "go.mondoo.com/cnquery/v10" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" + "go.mondoo.com/cnquery/v10/cli/config" + cli_errors "go.mondoo.com/cnquery/v10/cli/errors" + "go.mondoo.com/cnquery/v10/cli/providers" + "go.mondoo.com/cnquery/v10/cli/theme" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/sysinfo" + "go.mondoo.com/cnspec/v10" "go.mondoo.com/ranger-rpc" "go.mondoo.com/ranger-rpc/plugins/scope" ) diff --git a/apps/cnspec/cmd/run.go b/apps/cnspec/cmd/run.go index 1a8d3b7f..d2a0f715 100644 --- a/apps/cnspec/cmd/run.go +++ b/apps/cnspec/cmd/run.go @@ -4,7 +4,7 @@ package cmd import ( - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/scan.go b/apps/cnspec/cmd/scan.go index af4edf90..087ad943 100644 --- a/apps/cnspec/cmd/scan.go +++ b/apps/cnspec/cmd/scan.go @@ -13,21 +13,21 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/cli/config" - "go.mondoo.com/cnquery/v9/cli/execruntime" - "go.mondoo.com/cnquery/v9/cli/inventoryloader" - "go.mondoo.com/cnquery/v9/cli/theme" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/plugin" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnspec/v9/cli/reporter" - "go.mondoo.com/cnspec/v9/policy" - "go.mondoo.com/cnspec/v9/policy/scan" - policy_upstream "go.mondoo.com/cnspec/v9/policy/upstream" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/cli/config" + "go.mondoo.com/cnquery/v10/cli/execruntime" + "go.mondoo.com/cnquery/v10/cli/inventoryloader" + "go.mondoo.com/cnquery/v10/cli/theme" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/plugin" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v10/cli/reporter" + "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnspec/v10/policy/scan" + policy_upstream "go.mondoo.com/cnspec/v10/policy/upstream" ) const ( diff --git a/apps/cnspec/cmd/serve.go b/apps/cnspec/cmd/serve.go index d250d0e8..1429ccd2 100644 --- a/apps/cnspec/cmd/serve.go +++ b/apps/cnspec/cmd/serve.go @@ -11,19 +11,19 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/cli/config" - cli_errors "go.mondoo.com/cnquery/v9/cli/errors" - "go.mondoo.com/cnquery/v9/cli/execruntime" - "go.mondoo.com/cnquery/v9/cli/inventoryloader" - "go.mondoo.com/cnquery/v9/cli/prof" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnspec/v9" - "go.mondoo.com/cnspec/v9/apps/cnspec/cmd/backgroundjob" - cnspec_config "go.mondoo.com/cnspec/v9/apps/cnspec/cmd/config" - "go.mondoo.com/cnspec/v9/policy/scan" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/cli/config" + cli_errors "go.mondoo.com/cnquery/v10/cli/errors" + "go.mondoo.com/cnquery/v10/cli/execruntime" + "go.mondoo.com/cnquery/v10/cli/inventoryloader" + "go.mondoo.com/cnquery/v10/cli/prof" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v10" + "go.mondoo.com/cnspec/v10/apps/cnspec/cmd/backgroundjob" + cnspec_config "go.mondoo.com/cnspec/v10/apps/cnspec/cmd/config" + "go.mondoo.com/cnspec/v10/policy/scan" ) // we send a 78 exit code to prevent systemd from restart diff --git a/apps/cnspec/cmd/serve_api.go b/apps/cnspec/cmd/serve_api.go index 8a898665..b2f653a5 100644 --- a/apps/cnspec/cmd/serve_api.go +++ b/apps/cnspec/cmd/serve_api.go @@ -17,12 +17,12 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9/cli/config" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - cnspec_config "go.mondoo.com/cnspec/v9/apps/cnspec/cmd/config" - "go.mondoo.com/cnspec/v9/policy/scan" + "go.mondoo.com/cnquery/v10/cli/config" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + cnspec_config "go.mondoo.com/cnspec/v10/apps/cnspec/cmd/config" + "go.mondoo.com/cnspec/v10/policy/scan" ) func init() { diff --git a/apps/cnspec/cmd/shell.go b/apps/cnspec/cmd/shell.go index fefbdbec..c6aaa326 100644 --- a/apps/cnspec/cmd/shell.go +++ b/apps/cnspec/cmd/shell.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9" - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/plugin" - "go.mondoo.com/cnspec/v9" + "go.mondoo.com/cnquery/v10" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/plugin" + "go.mondoo.com/cnspec/v10" ) func init() { diff --git a/apps/cnspec/cmd/status.go b/apps/cnspec/cmd/status.go index c408929f..9431b182 100644 --- a/apps/cnspec/cmd/status.go +++ b/apps/cnspec/cmd/status.go @@ -4,7 +4,7 @@ package cmd import ( - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/update.go b/apps/cnspec/cmd/update.go index 61cb0261..3f3c2512 100644 --- a/apps/cnspec/cmd/update.go +++ b/apps/cnspec/cmd/update.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "go.mondoo.com/cnquery/v9/cli/config" + "go.mondoo.com/cnquery/v10/cli/config" ) func init() { diff --git a/apps/cnspec/cmd/vault.go b/apps/cnspec/cmd/vault.go index 3dc59e31..7f0072c8 100644 --- a/apps/cnspec/cmd/vault.go +++ b/apps/cnspec/cmd/vault.go @@ -4,7 +4,7 @@ package cmd import ( - cnquery_app "go.mondoo.com/cnquery/v9/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v10/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/version.go b/apps/cnspec/cmd/version.go index 14112c06..8f8ea39c 100644 --- a/apps/cnspec/cmd/version.go +++ b/apps/cnspec/cmd/version.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/spf13/cobra" - "go.mondoo.com/cnspec/v9" + "go.mondoo.com/cnspec/v10" ) // versionCmd represents the version command diff --git a/apps/cnspec/cmd/vuln.go b/apps/cnspec/cmd/vuln.go index fe671331..4bd91d1a 100644 --- a/apps/cnspec/cmd/vuln.go +++ b/apps/cnspec/cmd/vuln.go @@ -9,14 +9,14 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.mondoo.com/cnquery/v9/cli/shell" - "go.mondoo.com/cnquery/v9/explorer/executor" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/plugin" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnspec/v9/cli/reporter" + "go.mondoo.com/cnquery/v10/cli/shell" + "go.mondoo.com/cnquery/v10/explorer/executor" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/plugin" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnspec/v10/cli/reporter" mondoogql "go.mondoo.com/mondoo-go" "go.mondoo.com/ranger-rpc/codes" "go.mondoo.com/ranger-rpc/status" diff --git a/apps/cnspec/cnspec.go b/apps/cnspec/cnspec.go index 50897595..b9dcf75c 100644 --- a/apps/cnspec/cnspec.go +++ b/apps/cnspec/cnspec.go @@ -3,7 +3,7 @@ package main -import "go.mondoo.com/cnspec/v9/apps/cnspec/cmd" +import "go.mondoo.com/cnspec/v10/apps/cnspec/cmd" func main() { cmd.Execute() diff --git a/apps/gen-docs/main.go b/apps/gen-docs/main.go index 2ce4e8bc..389f8a8d 100644 --- a/apps/gen-docs/main.go +++ b/apps/gen-docs/main.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/pflag" - "go.mondoo.com/cnspec/v9/apps/cnspec/cmd" + "go.mondoo.com/cnspec/v10/apps/cnspec/cmd" ) func main() { diff --git a/cli/components/advisories/report.go b/cli/components/advisories/report.go index 38e80ba7..7b9cf5ee 100644 --- a/cli/components/advisories/report.go +++ b/cli/components/advisories/report.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/providers/core/resources/versions/generic" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/providers/core/resources/versions/generic" ) type RowWriter interface { diff --git a/cli/components/advisory_results.go b/cli/components/advisory_results.go index 85f016e2..739965a6 100644 --- a/cli/components/advisory_results.go +++ b/cli/components/advisory_results.go @@ -11,9 +11,9 @@ import ( "github.com/cockroachdb/errors" "github.com/olekukonko/tablewriter" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd/cvss" - "go.mondoo.com/cnspec/v9/cli/components/advisories" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd/cvss" + "go.mondoo.com/cnspec/v10/cli/components/advisories" ) func NewAdvisoryResultTable() AdvisoryResultTable { diff --git a/cli/components/advisory_results_test.go b/cli/components/advisory_results_test.go index 227d231d..ff9d14b1 100644 --- a/cli/components/advisory_results_test.go +++ b/cli/components/advisory_results_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" "sigs.k8s.io/yaml" ) diff --git a/cli/components/barchart.go b/cli/components/barchart.go index 3732ec11..a4d6abc6 100644 --- a/cli/components/barchart.go +++ b/cli/components/barchart.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/theme/colors" + "go.mondoo.com/cnquery/v10/cli/theme/colors" ) func maxWidth(labels []string) int { diff --git a/cli/components/cvss_indicator.go b/cli/components/cvss_indicator.go index f137ca50..a2c62ebb 100644 --- a/cli/components/cvss_indicator.go +++ b/cli/components/cvss_indicator.go @@ -5,8 +5,8 @@ package components import ( "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd/cvss" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd/cvss" ) func NewCvssIndicator() CvssIndicator { diff --git a/cli/components/paper.go b/cli/components/paper.go index 29617621..db9ea33e 100644 --- a/cli/components/paper.go +++ b/cli/components/paper.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/theme/colors" + "go.mondoo.com/cnquery/v10/cli/theme/colors" ) type PaperCharsTheme struct { diff --git a/cli/components/rating.go b/cli/components/rating.go index cabf16bf..d0f741f8 100644 --- a/cli/components/rating.go +++ b/cli/components/rating.go @@ -5,8 +5,8 @@ package components import ( "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnspec/v10/policy" ) var DefaultRatingColors = NewRating(colors.DefaultColorTheme) diff --git a/cli/components/scorecard.go b/cli/components/scorecard.go index 92ba212c..e7c6845e 100644 --- a/cli/components/scorecard.go +++ b/cli/components/scorecard.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/utils/stringx" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/utils/stringx" + "go.mondoo.com/cnspec/v10/policy" ) const ( diff --git a/cli/components/stackbar.go b/cli/components/stackbar.go index 3c08012f..db09e4cf 100644 --- a/cli/components/stackbar.go +++ b/cli/components/stackbar.go @@ -11,7 +11,7 @@ import ( "github.com/muesli/reflow/ansi" "github.com/muesli/reflow/wordwrap" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/theme/colors" + "go.mondoo.com/cnquery/v10/cli/theme/colors" ) func sanitizeDatapoints(datapoints []float64) []float64 { diff --git a/cli/components/stackbar_test.go b/cli/components/stackbar_test.go index 07361103..db00d762 100644 --- a/cli/components/stackbar_test.go +++ b/cli/components/stackbar_test.go @@ -9,7 +9,7 @@ import ( "github.com/muesli/termenv" "github.com/stretchr/testify/assert" - "go.mondoo.com/cnquery/v9/cli/theme/colors" + "go.mondoo.com/cnquery/v10/cli/theme/colors" ) func TestStackBarGeneration(t *testing.T) { diff --git a/cli/reporter/aws_sqs_handler.go b/cli/reporter/aws_sqs_handler.go index 920f013f..2800c6cd 100644 --- a/cli/reporter/aws_sqs_handler.go +++ b/cli/reporter/aws_sqs_handler.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" "gocloud.dev/pubsub" _ "gocloud.dev/pubsub/awssnssqs" ) diff --git a/cli/reporter/cli_reporter.go b/cli/reporter/cli_reporter.go index 4ce30e84..83f17efb 100644 --- a/cli/reporter/cli_reporter.go +++ b/cli/reporter/cli_reporter.go @@ -11,15 +11,15 @@ import ( "os" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/policy" "sigs.k8s.io/yaml" ) diff --git a/cli/reporter/cli_reporter_test.go b/cli/reporter/cli_reporter_test.go index e761f713..b03e70e2 100644 --- a/cli/reporter/cli_reporter_test.go +++ b/cli/reporter/cli_reporter_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/policy" ) func TestCompactReporter(t *testing.T) { diff --git a/cli/reporter/csv_vuln.go b/cli/reporter/csv_vuln.go index 6757419c..27fa62f1 100644 --- a/cli/reporter/csv_vuln.go +++ b/cli/reporter/csv_vuln.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/cli/components/advisories" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/cli/components/advisories" ) type csvStruct struct { diff --git a/cli/reporter/csv_vuln_test.go b/cli/reporter/csv_vuln_test.go index f98ce629..6653df8f 100644 --- a/cli/reporter/csv_vuln_test.go +++ b/cli/reporter/csv_vuln_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" ) func TestCsvConverter(t *testing.T) { diff --git a/cli/reporter/file_handler.go b/cli/reporter/file_handler.go index 8cf20724..b1014b85 100644 --- a/cli/reporter/file_handler.go +++ b/cli/reporter/file_handler.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" ) type localFileHandler struct { diff --git a/cli/reporter/file_handler_test.go b/cli/reporter/file_handler_test.go index 16b0f046..66908fd2 100644 --- a/cli/reporter/file_handler_test.go +++ b/cli/reporter/file_handler_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" ) func TestFileHandler(t *testing.T) { diff --git a/cli/reporter/json.go b/cli/reporter/json.go index ec7bec96..d1d195e2 100644 --- a/cli/reporter/json.go +++ b/cli/reporter/json.go @@ -8,11 +8,11 @@ import ( "errors" "strconv" - cr "go.mondoo.com/cnquery/v9/cli/reporter" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/policy" + cr "go.mondoo.com/cnquery/v10/cli/reporter" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/policy" ) func printScore(score *policy.Score, mrn string, out shared.OutputHelper, prefix string) bool { diff --git a/cli/reporter/json_vuln.go b/cli/reporter/json_vuln.go index 274e4bbf..ef066901 100644 --- a/cli/reporter/json_vuln.go +++ b/cli/reporter/json_vuln.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/cli/components/advisories" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/cli/components/advisories" ) // advisoryPrintable is a snapshot of the fields that get exported diff --git a/cli/reporter/json_vuln_test.go b/cli/reporter/json_vuln_test.go index c9c59757..7994560f 100644 --- a/cli/reporter/json_vuln_test.go +++ b/cli/reporter/json_vuln_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" ) func TestJsonConverter(t *testing.T) { diff --git a/cli/reporter/junit.go b/cli/reporter/junit.go index 3b75faf1..3dbc9af9 100644 --- a/cli/reporter/junit.go +++ b/cli/reporter/junit.go @@ -10,11 +10,11 @@ import ( "github.com/jstemmer/go-junit-report/v2/junit" "github.com/mitchellh/mapstructure" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/policy" ) // ReportCollectionToJunit maps the ReportCollection to Junit. Each asset becomes its own Suite diff --git a/cli/reporter/junit_test.go b/cli/reporter/junit_test.go index cfac82c3..6bd9ca48 100644 --- a/cli/reporter/junit_test.go +++ b/cli/reporter/junit_test.go @@ -7,10 +7,10 @@ import ( "bytes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/policy" "testing" ) diff --git a/cli/reporter/output_handler.go b/cli/reporter/output_handler.go index 6aa12f19..1183797a 100644 --- a/cli/reporter/output_handler.go +++ b/cli/reporter/output_handler.go @@ -9,8 +9,8 @@ import ( "errors" "strings" - "go.mondoo.com/cnquery/v9/shared" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnspec/v10/policy" _ "gocloud.dev/pubsub/awssnssqs" "sigs.k8s.io/yaml" ) diff --git a/cli/reporter/print.go b/cli/reporter/print.go index d2a1dca3..a157664c 100644 --- a/cli/reporter/print.go +++ b/cli/reporter/print.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnspec/v10/policy" ) //go:generate protoc --proto_path=../../:. --go_out=. --go_opt=paths=source_relative reporter.proto diff --git a/cli/reporter/print_compact.go b/cli/reporter/print_compact.go index 390010de..8fb96a48 100644 --- a/cli/reporter/print_compact.go +++ b/cli/reporter/print_compact.go @@ -14,14 +14,14 @@ import ( "github.com/muesli/ansi" "github.com/muesli/termenv" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/cli/components" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/utils/stringx" - cnspecComponents "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/components" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/utils/stringx" + cnspecComponents "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/policy" ) type assetMrnName struct { diff --git a/cli/reporter/print_report.go b/cli/reporter/print_report.go index f6ce2a82..ca5548a9 100644 --- a/cli/reporter/print_report.go +++ b/cli/reporter/print_report.go @@ -12,14 +12,14 @@ import ( "github.com/muesli/termenv" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/utils/stringx" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/utils/stringx" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/policy" ) const ( diff --git a/cli/reporter/print_vuln.go b/cli/reporter/print_vuln.go index b57c2f6b..0d986988 100644 --- a/cli/reporter/print_vuln.go +++ b/cli/reporter/print_vuln.go @@ -11,8 +11,8 @@ import ( "github.com/muesli/termenv" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/cli/theme" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/cli/theme" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" ) type defaultVulnReporter struct { diff --git a/cli/reporter/render_advisory_policy.go b/cli/reporter/render_advisory_policy.go index 5ef33bc1..0c368372 100644 --- a/cli/reporter/render_advisory_policy.go +++ b/cli/reporter/render_advisory_policy.go @@ -12,13 +12,13 @@ import ( "github.com/mitchellh/mapstructure" "github.com/muesli/termenv" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v9/utils/stringx" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v10/utils/stringx" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/policy" ) // TODO: re-use the structure without importing all os resources diff --git a/cli/reporter/render_asset_overview.go b/cli/reporter/render_asset_overview.go index 318efd6e..76e46a63 100644 --- a/cli/reporter/render_asset_overview.go +++ b/cli/reporter/render_asset_overview.go @@ -8,9 +8,9 @@ import ( "sort" "strings" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnspec/v10/policy" ) var mqlQueryNames = map[string]string{ diff --git a/cli/reporter/render_meta_policy.go b/cli/reporter/render_meta_policy.go index b44e8432..a50564e0 100644 --- a/cli/reporter/render_meta_policy.go +++ b/cli/reporter/render_meta_policy.go @@ -8,9 +8,9 @@ import ( "sort" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/policy" ) var colorProfile func(string) termenv.Color = termenv.ColorProfile().Color diff --git a/cli/reporter/render_policy.go b/cli/reporter/render_policy.go index 48437773..7c166932 100644 --- a/cli/reporter/render_policy.go +++ b/cli/reporter/render_policy.go @@ -9,13 +9,13 @@ import ( "strings" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/utils/stringx" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/utils/stringx" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/policy" ) func renderPolicy(print *printer.Printer, policyObj *policy.Policy, report *policy.Report, bundle *policy.PolicyBundleMap, resolvedPolicy *policy.ResolvedPolicy, scoringData []reportRow) string { diff --git a/cli/reporter/reporter.pb.go b/cli/reporter/reporter.pb.go index ccfcbcdd..7b2d6dcb 100644 --- a/cli/reporter/reporter.pb.go +++ b/cli/reporter/reporter.pb.go @@ -195,10 +195,10 @@ var file_reporter_proto_rawDesc = []byte{ 0x02, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x67, 0x6f, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x26, 0x5a, 0x24, 0x67, + 0x09, 0x52, 0x08, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x42, 0x27, 0x5a, 0x25, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, 0x6f, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, - 0x70, 0x65, 0x63, 0x2f, 0x76, 0x39, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x65, 0x63, 0x2f, 0x76, 0x31, 0x30, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cli/reporter/reporter.proto b/cli/reporter/reporter.proto index 847e6555..b5085199 100644 --- a/cli/reporter/reporter.proto +++ b/cli/reporter/reporter.proto @@ -4,7 +4,7 @@ syntax = "proto3"; package cnspec.reporter.v1; -option go_package = "go.mondoo.com/cnspec/v9/cli/reporter"; +option go_package = "go.mondoo.com/cnspec/v10/cli/reporter"; message Result { bool pass = 1; diff --git a/cli/reporter/summary.go b/cli/reporter/summary.go index f6a82a40..55075b39 100644 --- a/cli/reporter/summary.go +++ b/cli/reporter/summary.go @@ -10,11 +10,11 @@ import ( "strings" "github.com/muesli/termenv" - "go.mondoo.com/cnquery/v9/cli/printer" - "go.mondoo.com/cnquery/v9/cli/theme/colors" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnspec/v9/cli/components" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/printer" + "go.mondoo.com/cnquery/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnspec/v10/cli/components" + "go.mondoo.com/cnspec/v10/policy" ) type policyScore struct { diff --git a/go.mod b/go.mod index 511681b7..9b544595 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module go.mondoo.com/cnspec/v9 +module go.mondoo.com/cnspec/v10 go 1.21 -// replace go.mondoo.com/cnquery/v9 => ../cnquery +// replace go.mondoo.com/cnquery/v10 => ../cnquery toolchain go1.21.3 @@ -32,7 +32,7 @@ require ( github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 - go.mondoo.com/cnquery/v9 v9.14.1-0.20240112183847-ed5ecf03a6f9 + go.mondoo.com/cnquery/v10 v10.0.0-20240114201546-3c1bfaddb3a5 go.mondoo.com/mondoo-go v0.0.0-20240103050411-fa7e920c6784 go.mondoo.com/ranger-rpc v0.5.3 go.opentelemetry.io/otel v1.21.0 @@ -48,7 +48,7 @@ require ( require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect - cloud.google.com/go v0.111.0 // indirect + cloud.google.com/go v0.112.0 // indirect cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.5 // indirect @@ -81,7 +81,7 @@ require ( github.com/ashanbrown/forbidigo v1.6.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect github.com/atotto/clipboard v0.1.4 // indirect - github.com/aws/aws-sdk-go v1.49.17 // indirect + github.com/aws/aws-sdk-go v1.49.19 // indirect github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.143.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.144.0 // indirect github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.20.6 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.6 // indirect @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.2 // indirect github.com/aws/aws-sdk-go-v2/service/sns v1.26.5 // indirect github.com/aws/aws-sdk-go-v2/service/sqs v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.44.7 // indirect @@ -144,7 +144,7 @@ require ( github.com/docker/cli v24.0.7+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker v24.0.7+incompatible // indirect - github.com/docker/docker-credential-helpers v0.8.0 // indirect + github.com/docker/docker-credential-helpers v0.8.1 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -158,7 +158,7 @@ require ( github.com/firefart/nonamedreturns v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect - github.com/getsentry/sentry-go v0.25.0 // indirect + github.com/getsentry/sentry-go v0.26.0 // indirect github.com/ghostiam/protogetter v0.3.3 // indirect github.com/glebarez/go-sqlite v1.22.0 // indirect github.com/go-critic/go-critic v0.11.0 // indirect @@ -361,7 +361,7 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/api v0.155.0 // indirect + google.golang.org/api v0.156.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240108191215-35c7eff3a6b1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect diff --git a/go.sum b/go.sum index b9088270..4bdd2339 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,8 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= -cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= +cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -144,8 +144,8 @@ github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5Fc github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aws/aws-sdk-go v1.49.17 h1:Cc+7LgPjKeJkF2SdNo1IkpQ5Dfl9HCZEVw9OP3CPuEI= -github.com/aws/aws-sdk-go v1.49.17/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.49.19 h1:oZryiqeQpeJsIcAmZlp86duMu/s/DJ43qyfwa51qmLg= +github.com/aws/aws-sdk-go v1.49.19/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs= @@ -164,8 +164,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsM github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 h1:5oE2WzJE56/mVveuDZPJESKlg/00AaS2pY2QZcnxg4M= github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10/go.mod h1:FHbKWQtRBYUz4vO5WBWjzMD2by126ny5y/1EoaWoLfI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.143.0 h1:ZAO4y7MSRqU74ZFCA+HC6Ek5fI7dsTdwJg88s72I/gE= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.143.0/go.mod h1:hIsHE0PaWAQakLCshKS7VKWMGXaqrAFp4m95s2W9E6c= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.144.0 h1:1KE7EgE5xiPZ6H19hdF27B/p/CGhB2UNO5wcpOHe0JM= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.144.0/go.mod h1:hIsHE0PaWAQakLCshKS7VKWMGXaqrAFp4m95s2W9E6c= github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.20.6 h1:Y0pqdpafA8TdG6AalCMFbbQ5SlO99MAybU0BDPLHbwo= github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.20.6/go.mod h1:y6fUhf01cjz+VUz+zrmJh3KfIXhefV7dS4STCxgHx7g= github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7 h1:3iaT/LnGV6jNtbBkvHZDlzz7Ky3wMHDJAyFtGd5GUJI= @@ -182,8 +182,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 h1:KOxnQeWy5sXyS github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10/go.mod h1:jMx5INQFYFYB3lQD9W0D8Ohgq6Wnl7NYOJ2TQndbulI= github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0 h1:PJTdBMsyvra6FtED7JZtDpQrIAflYDHFoZAu/sKYkwU= github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.1 h1:Sn3MAV9YeACCULaxNWWYFH1a6G4wYFwBn3/TA5MwE2Q= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.1/go.mod h1:qutL00aW8GSo2D0I6UEOqMvRS3ZyuBrOC1BLe5D2jPc= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.2 h1:A5sGOT/mukuU+4At1vkSIWAN8tPwPCoYZBp7aruR540= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.2/go.mod h1:qutL00aW8GSo2D0I6UEOqMvRS3ZyuBrOC1BLe5D2jPc= github.com/aws/aws-sdk-go-v2/service/sns v1.26.5 h1:umyC9zH/A1w8AXrrG7iMxT4Rfgj80FjfvLannWt5vuE= github.com/aws/aws-sdk-go-v2/service/sns v1.26.5/go.mod h1:IrcbquqMupzndZ20BXxDxjM7XenTRhbwBOetk4+Z5oc= github.com/aws/aws-sdk-go-v2/service/sqs v1.29.5 h1:cJb4I498c1mrOVrRqYTcnLD65AFqUuseHfzHdNZHL9U= @@ -319,8 +319,8 @@ github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBi github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= -github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= +github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= +github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -367,8 +367,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= -github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.26.0 h1:IX3++sF6/4B5JcevhdZfdKIHfyvMmAq/UnqcyT2H6mA= +github.com/getsentry/sentry-go v0.26.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghostiam/protogetter v0.3.3 h1:EvOuzB/SEifg/c4aMnwcj033Qc1lHO7Yz4QnBDbmbik= github.com/ghostiam/protogetter v0.3.3/go.mod h1:A0JgIhs0fgVnotGinjQiKaFVG3waItLJNwPmcMzDnvk= @@ -1113,8 +1113,8 @@ go-simpler.org/sloglint v0.4.0/go.mod h1:v6zJ++j/thFPhefs2wEXoCKwT10yo5nkBDYRCXy go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= -go.mondoo.com/cnquery/v9 v9.14.1-0.20240112183847-ed5ecf03a6f9 h1:pVBnmHKYHN9aMvcswmo1I9oLTgwR3HDLO2iUfoJFqxM= -go.mondoo.com/cnquery/v9 v9.14.1-0.20240112183847-ed5ecf03a6f9/go.mod h1:jmEIloJqP6cXYAci3rL2oq82QUgiDDyqngUDc4kldbc= +go.mondoo.com/cnquery/v10 v10.0.0-20240114201546-3c1bfaddb3a5 h1:87BMGgzcpIdFK4qOOCczVLm7rAfIz/yoWT7nTXXXJrE= +go.mondoo.com/cnquery/v10 v10.0.0-20240114201546-3c1bfaddb3a5/go.mod h1:RO+r1+7uMPqrlhBU2VBiJ8xIsiWnyWECSFhmTCA64SA= go.mondoo.com/mondoo-go v0.0.0-20240103050411-fa7e920c6784 h1:k6Z9Fax2ELkspDozxy3Skkqe1eaHRSqRS16InEspMHg= go.mondoo.com/mondoo-go v0.0.0-20240103050411-fa7e920c6784/go.mod h1:elugDWMp6Tnk1tSpTf/7HHewkb0ORjMA2ubeFLI+FwQ= go.mondoo.com/ranger-rpc v0.5.3 h1:914JOFTrxWFtBu1qrvuTyTyMibuT7g1GAX3HaUcbFqI= @@ -1136,8 +1136,8 @@ go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= -go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= -go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1544,8 +1544,8 @@ google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdr google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= -google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA= -google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= +google.golang.org/api v0.156.0 h1:yloYcGbBtVYjLKQe4enCunxvwn3s2w/XPrrhVf6MsvQ= +google.golang.org/api v0.156.0/go.mod h1:bUSmn4KFO0Q+69zo9CNIDp4Psi6BqM0np0CbzKRSiSY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/internal/bundle/bundle.yac.go b/internal/bundle/bundle.yac.go index c3c2fee8..115ae32d 100644 --- a/internal/bundle/bundle.yac.go +++ b/internal/bundle/bundle.yac.go @@ -8,8 +8,8 @@ package bundle import ( "encoding/json" "errors" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnspec/v10/policy" "gopkg.in/yaml.v3" ) diff --git a/internal/bundle/bundle_ext.go b/internal/bundle/bundle_ext.go index e3189cf0..a8a6c791 100644 --- a/internal/bundle/bundle_ext.go +++ b/internal/bundle/bundle_ext.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/cockroachdb/errors" - "go.mondoo.com/cnquery/v9/explorer" + "go.mondoo.com/cnquery/v10/explorer" "gopkg.in/yaml.v3" ) diff --git a/internal/bundle/fmt.go b/internal/bundle/fmt.go index a4208357..9eb5eaf8 100644 --- a/internal/bundle/fmt.go +++ b/internal/bundle/fmt.go @@ -11,7 +11,7 @@ import ( "github.com/cockroachdb/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" "gopkg.in/yaml.v3" ) diff --git a/internal/bundle/lint.go b/internal/bundle/lint.go index 360a7f2c..13aa4889 100644 --- a/internal/bundle/lint.go +++ b/internal/bundle/lint.go @@ -12,8 +12,8 @@ import ( "strconv" "github.com/Masterminds/semver" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnspec/v10/policy" ) const ( diff --git a/internal/bundle/lint_test.go b/internal/bundle/lint_test.go index cd0702ed..0b69630e 100644 --- a/internal/bundle/lint_test.go +++ b/internal/bundle/lint_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/testutils" - "go.mondoo.com/cnspec/v9/internal/bundle" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v10/internal/bundle" ) var schema llx.Schema diff --git a/internal/bundle/yacit/main.go b/internal/bundle/yacit/main.go index fd5e4472..678f60aa 100644 --- a/internal/bundle/yacit/main.go +++ b/internal/bundle/yacit/main.go @@ -7,8 +7,8 @@ import ( "go/format" "os" - yacit "go.mondoo.com/cnspec/v9/internal/yac-it" - "go.mondoo.com/cnspec/v9/policy" + yacit "go.mondoo.com/cnspec/v10/internal/yac-it" + "go.mondoo.com/cnspec/v10/policy" ) //go:generate go run ./main.go diff --git a/internal/datalakes/inmemory/assets.go b/internal/datalakes/inmemory/assets.go index f542a9d8..1501ba15 100644 --- a/internal/datalakes/inmemory/assets.go +++ b/internal/datalakes/inmemory/assets.go @@ -8,7 +8,7 @@ import ( "errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" ) type wrapAsset struct { diff --git a/internal/datalakes/inmemory/inmemory.go b/internal/datalakes/inmemory/inmemory.go index c28d957d..1715b57d 100644 --- a/internal/datalakes/inmemory/inmemory.go +++ b/internal/datalakes/inmemory/inmemory.go @@ -7,8 +7,8 @@ import ( "time" "github.com/google/uuid" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnspec/v10/policy" ) // Db is the ent-based Database backend for Mondoo services diff --git a/internal/datalakes/inmemory/policyhub.go b/internal/datalakes/inmemory/policyhub.go index 364de767..8b1b1a25 100644 --- a/internal/datalakes/inmemory/policyhub.go +++ b/internal/datalakes/inmemory/policyhub.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnspec/v10/policy" "google.golang.org/protobuf/proto" ) diff --git a/internal/datalakes/inmemory/policyresolver.go b/internal/datalakes/inmemory/policyresolver.go index 83c5fbcf..fb0762ad 100644 --- a/internal/datalakes/inmemory/policyresolver.go +++ b/internal/datalakes/inmemory/policyresolver.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/go-multierror" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/types" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/types" + "go.mondoo.com/cnspec/v10/policy" ) // return true if the framework was changed diff --git a/internal/datalakes/inmemory/resolved_policy_cache.go b/internal/datalakes/inmemory/resolved_policy_cache.go index 10e1d921..58af332b 100644 --- a/internal/datalakes/inmemory/resolved_policy_cache.go +++ b/internal/datalakes/inmemory/resolved_policy_cache.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" "google.golang.org/protobuf/proto" ) diff --git a/internal/yac-it/yac-it.go b/internal/yac-it/yac-it.go index 796375d0..2cf9c795 100644 --- a/internal/yac-it/yac-it.go +++ b/internal/yac-it/yac-it.go @@ -29,8 +29,8 @@ import ( "gopkg.in/yaml.v3" "encoding/json" "errors" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnspec/v10/policy" ) type FileContext struct { diff --git a/policy/assessment.go b/policy/assessment.go index 5da3162a..b6ecff6a 100644 --- a/policy/assessment.go +++ b/policy/assessment.go @@ -5,7 +5,7 @@ package policy import ( "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/llx" + "go.mondoo.com/cnquery/v10/llx" ) func Query2Assessment(bundle *llx.CodeBundle, report *Report) *llx.Assessment { diff --git a/policy/bundle.go b/policy/bundle.go index 586523f6..cef3c86d 100644 --- a/policy/bundle.go +++ b/policy/bundle.go @@ -13,14 +13,14 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/utils/multierr" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/utils/multierr" "sigs.k8s.io/yaml" ) diff --git a/policy/bundle_map.go b/policy/bundle_map.go index 6618a16d..52abe0d4 100644 --- a/policy/bundle_map.go +++ b/policy/bundle_map.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/go-version" "github.com/pkg/errors" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/utils/sortx" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/utils/sortx" ) // PolicyBundleMap is a PolicyBundle with easier access to policies and queries diff --git a/policy/bundle_test.go b/policy/bundle_test.go index 512c35b5..c186ffcc 100644 --- a/policy/bundle_test.go +++ b/policy/bundle_test.go @@ -15,10 +15,10 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnspec/v9/internal/datalakes/inmemory" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnspec/v10/internal/datalakes/inmemory" + "go.mondoo.com/cnspec/v10/policy" ) type s3Fake struct { diff --git a/policy/cnspec_policy.pb.go b/policy/cnspec_policy.pb.go index 20ac8780..678980bf 100644 --- a/policy/cnspec_policy.pb.go +++ b/policy/cnspec_policy.pb.go @@ -10,10 +10,10 @@ package policy import ( - explorer "go.mondoo.com/cnquery/v9/explorer" - llx "go.mondoo.com/cnquery/v9/llx" - inventory "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - mvd "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" + explorer "go.mondoo.com/cnquery/v10/explorer" + llx "go.mondoo.com/cnquery/v10/llx" + inventory "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + mvd "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -5961,9 +5961,9 @@ var file_cnspec_policy_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x72, 0x67, 0x65, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x00, 0x42, 0x20, 0x5a, 0x1e, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, 0x6f, 0x6f, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x76, 0x39, 0x2f, 0x70, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x00, 0x42, 0x21, 0x5a, 0x1f, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, 0x6f, 0x6f, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x76, 0x31, 0x30, 0x2f, 0x70, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/policy/cnspec_policy.proto b/policy/cnspec_policy.proto index 3c304b24..971f9c89 100644 --- a/policy/cnspec_policy.proto +++ b/policy/cnspec_policy.proto @@ -4,7 +4,7 @@ syntax = "proto3"; package cnspec.policy.v1; -option go_package = "go.mondoo.com/cnspec/v9/policy"; +option go_package = "go.mondoo.com/cnspec/v10/policy"; import "llx/llx.proto"; import "explorer/cnquery_explorer.proto"; diff --git a/policy/cnspec_policy.ranger.go b/policy/cnspec_policy.ranger.go index 36bb42c8..429421bb 100644 --- a/policy/cnspec_policy.ranger.go +++ b/policy/cnspec_policy.ranger.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "go.mondoo.com/cnquery/v9/explorer" + "go.mondoo.com/cnquery/v10/explorer" ranger "go.mondoo.com/ranger-rpc" "go.mondoo.com/ranger-rpc/metadata" jsonpb "google.golang.org/protobuf/encoding/protojson" diff --git a/policy/datalake.go b/policy/datalake.go index c03e2780..12ec2dd9 100644 --- a/policy/datalake.go +++ b/policy/datalake.go @@ -6,9 +6,9 @@ package policy import ( "context" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/types" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/types" ) // DataLake provides additional database calls, that are not accessible to diff --git a/policy/executor/executor.go b/policy/executor/executor.go index 34e453e6..094df0a4 100644 --- a/policy/executor/executor.go +++ b/policy/executor/executor.go @@ -11,13 +11,13 @@ import ( vrs "github.com/hashicorp/go-version" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/types" - "go.mondoo.com/cnspec/v9" - "go.mondoo.com/cnspec/v9/policy/executor/internal" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/types" + "go.mondoo.com/cnspec/v10" + "go.mondoo.com/cnspec/v10/policy/executor/internal" ) // Executor helps you run multiple pieces of mondoo code and process results diff --git a/policy/executor/executor_test.go b/policy/executor/executor_test.go index 7834dd32..57bb3929 100644 --- a/policy/executor/executor_test.go +++ b/policy/executor/executor_test.go @@ -10,12 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/testutils" - "go.mondoo.com/cnquery/v9/types" - "go.mondoo.com/cnspec/v9" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" + "go.mondoo.com/cnquery/v10/types" ) func initExecutor() *Executor { diff --git a/policy/executor/graph.go b/policy/executor/graph.go index d434a82d..99ac7e88 100644 --- a/policy/executor/graph.go +++ b/policy/executor/graph.go @@ -7,13 +7,13 @@ import ( "time" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/cli/progress" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnspec/v9/policy" - "go.mondoo.com/cnspec/v9/policy/executor/internal" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/cli/progress" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnspec/v10/policy/executor/internal" ) type GraphExecutor interface { diff --git a/policy/executor/internal/builder.go b/policy/executor/internal/builder.go index deaf12cf..79ab3e13 100644 --- a/policy/executor/internal/builder.go +++ b/policy/executor/internal/builder.go @@ -11,10 +11,10 @@ import ( vrs "github.com/hashicorp/go-version" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/cli/progress" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnspec/v9" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/progress" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnspec/v10" + "go.mondoo.com/cnspec/v10/policy" ) type query struct { diff --git a/policy/executor/internal/builder_test.go b/policy/executor/internal/builder_test.go index 086c5d59..8316d255 100644 --- a/policy/executor/internal/builder_test.go +++ b/policy/executor/internal/builder_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/types" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/types" + "go.mondoo.com/cnspec/v10/policy" ) func TestPrioritizeNode(t *testing.T) { diff --git a/policy/executor/internal/collector.go b/policy/executor/internal/collector.go index 3ad5973d..7eb8f15a 100644 --- a/policy/executor/internal/collector.go +++ b/policy/executor/internal/collector.go @@ -9,8 +9,8 @@ import ( "time" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnspec/v10/policy" "google.golang.org/protobuf/proto" ) diff --git a/policy/executor/internal/execution_manager.go b/policy/executor/internal/execution_manager.go index 0e2ce6f0..e26fed95 100644 --- a/policy/executor/internal/execution_manager.go +++ b/policy/executor/internal/execution_manager.go @@ -9,7 +9,7 @@ import ( "time" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/llx" + "go.mondoo.com/cnquery/v10/llx" ) type executionManager struct { diff --git a/policy/executor/internal/graph.go b/policy/executor/internal/graph.go index 2f61eafa..e2b30dee 100644 --- a/policy/executor/internal/graph.go +++ b/policy/executor/internal/graph.go @@ -11,8 +11,8 @@ import ( vrs "github.com/hashicorp/go-version" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnspec/v10/policy" ) type ( diff --git a/policy/executor/internal/nodes.go b/policy/executor/internal/nodes.go index e381f649..c8e82364 100644 --- a/policy/executor/internal/nodes.go +++ b/policy/executor/internal/nodes.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/cli/progress" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/types" - "go.mondoo.com/cnquery/v9/utils/multierr" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/progress" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/types" + "go.mondoo.com/cnquery/v10/utils/multierr" + "go.mondoo.com/cnspec/v10/policy" "google.golang.org/protobuf/proto" ) diff --git a/policy/executor/internal/nodes_test.go b/policy/executor/internal/nodes_test.go index ea8df78d..ed25df5e 100644 --- a/policy/executor/internal/nodes_test.go +++ b/policy/executor/internal/nodes_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/types" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/types" + "go.mondoo.com/cnspec/v10/policy" ) func TestDatapointNode(t *testing.T) { diff --git a/policy/framework.go b/policy/framework.go index 772f35b9..17afb79d 100644 --- a/policy/framework.go +++ b/policy/framework.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/utils/sortx" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/utils/sortx" ) type ResolvedFrameworkNodeType int diff --git a/policy/hub.go b/policy/hub.go index 053c3871..c0c2f3d2 100644 --- a/policy/hub.go +++ b/policy/hub.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/mrn" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/mrn" "go.mondoo.com/ranger-rpc" "go.mondoo.com/ranger-rpc/codes" "go.mondoo.com/ranger-rpc/status" @@ -26,7 +26,7 @@ const ( CollectionIDPolicies = "policies" ) -var tracer = otel.Tracer("go.mondoo.com/cnspec/v9/policy") +var tracer = otel.Tracer("go.mondoo.com/cnspec/v10/policy") func NewPolicyMrn(namespace string, uid string) string { m := &mrn.MRN{ diff --git a/policy/mquery.go b/policy/mquery.go index a72ed0fa..0a7cb516 100644 --- a/policy/mquery.go +++ b/policy/mquery.go @@ -7,10 +7,10 @@ import ( "sort" "github.com/pkg/errors" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/mrn" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/mrn" ) func RefreshMRN(ownerMRN string, existingMRN string, resource string, uid string) (string, error) { diff --git a/policy/mquery_test.go b/policy/mquery_test.go index 1b92f659..c8ea08ab 100644 --- a/policy/mquery_test.go +++ b/policy/mquery_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/testutils" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" ) func TestMquery_Whitespaces(t *testing.T) { diff --git a/policy/policy.go b/policy/policy.go index dfc9b6fb..f5f6784c 100644 --- a/policy/policy.go +++ b/policy/policy.go @@ -12,11 +12,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/types" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/types" "google.golang.org/protobuf/proto" ) diff --git a/policy/policy_test.go b/policy/policy_test.go index 8dd8cd4f..dcebaf3d 100644 --- a/policy/policy_test.go +++ b/policy/policy_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/testutils" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v10/policy" ) var conf mqlc.CompilerConfig diff --git a/policy/report.go b/policy/report.go index d9c850d0..973dbc00 100644 --- a/policy/report.go +++ b/policy/report.go @@ -7,7 +7,7 @@ import ( "encoding/json" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/llx" + "go.mondoo.com/cnquery/v10/llx" ) func (r *Report) RawResults() map[string]*llx.RawResult { diff --git a/policy/report_test.go b/policy/report_test.go index 08c7cce7..08816eb6 100644 --- a/policy/report_test.go +++ b/policy/report_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" ) func TestScoreDistributionAdd(t *testing.T) { diff --git a/policy/reportingjob.go b/policy/reportingjob.go index 18267f2a..178699bc 100644 --- a/policy/reportingjob.go +++ b/policy/reportingjob.go @@ -6,8 +6,8 @@ package policy import ( "sort" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/utils/sortx" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/utils/sortx" ) // RefreshChecksum recalculates the reporting job checksum diff --git a/policy/resolved_policy.go b/policy/resolved_policy.go index 87efb536..5967eba1 100644 --- a/policy/resolved_policy.go +++ b/policy/resolved_policy.go @@ -5,8 +5,8 @@ package policy import ( "github.com/pkg/errors" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" ) // WithDataQueries cycles through all data queries of the resolved policy and calls the given function diff --git a/policy/resolver.go b/policy/resolver.go index c277ac4b..f5269ae0 100644 --- a/policy/resolver.go +++ b/policy/resolver.go @@ -14,13 +14,13 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/segmentio/fasthash/fnv1a" - "go.mondoo.com/cnquery/v9/checksums" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/utils/sortx" + "go.mondoo.com/cnquery/v10/checksums" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/utils/sortx" "go.mondoo.com/ranger-rpc/codes" "go.mondoo.com/ranger-rpc/status" ) diff --git a/policy/resolver_test.go b/policy/resolver_test.go index 31b4dded..1e7acba5 100644 --- a/policy/resolver_test.go +++ b/policy/resolver_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/testutils" - "go.mondoo.com/cnspec/v9/internal/datalakes/inmemory" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v10/internal/datalakes/inmemory" + "go.mondoo.com/cnspec/v10/policy" ) type testAsset struct { diff --git a/policy/scan/aggregate_reporter.go b/policy/scan/aggregate_reporter.go index 07235e3f..0c6674be 100644 --- a/policy/scan/aggregate_reporter.go +++ b/policy/scan/aggregate_reporter.go @@ -6,10 +6,10 @@ package scan import ( "github.com/hashicorp/go-multierror" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnspec/v10/policy" ) type AggregateReporter struct { diff --git a/policy/scan/disk_queue.go b/policy/scan/disk_queue.go index 32987a32..bca33780 100644 --- a/policy/scan/disk_queue.go +++ b/policy/scan/disk_queue.go @@ -10,7 +10,7 @@ import ( "time" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy/scan/pdque" + "go.mondoo.com/cnspec/v10/policy/scan/pdque" "google.golang.org/protobuf/proto" ) diff --git a/policy/scan/disk_queue_test.go b/policy/scan/disk_queue_test.go index 088ebf67..17b264ca 100644 --- a/policy/scan/disk_queue_test.go +++ b/policy/scan/disk_queue_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" ) func TestDiskQueueClient_EnqueueDequeue(t *testing.T) { diff --git a/policy/scan/error_reporter.go b/policy/scan/error_reporter.go index 8ba0fdd6..d1b00494 100644 --- a/policy/scan/error_reporter.go +++ b/policy/scan/error_reporter.go @@ -6,10 +6,10 @@ package scan import ( "strings" - "go.mondoo.com/cnquery/v9/cli/theme" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/theme" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnspec/v10/policy" pbStatus "go.mondoo.com/ranger-rpc/status" "google.golang.org/genproto/googleapis/rpc/errdetails" ) diff --git a/policy/scan/fetcher.go b/policy/scan/fetcher.go index a9143d5d..4a87975e 100644 --- a/policy/scan/fetcher.go +++ b/policy/scan/fetcher.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/pkg/errors" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnspec/v9" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnspec/v10" + "go.mondoo.com/cnspec/v10/policy" ) type fetcher struct { diff --git a/policy/scan/local_scanner.go b/policy/scan/local_scanner.go index 54c57574..8a111afd 100644 --- a/policy/scan/local_scanner.go +++ b/policy/scan/local_scanner.go @@ -17,26 +17,26 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/segmentio/ksuid" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/cli/config" - "go.mondoo.com/cnquery/v9/cli/execruntime" - "go.mondoo.com/cnquery/v9/cli/progress" - "go.mondoo.com/cnquery/v9/explorer" - ee "go.mondoo.com/cnquery/v9/explorer/executor" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/logger" - "go.mondoo.com/cnquery/v9/mrn" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory/manager" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/plugin" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - "go.mondoo.com/cnquery/v9/utils/multierr" - "go.mondoo.com/cnspec/v9" - "go.mondoo.com/cnspec/v9/internal/datalakes/inmemory" - "go.mondoo.com/cnspec/v9/policy" - "go.mondoo.com/cnspec/v9/policy/executor" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/cli/config" + "go.mondoo.com/cnquery/v10/cli/execruntime" + "go.mondoo.com/cnquery/v10/cli/progress" + "go.mondoo.com/cnquery/v10/explorer" + ee "go.mondoo.com/cnquery/v10/explorer/executor" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/logger" + "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory/manager" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/plugin" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnquery/v10/utils/multierr" + "go.mondoo.com/cnspec/v10" + "go.mondoo.com/cnspec/v10/internal/datalakes/inmemory" + "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnspec/v10/policy/executor" "go.mondoo.com/ranger-rpc/codes" "go.mondoo.com/ranger-rpc/status" "google.golang.org/protobuf/proto" diff --git a/policy/scan/local_scanner_test.go b/policy/scan/local_scanner_test.go index be16bb50..78a8dc6d 100644 --- a/policy/scan/local_scanner_test.go +++ b/policy/scan/local_scanner_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/mqlc" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/testutils" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/mqlc" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v10/policy" ) func TestFilterPreprocess(t *testing.T) { diff --git a/policy/scan/noop_reporter.go b/policy/scan/noop_reporter.go index ceb1cc24..f939a4db 100644 --- a/policy/scan/noop_reporter.go +++ b/policy/scan/noop_reporter.go @@ -4,8 +4,8 @@ package scan import ( - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" ) type NoOpReporter struct{} diff --git a/policy/scan/reporter.go b/policy/scan/reporter.go index 7d724319..e7ad84a2 100644 --- a/policy/scan/reporter.go +++ b/policy/scan/reporter.go @@ -4,9 +4,9 @@ package scan import ( - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnspec/v10/policy" ) type AssetReport struct { diff --git a/policy/scan/scan.go b/policy/scan/scan.go index 08d2f399..95144d7f 100644 --- a/policy/scan/scan.go +++ b/policy/scan/scan.go @@ -8,11 +8,11 @@ import ( "math/rand" "time" - "go.mondoo.com/cnquery/v9/cli/progress" - "go.mondoo.com/cnquery/v9/providers" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/cli/progress" + "go.mondoo.com/cnquery/v10/providers" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v10/policy" ) // Why do we want the scan stuff as a proto? Because we have a disk queue diff --git a/policy/scan/scan.pb.go b/policy/scan/scan.pb.go index 05dfbcbc..cfe005dc 100644 --- a/policy/scan/scan.pb.go +++ b/policy/scan/scan.pb.go @@ -10,8 +10,8 @@ package scan import ( - inventory "go.mondoo.com/cnquery/v9/providers-sdk/v1/inventory" - policy "go.mondoo.com/cnspec/v9/policy" + inventory "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" + policy "go.mondoo.com/cnspec/v10/policy" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" structpb "google.golang.org/protobuf/types/known/structpb" @@ -911,10 +911,10 @@ var file_scan_proto_rawDesc = []byte{ 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x26, 0x5a, 0x24, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, 0x6f, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2f, - 0x76, 0x39, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x31, 0x30, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/policy/scan/scan.proto b/policy/scan/scan.proto index c63102f2..9e30ed58 100644 --- a/policy/scan/scan.proto +++ b/policy/scan/scan.proto @@ -8,7 +8,7 @@ import "google/protobuf/struct.proto"; import "policy/cnspec_policy.proto"; package cnspec.policy.scan; -option go_package = "go.mondoo.com/cnspec/v9/policy/scan"; +option go_package = "go.mondoo.com/cnspec/v10/policy/scan"; service Scan { // Run executes a scan immediately and reports the result to Mondoo Platform diff --git a/policy/score_calculator.go b/policy/score_calculator.go index eec5e952..1b7d2423 100644 --- a/policy/score_calculator.go +++ b/policy/score_calculator.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/pkg/errors" - "go.mondoo.com/cnquery/v9/explorer" + "go.mondoo.com/cnquery/v10/explorer" "google.golang.org/protobuf/proto" ) diff --git a/policy/score_calculator_test.go b/policy/score_calculator_test.go index f6d1867d..91376dc4 100644 --- a/policy/score_calculator_test.go +++ b/policy/score_calculator_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v9/explorer" + "go.mondoo.com/cnquery/v10/explorer" ) type scoreTest struct { diff --git a/policy/services.go b/policy/services.go index 6f3de4bb..fcecc283 100644 --- a/policy/services.go +++ b/policy/services.go @@ -7,10 +7,10 @@ import ( "context" "net/http" - "go.mondoo.com/cnquery/v9" - "go.mondoo.com/cnquery/v9/explorer" - "go.mondoo.com/cnquery/v9/llx" - "go.mondoo.com/cnquery/v9/mqlc" + "go.mondoo.com/cnquery/v10" + "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v10/mqlc" "go.mondoo.com/ranger-rpc" ) diff --git a/policy/upstream/reporting_upstream.pb.go b/policy/upstream/reporting_upstream.pb.go index df19f87b..ef45663f 100644 --- a/policy/upstream/reporting_upstream.pb.go +++ b/policy/upstream/reporting_upstream.pb.go @@ -10,7 +10,7 @@ package upstream import ( - policy "go.mondoo.com/cnspec/v9/policy" + policy "go.mondoo.com/cnspec/v10/policy" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -96,10 +96,10 @@ var file_reporting_upstream_proto_rawDesc = []byte{ 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x23, 0x2e, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x70, 0x6f, - 0x72, 0x74, 0x49, 0x44, 0x22, 0x00, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, + 0x72, 0x74, 0x49, 0x44, 0x22, 0x00, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, 0x6f, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x76, - 0x39, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, - 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x31, 0x30, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, + 0x61, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/policy/upstream/reporting_upstream.proto b/policy/upstream/reporting_upstream.proto index 2c957297..c26b2bbf 100644 --- a/policy/upstream/reporting_upstream.proto +++ b/policy/upstream/reporting_upstream.proto @@ -4,7 +4,7 @@ syntax = "proto3"; package cnspec.policy.upstream.v1; -option go_package = "go.mondoo.com/cnspec/v9/policy/upstream"; +option go_package = "go.mondoo.com/cnspec/v10/policy/upstream"; import "policy/cnspec_policy.proto"; diff --git a/policy/upstream/reporting_upstream.ranger.go b/policy/upstream/reporting_upstream.ranger.go index ab8f0794..f15a1a48 100644 --- a/policy/upstream/reporting_upstream.ranger.go +++ b/policy/upstream/reporting_upstream.ranger.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" ranger "go.mondoo.com/ranger-rpc" "go.mondoo.com/ranger-rpc/metadata" jsonpb "google.golang.org/protobuf/encoding/protojson" diff --git a/policy/upstream/upstream.go b/policy/upstream/upstream.go index 6deb7fad..0f4bfa2e 100644 --- a/policy/upstream/upstream.go +++ b/policy/upstream/upstream.go @@ -10,7 +10,7 @@ import ( "net/url" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" "go.mondoo.com/ranger-rpc" ) diff --git a/test/cli/cli_test.go b/test/cli/cli_test.go index 4292834a..2d566b8b 100644 --- a/test/cli/cli_test.go +++ b/test/cli/cli_test.go @@ -11,7 +11,7 @@ import ( cmdtest "github.com/google/go-cmdtest" "github.com/spf13/cobra" "github.com/stretchr/testify/require" - "go.mondoo.com/cnspec/v9/apps/cnspec/cmd" + "go.mondoo.com/cnspec/v10/apps/cnspec/cmd" ) var ( diff --git a/upstream/cnspec_upstream.pb.go b/upstream/cnspec_upstream.pb.go index 70946f5f..40c3a7f8 100644 --- a/upstream/cnspec_upstream.pb.go +++ b/upstream/cnspec_upstream.pb.go @@ -10,7 +10,7 @@ package upstream import ( - policy "go.mondoo.com/cnspec/v9/policy" + policy "go.mondoo.com/cnspec/v10/policy" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -95,10 +95,10 @@ var file_cnspec_upstream_proto_rawDesc = []byte{ 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x1c, 0x2e, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x49, 0x44, 0x22, 0x00, 0x42, 0x22, 0x5a, 0x20, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, - 0x6f, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x76, 0x39, - 0x2f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x74, 0x49, 0x44, 0x22, 0x00, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x6f, 0x2e, 0x6d, 0x6f, 0x6e, 0x64, + 0x6f, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x76, 0x31, + 0x30, 0x2f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/upstream/cnspec_upstream.proto b/upstream/cnspec_upstream.proto index 8cfd7b49..c0ff126f 100644 --- a/upstream/cnspec_upstream.proto +++ b/upstream/cnspec_upstream.proto @@ -4,7 +4,7 @@ syntax = "proto3"; package cnspec.upstream.v1; -option go_package = "go.mondoo.com/cnspec/v9/upstream"; +option go_package = "go.mondoo.com/cnspec/v10/upstream"; import "policy/cnspec_policy.proto"; diff --git a/upstream/cnspec_upstream.ranger.go b/upstream/cnspec_upstream.ranger.go index 73fddeb0..a6380ded 100644 --- a/upstream/cnspec_upstream.ranger.go +++ b/upstream/cnspec_upstream.ranger.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" ranger "go.mondoo.com/ranger-rpc" "go.mondoo.com/ranger-rpc/metadata" jsonpb "google.golang.org/protobuf/encoding/protojson" diff --git a/upstream/gql.go b/upstream/gql.go index fd0e07e0..c1aa895e 100644 --- a/upstream/gql.go +++ b/upstream/gql.go @@ -6,8 +6,8 @@ package upstream import ( "context" - "go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream/gql" - policy "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" + policy "go.mondoo.com/cnspec/v10/policy" mondoogql "go.mondoo.com/mondoo-go" ) diff --git a/upstream/upstream.go b/upstream/upstream.go index 506c6450..3d97f071 100644 --- a/upstream/upstream.go +++ b/upstream/upstream.go @@ -10,7 +10,7 @@ import ( "net/url" "github.com/rs/zerolog/log" - "go.mondoo.com/cnspec/v9/policy" + "go.mondoo.com/cnspec/v10/policy" "go.mondoo.com/ranger-rpc" )