Fix support for application resource on latest versions of ArgoCD (#240)

Author: onematchfox

.github/workflows/tests.yml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.5.0", "v2.4.12", "v2.3.9"]
+        argocd_version: ["v2.4.0", "v2.4.28", "v2.5.0", "v2.5.16", "v2.6.0", "v2.6.7"]
     steps:
       - name: Check out code
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

GNUmakefile

@@ -5,7 +5,7 @@ ARGOCD_SERVER?=127.0.0.1:8080
 ARGOCD_AUTH_USERNAME?=admin
 ARGOCD_AUTH_PASSWORD?=acceptancetesting
 ARGOCD_CONTEXT?=kind-argocd
-ARGOCD_VERSION?=v2.5.0
+ARGOCD_VERSION?=v2.6.7
 
 export
 

README.md

@@ -103,18 +103,6 @@ make testacc
 make testacc_clean_env
 ```
 
-**Note:** to speed up testing environment setup, it is highly recommended you
-pull all needed container images into your local registry first, as the setup
-tries to sideload the images within the Kind cluster upon cluster creation.
-
-For example if you use Docker as your local container runtime:
-```shell
-docker pull quay.io/argoproj/argocd:v2.5.0
-docker pull ghcr.io/dexidp/dex:v2.27.0
-docker pull redis:6.2.4-alpine
-docker pull alpine:3
-```
-
 ### Generating documentation
 
 This provider uses [terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs/)

argocd/features.go

@@ -43,7 +43,7 @@ var featureVersionConstraintsMap = map[int]*semver.Version{
 	featureClusterMetadata:             semver.MustParse("2.2.0"),
 	featureRepositoryCertificates:      semver.MustParse("1.2.0"),
 	featureApplicationHelmSkipCrds:     semver.MustParse("2.3.0"),
-	featureExecLogsPolicy:              semver.MustParse("2.4.0"),
+	featureExecLogsPolicy:              semver.MustParse("2.4.4"),
 	featureProjectSourceNamespaces:     semver.MustParse("2.5.0"),
 }
 

argocd/resource_argocd_application.go

@@ -89,7 +89,7 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 		}
 	}
 	c := *server.ApplicationClient
-	app, err := c.Get(ctx, &applicationClient.ApplicationQuery{
+	apps, err := c.List(ctx, &applicationClient.ApplicationQuery{
 		Name:         &objectMeta.Name,
 		AppNamespace: &objectMeta.Namespace,
 	})
@@ -102,12 +102,22 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 			},
 		}
 	}
-	if app != nil {
-		switch app.DeletionTimestamp {
+	if apps != nil {
+		if len(apps.Items) != 1 {
+			return []diag.Diagnostic{
+				{
+					Severity: diag.Error,
+					Summary:  fmt.Sprintf("found multiple applications matching name '%s' and namespace '%s'", objectMeta.Name, objectMeta.Namespace),
+					Detail:   err.Error(),
+				},
+			}
+		}
+
+		switch apps.Items[0].DeletionTimestamp {
 		case nil:
 		default:
 			// Pre-existing app is still in Kubernetes soft deletion queue
-			time.Sleep(time.Duration(*app.DeletionGracePeriodSeconds))
+			time.Sleep(time.Duration(*apps.Items[0].DeletionGracePeriodSeconds))
 		}
 	}
 
@@ -190,7 +200,7 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
-	app, err = c.Create(ctx, &applicationClient.ApplicationCreateRequest{
+	app, err := c.Create(ctx, &applicationClient.ApplicationCreateRequest{
 		Application: &application.Application{
 			ObjectMeta: objectMeta,
 			Spec:       spec,
@@ -222,18 +232,21 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 
 	if wait, ok := d.GetOk("wait"); ok && wait.(bool) {
 		err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
-			a, err := c.Get(ctx, &applicationClient.ApplicationQuery{
+			list, err := c.List(ctx, &applicationClient.ApplicationQuery{
 				Name:         &app.Name,
 				AppNamespace: &app.Namespace,
 			})
 			if err != nil {
 				return resource.NonRetryableError(fmt.Errorf("error while waiting for application %s to be synced and healthy: %s", app.Name, err))
 			}
-			if a.Status.Health.Status != health.HealthStatusHealthy {
-				return resource.RetryableError(fmt.Errorf("expected application health status to be healthy but was %s", a.Status.Health.Status))
+			if len(list.Items) != 1 {
+				return resource.NonRetryableError(fmt.Errorf("found multiple applications matching name '%s' and namespace '%s'", app.Name, app.Namespace))
+			}
+			if list.Items[0].Status.Health.Status != health.HealthStatusHealthy {
+				return resource.RetryableError(fmt.Errorf("expected application health status to be healthy but was %s", list.Items[0].Status.Health.Status))
 			}
-			if a.Status.Sync.Status != application.SyncStatusCodeSynced {
-				return resource.RetryableError(fmt.Errorf("expected application sync status to be synced but was %s", a.Status.Sync.Status))
+			if list.Items[0].Status.Sync.Status != application.SyncStatusCodeSynced {
+				return resource.RetryableError(fmt.Errorf("expected application sync status to be synced but was %s", list.Items[0].Status.Sync.Status))
 			}
 			return nil
 		})
@@ -268,7 +281,7 @@ func resourceArgoCDApplicationRead(ctx context.Context, d *schema.ResourceData,
 	appName := ids[0]
 	namespace := ids[1]
 
-	app, err := c.Get(ctx, &applicationClient.ApplicationQuery{
+	apps, err := c.List(ctx, &applicationClient.ApplicationQuery{
 		Name:         &appName,
 		AppNamespace: &namespace,
 	})
@@ -285,7 +298,16 @@ func resourceArgoCDApplicationRead(ctx context.Context, d *schema.ResourceData,
 			},
 		}
 	}
-	err = flattenApplication(app, d)
+	if len(apps.Items) != 1 {
+		return []diag.Diagnostic{
+			{
+				Severity: diag.Error,
+				Summary:  fmt.Sprintf("found multiple applications matching name '%s' and namespace '%s'", appName, namespace),
+				Detail:   err.Error(),
+			},
+		}
+	}
+	err = flattenApplication(&apps.Items[0], d)
 	if err != nil {
 		return []diag.Diagnostic{
 			{
@@ -407,11 +429,11 @@ func resourceArgoCDApplicationUpdate(ctx context.Context, d *schema.ResourceData
 				}
 			}
 		}
-		app, err := c.Get(ctx, &applicationClient.ApplicationQuery{
+		apps, err := c.List(ctx, &applicationClient.ApplicationQuery{
 			Name:         &appName,
 			AppNamespace: &namespace,
 		})
-		if app != nil {
+		if apps != nil {
 			// Kubernetes API requires providing the up-to-date correct ResourceVersion for updates
 			// FIXME ResourceVersion not available anymore
 			// appRequest.ResourceVersion = app.ResourceVersion
@@ -428,18 +450,21 @@ func resourceArgoCDApplicationUpdate(ctx context.Context, d *schema.ResourceData
 		}
 		if wait, _ok := d.GetOk("wait"); _ok && wait.(bool) {
 			err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
-				a, err := c.Get(ctx, &applicationClient.ApplicationQuery{
-					Name:         &app.Name,
-					AppNamespace: &app.Namespace,
+				list, err := c.List(ctx, &applicationClient.ApplicationQuery{
+					Name:         &appName,
+					AppNamespace: &namespace,
 				})
 				if err != nil {
-					return resource.NonRetryableError(fmt.Errorf("error while waiting for application %s to be synced and healthy: %s", app.Name, err))
+					return resource.NonRetryableError(fmt.Errorf("error while waiting for application %s to be synced and healthy: %s", list.Items[0].Name, err))
+				}
+				if len(list.Items) != 1 {
+					return resource.NonRetryableError(fmt.Errorf("found multiple applications matching name '%s' and namespace '%s'", appName, namespace))
 				}
-				if a.Status.Health.Status != health.HealthStatusHealthy {
-					return resource.RetryableError(fmt.Errorf("expected application health status to be healthy but was %s", a.Status.Health.Status))
+				if list.Items[0].Status.Health.Status != health.HealthStatusHealthy {
+					return resource.RetryableError(fmt.Errorf("expected application health status to be healthy but was %s", list.Items[0].Status.Health.Status))
 				}
-				if a.Status.Sync.Status != application.SyncStatusCodeSynced {
-					return resource.RetryableError(fmt.Errorf("expected application sync status to be synced but was %s", a.Status.Sync.Status))
+				if list.Items[0].Status.Sync.Status != application.SyncStatusCodeSynced {
+					return resource.RetryableError(fmt.Errorf("expected application sync status to be synced but was %s", list.Items[0].Status.Sync.Status))
 				}
 				return nil
 			})
@@ -489,7 +514,7 @@ func resourceArgoCDApplicationDelete(ctx context.Context, d *schema.ResourceData
 	}
 	if wait, ok := d.GetOk("wait"); ok && wait.(bool) {
 		err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
-			_, err := c.Get(ctx, &applicationClient.ApplicationQuery{
+			_, err := c.List(ctx, &applicationClient.ApplicationQuery{
 				Name:         &appName,
 				AppNamespace: &namespace,
 			})

argocd/resource_argocd_cluster_test.go

@@ -34,7 +34,7 @@ func TestAccArgoCDCluster(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"argocd_cluster.simple",
 						"info.0.server_version",
-						"1.23",
+						"1.24",
 					),
 					resource.TestCheckResourceAttr(
 						"argocd_cluster.simple",
@@ -66,7 +66,7 @@ func TestAccArgoCDCluster(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"argocd_cluster.tls",
 						"info.0.server_version",
-						"1.23",
+						"1.24",
 					),
 					resource.TestCheckResourceAttr(
 						"argocd_cluster.tls",

scripts/testacc_prepare_env.sh

@@ -3,28 +3,39 @@
 
 export PATH=$PATH:.
 
+argocd_version=${ARGOCD_VERSION:-v2.6.7}
+k8s_version=${ARGOCD_KUBERNETES_VERSION:-v1.24.7}
+
 echo "\n--- Kustomize sanity checks\n"
 kustomize version || exit 1
 
 echo "\n--- Create Kind cluster\n"
-kind create cluster --name argocd --config scripts/kind-config.yml --image kindest/node:${ARGOCD_KUBERNETES_VERSION:-v1.23.12}
+kind create cluster --name argocd --config scripts/kind-config.yml --image kindest/node:$k8s_version
 
 echo "\n--- Kind sanity checks\n"
 kubectl get nodes -o wide
 kubectl get pods --all-namespaces -o wide
 kubectl get services --all-namespaces -o wide
 
-if [[ -z "${ARGOCD_CI}" ]]; then
-  echo "\n--- Load already available container images from local registry into Kind (local development only)\n"
-  kind load docker-image redis:6.2.4-alpine --name argocd
-  kind load docker-image ghcr.io/dexidp/dex:v2.27.0 --name argocd
-  kind load docker-image alpine:3 --name argocd
-  kind load docker-image quay.io/argoproj/argocd:${ARGOCD_VERSION:-v2.5.0} --name argocd
+echo "\n--- Fetch ArgoCD installation manifests\n"
+curl https://raw.githubusercontent.com/argoproj/argo-cd/$argocd_version/manifests/install.yaml > manifests/install/argocd.yml
+
+if [ -z "${ARGOCD_CI}" ]; then
+  echo "\n--- Load local container images from into Kind (local development only)\n"
+  docker pull quay.io/argoproj/argocd:$argocd_version
+  kind load docker-image quay.io/argoproj/argocd:$argocd_version --name argocd
+  
+  dex_version=$(cat manifests/install/argocd.yml| grep "image: ghcr.io/dexidp/dex" | cut -d":" -f3)
+  docker pull ghcr.io/dexidp/dex:$dex_version
+  kind load docker-image ghcr.io/dexidp/dex:$dex_version --name argocd
+  
+  redis_version=$(cat manifests/install/argocd.yml| grep "image: redis" | cut -d":" -f3)
+  docker pull redis:$redis_version
+  kind load docker-image redis:$redis_version --name argocd
 fi
 
-echo "\n--- Install ArgoCD ${ARGOCD_VERSION:-v2.5.0}\n"
-curl https://raw.githubusercontent.com/argoproj/argo-cd/${ARGOCD_VERSION:-v2.5.0}/manifests/install.yaml > manifests/install/argocd.yml && \
-  kustomize build manifests/install | kubectl apply -f - && \
+echo "\n--- Install ArgoCD $argocd_version\n"
+kustomize build manifests/install | kubectl apply -f - && \
   kubectl apply -f manifests/testdata/
 
 echo "\n--- Wait for ArgoCD components to be ready...\n"