address review comments

Signed-off-by: Jaideep Rao <[email protected]>
jaideepr97 · Sep 28, 2023 · 97c92d8 · 97c92d8
1 parent 7d8f070
commit 97c92d8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/controllers/suite_testx.go b/controllers/suite_testx.go
@@ -29,7 +29,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
+	argoprojv1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
 	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	//+kubebuilder:scaffold:imports
 )
@@ -62,7 +62,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
-	err = v1alpha1.AddToScheme(scheme.Scheme)
+	err = argoprojv1alpha1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	err = argoproj.AddToScheme(scheme.Scheme)

diff --git a/pkg/util/removeFunctions.go b/pkg/util/removeFunctions.go
@@ -3,7 +3,7 @@ package util
 import (
 	"fmt"
 
-	"github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/argoproj-labs/argocd-operator/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -13,14 +13,14 @@ import (
 // FetchSecret will retrieve the object with the given Name using the provided client.
 // The result will be returned.
 func FetchSecret(client client.Client, meta metav1.ObjectMeta, name string) (*corev1.Secret, error) {
-	a := &v1beta1.ArgoCD{}
+	a := &argoproj.ArgoCD{}
 	a.ObjectMeta = meta
 	secret := NewSecretWithName(a, name)
 	return secret, FetchObject(client, meta.Namespace, name, secret)
 }
 
 // NewSecret returns a new Secret based on the given metadata.
-func NewSecret(cr *v1beta1.ArgoCD) *corev1.Secret {
+func NewSecret(cr *argoproj.ArgoCD) *corev1.Secret {
 	return &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: common.DefaultLabels(cr.Name, cr.Name, ""),
@@ -30,14 +30,14 @@ func NewSecret(cr *v1beta1.ArgoCD) *corev1.Secret {
 }
 
 // NewTLSSecret returns a new TLS Secret based on the given metadata with the provided suffix on the Name.
-func NewTLSSecret(cr *v1beta1.ArgoCD, suffix string) *corev1.Secret {
+func NewTLSSecret(cr *argoproj.ArgoCD, suffix string) *corev1.Secret {
 	secret := NewSecretWithSuffix(cr, suffix)
 	secret.Type = corev1.SecretTypeTLS
 	return secret
 }
 
 // NewSecretWithName returns a new Secret based on the given metadata with the provided Name.
-func NewSecretWithName(cr *v1beta1.ArgoCD, name string) *corev1.Secret {
+func NewSecretWithName(cr *argoproj.ArgoCD, name string) *corev1.Secret {
 	secret := NewSecret(cr)
 
 	secret.ObjectMeta.Name = name
@@ -48,6 +48,6 @@ func NewSecretWithName(cr *v1beta1.ArgoCD, name string) *corev1.Secret {
 }
 
 // NewSecretWithSuffix returns a new Secret based on the given metadata with the provided suffix on the Name.
-func NewSecretWithSuffix(cr *v1beta1.ArgoCD, suffix string) *corev1.Secret {
+func NewSecretWithSuffix(cr *argoproj.ArgoCD, suffix string) *corev1.Secret {
 	return NewSecretWithName(cr, fmt.Sprintf("%s-%s", cr.Name, suffix))
 }
diff --git a/pkg/util/resource_test.go b/pkg/util/resource_test.go
@@ -20,13 +20,13 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/argoproj-labs/argocd-operator/common"
 )
 
 func TestDefaultAnnotations(t *testing.T) {
 	type args struct {
-		cr *v1beta1.ArgoCD
+		cr *argoproj.ArgoCD
 	}
 	tests := []struct {
 		name string
@@ -36,7 +36,7 @@ func TestDefaultAnnotations(t *testing.T) {
 		{
 			name: "simple annotations",
 			args: args{
-				&v1beta1.ArgoCD{
+				&argoproj.ArgoCD{
 					ObjectMeta: v1.ObjectMeta{
 						Name:      "foo",
 						Namespace: "bar",

diff --git a/pkg/workloads/workloads_test.go b/pkg/workloads/workloads_test.go
@@ -3,7 +3,7 @@ package workloads
 import (
 	"errors"
 
-	"github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	oappsv1 "github.com/openshift/api/apps/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	autoscaling "k8s.io/api/autoscaling/v1"
@@ -32,11 +32,11 @@ var (
 	}
 )
 
-func testMutationFuncFailed(cr *v1beta1.ArgoCD, resource interface{}, client cntrlClient.Client) error {
+func testMutationFuncFailed(cr *argoproj.ArgoCD, resource interface{}, client cntrlClient.Client) error {
 	return errors.New("test-mutation-error")
 }
 
-func testMutationFuncSuccessful(cr *v1beta1.ArgoCD, resource interface{}, client cntrlClient.Client) error {
+func testMutationFuncSuccessful(cr *argoproj.ArgoCD, resource interface{}, client cntrlClient.Client) error {
 	switch obj := resource.(type) {
 	case *appsv1.Deployment:
 		obj.Name = testNameMutated