From 0b6d694247da14490cfd3cdbb98dfe496224f6e1 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Tue, 4 Mar 2025 01:54:51 +0530 Subject: [PATCH] Fix static checks --- api/netbox/v1beta1/netboxip.go | 18 ++--- cmd/netbox-ip-controller/integration_test.go | 5 +- internal/controller/pod/pod_test.go | 78 ++++++++++---------- internal/controller/service/service_test.go | 74 +++++++++---------- 4 files changed, 87 insertions(+), 88 deletions(-) diff --git a/api/netbox/v1beta1/netboxip.go b/api/netbox/v1beta1/netboxip.go index c2eef86f..e669f321 100644 --- a/api/netbox/v1beta1/netboxip.go +++ b/api/netbox/v1beta1/netboxip.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) // +genclient @@ -110,13 +110,13 @@ var tagSchema = &apiextensionsv1.JSONSchemaProps{ Properties: map[string]apiextensionsv1.JSONSchemaProps{ "name": apiextensionsv1.JSONSchemaProps{ Type: "string", - MinLength: pointer.Int64(1), - MaxLength: pointer.Int64(100), + MinLength: ptr.To[int64](1), + MaxLength: ptr.To[int64](100), }, "slug": apiextensionsv1.JSONSchemaProps{ Type: "string", - MinLength: pointer.Int64(1), - MaxLength: pointer.Int64(100), + MinLength: ptr.To[int64](1), + MaxLength: ptr.To[int64](100), Pattern: tagSlugRegexp, }, }, @@ -130,15 +130,15 @@ var NetBoxIPValidationSchema = &apiextensionsv1.CustomResourceValidation{ Properties: map[string]apiextensionsv1.JSONSchemaProps{ "address": apiextensionsv1.JSONSchemaProps{ Type: "string", - MinLength: pointer.Int64(1), + MinLength: ptr.To[int64](1), // actual validation happens when unmarshaling, here we only // make sure the addess is not empty (empty addresses will not // produce an error when unmarshaled) }, "dnsName": apiextensionsv1.JSONSchemaProps{ Type: "string", - MinLength: pointer.Int64(1), - MaxLength: pointer.Int64(253), + MinLength: ptr.To[int64](1), + MaxLength: ptr.To[int64](253), Pattern: dnsNameRegexp, }, "tags": apiextensionsv1.JSONSchemaProps{ @@ -150,7 +150,7 @@ var NetBoxIPValidationSchema = &apiextensionsv1.CustomResourceValidation{ "description": apiextensionsv1.JSONSchemaProps{ Type: "string", // limit set by NetBox - MaxLength: pointer.Int64(200), + MaxLength: ptr.To[int64](200), }, }, }, diff --git a/cmd/netbox-ip-controller/integration_test.go b/cmd/netbox-ip-controller/integration_test.go index 9bc0ade7..78baec20 100644 --- a/cmd/netbox-ip-controller/integration_test.go +++ b/cmd/netbox-ip-controller/integration_test.go @@ -42,7 +42,6 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" - v1 "k8s.io/api/core/v1" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" kubeerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -371,7 +370,7 @@ func TestClean(t *testing.T) { }, ObjectMeta: metav1.ObjectMeta{ Name: name, - Namespace: v1.NamespaceDefault, + Namespace: corev1.NamespaceDefault, Finalizers: []string{netboxipctrl.IPFinalizer}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -381,7 +380,7 @@ func TestClean(t *testing.T) { } var err error - ip, err = env.KubeCRDClient.NetboxV1beta1().NetBoxIPs(v1.NamespaceDefault).Create(context.Background(), ip, metav1.CreateOptions{}) + ip, err = env.KubeCRDClient.NetboxV1beta1().NetBoxIPs(corev1.NamespaceDefault).Create(context.Background(), ip, metav1.CreateOptions{}) if err != nil { t.Fatalf("creating netboxip: %q\n", err) } diff --git a/internal/controller/pod/pod_test.go b/internal/controller/pod/pod_test.go index 2775644b..631f7492 100644 --- a/internal/controller/pod/pod_test.go +++ b/internal/controller/pod/pod_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" kubescheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -98,8 +98,8 @@ func TestReconcile(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -157,8 +157,8 @@ func TestReconcile(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -235,8 +235,8 @@ func TestReconcile(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -282,8 +282,8 @@ func TestReconcile(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -332,8 +332,8 @@ func TestReconcile(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -450,8 +450,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -500,8 +500,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -548,8 +548,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -577,8 +577,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -625,8 +625,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -653,8 +653,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -682,8 +682,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -730,8 +730,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -758,8 +758,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -788,8 +788,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -835,8 +835,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -863,8 +863,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -892,8 +892,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -921,8 +921,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Pod", Name: name, UID: types.UID(podUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, diff --git a/internal/controller/service/service_test.go b/internal/controller/service/service_test.go index 8b755b7f..2f0a1bba 100644 --- a/internal/controller/service/service_test.go +++ b/internal/controller/service/service_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" kubescheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -100,8 +100,8 @@ func TestReconcile(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -189,8 +189,8 @@ func TestReconcile(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -271,8 +271,8 @@ func TestReconcile(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -323,8 +323,8 @@ func TestReconcile(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -443,8 +443,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -495,8 +495,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -545,8 +545,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -574,8 +574,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -624,8 +624,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -652,8 +652,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -680,8 +680,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -730,8 +730,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -758,8 +758,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -787,8 +787,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -836,8 +836,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -864,8 +864,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, }, Spec: v1beta1.NetBoxIPSpec{ @@ -892,8 +892,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, }, @@ -921,8 +921,8 @@ func TestReconcileDualStack(t *testing.T) { Kind: "Service", Name: name, UID: types.UID(serviceUID), - Controller: pointer.Bool(true), - BlockOwnerDeletion: pointer.Bool(true), + Controller: ptr.To[bool](true), + BlockOwnerDeletion: ptr.To[bool](true), }}, Finalizers: []string{netboxctrl.IPFinalizer}, },