chore: test again Argo CD 3.1

Signed-off-by: Nathanael Liechti <[email protected]>

Author: the-technat

.devcontainer.json

@@ -18,7 +18,7 @@
     },
     // https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube
     "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
-      "version": "1.31.7"
+      "version": "1.31.9"
     },
     // https://github.com/rio/features/tree/main/src/kustomize
     "ghcr.io/rio/features/kustomize:1": {},

.github/workflows/tests.yml

@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.13.5", "v2.14.5", "v3.0.0"]
+        argocd_version: ["v2.14.5", "v3.0.0", "v3.1.0"]
         terraform_version: ["1.4.*"]
     steps:
       - name: Check out code

.run/Template Go Test.run.xml

@@ -11,7 +11,7 @@
       <env name="ARGOCD_AUTH_PASSWORD" value="acceptancetesting" />
       <env name="ARGOCD_CONTEXT" value="kind-argocd" />
       <env name="USE_TESTCONTAINERS" value="true" />
-      <env name="K3S_VERSION" value="v1.31.6-k3s1" />
+      <env name="K3S_VERSION" value="v1.31.9-k3s1" />
       <env name="TF_ACC" value="1" />
     </envs>
     <framework value="gotest" />

README.md

@@ -37,6 +37,7 @@ The following table shows the versions of Argo CD that are tested with each vers
 
 | Provider version | Argo CD versions |
 |---|---|
+| 7.11 | v2.14, v3.0, v3.1 | 
 | 7.7 | v2.13, v2.14, v3.0 | 
 | 7.5 | v2.12, v2.13, v2.14 | 
 | 7.4 | v2.11, v2.12, v2.13 | 

internal/provider/resource_repository_certificate_test.go

@@ -158,7 +158,7 @@ func TestAccArgoCDRepositoryCertificatesSSH_Invalid(t *testing.T) {
 					certSubType,
 					"",
 				),
-				ExpectError: regexp.MustCompile("Invalid hostname in request"),
+				ExpectError: regexp.MustCompile("invalid hostname in request"),
 			},
 			{
 				Config: testAccArgoCDRepositoryCertificatesSSH(
@@ -247,7 +247,7 @@ func TestAccArgoCDRepositoryCertificatesSSH_CannotUpdateExisting(t *testing.T) {
 					// github's
 					"AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==",
 				),
-				ExpectError: regexp.MustCompile("already exist and upsert was not specified"),
+				ExpectError: regexp.MustCompile("already exists, and upsert was not specified"),
 			},
 		},
 	})
@@ -265,7 +265,7 @@ func TestAccArgoCDRepositoryCertificatesSSH_CannotUpdateExisting_MultipleAtOnce(
 					// github's
 					"AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==",
 				),
-				ExpectError: regexp.MustCompile("already exist and upsert was not specified"),
+				ExpectError: regexp.MustCompile("already exists, and upsert was not specified"),
 			},
 		},
 	})

internal/testhelpers/suite.go

@@ -21,8 +21,8 @@ func TestMain(m *testing.M) {
 	envDefaultValue("ARGOCD_SERVER", "127.0.0.1:8080")
 	envDefaultValue("ARGOCD_INSECURE", "true")
 	envDefaultValue("USE_TESTCONTAINERS", "true")
-	envDefaultValue("K3S_VERSION", "v1.31.6-k3s1")
-	envDefaultValue("ARGOCD_VERSION", "v3.0.0")
+	envDefaultValue("K3S_VERSION", "v1.31.9-k3s1")
+	envDefaultValue("ARGOCD_VERSION", "v3.1.0")
 
 	if os.Getenv("USE_TESTCONTAINERS") == "true" {
 		os.Exit(runTestSuite(m))

kind-config.yml

@@ -4,8 +4,8 @@ kind: Cluster
 name: argocd
 nodes:
   - role: control-plane
-    # It seems that the latest .7 patch release is not available, use latest available one instead
-    image: kindest/node:v1.31.6
+    # It seems that the latest .11 patch release is not available, use latest available one instead
+    image: kindest/node:v1.31.9
     extraPortMappings:
       - containerPort: 30123
         hostPort: 8080

manifests/overlays/v3.1.0/kustomization.yml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: argocd
+resources:
+- https://raw.githubusercontent.com/argoproj/argo-cd/v3.1.0/manifests/install.yaml
+- ../../install
+components:
+  - ../../patches