Add support for multiple application sources (#262)

Author: onematchfox

argocd/features.go

@@ -31,6 +31,7 @@ const (
 	featureApplicationHelmSkipCrds
 	featureExecLogsPolicy
 	featureProjectSourceNamespaces
+	featureMultipleApplicationSources
 )
 
 var featureVersionConstraintsMap = map[int]*semver.Version{
@@ -45,6 +46,7 @@ var featureVersionConstraintsMap = map[int]*semver.Version{
 	featureApplicationHelmSkipCrds:     semver.MustParse("2.3.0"),
 	featureExecLogsPolicy:              semver.MustParse("2.4.4"),
 	featureProjectSourceNamespaces:     semver.MustParse("2.5.0"),
+	featureMultipleApplicationSources:  semver.MustParse("2.6.3"), // Whilst the feature was introduced in 2.6.0 there was a bug that affects refresh of applications (and hence `wait` within this provider) that was only fixed in https://github.com/argoproj/argo-cd/pull/12576
 }
 
 type ServerInterface struct {

argocd/provider_test.go

@@ -1,10 +1,13 @@
 package argocd
 
 import (
+	"fmt"
 	"os"
 	"testing"
 
 	"github.com/Masterminds/semver"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -26,6 +29,26 @@ func TestProvider(t *testing.T) {
 	}
 }
 
+func TestProvider_headers(t *testing.T) {
+	t.Parallel()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf("%s %s", `
+                provider "argocd" {
+                    headers = [
+                        "Hello: HiThere",
+                    ]
+                }`, testAccArgoCDApplicationSimple(acctest.RandomWithPrefix("test-acc"), "9.4.1", false),
+				),
+			},
+		},
+	})
+}
+
 func testAccPreCheck(t *testing.T) {
 	if v := os.Getenv("ARGOCD_AUTH_USERNAME"); v == "" {
 		t.Fatal("ARGOCD_AUTH_USERNAME must be set for acceptance tests")

argocd/resource_argocd_application.go

@@ -181,6 +181,31 @@ func resourceArgoCDApplicationCreate(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
+	featureMultipleApplicationSourcesSupported, err := si.isFeatureSupported(featureMultipleApplicationSources)
+	if err != nil {
+		return []diag.Diagnostic{
+			{
+				Severity: diag.Error,
+				Summary:  "feature not supported",
+				Detail:   err.Error(),
+			},
+		}
+	} else if !featureMultipleApplicationSourcesSupported {
+		if len(spec.Sources) > 1 {
+			return []diag.Diagnostic{
+				{
+					Severity: diag.Error,
+					Summary: fmt.Sprintf(
+						"multiple application sources is only supported from ArgoCD %s onwards",
+						featureVersionConstraintsMap[featureMultipleApplicationSources].String()),
+				},
+			}
+		}
+
+		spec.Source = &spec.Sources[0]
+		spec.Sources = nil
+	}
+
 	featureApplicationHelmSkipCrdsSupported, err := si.isFeatureSupported(featureApplicationHelmSkipCrds)
 	if err != nil {
 		return []diag.Diagnostic{
@@ -410,6 +435,31 @@ func resourceArgoCDApplicationUpdate(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
+	featureMultipleApplicationSourcesSupported, err := si.isFeatureSupported(featureMultipleApplicationSources)
+	if err != nil {
+		return []diag.Diagnostic{
+			{
+				Severity: diag.Error,
+				Summary:  "feature not supported",
+				Detail:   err.Error(),
+			},
+		}
+	} else if !featureMultipleApplicationSourcesSupported {
+		if len(spec.Sources) > 1 {
+			return []diag.Diagnostic{
+				{
+					Severity: diag.Error,
+					Summary: fmt.Sprintf(
+						"multiple application sources is only supported from ArgoCD %s onwards",
+						featureVersionConstraintsMap[featureMultipleApplicationSources].String()),
+				},
+			}
+		}
+
+		spec.Source = &spec.Sources[0]
+		spec.Sources = nil
+	}
+
 	featureApplicationHelmSkipCrdsSupported, err := si.isFeatureSupported(featureApplicationHelmSkipCrds)
 	if err != nil {
 		return []diag.Diagnostic{