Fix proxy_address_test

controllers/virtualmachinewebconsolerequest/v1alpha1/webconsolerequest_controller.go

@@ -25,7 +25,7 @@ import (
 	pkgctx "github.com/vmware-tanzu/vm-operator/pkg/context"
 	"github.com/vmware-tanzu/vm-operator/pkg/providers"
 	"github.com/vmware-tanzu/vm-operator/pkg/record"
-	"github.com/vmware-tanzu/vm-operator/pkg/util"
+	webconsole_util "github.com/vmware-tanzu/vm-operator/pkg/util/webconsole"
 )
 
 const (
@@ -184,7 +184,7 @@ func (r *Reconciler) ReconcileNormal(ctx *pkgctx.WebConsoleRequestContext) error
 	ctx.WebConsoleRequest.Status.Response = ticket
 	ctx.WebConsoleRequest.Status.ExpiryTime = metav1.NewTime(metav1.Now().Add(DefaultExpiryTime))
 
-	proxyAddr, err := util.ProxyAddress(ctx, r)
+	proxyAddr, err := webconsole_util.ProxyAddress(ctx, r)
 	if err != nil {
 		return err
 	}

controllers/virtualmachinewebconsolerequest/v1alpha1/webconsolerequest_intg_test.go

@@ -19,7 +19,7 @@ import (
 	vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha3"
 	webconsolerequest "github.com/vmware-tanzu/vm-operator/controllers/virtualmachinewebconsolerequest/v1alpha1"
 	"github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels"
-	"github.com/vmware-tanzu/vm-operator/pkg/util"
+	webconsole_util "github.com/vmware-tanzu/vm-operator/pkg/util/webconsole"
 	"github.com/vmware-tanzu/vm-operator/test/builder"
 )
 
@@ -83,8 +83,8 @@ func intgTestsReconcile() {
 
 		proxySvc = &corev1.Service{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      util.ProxyAddrServiceName,
-				Namespace: util.ProxyAddrServiceNamespace,
+				Name:      webconsole_util.ProxyAddrServiceName,
+				Namespace: webconsole_util.ProxyAddrServiceNamespace,
 			},
 			Spec: corev1.ServiceSpec{
 				Type: corev1.ServiceTypeLoadBalancer,

controllers/virtualmachinewebconsolerequest/v1alpha1/webconsolerequest_unit_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels"
 	pkgctx "github.com/vmware-tanzu/vm-operator/pkg/context"
 	providerfake "github.com/vmware-tanzu/vm-operator/pkg/providers/fake"
-	"github.com/vmware-tanzu/vm-operator/pkg/util"
+	webconsole_util "github.com/vmware-tanzu/vm-operator/pkg/util/webconsole"
 	"github.com/vmware-tanzu/vm-operator/test/builder"
 )
 
@@ -72,8 +72,8 @@ func unitTestsReconcile() {
 
 		proxySvc = &corev1.Service{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      util.ProxyAddrServiceName,
-				Namespace: util.ProxyAddrServiceNamespace,
+				Name:      webconsole_util.ProxyAddrServiceName,
+				Namespace: webconsole_util.ProxyAddrServiceNamespace,
 			},
 			Status: corev1.ServiceStatus{
 				LoadBalancer: corev1.LoadBalancerStatus{

controllers/virtualmachinewebconsolerequest/v1alpha2/webconsolerequest_controller.go

@@ -24,7 +24,7 @@ import (
 	"github.com/vmware-tanzu/vm-operator/pkg/patch"
 	"github.com/vmware-tanzu/vm-operator/pkg/providers"
 	"github.com/vmware-tanzu/vm-operator/pkg/record"
-	"github.com/vmware-tanzu/vm-operator/pkg/util"
+	webconsole_util "github.com/vmware-tanzu/vm-operator/pkg/util/webconsole"
 )
 
 const (
@@ -176,7 +176,7 @@ func (r *Reconciler) ReconcileNormal(ctx *pkgctx.WebConsoleRequestContextV1) err
 	ctx.WebConsoleRequest.Status.Response = ticket
 	ctx.WebConsoleRequest.Status.ExpiryTime = metav1.NewTime(metav1.Now().Add(DefaultExpiryTime))
 
-	proxyAddr, err := util.ProxyAddress(ctx, r)
+	proxyAddr, err := webconsole_util.ProxyAddress(ctx, r)
 	if err != nil {
 		return err
 	}

controllers/virtualmachinewebconsolerequest/v1alpha2/webconsolerequest_intg_test.go

@@ -18,7 +18,7 @@ import (
 	vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha3"
 	webconsolerequest "github.com/vmware-tanzu/vm-operator/controllers/virtualmachinewebconsolerequest/v1alpha2"
 	"github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels"
-	"github.com/vmware-tanzu/vm-operator/pkg/util"
+	webconsole_util "github.com/vmware-tanzu/vm-operator/pkg/util/webconsole"
 	"github.com/vmware-tanzu/vm-operator/test/builder"
 )
 
@@ -81,8 +81,8 @@ func intgTestsReconcile() {
 
 		proxySvc = &corev1.Service{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      util.ProxyAddrServiceName,
-				Namespace: util.ProxyAddrServiceNamespace,
+				Name:      webconsole_util.ProxyAddrServiceName,
+				Namespace: webconsole_util.ProxyAddrServiceNamespace,
 			},
 			Spec: corev1.ServiceSpec{
 				Type: corev1.ServiceTypeLoadBalancer,

controllers/virtualmachinewebconsolerequest/v1alpha2/webconsolerequest_unit_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels"
 	pkgctx "github.com/vmware-tanzu/vm-operator/pkg/context"
 	providerfake "github.com/vmware-tanzu/vm-operator/pkg/providers/fake"
-	"github.com/vmware-tanzu/vm-operator/pkg/util"
+	webconsole_util "github.com/vmware-tanzu/vm-operator/pkg/util/webconsole"
 	"github.com/vmware-tanzu/vm-operator/test/builder"
 )
 
@@ -67,8 +67,8 @@ func unitTestsReconcile() {
 
 		proxySvc = &corev1.Service{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      util.ProxyAddrServiceName,
-				Namespace: util.ProxyAddrServiceNamespace,
+				Name:      webconsole_util.ProxyAddrServiceName,
+				Namespace: webconsole_util.ProxyAddrServiceNamespace,
 			},
 			Status: corev1.ServiceStatus{
 				LoadBalancer: corev1.LoadBalancerStatus{

go.mod

@@ -28,9 +28,9 @@ require (
 	github.com/vmware-tanzu/net-operator-api v0.0.0-20240523152550-862e2c4eb0e0
 	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240902045731-00a14868c72d
 	github.com/vmware-tanzu/vm-operator/api v0.0.0-00010101000000-000000000000
-	github.com/vmware-tanzu/vm-operator/external/capabilities v0.0.0-00010101000000-000000000000
 	github.com/vmware-tanzu/vm-operator/external/appplatform v0.0.0-00010101000000-000000000000
 	github.com/vmware-tanzu/vm-operator/external/byok v0.0.0-00010101000000-000000000000
+	github.com/vmware-tanzu/vm-operator/external/capabilities v0.0.0-00010101000000-000000000000
 	github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-00010101000000-000000000000
 	github.com/vmware-tanzu/vm-operator/external/storage-policy-quota v0.0.0-00010101000000-000000000000
 	github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-00010101000000-000000000000

pkg/util/proxy_address.go → pkg/util/webconsole/proxy_address.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package util
+package webconsole
 
 import (
 	"context"

pkg/util/proxy_address_test.go → pkg/util/webconsole/proxy_address_test.go

@@ -1,4 +1,7 @@
-package util
+// Copyright (c) 2024 VMware, Inc. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package webconsole
 
 import (
 	"context"
@@ -8,20 +11,21 @@ import (
 
 	appv1a1 "github.com/vmware-tanzu/vm-operator/external/appplatform/api/v1alpha1"
 	pkgcfg "github.com/vmware-tanzu/vm-operator/pkg/config"
+	"github.com/vmware-tanzu/vm-operator/test/builder"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 )
 
 var _ = Describe("Test Proxy Address", func() {
 	var (
-		// err            error
 		ctx            context.Context
-		k8sClient      ctrlclient.Client
+		client         ctrlclient.Client
 		initialObjects []ctrlclient.Object
 		proxySvc       *corev1.Service
 		api            *appv1a1.SupervisorProperties
+		withFuncs      interceptor.Funcs
 	)
 
 	const (
@@ -49,10 +53,12 @@ var _ = Describe("Test Proxy Address", func() {
 		api = nil
 		initialObjects = nil
 		ctx = pkgcfg.NewContext()
+		withFuncs = interceptor.Funcs{}
 	})
 
 	JustBeforeEach(func() {
-		k8sClient = fake.NewClientBuilder().WithObjects(initialObjects...).Build()
+		client = builder.NewFakeClientWithInterceptors(
+			withFuncs, initialObjects...)
 	})
 
 	When("Simplified Enablement FSS is disabled", func() {
@@ -74,7 +80,7 @@ var _ = Describe("Test Proxy Address", func() {
 		})
 
 		It("Should always return the virtual IP", func() {
-			str, err := ProxyAddress(ctx, k8sClient)
+			str, err := ProxyAddress(ctx, client)
 			Expect(err).To(BeNil())
 			Expect(str).To(Equal(virtualIP))
 		})
@@ -89,7 +95,7 @@ var _ = Describe("Test Proxy Address", func() {
 					Namespace: "vmware-system-supervisor-services",
 				},
 				Spec: appv1a1.SupervisorPropertiesSpec{
-					APIServerDNSNames: []string{apiServerDNSName},
+					APIServerDNSNames: []string{},
 				},
 			}
 			ctx = pkgcfg.UpdateContext(ctx, func(config *pkgcfg.Config) {
@@ -100,7 +106,7 @@ var _ = Describe("Test Proxy Address", func() {
 		})
 
 		It("Should always return the virtual IP", func() {
-			str, err := ProxyAddress(ctx, k8sClient)
+			str, err := ProxyAddress(ctx, client)
 			Expect(err).To(BeNil())
 			Expect(str).To(Equal(virtualIP))
 		})
@@ -126,7 +132,7 @@ var _ = Describe("Test Proxy Address", func() {
 		})
 
 		It("Should always return the DNS Name", func() {
-			str, err := ProxyAddress(ctx, k8sClient)
+			str, err := ProxyAddress(ctx, client)
 			Expect(err).To(BeNil())
 			Expect(str).To(Equal(apiServerDNSName))
 		})

pkg/util/webconsole/webconsole_suite_test.go

@@ -0,0 +1,16 @@
+// Copyright (c) 2024 VMware, Inc. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package webconsole
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestImage(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Web Console Suite Test")
+}