Add support for include and exclude on directory apps (#254)

Author: onematchfox

argocd/resource_argocd_application_test.go

@@ -442,6 +442,38 @@ func TestAccArgoCDApplication_Recurse(t *testing.T) {
 	})
 }
 
+func TestAccArgoCDApplication__DirectoryIncludeExclude(t *testing.T) {
+	name := acctest.RandomWithPrefix("test-acc")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArgoCDApplication_DirectoryIncludeExclude(name),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"argocd_application.directory",
+						"spec.0.source.0.directory.0.include",
+						"*.yaml",
+					),
+					resource.TestCheckResourceAttr(
+						"argocd_application.directory",
+						"spec.0.source.0.directory.0.exclude",
+						"config.yaml",
+					),
+				),
+			},
+			{
+				ResourceName:            "argocd_application.directory",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"wait", "cascade", "metadata.0.generation", "metadata.0.resource_version"},
+			},
+		},
+	})
+}
+
 func TestAccArgoCDApplication_EmptySyncPolicyBlock(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -1216,6 +1248,38 @@ resource "argocd_application" "directory" {
 	`, name, strconv.FormatBool(recurse))
 }
 
+func testAccArgoCDApplication_DirectoryIncludeExclude(name string) string {
+	return fmt.Sprintf(`
+resource "argocd_application" "directory" {
+  metadata {
+    name      = "%s"
+    namespace = "argocd"
+    labels = {
+      acceptance = "true"
+    }
+  }
+
+  spec {
+    source {
+      repo_url        = "https://github.com/argoproj/argocd-example-apps"
+      path            = "guestbook"
+      target_revision = "HEAD"
+      directory {
+        recurse = true
+		exclude = "config.yaml"
+		include = "*.yaml"
+      }
+    }
+
+    destination {
+      server    = "https://kubernetes.default.svc"
+      namespace = "default"
+    }
+  }
+}
+	`, name)
+}
+
 func testAccArgoCDApplicationSyncPolicy(name string) string {
 	return fmt.Sprintf(`
 resource "argocd_application" "sync_policy" {

argocd/schema_application.go

@@ -1496,6 +1496,16 @@ func applicationSpecSchemaV4() *schema.Schema {
 												},
 											},
 										},
+										"exclude": {
+											Type:        schema.TypeString,
+											Description: "Glob pattern to match paths against that should be explicitly excluded from being used during manifest generation. This takes precedence over the `include` field. To match multiple patterns, wrap the patterns in {} and separate them with commas. For example: '{config.yaml,env-use2/*}'",
+											Optional:    true,
+										},
+										"include": {
+											Type:        schema.TypeString,
+											Description: "Glob pattern to match paths against that should be explicitly included during manifest generation. If this field is set, only matching manifests will be included. To match multiple patterns, wrap the patterns in {} and separate them with commas. For example: '{*.yml,*.yaml}'",
+											Optional:    true,
+										},
 									},
 								},
 							},

argocd/structure_application.go

@@ -141,6 +141,14 @@ func expandApplicationSourceDirectory(in []interface{}) *application.Application
 		result.Recurse = v.(bool)
 	}
 
+	if v, ok := a["exclude"]; ok {
+		result.Exclude = v.(string)
+	}
+
+	if v, ok := a["include"]; ok {
+		result.Include = v.(string)
+	}
+
 	if aj, ok := a["jsonnet"].([]interface{}); ok {
 		jsonnet := application.ApplicationSourceJsonnet{}
 
@@ -672,6 +680,8 @@ func flattenApplicationSourceDirectory(as []*application.ApplicationSourceDirect
 
 			m := make(map[string]interface{})
 			m["recurse"] = a.Recurse
+			m["exclude"] = a.Exclude
+			m["include"] = a.Include
 
 			if len(jsonnet) > 0 {
 				m["jsonnet"] = []map[string][]interface{}{jsonnet}

docs/resources/application.md

@@ -219,6 +219,8 @@ Optional:
 
 Optional:
 
+- `exclude` (String) Glob pattern to match paths against that should be explicitly excluded from being used during manifest generation. This takes precedence over the `include` field. To match multiple patterns, wrap the patterns in {} and separate them with commas. For example: '{config.yaml,env-use2/*}'
+- `include` (String) Glob pattern to match paths against that should be explicitly included during manifest generation. If this field is set, only matching manifests will be included. To match multiple patterns, wrap the patterns in {} and separate them with commas. For example: '{*.yml,*.yaml}'
 - `jsonnet` (Block List, Max: 1) Jsonnet specific options. (see [below for nested schema](#nestedblock--spec--source--directory--jsonnet))
 - `recurse` (Boolean) Whether to scan a directory recursively for manifests.