Add applications sync to application set sync policies

GNUmakefile

@@ -4,7 +4,7 @@ ARGOCD_INSECURE?=true
 ARGOCD_SERVER?=127.0.0.1:8080
 ARGOCD_AUTH_USERNAME?=admin
 ARGOCD_AUTH_PASSWORD?=acceptancetesting
-ARGOCD_VERSION?=v2.7.1
+ARGOCD_VERSION?=v2.8.3
 
 export
 

argocd/resource_argocd_application_set.go

@@ -41,7 +41,7 @@ func resourceArgoCDApplicationSetCreate(ctx context.Context, d *schema.ResourceD
 		return featureNotSupported(features.ApplicationSet)
 	}
 
-	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources))
+	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources), si.IsFeatureSupported(features.ApplicationSetApplicationsSyncPolicy))
 	if err != nil {
 		return errorToDiagnostics("failed to expand application set", err)
 	}
@@ -118,7 +118,7 @@ func resourceArgoCDApplicationSetUpdate(ctx context.Context, d *schema.ResourceD
 		return nil
 	}
 
-	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources))
+	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources), si.IsFeatureSupported(features.ApplicationSetApplicationsSyncPolicy))
 	if err != nil {
 		return errorToDiagnostics(fmt.Sprintf("failed to expand application set %s", d.Id()), err)
 	}

argocd/resource_argocd_application_set_test.go

@@ -861,6 +861,43 @@ func TestAccArgoCDApplicationSet_syncPolicy(t *testing.T) {
 	})
 }
 
+func TestAccArgoCDApplicationSet_syncPolicyWithApplicationsSyncPolicy(t *testing.T) {
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccPreCheckFeatureSupported(t, features.ApplicationSetApplicationsSyncPolicy)
+		},
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArgoCDApplicationSet_syncPolicyWithApplicationsSync(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"argocd_application_set.applications_sync_policy",
+						"metadata.0.uid",
+					),
+					resource.TestCheckResourceAttr(
+						"argocd_application_set.applications_sync_policy",
+						"spec.0.sync_policy.0.preserve_resources_on_deletion",
+						"true",
+					),
+					resource.TestCheckResourceAttr(
+						"argocd_application_set.applications_sync_policy",
+						"spec.0.sync_policy.0.applications_sync",
+						"create-update",
+					),
+				),
+			},
+			{
+				ResourceName:            "argocd_application_set.applications_sync_policy",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"metadata.0.resource_version"},
+			},
+		},
+	})
+}
+
 func TestAccArgoCDApplicationSet_progressiveSync(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t); testAccPreCheckFeatureSupported(t, features.ApplicationSetProgressiveSync) },
@@ -2745,6 +2782,45 @@ resource "argocd_application_set" "sync_policy" {
 }`
 }
 
+func testAccArgoCDApplicationSet_syncPolicyWithApplicationsSync() string {
+	return `
+resource "argocd_application_set" "applications_sync_policy" {
+	metadata {
+		name = "applications-sync-policy"
+	}
+
+	spec {
+		generator {
+			clusters {} # Automatically use all clusters defined within Argo CD
+		}
+
+		sync_policy {
+			preserve_resources_on_deletion = true
+			applications_sync              = "create-update"
+		}
+
+		template {
+			metadata {
+				name = "appset-sync-policy-{{name}}"
+			}
+
+			spec {
+				source {
+					repo_url        = "https://github.com/argoproj/argocd-example-apps/"
+					target_revision = "HEAD"
+					path            = "guestbook"
+				}
+
+				destination {
+					server    = "{{server}}"
+					namespace = "default"
+				}
+			}
+		}
+	}
+}`
+}
+
 func testAccArgoCDApplicationSet_progressiveSync() string {
 	return `
 resource "argocd_application_set" "progressive_sync" {

argocd/schema_application_set.go

@@ -74,6 +74,11 @@ func applicationSetSpecSchemaV0() *schema.Schema {
 								Description: "Label selector used to narrow the scope of targeted clusters.",
 								Optional:    true,
 							},
+							"applications_sync": {
+								Type:        schema.TypeString,
+								Description: "Represents the policy applied on the generated applications. Possible values are create-only, create-update, create-delete, and sync.",
+								Optional:    true,
+							},
 						},
 					},
 				},

argocd/structure_application_set.go

@@ -12,14 +12,14 @@ import (
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func expandApplicationSet(d *schema.ResourceData, featureMultipleApplicationSourcesSupported bool) (metadata meta.ObjectMeta, spec application.ApplicationSetSpec, err error) {
+func expandApplicationSet(d *schema.ResourceData, featureMultipleApplicationSourcesSupported bool, featureApplicationSetApplicationsSyncPolicy bool) (metadata meta.ObjectMeta, spec application.ApplicationSetSpec, err error) {
 	metadata = expandMetadata(d)
-	spec, err = expandApplicationSetSpec(d, featureMultipleApplicationSourcesSupported)
+	spec, err = expandApplicationSetSpec(d, featureMultipleApplicationSourcesSupported, featureApplicationSetApplicationsSyncPolicy)
 
 	return
 }
 
-func expandApplicationSetSpec(d *schema.ResourceData, featureMultipleApplicationSourcesSupported bool) (spec application.ApplicationSetSpec, err error) {
+func expandApplicationSetSpec(d *schema.ResourceData, featureMultipleApplicationSourcesSupported bool, featureApplicationSetApplicationsSyncPolicy bool) (spec application.ApplicationSetSpec, err error) {
 	s := d.Get("spec.0").(map[string]interface{})
 
 	if v, ok := s["generator"].([]interface{}); ok && len(v) > 0 {
@@ -39,7 +39,7 @@ func expandApplicationSetSpec(d *schema.ResourceData, featureMultipleApplication
 	}
 
 	if v, ok := s["sync_policy"].([]interface{}); ok && len(v) > 0 {
-		spec.SyncPolicy = expandApplicationSetSyncPolicy(v[0].(map[string]interface{}))
+		spec.SyncPolicy = expandApplicationSetSyncPolicy(v[0].(map[string]interface{}), featureApplicationSetApplicationsSyncPolicy)
 	}
 
 	if v, ok := s["template"].([]interface{}); ok && len(v) > 0 {
@@ -768,10 +768,35 @@ func expandApplicationMatchExpressions(mes []interface{}) []application.Applicat
 	return asrss
 }
 
-func expandApplicationSetSyncPolicy(sp map[string]interface{}) *application.ApplicationSetSyncPolicy {
-	return &application.ApplicationSetSyncPolicy{
-		PreserveResourcesOnDeletion: sp["preserve_resources_on_deletion"].(bool),
+func expandApplicationSetSyncPolicyApplicationsSyncPolicy(p string) (asp application.ApplicationsSyncPolicy) {
+	switch {
+	case p == "create-only":
+		asp = application.ApplicationsSyncPolicyCreateOnly
+	case p == "create-update":
+		asp = application.ApplicationsSyncPolicyCreateUpdate
+	case p == "create-delete":
+		asp = application.ApplicationsSyncPolicyCreateDelete
+	case p == "sync":
+		asp = application.ApplicationsSyncPolicyCreateDelete
 	}
+
+	return asp
+}
+
+func expandApplicationSetSyncPolicy(sp map[string]interface{}, featureApplicationSetApplicationsSyncPolicy bool) (assp *application.ApplicationSetSyncPolicy) {
+	assp = &application.ApplicationSetSyncPolicy{}
+
+	if v, ok := sp["applications_sync"].(string); ok && len(v) > 0 && featureApplicationSetApplicationsSyncPolicy {
+		asp := expandApplicationSetSyncPolicyApplicationsSyncPolicy(v)
+
+		assp.ApplicationsSync = &asp
+	}
+
+	if v, ok := sp["preserve_resources_on_deletion"]; ok {
+		assp.PreserveResourcesOnDeletion = v.(bool)
+	}
+
+	return assp
 }
 
 func expandApplicationSetTemplate(temp interface{}, featureMultipleApplicationSourcesSupported bool) (template application.ApplicationSetTemplate, err error) {
@@ -1437,6 +1462,7 @@ func flattenApplicationMatchExpression(in []application.ApplicationMatchExpressi
 func flattenApplicationSetSyncPolicy(assp application.ApplicationSetSyncPolicy) []map[string]interface{} {
 	p := map[string]interface{}{
 		"preserve_resources_on_deletion": assp.PreserveResourcesOnDeletion,
+		"applications_sync":              assp.ApplicationsSync,
 	}
 
 	return []map[string]interface{}{p}

docs/resources/application_set.md

@@ -15568,4 +15568,5 @@ Optional:
 
 Optional:
 
+- `applications_sync` (String) Represents the policy applied on the generated applications. Possible values are create-only, create-update, create-delete, and sync.
 - `preserve_resources_on_deletion` (Boolean) Label selector used to narrow the scope of targeted clusters.