diff --git a/.github/.goreleaser-edge.yml b/.github/.goreleaser-edge.yml index 4bc46253..71379025 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/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}} + - -s -w -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.Date={{.Date}} checksum: name_template: '{{ .ProjectName }}_v{{ .Version }}_SHA256SUMS' algorithm: sha256 diff --git a/.github/.goreleaser-unstable.yml b/.github/.goreleaser-unstable.yml index 67f82c94..feb8d30e 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/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}} + - -s -w -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.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/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}} + - -s -w -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.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/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}} + - -s -w -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.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 05f11b04..5815ab7f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -27,8 +27,8 @@ builds: ldflags: - "-extldflags=-static" - -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}} + - -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.Date={{.Date}} - id: macos main: ./apps/cnspec/cnspec.go binary: cnspec @@ -41,8 +41,8 @@ builds: ldflags: # clang + macos does not support static: - -extldflags "-static" - -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}} + - -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.Date={{.Date}} hooks: post: - cmd: /tmp/quill sign-and-notarize "{{ .Path }}" -vv @@ -61,8 +61,8 @@ builds: ldflags: - "-extldflags -static" - -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}} + - -X go.mondoo.com/cnspec/v11.Version={{.Version}} -X go.mondoo.com/cnspec/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnspec/v11.Date={{.Date}} + - -X go.mondoo.com/cnquery/v11.Version={{.Version}} -X go.mondoo.com/cnquery/v11.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v11.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 b7152dbd..40e706d8 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/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/cnquery/v10.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnquery/v10.Build=${TAG} -X go.mondoo.com/cnspec/v10.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnspec/v10.Build=${TAG} -s -w" +LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnspec/v11.Version=${VERSION} -X go.mondoo.com/cnspec/v11.Build=${TAG}" # -linkmode external -extldflags=-static +LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnquery/v11.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnquery/v11.Build=${TAG} -X go.mondoo.com/cnspec/v11.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnspec/v11.Build=${TAG} -s -w" .PHONY: info/ldflags info/ldflags: @@ -117,7 +117,7 @@ test/lint: test/lint/golangci-lint/run test: test/go test/lint benchmark/go: - go test -bench=. -benchmem go.mondoo.com/cnspec/v10/policy/scan/benchmark + go test -bench=. -benchmem go.mondoo.com/cnspec/v11/policy/scan/benchmark test/go: cnspec/generate test/go/plain diff --git a/apps/cnspec/cmd/backgroundjob/checkin.go b/apps/cnspec/cmd/backgroundjob/checkin.go index 4a1c01eb..8eb986fd 100644 --- a/apps/cnspec/cmd/backgroundjob/checkin.go +++ b/apps/cnspec/cmd/backgroundjob/checkin.go @@ -8,9 +8,9 @@ import ( "net/http" "github.com/pkg/errors" - "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/cnquery/v11" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/sysinfo" + "go.mondoo.com/cnquery/v11/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 aaebf283..720954c0 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/v10/logger/eventlog" + "go.mondoo.com/cnquery/v11/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 399af130..ff9dacbb 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/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" + "go.mondoo.com/cnquery/v11/cli/config" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v11/internal/bundle" + "go.mondoo.com/cnspec/v11/policy" ) func init() { diff --git a/apps/cnspec/cmd/config/config.go b/apps/cnspec/cmd/config/config.go index e2ea6fa0..2b230185 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/v10/cli/config" + "go.mondoo.com/cnquery/v11/cli/config" ) const ( diff --git a/apps/cnspec/cmd/login.go b/apps/cnspec/cmd/login.go index 9a33b385..e773a9d8 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/v10/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/logout.go b/apps/cnspec/cmd/logout.go index 3a577d85..67bb3df0 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/v10/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/policy.go b/apps/cnspec/cmd/policy.go index 14325358..cf3ef89e 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/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" + "go.mondoo.com/cnquery/v11/cli/config" + "go.mondoo.com/cnquery/v11/cli/theme" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnspec/v11/internal/bundle" + "go.mondoo.com/cnspec/v11/policy" + cnspec_upstream "go.mondoo.com/cnspec/v11/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 885fe63d..2182f4d7 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/v10/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/root.go b/apps/cnspec/cmd/root.go index a883f1f8..01ba52a8 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/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/cnquery/v11" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" + "go.mondoo.com/cnquery/v11/cli/config" + cli_errors "go.mondoo.com/cnquery/v11/cli/errors" + "go.mondoo.com/cnquery/v11/cli/providers" + "go.mondoo.com/cnquery/v11/cli/theme" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/sysinfo" + "go.mondoo.com/cnspec/v11" "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 d2a0f715..456043f5 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/v10/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/scan.go b/apps/cnspec/cmd/scan.go index c626b815..32b4946f 100644 --- a/apps/cnspec/cmd/scan.go +++ b/apps/cnspec/cmd/scan.go @@ -13,20 +13,20 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "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" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/cli/config" + "go.mondoo.com/cnquery/v11/cli/execruntime" + "go.mondoo.com/cnquery/v11/cli/inventoryloader" + "go.mondoo.com/cnquery/v11/cli/theme" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v11/cli/reporter" + "go.mondoo.com/cnspec/v11/policy" + "go.mondoo.com/cnspec/v11/policy/scan" ) const ( diff --git a/apps/cnspec/cmd/serve.go b/apps/cnspec/cmd/serve.go index af3369fd..63afaf18 100644 --- a/apps/cnspec/cmd/serve.go +++ b/apps/cnspec/cmd/serve.go @@ -11,21 +11,21 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "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/logger" - "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" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/cli/config" + + cli_errors "go.mondoo.com/cnquery/v11/cli/errors" + "go.mondoo.com/cnquery/v11/cli/execruntime" + "go.mondoo.com/cnquery/v11/cli/inventoryloader" + "go.mondoo.com/cnquery/v11/cli/prof" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v11" + "go.mondoo.com/cnspec/v11/apps/cnspec/cmd/backgroundjob" + cnspec_config "go.mondoo.com/cnspec/v11/apps/cnspec/cmd/config" + "go.mondoo.com/cnspec/v11/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 9903da71..45df507f 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/v10/cli/config" - "go.mondoo.com/cnquery/v10/logger" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/recording" - "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" + "go.mondoo.com/cnquery/v11/cli/config" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/recording" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + cnspec_config "go.mondoo.com/cnspec/v11/apps/cnspec/cmd/config" + "go.mondoo.com/cnspec/v11/policy/scan" ) func init() { diff --git a/apps/cnspec/cmd/shell.go b/apps/cnspec/cmd/shell.go index 94481571..237e8d2a 100644 --- a/apps/cnspec/cmd/shell.go +++ b/apps/cnspec/cmd/shell.go @@ -7,9 +7,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - 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" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" ) func init() { diff --git a/apps/cnspec/cmd/status.go b/apps/cnspec/cmd/status.go index 9431b182..8e233fa6 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/v10/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/update.go b/apps/cnspec/cmd/update.go index 3f3c2512..6a8706ac 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/v10/cli/config" + "go.mondoo.com/cnquery/v11/cli/config" ) func init() { diff --git a/apps/cnspec/cmd/vault.go b/apps/cnspec/cmd/vault.go index 7f0072c8..880a3ca8 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/v10/apps/cnquery/cmd" + cnquery_app "go.mondoo.com/cnquery/v11/apps/cnquery/cmd" ) func init() { diff --git a/apps/cnspec/cmd/version.go b/apps/cnspec/cmd/version.go index d50d52b5..b5c6c2fa 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/v10" + "go.mondoo.com/cnspec/v11" ) // versionCmd represents the version command diff --git a/apps/cnspec/cmd/vuln.go b/apps/cnspec/cmd/vuln.go index 06c8c3f9..1bbae6e9 100644 --- a/apps/cnspec/cmd/vuln.go +++ b/apps/cnspec/cmd/vuln.go @@ -9,13 +9,13 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - "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/mvd" - "go.mondoo.com/cnquery/v10/sbom" - "go.mondoo.com/cnspec/v10/cli/reporter" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/sbom" + "go.mondoo.com/cnspec/v11/cli/reporter" + "go.mondoo.com/cnspec/v11/policy" ) func init() { diff --git a/apps/cnspec/cnspec.go b/apps/cnspec/cnspec.go index b8635caf..b35fd7be 100644 --- a/apps/cnspec/cnspec.go +++ b/apps/cnspec/cnspec.go @@ -4,9 +4,9 @@ package main import ( - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/health" - "go.mondoo.com/cnspec/v10" - "go.mondoo.com/cnspec/v10/apps/cnspec/cmd" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/health" + "go.mondoo.com/cnspec/v11" + "go.mondoo.com/cnspec/v11/apps/cnspec/cmd" ) func main() { diff --git a/apps/gen-docs/main.go b/apps/gen-docs/main.go index 389f8a8d..9dd6a602 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/v10/apps/cnspec/cmd" + "go.mondoo.com/cnspec/v11/apps/cnspec/cmd" ) func main() { diff --git a/cli/components/advisories/report.go b/cli/components/advisories/report.go index 267271de..99d219a3 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/v10/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v10/providers/core/resources/versions/generic" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/providers/core/resources/versions/generic" ) type RowWriter interface { diff --git a/cli/components/advisories/report_test.go b/cli/components/advisories/report_test.go index c34bbf05..75e1ed2a 100644 --- a/cli/components/advisories/report_test.go +++ b/cli/components/advisories/report_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" ) func TestFindVulnerablePackageWithoutNamespace(t *testing.T) { diff --git a/cli/components/advisory_results.go b/cli/components/advisory_results.go index 739965a6..8e1ee2bd 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/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" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd/cvss" + "go.mondoo.com/cnspec/v11/cli/components/advisories" ) func NewAdvisoryResultTable() AdvisoryResultTable { diff --git a/cli/components/advisory_results_test.go b/cli/components/advisory_results_test.go index ff9d14b1..8421236d 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/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" "sigs.k8s.io/yaml" ) diff --git a/cli/components/barchart.go b/cli/components/barchart.go index a4d6abc6..338a844a 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/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v11/cli/theme/colors" ) func maxWidth(labels []string) int { diff --git a/cli/components/cvss_indicator.go b/cli/components/cvss_indicator.go index a2c62ebb..f0fe5f30 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/v10/cli/theme/colors" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd/cvss" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd/cvss" ) func NewCvssIndicator() CvssIndicator { diff --git a/cli/components/paper.go b/cli/components/paper.go index db9ea33e..e5bec60d 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/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v11/cli/theme/colors" ) type PaperCharsTheme struct { diff --git a/cli/components/rating.go b/cli/components/rating.go index d0f741f8..623e04fe 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/v10/cli/theme/colors" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnspec/v11/policy" ) var DefaultRatingColors = NewRating(colors.DefaultColorTheme) diff --git a/cli/components/scorecard.go b/cli/components/scorecard.go index e7c6845e..8601e4a6 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/v10/cli/theme/colors" - "go.mondoo.com/cnquery/v10/utils/stringx" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/utils/stringx" + "go.mondoo.com/cnspec/v11/policy" ) const ( diff --git a/cli/components/stackbar.go b/cli/components/stackbar.go index db09e4cf..f0f65c57 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/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v11/cli/theme/colors" ) func sanitizeDatapoints(datapoints []float64) []float64 { diff --git a/cli/components/stackbar_test.go b/cli/components/stackbar_test.go index db00d762..84bcb961 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/v10/cli/theme/colors" + "go.mondoo.com/cnquery/v11/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 692cd673..e7985f4b 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" "gocloud.dev/pubsub" _ "gocloud.dev/pubsub/awssnssqs" ) diff --git a/cli/reporter/azure_service_bus_handler.go b/cli/reporter/azure_service_bus_handler.go index d73343eb..bef16f66 100644 --- a/cli/reporter/azure_service_bus_handler.go +++ b/cli/reporter/azure_service_bus_handler.go @@ -13,8 +13,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/util/azauth" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/util/azauth" + "go.mondoo.com/cnspec/v11/policy" ) var sbusRegex = regexp.MustCompile(`(https:\/\/|http:\/\/)?[a-zA-Z0-9-_]*[.](servicebus.windows.net)[\/][a-zA-Z0-9-_]*`) diff --git a/cli/reporter/cli_reporter.go b/cli/reporter/cli_reporter.go index 1cd6b026..9cabe227 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/v10" - "go.mondoo.com/cnquery/v10/cli/printer" - "go.mondoo.com/cnquery/v10/cli/theme/colors" - "go.mondoo.com/cnquery/v10/mqlc" - "go.mondoo.com/cnquery/v10/providers" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/resources" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v10/shared" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" "sigs.k8s.io/yaml" ) diff --git a/cli/reporter/cli_reporter_test.go b/cli/reporter/cli_reporter_test.go index 81da6273..f8acbe2a 100644 --- a/cli/reporter/cli_reporter_test.go +++ b/cli/reporter/cli_reporter_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" ) func TestCompactReporter(t *testing.T) { diff --git a/cli/reporter/cnspec_report.pb.go b/cli/reporter/cnspec_report.pb.go index cd9b2529..f632e644 100644 --- a/cli/reporter/cnspec_report.pb.go +++ b/cli/reporter/cnspec_report.pb.go @@ -10,7 +10,7 @@ package reporter import ( - reporter "go.mondoo.com/cnquery/v10/cli/reporter" + reporter "go.mondoo.com/cnquery/v11/cli/reporter" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -261,7 +261,7 @@ var file_cnspec_report_proto_rawDesc = []byte{ 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 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, 0x31, 0x30, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, + 0x76, 0x31, 0x31, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/cli/reporter/cnspec_report.proto b/cli/reporter/cnspec_report.proto index fa929728..5c81a350 100644 --- a/cli/reporter/cnspec_report.proto +++ b/cli/reporter/cnspec_report.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package mondoo.report.cnspec.v1; -option go_package = "go.mondoo.com/cnspec/v10/cli/reporter"; +option go_package = "go.mondoo.com/cnspec/v11/cli/reporter"; import "cli/reporter/cnquery_report.proto"; diff --git a/cli/reporter/csv_vuln.go b/cli/reporter/csv_vuln.go index 27fa62f1..f90f45c0 100644 --- a/cli/reporter/csv_vuln.go +++ b/cli/reporter/csv_vuln.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "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" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/cli/components/advisories" ) type csvStruct struct { diff --git a/cli/reporter/csv_vuln_test.go b/cli/reporter/csv_vuln_test.go index 6653df8f..d1c9ebc0 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/v10/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" ) func TestCsvConverter(t *testing.T) { diff --git a/cli/reporter/file_handler.go b/cli/reporter/file_handler.go index b1014b85..e6ed7fb9 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" ) type localFileHandler struct { diff --git a/cli/reporter/file_handler_test.go b/cli/reporter/file_handler_test.go index 66908fd2..9af8ab54 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" ) func TestFileHandler(t *testing.T) { diff --git a/cli/reporter/json.go b/cli/reporter/json.go index 15f43392..2ec56eb0 100644 --- a/cli/reporter/json.go +++ b/cli/reporter/json.go @@ -8,11 +8,11 @@ import ( "errors" "strconv" - 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" + cr "go.mondoo.com/cnquery/v11/cli/reporter" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" ) func printScore(score *policy.Score, mrn string, out shared.OutputHelper, prefix string) bool { diff --git a/cli/reporter/json_test.go b/cli/reporter/json_test.go index 94b1e8f7..3204acd9 100644 --- a/cli/reporter/json_test.go +++ b/cli/reporter/json_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v10/cli/printer" - "go.mondoo.com/cnquery/v10/cli/theme/colors" - "go.mondoo.com/cnquery/v10/shared" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" ) func TestJsonOutput(t *testing.T) { diff --git a/cli/reporter/json_vuln.go b/cli/reporter/json_vuln.go index ef066901..73e0294d 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/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" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/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 7994560f..3dffcc95 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/v10/providers-sdk/v1/upstream/mvd" - "go.mondoo.com/cnquery/v10/shared" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" ) func TestJsonConverter(t *testing.T) { diff --git a/cli/reporter/junit.go b/cli/reporter/junit.go index d43b036c..4304657d 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/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" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" ) // ConvertToJunit 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 57b0fad8..00677c73 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/v10/explorer" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v10/shared" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" "testing" ) diff --git a/cli/reporter/output_handler.go b/cli/reporter/output_handler.go index c455aafc..640413c6 100644 --- a/cli/reporter/output_handler.go +++ b/cli/reporter/output_handler.go @@ -9,8 +9,8 @@ import ( "errors" "strings" - "go.mondoo.com/cnquery/v10/shared" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" _ "gocloud.dev/pubsub/awssnssqs" _ "gocloud.dev/pubsub/azuresb" "sigs.k8s.io/yaml" diff --git a/cli/reporter/print.go b/cli/reporter/print.go index 3d265729..6f035fc9 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/v10/providers-sdk/v1/inventory" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnspec/v11/policy" ) type Format byte diff --git a/cli/reporter/print_compact.go b/cli/reporter/print_compact.go index 02a13ddd..c2d470a9 100644 --- a/cli/reporter/print_compact.go +++ b/cli/reporter/print_compact.go @@ -15,14 +15,14 @@ import ( "github.com/muesli/ansi" "github.com/muesli/termenv" "github.com/rs/zerolog/log" - "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" + "go.mondoo.com/cnquery/v11/cli/components" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/utils/stringx" + cnspecComponents "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/policy" ) type assetMrnName struct { diff --git a/cli/reporter/print_report.go b/cli/reporter/print_report.go index ca5548a9..f9bf0444 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/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" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/utils/stringx" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/policy" ) const ( diff --git a/cli/reporter/print_vuln.go b/cli/reporter/print_vuln.go index 0d986988..4fcc0506 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/v10/cli/theme" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/cli/theme" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" ) type defaultVulnReporter struct { diff --git a/cli/reporter/proto.go b/cli/reporter/proto.go index 4799ee9b..c9bf4ddb 100644 --- a/cli/reporter/proto.go +++ b/cli/reporter/proto.go @@ -9,9 +9,9 @@ import ( "errors" "strings" - cr "go.mondoo.com/cnquery/v10/cli/reporter" - "go.mondoo.com/cnquery/v10/shared" - "go.mondoo.com/cnspec/v10/policy" + cr "go.mondoo.com/cnquery/v11/cli/reporter" + "go.mondoo.com/cnquery/v11/shared" + "go.mondoo.com/cnspec/v11/policy" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/cli/reporter/proto_test.go b/cli/reporter/proto_test.go index 8be657bf..bc85889b 100644 --- a/cli/reporter/proto_test.go +++ b/cli/reporter/proto_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnspec/v11/policy" ) func TestProtoConversion(t *testing.T) { diff --git a/cli/reporter/render_advisory_policy.go b/cli/reporter/render_advisory_policy.go index 0c368372..de21b22b 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/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" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnquery/v11/utils/stringx" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/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 76e46a63..4a9d6298 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/v10/cli/printer" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnspec/v11/policy" ) var mqlQueryNames = map[string]string{ diff --git a/cli/reporter/render_meta_policy.go b/cli/reporter/render_meta_policy.go index a50564e0..cec5978e 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/v10/cli/printer" - "go.mondoo.com/cnspec/v10/cli/components" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/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 7c166932..70752e00 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/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" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/utils/stringx" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/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/summary.go b/cli/reporter/summary.go index 55075b39..c3056ca1 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/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" + "go.mondoo.com/cnquery/v11/cli/printer" + "go.mondoo.com/cnquery/v11/cli/theme/colors" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnspec/v11/cli/components" + "go.mondoo.com/cnspec/v11/policy" ) type policyScore struct { diff --git a/examples/lint_test.go b/examples/lint_test.go index 09bb91c4..1f48bd11 100644 --- a/examples/lint_test.go +++ b/examples/lint_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v10/providers" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" - "go.mondoo.com/cnspec/v10/internal/bundle" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v11/internal/bundle" ) func ensureProviders(ids []string) error { diff --git a/go.mod b/go.mod index f1a26592..143a3e61 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module go.mondoo.com/cnspec/v10 +module go.mondoo.com/cnspec/v11 go 1.22 -// replace go.mondoo.com/cnquery/v10 => ../cnquery +// replace go.mondoo.com/cnquery/v11 => ../cnquery toolchain go1.22.0 @@ -33,7 +33,7 @@ require ( github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 - go.mondoo.com/cnquery/v10 v10.12.2 + go.mondoo.com/cnquery/v11 v11.0.0-beta1 go.mondoo.com/mondoo-go v0.0.0-20240410071618-4acf10b559af go.mondoo.com/ranger-rpc v0.6.0 go.opentelemetry.io/otel v1.25.0 diff --git a/go.sum b/go.sum index 4aea25d6..2e286894 100644 --- a/go.sum +++ b/go.sum @@ -1186,8 +1186,8 @@ go-simpler.org/sloglint v0.5.0/go.mod h1:EUknX5s8iXqf18KQxKnaBHUPVriiPnOrPjjJcsa 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/v10 v10.12.2 h1:XUETSMr+ZsdvBLaJ9HVhY/2bw+u440+idQpLMcU8t2I= -go.mondoo.com/cnquery/v10 v10.12.2/go.mod h1:G+a3kazrOjtJZhx/gj0pa6Ho5mKwZP6OQcGQIC5cEsM= +go.mondoo.com/cnquery/v11 v11.0.0-beta1 h1:nzcUtkXwXPreZ5Tu+9WfWH5P0IWDiVk/R8e1VDdWANU= +go.mondoo.com/cnquery/v11 v11.0.0-beta1/go.mod h1:Xos8GCE3edbS9i4ZvkCMjT1Em7cmOYND10MojKwbTtA= go.mondoo.com/mondoo-go v0.0.0-20240410071618-4acf10b559af h1:r9Z2Y/807qYvhSyuTTu52lhAtq4yJgXz73XOOMNk7XI= go.mondoo.com/mondoo-go v0.0.0-20240410071618-4acf10b559af/go.mod h1:jF0ibH/my2Mo5m1+iNOit6hUu5fmulzOWWmkPcuQtwE= go.mondoo.com/ranger-rpc v0.6.0 h1:u8FY0NGhR1B/LZk9+DdmqksrWc007argv+nMGJGa3OA= @@ -1209,12 +1209,12 @@ go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 h1:Mbi5PKN7u322woPa85d7ebZ+SOvEoPvoiBu+ryHWgfA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0/go.mod h1:e7ciERRhZaOZXVjx5MiL8TK5+Xv7G5Gv5PA2ZDEJdL8= go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA= go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s= -go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= -go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= +go.opentelemetry.io/otel/sdk v1.25.0 h1:PDryEJPC8YJZQSyLY5eqLeafHtG+X7FWnf3aXMtxbqo= +go.opentelemetry.io/otel/sdk v1.25.0/go.mod h1:oFgzCM2zdsxKzz6zwpTZYLLQsFwc+K0daArPdIhuxkw= go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM= go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= diff --git a/internal/bundle/bundle.yac.go b/internal/bundle/bundle.yac.go index b43e000e..aa8df9ac 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/v10/explorer" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnspec/v11/policy" "gopkg.in/yaml.v3" ) @@ -1394,30 +1394,28 @@ func (d QueryGroup) MarshalYAML() (interface{}, error) { } type QueryPack struct { - LocalContentChecksum string `protobuf:"bytes,23,opt,name=local_content_checksum,json=localContentChecksum,proto3" json:"local_content_checksum,omitempty" yaml:"local_content_checksum,omitempty"` - LocalExecutionChecksum string `protobuf:"bytes,24,opt,name=local_execution_checksum,json=localExecutionChecksum,proto3" json:"local_execution_checksum,omitempty" yaml:"local_execution_checksum,omitempty"` - Uid string `protobuf:"bytes,36,opt,name=uid,proto3" json:"uid,omitempty" yaml:"uid,omitempty"` - OwnerMrn string `protobuf:"bytes,4,opt,name=owner_mrn,json=ownerMrn,proto3" json:"owner_mrn,omitempty" yaml:"owner_mrn,omitempty"` - Mrn string `protobuf:"bytes,1,opt,name=mrn,proto3" json:"mrn,omitempty" yaml:"mrn,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" yaml:"name,omitempty"` - Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty" yaml:"version,omitempty"` - License string `protobuf:"bytes,21,opt,name=license,proto3" json:"license,omitempty" yaml:"license,omitempty"` - Filters *Filters `protobuf:"bytes,48,opt,name=filters,proto3" json:"filters,omitempty" yaml:"filters,omitempty"` - Props []*Property `protobuf:"bytes,35,rep,name=props,proto3" json:"props,omitempty" yaml:"props,omitempty"` - Tags map[string]string `protobuf:"bytes,34,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" yaml:"tags,omitempty"` - Queries []*Mquery `protobuf:"bytes,6,rep,name=queries,proto3" json:"queries,omitempty" yaml:"queries,omitempty"` - Authors []*Author `protobuf:"bytes,30,rep,name=authors,proto3" json:"authors,omitempty" yaml:"authors,omitempty"` - Docs *QueryPackDocs `protobuf:"bytes,22,opt,name=docs,proto3" json:"docs,omitempty" yaml:"docs,omitempty"` - Groups []*QueryGroup `protobuf:"bytes,11,rep,name=groups,proto3" json:"groups,omitempty" yaml:"groups,omitempty"` - AssetFilters map[string]*Mquery `protobuf:"bytes,7,rep,name=asset_filters,json=assetFilters,proto3" json:"asset_filters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" yaml:"asset_filters,omitempty"` - DeprecatedFilters []string `protobuf:"bytes,43,rep,name=deprecated_filters,json=deprecatedFilters,proto3" json:"deprecated_filters,omitempty" yaml:"deprecated_filters,omitempty"` - Context string `protobuf:"bytes,8,opt,name=context,proto3" json:"context,omitempty" yaml:"context,omitempty"` - ComputedFilters *Filters `protobuf:"bytes,47,opt,name=computed_filters,json=computedFilters,proto3" json:"computed_filters,omitempty" yaml:"computed_filters,omitempty"` - Summary string `protobuf:"bytes,46,opt,name=summary,proto3" json:"summary,omitempty" yaml:"summary,omitempty"` - Created int64 `protobuf:"varint,32,opt,name=created,proto3" json:"created,omitempty" yaml:"created,omitempty"` - Modified int64 `protobuf:"varint,33,opt,name=modified,proto3" json:"modified,omitempty" yaml:"modified,omitempty"` - FileContext FileContext `json:"-" yaml:"-"` - Comments Comments `json:"-" yaml:"-"` + Context string `protobuf:"bytes,8,opt,name=context,proto3" json:"context,omitempty" yaml:"context,omitempty"` + ComputedFilters *Filters `protobuf:"bytes,47,opt,name=computed_filters,json=computedFilters,proto3" json:"computed_filters,omitempty" yaml:"computed_filters,omitempty"` + Summary string `protobuf:"bytes,46,opt,name=summary,proto3" json:"summary,omitempty" yaml:"summary,omitempty"` + Created int64 `protobuf:"varint,32,opt,name=created,proto3" json:"created,omitempty" yaml:"created,omitempty"` + Modified int64 `protobuf:"varint,33,opt,name=modified,proto3" json:"modified,omitempty" yaml:"modified,omitempty"` + LocalContentChecksum string `protobuf:"bytes,23,opt,name=local_content_checksum,json=localContentChecksum,proto3" json:"local_content_checksum,omitempty" yaml:"local_content_checksum,omitempty"` + LocalExecutionChecksum string `protobuf:"bytes,24,opt,name=local_execution_checksum,json=localExecutionChecksum,proto3" json:"local_execution_checksum,omitempty" yaml:"local_execution_checksum,omitempty"` + Uid string `protobuf:"bytes,36,opt,name=uid,proto3" json:"uid,omitempty" yaml:"uid,omitempty"` + OwnerMrn string `protobuf:"bytes,4,opt,name=owner_mrn,json=ownerMrn,proto3" json:"owner_mrn,omitempty" yaml:"owner_mrn,omitempty"` + Mrn string `protobuf:"bytes,1,opt,name=mrn,proto3" json:"mrn,omitempty" yaml:"mrn,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" yaml:"name,omitempty"` + Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty" yaml:"version,omitempty"` + License string `protobuf:"bytes,21,opt,name=license,proto3" json:"license,omitempty" yaml:"license,omitempty"` + Filters *Filters `protobuf:"bytes,48,opt,name=filters,proto3" json:"filters,omitempty" yaml:"filters,omitempty"` + Props []*Property `protobuf:"bytes,35,rep,name=props,proto3" json:"props,omitempty" yaml:"props,omitempty"` + Tags map[string]string `protobuf:"bytes,34,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" yaml:"tags,omitempty"` + Queries []*Mquery `protobuf:"bytes,6,rep,name=queries,proto3" json:"queries,omitempty" yaml:"queries,omitempty"` + Authors []*Author `protobuf:"bytes,30,rep,name=authors,proto3" json:"authors,omitempty" yaml:"authors,omitempty"` + Docs *QueryPackDocs `protobuf:"bytes,22,opt,name=docs,proto3" json:"docs,omitempty" yaml:"docs,omitempty"` + Groups []*QueryGroup `protobuf:"bytes,11,rep,name=groups,proto3" json:"groups,omitempty" yaml:"groups,omitempty"` + FileContext FileContext `json:"-" yaml:"-"` + Comments Comments `json:"-" yaml:"-"` } func (x *QueryPack) UnmarshalYAML(node *yaml.Node) error { diff --git a/internal/bundle/bundle_ext.go b/internal/bundle/bundle_ext.go index a8a6c791..7dd21888 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/v10/explorer" + "go.mondoo.com/cnquery/v11/explorer" "gopkg.in/yaml.v3" ) diff --git a/internal/bundle/fmt.go b/internal/bundle/fmt.go index 1f17e221..57cd7a27 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" "gopkg.in/yaml.v3" ) diff --git a/internal/bundle/lint.go b/internal/bundle/lint.go index da1bb08f..e1ff4c66 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/v10/providers-sdk/v1/resources" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" + "go.mondoo.com/cnspec/v11/policy" ) const ( diff --git a/internal/bundle/lint_test.go b/internal/bundle/lint_test.go index 7f9bb04f..77dbca3c 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/v10/providers-sdk/v1/resources" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" - "go.mondoo.com/cnspec/v10/internal/bundle" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v11/internal/bundle" ) var schema resources.ResourcesSchema diff --git a/internal/bundle/yacit/main.go b/internal/bundle/yacit/main.go index 769e6e96..a35b2c3d 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/v10/internal/yac-it" - "go.mondoo.com/cnspec/v10/policy" + yacit "go.mondoo.com/cnspec/v11/internal/yac-it" + "go.mondoo.com/cnspec/v11/policy" ) //go:generate go run ./main.go diff --git a/internal/datalakes/inmemory/assets.go b/internal/datalakes/inmemory/assets.go index 1501ba15..a329e128 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" ) type wrapAsset struct { diff --git a/internal/datalakes/inmemory/inmemory.go b/internal/datalakes/inmemory/inmemory.go index f0a694f4..4fec9011 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/v10/llx" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnspec/v11/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 216d0446..f06909de 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/v10/checksums" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnspec/v11/policy" "google.golang.org/protobuf/proto" ) diff --git a/internal/datalakes/inmemory/policyresolver.go b/internal/datalakes/inmemory/policyresolver.go index f8e6c44b..3b3e1d23 100644 --- a/internal/datalakes/inmemory/policyresolver.go +++ b/internal/datalakes/inmemory/policyresolver.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/go-multierror" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnquery/v10/explorer/resources" - "go.mondoo.com/cnquery/v10/llx" - "go.mondoo.com/cnquery/v10/types" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/explorer/resources" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnspec/v11/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 58af332b..3ab51027 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" "google.golang.org/protobuf/proto" ) diff --git a/internal/yac-it/yac-it.go b/internal/yac-it/yac-it.go index 2cf9c795..91477662 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/v10/explorer" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnspec/v11/policy" ) type FileContext struct { diff --git a/policy/assessment.go b/policy/assessment.go index b6ecff6a..5c59a3b1 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/v10/llx" + "go.mondoo.com/cnquery/v11/llx" ) func Query2Assessment(bundle *llx.CodeBundle, report *Report) *llx.Assessment { diff --git a/policy/bundle.go b/policy/bundle.go index 75753577..3b741028 100644 --- a/policy/bundle.go +++ b/policy/bundle.go @@ -13,15 +13,15 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "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/providers-sdk/v1/resources" - "go.mondoo.com/cnquery/v10/utils/multierr" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" + "go.mondoo.com/cnquery/v11/utils/multierr" "sigs.k8s.io/yaml" ) @@ -155,10 +155,6 @@ func (p *Bundle) ConvertQuerypacks() { for i := range p.Packs { pack := p.Packs[i] - // Remove this once we reach v10 vv - pack.DeprecatedV9_ensureUIDs() - // ^^ - policy := Policy{ Mrn: pack.Mrn, Uid: pack.Uid, diff --git a/policy/bundle_map.go b/policy/bundle_map.go index 3e641d4b..1d2c3e98 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/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" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/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 b41984fb..33e93330 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/v10/explorer" - "go.mondoo.com/cnquery/v10/providers" - "go.mondoo.com/cnspec/v10/internal/datalakes/inmemory" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnspec/v11/internal/datalakes/inmemory" + "go.mondoo.com/cnspec/v11/policy" ) type s3Fake struct { diff --git a/policy/cnspec_policy.pb.go b/policy/cnspec_policy.pb.go index a8a75b6c..d85e8a68 100644 --- a/policy/cnspec_policy.pb.go +++ b/policy/cnspec_policy.pb.go @@ -4,17 +4,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc v4.25.3 // source: cnspec_policy.proto package policy import ( - explorer "go.mondoo.com/cnquery/v10/explorer" - resources "go.mondoo.com/cnquery/v10/explorer/resources" - 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" + explorer "go.mondoo.com/cnquery/v11/explorer" + resources "go.mondoo.com/cnquery/v11/explorer/resources" + llx "go.mondoo.com/cnquery/v11/llx" + inventory "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + mvd "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1388,7 +1388,66 @@ type RiskFactor struct { IsAbsolute bool `protobuf:"varint,72,opt,name=is_absolute,json=isAbsolute,proto3" json:"is_absolute,omitempty"` Software []*SoftwareSelector `protobuf:"bytes,73,rep,name=software,proto3" json:"software,omitempty"` Resources []*ResourceSelector `protobuf:"bytes,74,rep,name=resources,proto3" json:"resources,omitempty"` - Indicator string `protobuf:"bytes,75,opt,name=indicator,proto3" json:"indicator,omitempty"` + // Risk Factor indicators are freely configurable. Currently we support: + // + // 1. Contextual risks + // + // - Internet-facing asset [internet-facing] + // Any assets that are facing the internet may be at risk of being breached + // + // - Asset or service in use [asset-in-use] + // Assets or services that are currently being used. If vulnerabilities + // are found on an asset in use, their priority is increased. However, + // vulnerabilities on an asset not in use may be reduced in priority. + // + // - Exploitable vulnerabilities [exploitable] + // Exploitable vulnerabilities are detected on the asset. These are more + // likely to lead to a breach. + // + // - Code Execution risks [code-execution] + // Vulnerabilities are detected which contain (remote) code executions. + // These can cause serious damage to other resources on the asset. + // + // - End of life [eol] + // The asset or some of its resources have reach their end of life and + // no longer receive security updates. Vulnerability analysis is + // unreliable and may not be actionable. + // + // - Defensive countermeasures [defensive] + // Defensive countermeasures have been detected on the asset. These may + // contain security modules, firewalls, or other mitigations. + // + // 2. Downstream exposure + // + // - DB access [db-access] + // Databases are downstream exposures that may hold valuable customer data + // + // - User risks [user-risk] + // Users, often with elevated privileges, that are at risk + // + // - Sensitive data [sensitive-data] + // The asset contains sensitivie data, which an attacker may access if + // they manage to breach it. + // + // - Credential risks [credentials] + // Credentials are found on the asset that attackers may use to elevate + // their privileges or breach other systems. + // + // - Containers or Kubernetes [containers] + // Containers or Kuberenetes environments are found ont he asset. Attackers + // may expand their attacks to these virtual systems. + // + // 3. Misc + // + // - Tagged assets [tagged] + // Tagged assets may be increased or decreased in priority, depending on + // a users' needs. For example: Critical production infrastructure may + // increase the risk of findings. + // + // - Other risks [uncategorized] + // This captures any other type of risk factor, that doesn't fit the above + // risk categories. + Indicator string `protobuf:"bytes,75,opt,name=indicator,proto3" json:"indicator,omitempty"` } func (x *RiskFactor) Reset() { @@ -7297,7 +7356,7 @@ var file_cnspec_policy_proto_rawDesc = []byte{ 0x67, 0x65, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 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, + 0x31, 0x31, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/policy/cnspec_policy.proto b/policy/cnspec_policy.proto index 0d025be6..c8070cea 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/v10/policy"; +option go_package = "go.mondoo.com/cnspec/v11/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 f991de5c..9ac1efcc 100644 --- a/policy/cnspec_policy.ranger.go +++ b/policy/cnspec_policy.ranger.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnquery/v10/explorer/resources" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/explorer/resources" 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 fc3b38b1..b73a6b66 100644 --- a/policy/datalake.go +++ b/policy/datalake.go @@ -6,10 +6,10 @@ package policy import ( "context" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnquery/v10/explorer/resources" - "go.mondoo.com/cnquery/v10/llx" - "go.mondoo.com/cnquery/v10/types" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/explorer/resources" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/types" ) // DataLake provides additional database calls, that are not accessible to diff --git a/policy/evidence.go b/policy/evidence.go index bda745a4..e59b14c0 100644 --- a/policy/evidence.go +++ b/policy/evidence.go @@ -6,7 +6,7 @@ package policy import ( "fmt" - "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v11/explorer" ) func (e *Evidence) fillUidIfEmpty(frameworkUid string, controlUid string, suffix string) { diff --git a/policy/evidence_test.go b/policy/evidence_test.go index 15474270..d4a59387 100644 --- a/policy/evidence_test.go +++ b/policy/evidence_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v11/explorer" ) func TestEvidenceFillUidIfEmpty(t *testing.T) { diff --git a/policy/executor/executor.go b/policy/executor/executor.go index 4739f2e6..afb46ca7 100644 --- a/policy/executor/executor.go +++ b/policy/executor/executor.go @@ -11,14 +11,14 @@ import ( vrs "github.com/hashicorp/go-version" "github.com/rs/zerolog/log" - "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/providers-sdk/v1/resources" - "go.mondoo.com/cnquery/v10/types" - "go.mondoo.com/cnspec/v10" - "go.mondoo.com/cnspec/v10/policy/executor/internal" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnspec/v11" + "go.mondoo.com/cnspec/v11/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 1a13a53f..cf53f4ab 100644 --- a/policy/executor/executor_test.go +++ b/policy/executor/executor_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" - "go.mondoo.com/cnspec/v10" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnspec/v11" ) func initExecutor() *Executor { diff --git a/policy/executor/graph.go b/policy/executor/graph.go index deda7070..7a7d7966 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/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" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/cli/progress" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnspec/v11/policy" + "go.mondoo.com/cnspec/v11/policy/executor/internal" ) type GraphExecutor interface { diff --git a/policy/executor/internal/builder.go b/policy/executor/internal/builder.go index 79ab3e13..b276841f 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/v10/cli/progress" - "go.mondoo.com/cnquery/v10/llx" - "go.mondoo.com/cnspec/v10" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/progress" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnspec/v11" + "go.mondoo.com/cnspec/v11/policy" ) type query struct { diff --git a/policy/executor/internal/builder_test.go b/policy/executor/internal/builder_test.go index 8316d255..dac4a7dd 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/v10/llx" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v10/types" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnspec/v11/policy" ) func TestPrioritizeNode(t *testing.T) { diff --git a/policy/executor/internal/collector.go b/policy/executor/internal/collector.go index 81f1dcfb..df0b9048 100644 --- a/policy/executor/internal/collector.go +++ b/policy/executor/internal/collector.go @@ -10,8 +10,8 @@ import ( "time" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v10/llx" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnspec/v11/policy" "google.golang.org/protobuf/proto" ) diff --git a/policy/executor/internal/execution_manager.go b/policy/executor/internal/execution_manager.go index 9cddc619..0ad23f6f 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/v10/llx" + "go.mondoo.com/cnquery/v11/llx" ) type executionManager struct { diff --git a/policy/executor/internal/graph.go b/policy/executor/internal/graph.go index e2b30dee..f796bf02 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/v10/llx" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnspec/v11/policy" ) type ( diff --git a/policy/executor/internal/nodes.go b/policy/executor/internal/nodes.go index d7c0aa17..7f27b655 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/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" + "go.mondoo.com/cnquery/v11/cli/progress" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnquery/v11/utils/multierr" + "go.mondoo.com/cnspec/v11/policy" "google.golang.org/protobuf/proto" ) diff --git a/policy/executor/internal/nodes_test.go b/policy/executor/internal/nodes_test.go index 97f2fa1c..d0eb2c30 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/v10/llx" - "go.mondoo.com/cnquery/v10/types" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnspec/v11/policy" ) func TestDatapointNode(t *testing.T) { diff --git a/policy/fmt/fmt.go b/policy/fmt/fmt.go index 3ae4281c..83e6580f 100644 --- a/policy/fmt/fmt.go +++ b/policy/fmt/fmt.go @@ -3,8 +3,8 @@ package fmt -import "go.mondoo.com/cnspec/v10/policy" -import bundlefmt "go.mondoo.com/cnspec/v10/internal/bundle" +import "go.mondoo.com/cnspec/v11/policy" +import bundlefmt "go.mondoo.com/cnspec/v11/internal/bundle" func ToFormattedYAML(p *policy.Bundle) ([]byte, error) { data, err := p.ToYAML() diff --git a/policy/fmt/fmt_test.go b/policy/fmt/fmt_test.go index 58a66efe..d486325b 100644 --- a/policy/fmt/fmt_test.go +++ b/policy/fmt/fmt_test.go @@ -5,7 +5,7 @@ package fmt import ( "github.com/stretchr/testify/require" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnspec/v11/policy" "testing" ) diff --git a/policy/framework.go b/policy/framework.go index c399d644..a0070ca9 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/v10/checksums" - "go.mondoo.com/cnquery/v10/mrn" - "go.mondoo.com/cnquery/v10/utils/sortx" + "go.mondoo.com/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/utils/sortx" ) type ResolvedFrameworkNodeType int diff --git a/policy/hub.go b/policy/hub.go index af319bba..a5e2f58b 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/v10/explorer" - "go.mondoo.com/cnquery/v10/logger" - "go.mondoo.com/cnquery/v10/mrn" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/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/v10/policy") +var tracer = otel.Tracer("go.mondoo.com/cnspec/v11/policy") func NewPolicyMrn(namespace string, uid string) string { m := &mrn.MRN{ diff --git a/policy/mquery.go b/policy/mquery.go index 0a7cb516..b2f17753 100644 --- a/policy/mquery.go +++ b/policy/mquery.go @@ -7,10 +7,10 @@ import ( "sort" "github.com/pkg/errors" - "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/v11/checksums" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/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 c8ea08ab..929d3de6 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/v10" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnquery/v10/mqlc" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" ) func TestMquery_Whitespaces(t *testing.T) { diff --git a/policy/policy.go b/policy/policy.go index de72beb8..ea617bfe 100644 --- a/policy/policy.go +++ b/policy/policy.go @@ -12,12 +12,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "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" - "go.mondoo.com/cnquery/v10/utils/sortx" + "go.mondoo.com/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/types" + "go.mondoo.com/cnquery/v11/utils/sortx" "google.golang.org/protobuf/proto" ) diff --git a/policy/policy_test.go b/policy/policy_test.go index 8c27fde0..fc083c8d 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/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" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v11/policy" ) var conf mqlc.CompilerConfig diff --git a/policy/report.go b/policy/report.go index 973dbc00..81420bc8 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/v10/llx" + "go.mondoo.com/cnquery/v11/llx" ) func (r *Report) RawResults() map[string]*llx.RawResult { diff --git a/policy/report_test.go b/policy/report_test.go index 08816eb6..d1824dc6 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/v10/policy" + "go.mondoo.com/cnspec/v11/policy" ) func TestScoreDistributionAdd(t *testing.T) { diff --git a/policy/reportingjob.go b/policy/reportingjob.go index 178699bc..f7ebd675 100644 --- a/policy/reportingjob.go +++ b/policy/reportingjob.go @@ -6,8 +6,8 @@ package policy import ( "sort" - "go.mondoo.com/cnquery/v10/checksums" - "go.mondoo.com/cnquery/v10/utils/sortx" + "go.mondoo.com/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/utils/sortx" ) // RefreshChecksum recalculates the reporting job checksum diff --git a/policy/resolved_policy.go b/policy/resolved_policy.go index 5967eba1..1125f88f 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/v10/explorer" - "go.mondoo.com/cnquery/v10/llx" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/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 39097236..6900e315 100644 --- a/policy/resolver.go +++ b/policy/resolver.go @@ -14,14 +14,14 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/segmentio/fasthash/fnv1a" - "go.mondoo.com/cnquery/v10/checksums" - "go.mondoo.com/cnquery/v10/explorer" - resources "go.mondoo.com/cnquery/v10/explorer/resources" - "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/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/explorer" + resources "go.mondoo.com/cnquery/v11/explorer/resources" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/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 d9d72557..a44e1633 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/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" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v11/internal/datalakes/inmemory" + "go.mondoo.com/cnspec/v11/policy" ) type testAsset struct { diff --git a/policy/risk_factor.go b/policy/risk_factor.go index 15888af5..0097f609 100644 --- a/policy/risk_factor.go +++ b/policy/risk_factor.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.mondoo.com/cnquery/v10/checksums" - "go.mondoo.com/cnquery/v10/mqlc" - "go.mondoo.com/cnquery/v10/utils/multierr" + "go.mondoo.com/cnquery/v11/checksums" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/utils/multierr" ) type ScoredRiskInfo struct { diff --git a/policy/risk_factor_test.go b/policy/risk_factor_test.go index 126c5df0..14f682d5 100644 --- a/policy/risk_factor_test.go +++ b/policy/risk_factor_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" ) func risks(risks ...*ScoredRiskFactor) *ScoredRiskFactors { diff --git a/policy/scan/benchmark/benchmark_test.go b/policy/scan/benchmark/benchmark_test.go index 787caa4c..3b10ee9a 100644 --- a/policy/scan/benchmark/benchmark_test.go +++ b/policy/scan/benchmark/benchmark_test.go @@ -11,13 +11,13 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" - "go.mondoo.com/cnquery/v10" - "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/cnspec/v10/policy" - "go.mondoo.com/cnspec/v10/policy/scan" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnspec/v11/policy" + "go.mondoo.com/cnspec/v11/policy/scan" ) func init() { diff --git a/policy/scan/disk_queue.go b/policy/scan/disk_queue.go index bca33780..18df59d3 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/v10/policy/scan/pdque" + "go.mondoo.com/cnspec/v11/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 17b264ca..6945435f 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/v10/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" ) func TestDiskQueueClient_EnqueueDequeue(t *testing.T) { diff --git a/policy/scan/fetcher.go b/policy/scan/fetcher.go index dde4bf87..d54dfc21 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/v10/mqlc" - "go.mondoo.com/cnspec/v10" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnspec/v11" + "go.mondoo.com/cnspec/v11/policy" ) type fetcher struct { diff --git a/policy/scan/local_scanner.go b/policy/scan/local_scanner.go index af9d921c..4390fbaa 100644 --- a/policy/scan/local_scanner.go +++ b/policy/scan/local_scanner.go @@ -15,27 +15,27 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/segmentio/ksuid" - "go.mondoo.com/cnquery/v10" - "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/explorer/scan" - "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/plugin" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/recording" - "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/cnquery/v10/utils/slicesx" - "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/cnquery/v11" + "go.mondoo.com/cnquery/v11/cli/execruntime" + "go.mondoo.com/cnquery/v11/cli/progress" + "go.mondoo.com/cnquery/v11/explorer" + ee "go.mondoo.com/cnquery/v11/explorer/executor" + "go.mondoo.com/cnquery/v11/explorer/scan" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/logger" + "go.mondoo.com/cnquery/v11/mrn" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/recording" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnquery/v11/utils/multierr" + "go.mondoo.com/cnquery/v11/utils/slicesx" + "go.mondoo.com/cnspec/v11" + "go.mondoo.com/cnspec/v11/internal/datalakes/inmemory" + "go.mondoo.com/cnspec/v11/policy" + "go.mondoo.com/cnspec/v11/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 410aa3d3..f8d03447 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/v10" - "go.mondoo.com/cnquery/v10/explorer" - "go.mondoo.com/cnquery/v10/mqlc" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/recording" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/testutils" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/explorer" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/recording" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/testutils" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v11/policy" ) func TestFilterPreprocess(t *testing.T) { diff --git a/policy/scan/reporter.go b/policy/scan/reporter.go index d50f1954..b2a980f0 100644 --- a/policy/scan/reporter.go +++ b/policy/scan/reporter.go @@ -4,9 +4,9 @@ package scan import ( - "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" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnspec/v11/policy" ) type AssetReport struct { diff --git a/policy/scan/reporter_aggregate.go b/policy/scan/reporter_aggregate.go index a6a646dd..707ec645 100644 --- a/policy/scan/reporter_aggregate.go +++ b/policy/scan/reporter_aggregate.go @@ -6,10 +6,10 @@ package scan import ( "github.com/hashicorp/go-multierror" "github.com/rs/zerolog/log" - "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" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/gql" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/mvd" + "go.mondoo.com/cnspec/v11/policy" ) var _ VulnReporter = &AggregateReporter{} diff --git a/policy/scan/reporter_aggregate_test.go b/policy/scan/reporter_aggregate_test.go index 78092d8e..3185e91e 100644 --- a/policy/scan/reporter_aggregate_test.go +++ b/policy/scan/reporter_aggregate_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnspec/v11/policy" ) func TestAggregateReport(t *testing.T) { diff --git a/policy/scan/reporter_error.go b/policy/scan/reporter_error.go index 6b864b40..ce03abdf 100644 --- a/policy/scan/reporter_error.go +++ b/policy/scan/reporter_error.go @@ -6,9 +6,9 @@ package scan import ( "strings" - "go.mondoo.com/cnquery/v10/cli/theme" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/cli/theme" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnspec/v11/policy" pbStatus "go.mondoo.com/ranger-rpc/status" "google.golang.org/genproto/googleapis/rpc/errdetails" ) diff --git a/policy/scan/reporter_noop.go b/policy/scan/reporter_noop.go index a13c1531..1cabde07 100644 --- a/policy/scan/reporter_noop.go +++ b/policy/scan/reporter_noop.go @@ -4,8 +4,8 @@ package scan import ( - "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" - "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnspec/v11/policy" ) type NoOpReporter struct{} diff --git a/policy/scan/scan.go b/policy/scan/scan.go index 95144d7f..36bc9a00 100644 --- a/policy/scan/scan.go +++ b/policy/scan/scan.go @@ -8,11 +8,11 @@ import ( "math/rand" "time" - "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" + "go.mondoo.com/cnquery/v11/cli/progress" + "go.mondoo.com/cnquery/v11/providers" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" + "go.mondoo.com/cnspec/v11/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 63685f64..44033af5 100644 --- a/policy/scan/scan.pb.go +++ b/policy/scan/scan.pb.go @@ -4,14 +4,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc v4.25.3 // source: scan.proto package scan import ( - inventory "go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory" - policy "go.mondoo.com/cnspec/v10/policy" + inventory "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" + policy "go.mondoo.com/cnspec/v11/policy" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" structpb "google.golang.org/protobuf/types/known/structpb" @@ -913,7 +913,7 @@ var file_scan_proto_rawDesc = []byte{ 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 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, 0x31, 0x30, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x62, + 0x76, 0x31, 0x31, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/policy/scan/scan.proto b/policy/scan/scan.proto index 9e30ed58..8fcdcf0c 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/v10/policy/scan"; +option go_package = "go.mondoo.com/cnspec/v11/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 0aa010f2..c8acdd51 100644 --- a/policy/score_calculator.go +++ b/policy/score_calculator.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/pkg/errors" - "go.mondoo.com/cnquery/v10/explorer" + "go.mondoo.com/cnquery/v11/explorer" "google.golang.org/protobuf/proto" ) diff --git a/policy/score_calculator_test.go b/policy/score_calculator_test.go index aa6d6418..604c9e75 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/v10/explorer" + "go.mondoo.com/cnquery/v11/explorer" ) type scoreTest struct { diff --git a/policy/services.go b/policy/services.go index 891a137b..e7c0d8b0 100644 --- a/policy/services.go +++ b/policy/services.go @@ -7,11 +7,11 @@ import ( "context" "net/http" - "go.mondoo.com/cnquery/v10" - "go.mondoo.com/cnquery/v10/explorer/transport" - "go.mondoo.com/cnquery/v10/llx" - "go.mondoo.com/cnquery/v10/mqlc" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/resources" + "go.mondoo.com/cnquery/v11" + "go.mondoo.com/cnquery/v11/explorer/transport" + "go.mondoo.com/cnquery/v11/llx" + "go.mondoo.com/cnquery/v11/mqlc" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" "go.mondoo.com/ranger-rpc" ) diff --git a/test/cli/cli_test.go b/test/cli/cli_test.go index 2d566b8b..0a4b6285 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/v10/apps/cnspec/cmd" + "go.mondoo.com/cnspec/v11/apps/cnspec/cmd" ) var ( diff --git a/upstream/gql.go b/upstream/gql.go index c1aa895e..790c86fb 100644 --- a/upstream/gql.go +++ b/upstream/gql.go @@ -6,8 +6,8 @@ package upstream import ( "context" - "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream/gql" - policy "go.mondoo.com/cnspec/v10/policy" + "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream/gql" + policy "go.mondoo.com/cnspec/v11/policy" mondoogql "go.mondoo.com/mondoo-go" )