Add compatiblity for "source_namespaces" introduced in ArgoCD v2.5.0

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.19
 
     - name: Import GPG key
       id: import_gpg

.github/workflows/tests.yml

@@ -14,12 +14,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.4.12", "v2.3.9"]
+        argocd_version: ["v2.5.0", "v2.4.12", "v2.3.9"]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.17
+          go-version: 1.19
         id: go
       - name: Restore Go cache
         uses: actions/cache@v1

README.md

@@ -363,10 +363,10 @@ make testacc_clean_env
 
 For example if you use Docker as your local container runtime:
 ```shell
-docker pull argoproj/argocd:v1.8.3
+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 bitnami/redis:6.2.5
+docker pull alpine:3
 ```
 
 #### Troubleshooting during local development

argocd/features.go

@@ -29,6 +29,7 @@ const (
 	featureRepositoryCertificates
 	featureApplicationHelmSkipCrds
 	featureExecLogsPolicy
+	featureProjectSourceNamespaces
 )
 
 var featureVersionConstraintsMap = map[int]*semver.Version{
@@ -41,6 +42,7 @@ var featureVersionConstraintsMap = map[int]*semver.Version{
 	featureRepositoryCertificates:      semver.MustParse("1.2.0"),
 	featureApplicationHelmSkipCrds:     semver.MustParse("2.3.0"),
 	featureExecLogsPolicy:              semver.MustParse("2.4.0"),
+	featureProjectSourceNamespaces:     semver.MustParse("2.5.0"),
 }
 
 type ServerInterface struct {

argocd/resource_argocd_application.go

@@ -27,7 +27,7 @@ func resourceArgoCDApplication() *schema.Resource {
 		},
 		Schema: map[string]*schema.Schema{
 			"metadata": metadataSchema("applications.argoproj.io"),
-			"spec":     applicationSpecSchemaV2(),
+			"spec":     applicationSpecSchemaV3(),
 			"wait": {
 				Type:        schema.TypeBool,
 				Description: "Upon application creation or update, wait for application health/sync status to be healthy/Synced, upon application deletion, wait for application to be removed, when set to true.",
@@ -41,7 +41,7 @@ func resourceArgoCDApplication() *schema.Resource {
 				Default:     true,
 			},
 		},
-		SchemaVersion: 2,
+		SchemaVersion: 3,
 		StateUpgraders: []schema.StateUpgrader{
 			{
 				Type:    resourceArgoCDApplicationV0().CoreConfigSchema().ImpliedType(),
@@ -53,6 +53,11 @@ func resourceArgoCDApplication() *schema.Resource {
 				Upgrade: resourceArgoCDApplicationStateUpgradeV1,
 				Version: 1,
 			},
+			{
+				Type:    resourceArgoCDApplicationV2().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceArgoCDApplicationStateUpgradeV2,
+				Version: 2,
+			},
 		},
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(5 * time.Minute),
@@ -79,7 +84,8 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 	}
 	c := *server.ApplicationClient
 	app, err := c.Get(ctx, &applicationClient.ApplicationQuery{
-		Name: &objectMeta.Name,
+		Name:         &objectMeta.Name,
+		AppNamespace: &objectMeta.Namespace,
 	})
 	if err != nil && !strings.Contains(err.Error(), "NotFound") {
 		return []diag.Diagnostic{
@@ -205,11 +211,14 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 			},
 		}
 	}
-	d.SetId(app.Name)
+
+	d.SetId(fmt.Sprintf("%s:%s", app.Name, objectMeta.Namespace))
+
 	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{
-				Name: &app.Name,
+				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))
@@ -246,10 +255,16 @@ func resourceArgoCDApplicationRead(ctx context.Context, d *schema.ResourceData,
 			},
 		}
 	}
+
 	c := *server.ApplicationClient
-	appName := d.Id()
+
+	ids := strings.Split(d.Id(), ":")
+	appName := ids[0]
+	namespace := ids[1]
+
 	app, err := c.Get(ctx, &applicationClient.ApplicationQuery{
-		Name: &appName,
+		Name:         &appName,
+		AppNamespace: &namespace,
 	})
 	if err != nil {
 		if strings.Contains(err.Error(), "NotFound") {
@@ -278,7 +293,9 @@ func resourceArgoCDApplicationRead(ctx context.Context, d *schema.ResourceData,
 }
 
 func resourceArgoCDApplicationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	appName := d.Id()
+	ids := strings.Split(d.Id(), ":")
+	appName := ids[0]
+	namespace := ids[1]
 	if ok := d.HasChanges("metadata", "spec"); ok {
 		objectMeta, spec, diags := expandApplication(d)
 		if diags != nil {
@@ -384,9 +401,9 @@ func resourceArgoCDApplicationUpdate(ctx context.Context, d *schema.ResourceData
 				}
 			}
 		}
-
 		app, err := c.Get(ctx, &applicationClient.ApplicationQuery{
-			Name: &appName,
+			Name:         &appName,
+			AppNamespace: &namespace,
 		})
 		if app != nil {
 			// Kubernetes API requires providing the up-to-date correct ResourceVersion for updates
@@ -406,7 +423,8 @@ 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,
+					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))
@@ -445,11 +463,14 @@ func resourceArgoCDApplicationDelete(ctx context.Context, d *schema.ResourceData
 		}
 	}
 	c := *server.ApplicationClient
-	appName := d.Id()
+	ids := strings.Split(d.Id(), ":")
+	appName := ids[0]
+	namespace := ids[1]
 	cascade := d.Get("cascade").(bool)
 	_, err := c.Delete(ctx, &applicationClient.ApplicationDeleteRequest{
-		Name:    &appName,
-		Cascade: &cascade,
+		Name:         &appName,
+		Cascade:      &cascade,
+		AppNamespace: &namespace,
 	})
 	if err != nil && !strings.Contains(err.Error(), "NotFound") {
 		return []diag.Diagnostic{
@@ -463,7 +484,8 @@ 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{
-				Name: &appName,
+				Name:         &appName,
+				AppNamespace: &namespace,
 			})
 			if err == nil {
 				return resource.RetryableError(fmt.Errorf("application %s is still present", appName))

argocd/resource_argocd_application_test.go

@@ -340,7 +340,8 @@ func TestAccArgoCDApplication_NoSyncPolicyBlock(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_Recurse(t *testing.T) {
@@ -419,7 +420,8 @@ func TestAccArgoCDApplication_Recurse(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_EmptySyncPolicyBlock(t *testing.T) {
@@ -444,7 +446,8 @@ func TestAccArgoCDApplication_EmptySyncPolicyBlock(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_NoAutomatedBlock(t *testing.T) {
@@ -469,7 +472,8 @@ func TestAccArgoCDApplication_NoAutomatedBlock(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_EmptyAutomatedBlock(t *testing.T) {
@@ -490,7 +494,8 @@ func TestAccArgoCDApplication_EmptyAutomatedBlock(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_OptionalPath(t *testing.T) {
@@ -542,7 +547,8 @@ func TestAccArgoCDApplication_OptionalPath(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_Info(t *testing.T) {
@@ -657,7 +663,8 @@ func TestAccArgoCDApplication_Info(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestProvider_headers(t *testing.T) {
@@ -746,7 +753,8 @@ func TestAccArgoCDApplication_SkipCrds_NotSupported_On_OlderVersions(t *testing.
 					),
 				),
 			},
-		}})
+		},
+	})
 }
 
 func TestAccArgoCDApplication_SkipCrds(t *testing.T) {
@@ -798,7 +806,34 @@ func TestAccArgoCDApplication_SkipCrds(t *testing.T) {
 					),
 				),
 			},
-		}})
+		},
+	})
+}
+
+func TestAccArgoCDApplication_CustomNamespace(t *testing.T) {
+	name := acctest.RandomWithPrefix("test-acc-custom-namespace")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, featureProjectSourceNamespaces) },
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArgoCDApplicationCustomNamespace(name),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"argocd_application.simple",
+						"metadata.0.uid",
+					),
+				),
+			},
+			{
+				ResourceName:            "argocd_application.simple",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"wait", "cascade"},
+			},
+		},
+	})
 }
 
 func testAccArgoCDApplicationSimple(name string) string {
@@ -1659,6 +1694,60 @@ resource "argocd_application" "crds" {
 	`, name)
 }
 
+func testAccArgoCDApplicationCustomNamespace(name string) string {
+	return fmt.Sprintf(`
+resource "argocd_project" "simple" {
+  metadata {
+    name      = "%[1]s"
+    namespace = "argocd"
+  }
+
+  spec {
+    description  = "project with source namespace"
+    source_repos = ["*"]
+    source_namespaces = ["mynamespace-1"]
+
+    destination {
+      server    = "https://kubernetes.default.svc"
+      namespace = "default"
+    }
+  }
+}
+
+resource "argocd_application" "simple" {
+  metadata {
+    name      = "%[1]s"
+    namespace = "mynamespace-1"
+  }
+
+  spec {
+    project = argocd_project.simple.metadata[0].name
+    source {
+      repo_url        = "https://charts.bitnami.com/bitnami"
+      chart           = "redis"
+      target_revision = "16.9.11"
+      helm {
+        parameter {
+          name  = "image.tag"
+          value = "6.2.5"
+        }
+        parameter {
+          name  = "architecture"
+          value = "standalone"
+        }
+        release_name = "testing"
+      }
+    }
+
+    destination {
+      server    = "https://kubernetes.default.svc"
+      namespace = "default"
+    }
+  }
+}
+	`, name)
+}
+
 func testAccSkipFeatureIgnoreDiffJQPathExpressions() (bool, error) {
 	p, _ := testAccProviders["argocd"]()
 	_ = p.Configure(context.Background(), &terraform.ResourceConfig{})

argocd/resource_argocd_project.go

@@ -95,6 +95,30 @@ func resourceArgoCDProjectCreate(ctx context.Context, d *schema.ResourceData, me
 		}
 	}
 
+	featureProjectSourceNamespacesSupported, err := server.isFeatureSupported(featureProjectSourceNamespaces)
+	if err != nil {
+		return []diag.Diagnostic{
+			{
+				Severity: diag.Error,
+				Summary:  "feature not supported",
+				Detail:   err.Error(),
+			},
+		}
+	}
+	if !featureProjectSourceNamespacesSupported {
+		_, sourceNamespacesOk := d.GetOk("spec.0.source_namespaces")
+		if sourceNamespacesOk {
+			return []diag.Diagnostic{
+				{
+					Severity: diag.Error,
+					Summary: fmt.Sprintf(
+						"project source_namespaces is only supported from ArgoCD %s onwards",
+						featureVersionConstraintsMap[featureProjectSourceNamespaces].String()),
+				},
+			}
+		}
+	}
+
 	tokenMutexProjectMap[projectName].Lock()
 	p, err = c.Create(ctx, &projectClient.ProjectCreateRequest{
 		Project: &application.AppProject{