🧹 update cnquery/cnspec to v12

imilchev · imilchev · commit 72f3f75a7a24 · 2025-12-12T13:43:45.000+02:00
Signed-off-by: Ivan Milchev &lt;ivan@mondoo.com&gt;
diff --git a/.github/env b/.github/env
@@ -1,4 +1,4 @@
-golang-version=1.24.3
+golang-version=1.25.5
 operator-sdk-version=v1.33.0
 MONDOO_ORG_MRN=//captain.api.mondoo.app/organizations/mondoo-operator-testing
 MONDOO_GQL_ENDPOINT=https://api.mondoo.com/query
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -25,7 +25,7 @@ jobs:
           go-version: ">=${{ env.golang-version }}"
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
           version: latest
           args: --timeout=20m0s
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,18 @@
 # Copyright (c) Mondoo, Inc.
 # SPDX-License-Identifier: BUSL-1.1
-
+version: "2"
+run:
+  modules-download-mode: readonly
 linters:
+  default: none
   enable:
-    - gofumpt
+    #- errcheck
+    - govet
+    - ineffassign
+    #- staticcheck
+    - unused
+    #- gosec
+formatters:
+  settings:
+    gofmt:
+      simplify: false
diff --git a/Makefile b/Makefile
@@ -175,10 +175,7 @@ load-minikube: docker-build ## Build docker image with the manager and load it i
 	minikube image load ${IMG}
 
 load-k3d: docker-build
-	docker save -o operator.tar ${IMG}
-	docker cp operator.tar k3d-k3s-default-server-0:/tmp/operator.tar
-	docker exec k3d-k3s-default-server-0 ctr -a /run/k3s/containerd/containerd.sock -n k8s.io images import /tmp/operator.tar
-	rm operator.tar
+	k3d images import ${IMG}
 
 buildah-build: build ## Build container image
 	buildah build --platform=${TARGET_OS}/${TARGET_ARCH} -t ${IMG} .
@@ -254,7 +251,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v4.5.7
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.19.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 ## we intentionally install kustomize without the script to prevent GitHub API rate limits
diff --git a/cmd/mondoo-operator/garbage_collect/cmd.go b/cmd/mondoo-operator/garbage_collect/cmd.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/spf13/cobra"
-	"go.mondoo.com/cnspec/v11/policy/scan"
+	"go.mondoo.com/cnspec/v12/policy/scan"
 	"go.mondoo.com/mondoo-operator/pkg/client/scanapiclient"
 	"go.mondoo.com/mondoo-operator/pkg/utils/logger"
 	"k8s.io/utils/ptr"
diff --git a/controllers/container_image/resources.go b/controllers/container_image/resources.go
@@ -9,7 +9,7 @@ import (
 
 	// That's the mod k8s relies on https://github.com/kubernetes/kubernetes/blob/master/go.mod#L63
 
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
+	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
 	"go.mondoo.com/mondoo-operator/api/v1alpha2"
 	"go.mondoo.com/mondoo-operator/pkg/constants"
 	"go.mondoo.com/mondoo-operator/pkg/feature_flags"
diff --git a/controllers/nodes/resources.go b/controllers/nodes/resources.go
@@ -19,7 +19,7 @@ import (
 
 	// That's the mod k8s relies on https://github.com/kubernetes/kubernetes/blob/master/go.mod#L63
 
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
+	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
 	"go.mondoo.com/mondoo-operator/api/v1alpha2"
 	"go.mondoo.com/mondoo-operator/controllers/scanapi"
 	"go.mondoo.com/mondoo-operator/pkg/constants"
diff --git a/controllers/resource_monitor/resource_monitor_controller.go b/controllers/resource_monitor/resource_monitor_controller.go
@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	cnquery_k8s "go.mondoo.com/cnquery/v11/providers/k8s/resources"
+	cnquery_k8s "go.mondoo.com/cnquery/v12/providers/k8s/resources"
 )
 
 var logger = log.Log.WithName("resource-monitor")
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/client/scanapiclient/client.go b/pkg/client/scanapiclient/client.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
-	"go.mondoo.com/cnspec/v11/policy/scan"
+	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
+	"go.mondoo.com/cnspec/v12/policy/scan"
 	"go.mondoo.com/mondoo-operator/pkg/client/common"
 	"go.mondoo.com/mondoo-operator/pkg/constants"
 )
diff --git a/pkg/client/scanapiclient/mock/client_generated.go b/pkg/client/scanapiclient/mock/client_generated.go
diff --git a/pkg/client/scanapiclient/types.go b/pkg/client/scanapiclient/types.go
@@ -6,8 +6,8 @@ package scanapiclient
 import (
 	"context"
 
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
-	"go.mondoo.com/cnspec/v11/policy/scan"
+	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
+	"go.mondoo.com/cnspec/v12/policy/scan"
 	"go.mondoo.com/mondoo-operator/pkg/client/common"
 	"google.golang.org/protobuf/types/known/structpb"
 )
diff --git a/pkg/utils/mondoo/container_image_resolver.go b/pkg/utils/mondoo/container_image_resolver.go
@@ -20,8 +20,8 @@ import (
 
 const (
 	CnspecImage              = "ghcr.io/mondoohq/mondoo-operator/cnspec"
-	CnspecTag                = "11-rootless"
-	OpenShiftMondooClientTag = "11-ubi-rootless"
+	CnspecTag                = "12-rootless"
+	OpenShiftMondooClientTag = "12-ubi-rootless"
 	MondooOperatorImage      = "ghcr.io/mondoohq/mondoo-operator"
 	PodNameEnvVar            = "POD_NAME"
 	PodNamespaceEnvVar       = "POD_NAMESPACE"
diff --git a/pkg/webhooks/handler/webhook.go b/pkg/webhooks/handler/webhook.go
@@ -24,7 +24,7 @@ import (
 
 	serializerYaml "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
+	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
 	mondoov1alpha2 "go.mondoo.com/mondoo-operator/api/v1alpha2"
 	"go.mondoo.com/mondoo-operator/pkg/client/common"
 	"go.mondoo.com/mondoo-operator/pkg/client/scanapiclient"
@@ -67,7 +67,7 @@ const (
 
 type webhookValidator struct {
 	client            client.Client
-	decoder           *admission.Decoder
+	decoder           admission.Decoder
 	mode              mondoov1alpha2.AdmissionMode
 	scanner           scanapiclient.ScanApiClient
 	integrationMRN    string
diff --git a/pkg/webhooks/handler/webhook_test.go b/pkg/webhooks/handler/webhook_test.go
@@ -420,7 +420,7 @@ func testExampleDeployment() runtime.RawExtension {
 	}
 }
 
-func setupDecoder(t *testing.T) *admission.Decoder {
+func setupDecoder(t *testing.T) admission.Decoder {
 	scheme := runtime.NewScheme()
 	utilruntime.Must(corev1.AddToScheme(scheme))
 	decoder := admission.NewDecoder(scheme)
diff --git a/tests/framework/utils/asset.go b/tests/framework/utils/asset.go
@@ -6,7 +6,7 @@ package utils
 import (
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
-	"go.mondoo.com/cnquery/v11/providers/os/id/containerid"
+	"go.mondoo.com/cnquery/v12/providers/os/id/containerid"
 	"go.mondoo.com/mondoo-operator/api/v1alpha2"
 	"go.mondoo.com/mondoo-operator/pkg/utils"
 	"go.mondoo.com/mondoo-operator/tests/framework/nexus/assets"
diff --git a/tests/framework/utils/container_utils.go b/tests/framework/utils/container_utils.go
@@ -6,8 +6,8 @@ package utils
 import (
 	"strings"
 
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
-	"go.mondoo.com/cnquery/v11/types"
+	"go.mondoo.com/cnquery/v12/providers-sdk/v1/plugin"
+	"go.mondoo.com/cnquery/v12/types"
 	v1 "k8s.io/api/core/v1"
 )
 
diff --git a/tests/framework/utils/k8s_helper.go b/tests/framework/utils/k8s_helper.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	cnquery_k8s "go.mondoo.com/cnquery/v11/providers/k8s/resources"
+	cnquery_k8s "go.mondoo.com/cnquery/v12/providers/k8s/resources"
 	"go.mondoo.com/mondoo-operator/api/v1alpha2"
 	api "go.mondoo.com/mondoo-operator/api/v1alpha2"
 	"go.mondoo.com/mondoo-operator/pkg/utils/k8s"

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"sigs.k8s.io/controller-runtime/pkg/client/apiutil"`
`17`	`17`	`"sigs.k8s.io/controller-runtime/pkg/log"`
`18`	`18`
`19`		`- cnquery_k8s "go.mondoo.com/cnquery/v11/providers/k8s/resources"`
	`19`	`+ cnquery_k8s "go.mondoo.com/cnquery/v12/providers/k8s/resources"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var logger = log.Log.WithName("resource-monitor")`