Addressing review comments

Signed-off-by: Varsha B <[email protected]>

tests/k8s/1-046_validate_impersonation_cluster_scoped_instance/03-assert.yaml

@@ -1,24 +1,24 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
+apiVersion: v1
+kind: Namespace
 metadata:
   name: guestbook
-  namespace: argocd-test-impersonation
-spec:
-  destination:
-    namespace: guestbook
-    server: 'https://kubernetes.default.svc'
-  project: guestbook-proj
-  source:
-    directory:
-      jsonnet: {}
-      recurse: true
-    path: guestbook
-    repoURL: 'https://github.com/argoproj/argocd-example-apps'
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - ServerSideApply=true
-      - CreateNamespace=true
-status:
-  sync:
-    status: OutOfSync
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: guestbook-deployer
+  namespace: guestbook
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: guestbook-deployer-rb
+  namespace: guestbook
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: guestbook-deployer
+  namespace: guestbook

tests/k8s/1-046_validate_impersonation_cluster_scoped_instance/05-assert.yaml

@@ -1,24 +1,44 @@
-apiVersion: v1
-kind: Namespace
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
 metadata:
-  name: guestbook
+  name: guestbook-proj
+  namespace: argocd-test-impersonation
+spec:
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
+  destinationServiceAccounts:
+    - defaultServiceAccount: guestbook-deployer
+      namespace: guestbook
+      server: 'https://kubernetes.default.svc'
+  destinations:
+    - namespace: guestbook
+      server: 'https://kubernetes.default.svc'
+    - namespace: guestbook-dev
+      server: 'https://kubernetes.default.svc'
+  sourceRepos:
+    - 'https://github.com/argoproj/argocd-example-apps.git'
 ---
-apiVersion: v1
-kind: ServiceAccount
+apiVersion: argoproj.io/v1alpha1
+kind: Application
 metadata:
-  name: guestbook-deployer
-  namespace: guestbook
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: guestbook-deployer-rb
-  namespace: guestbook
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-- kind: ServiceAccount
-  name: guestbook-deployer
-  namespace: guestbook
+  name: guestbook-dev
+  namespace: argocd-test-impersonation
+spec:
+  destination:
+    namespace: guestbook-dev
+    server: 'https://kubernetes.default.svc'
+  project: guestbook-proj
+  source:
+    directory:
+      jsonnet: {}
+      recurse: true
+    path: guestbook
+    repoURL: 'https://github.com/argoproj/argocd-example-apps'
+  syncPolicy:
+    automated: {}
+    syncOptions:
+      - ServerSideApply=true
+status:
+  health:
+    status: Missing

tests/k8s/1-046_validate_impersonation_cluster_scoped_instance/08-errors.yaml → tests/k8s/1-046_validate_impersonation_cluster_scoped_instance/05-errors.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: guestbook-deployer
-  namespace: argocd-test-impersonation
+  namespace: guestbook-dev

tests/k8s/1-046_validate_impersonation_cluster_scoped_instance/09-check-app.yaml → tests/k8s/1-046_validate_impersonation_cluster_scoped_instance/06-check-app.yaml

@@ -5,6 +5,8 @@ commands:
     error_message=$(kubectl get app guestbook-dev -n argocd-test-impersonation -o jsonpath='{.status.operationState.message}')
     expected_error="failed to find a matching service account to impersonate: no matching service account found for destination server https://kubernetes.default.svc and namespace guestbook-dev"
 
-    if ! [[ ${error_message} =~ ${expected_error} ]]; then
+    if [[ "${error_message}" =~ "${expected_error}" ]]; then 
+      exit 0
+    else
       exit 1
     fi

tests/k8s/1-047_validate_impersonation_namespace_scoped_instance/06-create-app.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:

tests/k8s/1-047_validate_impersonation_namespace_scoped_instance/06-errors.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: guestbook-deployer
-  namespace: argocd-test-ns-scoped
+  namespace: guestbook-dev

tests/k8s/1-047_validate_impersonation_namespace_scoped_instance/07-check-app.yaml

@@ -5,6 +5,8 @@ commands:
     error_message=$(kubectl get app guestbook-dev -n argocd-test-ns-scoped -o jsonpath='{.status.operationState.message}')
     expected_error="failed to find a matching service account to impersonate: no matching service account found for destination server https://kubernetes.default.svc and namespace guestbook-dev"
 
-    if ! [[ ${error_message} =~ ${expected_error} ]]; then
+    if [[ "${error_message}" =~ "${expected_error}" ]]; then 
+      exit 0
+    else
       exit 1
     fi