Finished unit tests

Signed-off-by: Yi Cai <[email protected]>

common/values.go

@@ -44,8 +44,6 @@ const (
 
 	// K8sOSLinux is the value for kubernetes.io/os key for linux pods
 	K8sOSLinux = "linux"
-	// ArgoCDAppSetGitlabSCMTLSCertsConfigMapName is the hard-coded ApplicationSet Gitlab SCM TLS certificate data ConfigMap name.
-	ArgoCDAppSetGitlabSCMTLSCertsConfigMapName = "argocd-appset-gitlab-scm-tls-certs-cm"
 
 	// ArgoCDRedisServerTLSSecretName is the name of the TLS secret for the redis-server
 	ArgoCDRedisServerTLSSecretName = "argocd-operator-redis-tls"

controllers/argocd/applicationset/applicationset_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/argoproj-labs/argocd-operator/common"
 	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
 	"github.com/stretchr/testify/assert"
@@ -23,9 +24,11 @@ func makeTestApplicationSetReconciler(t *testing.T, objs ...runtime.Object) *App
 	logger := ctrl.Log.WithName(ArgoCDApplicationSetControllerComponent)
 
 	return &ApplicationSetReconciler{
-		Client:   cl,
-		Scheme:   s,
-		Instance: argocdcommon.MakeTestArgoCD(),
-		Logger:   logger,
+		Client: cl,
+		Scheme: s,
+		Instance: argocdcommon.MakeTestArgoCD(func(a *argoproj.ArgoCD) {
+			a.Spec.ApplicationSet = &argoproj.ArgoCDApplicationSet{}
+		}),
+		Logger: logger,
 	}
 }

controllers/argocd/applicationset/deployment.go

@@ -21,9 +21,6 @@ import (
 func (asr *ApplicationSetReconciler) getDesiredDeployment() *appsv1.Deployment {
 	desiredDeployment := &appsv1.Deployment{}
 
-	appSetEnv := asr.Instance.Spec.ApplicationSet.Env
-	appSetEnv = util.EnvMerge(appSetEnv, util.ProxyEnvVars(), false)
-
 	objMeta := metav1.ObjectMeta{
 		Name:      resourceName,
 		Namespace: asr.Instance.Namespace,

controllers/argocd/applicationset/deployment_test.go

@@ -0,0 +1,94 @@
+package applicationset
+
+import (
+	"context"
+	"testing"
+
+	"github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon"
+	"github.com/stretchr/testify/assert"
+
+	appsv1 "k8s.io/api/apps/v1"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+func TestApplicationSetReconciler_reconcileDeployment(t *testing.T) {
+	resourceName = argocdcommon.TestArgoCDName
+	resourceLabels = testExpectedLabels
+	ns := argocdcommon.MakeTestNamespace()
+	asr := makeTestApplicationSetReconciler(t, ns)
+
+	existingDeployment := asr.getDesiredDeployment()
+
+	tests := []struct {
+		name        string
+		setupClient func() *ApplicationSetReconciler
+		wantErr     bool
+	}{
+		{
+			name: "create a deployment",
+			setupClient: func() *ApplicationSetReconciler {
+				return makeTestApplicationSetReconciler(t, ns)
+			},
+			wantErr: false,
+		},
+		{
+			name: "update a deployment",
+			setupClient: func() *ApplicationSetReconciler {
+				outdatedDeployment := existingDeployment
+				outdatedDeployment.ObjectMeta.Labels = argocdcommon.TestKVP
+				return makeTestApplicationSetReconciler(t, outdatedDeployment, ns)
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			asr := tt.setupClient()
+			err := asr.reconcileDeployment()
+			if (err != nil) != tt.wantErr {
+				if tt.wantErr {
+					t.Errorf("Expected error but did not get one")
+				} else {
+					t.Errorf("Unexpected error: %v", err)
+				}
+			}
+
+			updatedDeployment := &appsv1.Deployment{}
+			err = asr.Client.Get(context.TODO(), types.NamespacedName{Name: resourceName, Namespace: argocdcommon.TestNamespace}, updatedDeployment)
+			if err != nil {
+				t.Fatalf("Could not get updated Deployment: %v", err)
+			}
+			assert.Equal(t, testExpectedLabels, updatedDeployment.ObjectMeta.Labels)
+		})
+	}
+}
+
+func TestApplicationSetReconciler_DeleteDeployment(t *testing.T) {
+	ns := argocdcommon.MakeTestNamespace()
+	resourceName = argocdcommon.TestArgoCDName
+	tests := []struct {
+		name        string
+		setupClient func() *ApplicationSetReconciler
+		wantErr     bool
+	}{
+		{
+			name: "successful delete",
+			setupClient: func() *ApplicationSetReconciler {
+				return makeTestApplicationSetReconciler(t, ns)
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			nr := tt.setupClient()
+			if err := nr.DeleteDeployment(resourceName, ns.Name); (err != nil) != tt.wantErr {
+				if tt.wantErr {
+					t.Errorf("Expected error but did not get one")
+				} else {
+					t.Errorf("Unexpected error: %v", err)
+				}
+			}
+		})
+	}
+}

controllers/argocd/applicationset/util.go

@@ -11,7 +11,7 @@ import (
 func isMergable(extraArgs []string, cmd []string) error {
 	for _, arg := range extraArgs {
 		if len(arg) > 2 && arg[:2] == "--" && util.ContainsString(cmd, arg) {
-			return fmt.Errorf("Arg %s is already part of the default command arguments", arg)
+			return fmt.Errorf("arg %s is already part of the default command arguments", arg)
 		}
 	}
 	return nil