feat: Support ApplicationSets in any Namespace (#636)

Signed-off-by: VerhovnikU <[email protected]>

Author: VerhovnikU

argocd/resource_argocd_application_set.go

@@ -83,7 +83,7 @@ func resourceArgoCDApplicationSetCreate(ctx context.Context, d *schema.ResourceD
 		}
 	}
 
-	d.SetId(as.Name)
+	d.SetId(fmt.Sprintf("%s:%s", as.Name, objectMeta.Namespace))
 
 	return resourceArgoCDApplicationSetRead(ctx, d, meta)
 }
@@ -94,23 +94,26 @@ func resourceArgoCDApplicationSetRead(ctx context.Context, d *schema.ResourceDat
 		return pluginSDKDiags(diags)
 	}
 
-	name := d.Id()
+	ids := strings.Split(d.Id(), ":")
+	appSetName := ids[0]
+	namespace := ids[1]
 
 	appSet, err := si.ApplicationSetClient.Get(ctx, &applicationset.ApplicationSetGetQuery{
-		Name: name,
+		Name:            appSetName,
+		AppsetNamespace: namespace,
 	})
 	if err != nil {
 		if strings.Contains(err.Error(), "NotFound") {
 			d.SetId("")
 			return diag.Diagnostics{}
 		}
 
-		return argoCDAPIError("read", "application set", name, err)
+		return argoCDAPIError("read", "application set", appSetName, err)
 	}
 
 	err = flattenApplicationSet(appSet, d)
 	if err != nil {
-		return errorToDiagnostics(fmt.Sprintf("failed to flatten application set %s", name), err)
+		return errorToDiagnostics(fmt.Sprintf("failed to flatten application set %s", appSetName), err)
 	}
 
 	return nil
@@ -172,12 +175,15 @@ func resourceArgoCDApplicationSetDelete(ctx context.Context, d *schema.ResourceD
 		return pluginSDKDiags(diags)
 	}
 
-	_, err := si.ApplicationSetClient.Delete(ctx, &applicationset.ApplicationSetDeleteRequest{
-		Name: d.Id(),
-	})
+	ids := strings.Split(d.Id(), ":")
+	appSetName := ids[0]
+	namespace := ids[1]
 
-	if err != nil && !strings.Contains(err.Error(), "NotFound") {
-		return argoCDAPIError("delete", "application set", d.Id(), err)
+	if _, err := si.ApplicationSetClient.Delete(ctx, &applicationset.ApplicationSetDeleteRequest{
+		Name:            appSetName,
+		AppsetNamespace: namespace,
+	}); err != nil && !strings.Contains(err.Error(), "NotFound") {
+		return argoCDAPIError("delete", "application set", appSetName, err)
 	}
 
 	d.SetId("")

argocd/resource_argocd_application_set_test.go

@@ -1,10 +1,12 @@
 package argocd
 
 import (
+	"fmt"
 	"regexp"
 	"testing"
 
 	"github.com/argoproj-labs/terraform-provider-argocd/internal/features"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
@@ -1042,6 +1044,32 @@ func TestAccArgoCDApplicationSet_templatePatch(t *testing.T) {
 	})
 }
 
+func TestAccArgoCDApplicationSet_CustomNamespace(t *testing.T) {
+	name := acctest.RandomWithPrefix("appset-ns")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ApplicationSet) },
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArgoCDApplicationSetCustomNamespace(name),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.custom_namespace",
+						"metadata.0.uid",
+					),
+				),
+			},
+			{
+				ResourceName:            "argocd_application_set.custom_namespace",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"wait", "cascade", "status", "validate"},
+			},
+		},
+	})
+}
+
 func testAccArgoCDApplicationSet_clusters() string {
 	return `
 resource "argocd_application_set" "clusters" {
@@ -3202,3 +3230,74 @@ resource "argocd_application_set" "template_patch" {
   }
 }`
 }
+
+func testAccArgoCDApplicationSetCustomNamespace(name string) string {
+	return fmt.Sprintf(`
+resource "argocd_project" "custom_namespace" {
+  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_set" "custom_namespace" {
+  metadata {
+    name      = "%[1]s"
+    namespace = "mynamespace-1"
+  }
+
+  spec {
+    generator {
+      list {
+        elements = [
+          {
+            cluster = "in-cluster"
+          }
+        ]
+      }
+    }
+
+    template {
+      metadata {
+        name = "test"
+      }
+      spec {
+		project = argocd_project.custom_namespace.metadata[0].name
+		source {
+		  repo_url        = "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/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 = "mynamespace-1"
+	    }
+	  }
+    }
+  }
+}
+`, name)
+}

manifests/install/cluster-rbac.yml

@@ -16,6 +16,7 @@ rules:
       - argoproj.io
     resources:
       - applications
+      - applicationsets
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

manifests/install/patches/argocd-cmd-params-cm.yml

@@ -4,3 +4,5 @@ metadata:
   name: argocd-cmd-params-cm
 data:
   application.namespaces: mynamespace-*
+  applicationsetcontroller.enable.scm.providers: "false"
+  applicationsetcontroller.namespaces: "*"