Add support for templatePatch (#499)

* fix test

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

* ran make generate

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

* fix tests by guarding the templatePatch behined a feature

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

* fix test in 2.9

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

---------

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

Author: KyriosGN0

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.9.3
+ARGOCD_VERSION?=v2.11.9
 
 export
 
@@ -39,4 +39,4 @@ testacc_prepare_env:
 clean:
 	git clean -fXd -e \!vendor -e \!vendor/**/* -e \!.vscode
 
-.PHONY: build install lint generate fmt test testacc testacc_clean_env testacc_prepare_env clean
+.PHONY: build install lint generate fmt test testacc testacc_clean_env testacc_prepare_env clean

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), si.IsFeatureSupported(features.ApplicationSetIgnoreApplicationDifferences))
+	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources), si.IsFeatureSupported(features.ApplicationSetIgnoreApplicationDifferences), si.IsFeatureSupported(features.ApplicationSetTemplatePatch))
 	if err != nil {
 		return errorToDiagnostics("failed to expand application set", err)
 	}
@@ -58,6 +58,10 @@ func resourceArgoCDApplicationSetCreate(ctx context.Context, d *schema.ResourceD
 		return featureNotSupported(features.ApplicationSetApplicationsSyncPolicy)
 	}
 
+	if !si.IsFeatureSupported(features.ApplicationSetTemplatePatch) && spec.TemplatePatch != nil {
+		return featureNotSupported(features.ApplicationSetTemplatePatch)
+	}
+
 	as, err := si.ApplicationSetClient.Create(ctx, &applicationset.ApplicationSetCreateRequest{
 		Applicationset: &application.ApplicationSet{
 			ObjectMeta: objectMeta,
@@ -126,7 +130,7 @@ func resourceArgoCDApplicationSetUpdate(ctx context.Context, d *schema.ResourceD
 		return nil
 	}
 
-	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources), si.IsFeatureSupported(features.ApplicationSetIgnoreApplicationDifferences))
+	objectMeta, spec, err := expandApplicationSet(d, si.IsFeatureSupported(features.MultipleApplicationSources), si.IsFeatureSupported(features.ApplicationSetIgnoreApplicationDifferences), si.IsFeatureSupported(features.ApplicationSetTemplatePatch))
 	if err != nil {
 		return errorToDiagnostics(fmt.Sprintf("failed to expand application set %s", d.Id()), err)
 	}