feat(argocd_application): add support for Helm file parameters (#293)

Author: onematchfox

argocd/resource_argocd_application_test.go

@@ -135,6 +135,20 @@ ingress:
 	})
 }
 
+func TestAccArgoCDApplication_Helm_FileParameters(t *testing.T) {
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArgoCDApplicationHelm_FileParameters(acctest.RandomWithPrefix("test-acc")),
+				// Setting up tests for this is non-trivial so it is easier to test for an expected failure (since file does not exist) than to test for success
+				ExpectError: regexp.MustCompile(`(?s)Error: failed parsing.*--set-file data`),
+			},
+		},
+	})
+}
+
 func TestAccArgoCDApplication_Kustomize(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -1127,6 +1141,41 @@ EOT
 	`, name, helmValues)
 }
 
+func testAccArgoCDApplicationHelm_FileParameters(name string) string {
+	return fmt.Sprintf(`
+resource "argocd_application" "helm_file_parameters" {
+	metadata {
+		name      = "%[1]s"
+		namespace = "argocd"
+	}
+
+	spec {
+		source {
+			repo_url        = "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
+			chart           = "redis"
+			target_revision = "16.9.11"
+
+			helm {
+				release_name = "testing"
+				file_parameter {
+					name = "foo"
+					path = "does-not-exist.txt"
+				}
+			}
+		}
+
+		sync_policy {
+			sync_options = ["CreateNamespace=true"]
+		}
+
+		destination {
+			server    = "https://kubernetes.default.svc"
+			namespace = "%[1]s"
+		}
+	}
+}`, name)
+}
+
 func testAccArgoCDApplicationKustomize(name string) string {
 	return fmt.Sprintf(`
 resource "argocd_application" "kustomize" {

argocd/schema_application.go

@@ -1354,6 +1354,25 @@ func applicationSpecSchemaV4(allOptional bool) *schema.Schema {
 												},
 											},
 										},
+										"file_parameter": {
+											Type:        schema.TypeSet,
+											Description: "File parameters for the helm template.",
+											Optional:    true,
+											Elem: &schema.Resource{
+												Schema: map[string]*schema.Schema{
+													"name": {
+														Type:        schema.TypeString,
+														Description: "Name of the Helm parameter.",
+														Required:    true,
+													},
+													"path": {
+														Type:        schema.TypeString,
+														Description: "Path to the file containing the values for the Helm parameter.",
+														Required:    true,
+													},
+												},
+											},
+										},
 										"release_name": {
 											Type:        schema.TypeString,
 											Description: "Helm release name. If omitted it will use the application name.",

argocd/structure_application.go

@@ -289,6 +289,24 @@ func expandApplicationSourceHelm(in []interface{}) *application.ApplicationSourc
 		}
 	}
 
+	if fileParameters, ok := a["file_parameter"]; ok {
+		for _, _p := range fileParameters.(*schema.Set).List() {
+			p := _p.(map[string]interface{})
+
+			parameter := application.HelmFileParameter{}
+
+			if v, ok := p["name"]; ok {
+				parameter.Name = v.(string)
+			}
+
+			if v, ok := p["path"]; ok {
+				parameter.Path = v.(string)
+			}
+
+			result.FileParameters = append(result.FileParameters, parameter)
+		}
+	}
+
 	if v, ok := a["skip_crds"]; ok {
 		result.SkipCrds = v.(bool)
 	}
@@ -726,8 +744,17 @@ func flattenApplicationSourceHelm(as []*application.ApplicationSourceHelm) (resu
 				})
 			}
 
+			var fileParameters []map[string]interface{}
+			for _, p := range a.FileParameters {
+				fileParameters = append(fileParameters, map[string]interface{}{
+					"name": p.Name,
+					"path": p.Path,
+				})
+			}
+
 			result = append(result, map[string]interface{}{
 				"parameter":                  parameters,
+				"file_parameter":             fileParameters,
 				"release_name":               a.ReleaseName,
 				"skip_crds":                  a.SkipCrds,
 				"value_files":                a.ValueFiles,
@@ -738,7 +765,7 @@ func flattenApplicationSourceHelm(as []*application.ApplicationSourceHelm) (resu
 		}
 	}
 
-	return
+	return result
 }
 
 func flattenApplicationDestinations(ds []application.ApplicationDestination) (result []map[string]string) {

docs/resources/application.md

@@ -290,6 +290,7 @@ Optional:
 
 Optional:
 
+- `file_parameter` (Block Set) File parameters for the helm template. (see [below for nested schema](#nestedblock--spec--source--helm--file_parameter))
 - `ignore_missing_value_files` (Boolean) Prevents 'helm template' from failing when `value_files` do not exist locally by not appending them to 'helm template --values'.
 - `parameter` (Block Set) Helm parameters which are passed to the helm template command upon manifest generation. (see [below for nested schema](#nestedblock--spec--source--helm--parameter))
 - `pass_credentials` (Boolean) If true then adds '--pass-credentials' to Helm commands to pass credentials to all domains.
@@ -298,6 +299,15 @@ Optional:
 - `value_files` (List of String) List of Helm value files to use when generating a template.
 - `values` (String) Helm values to be passed to 'helm template', typically defined as a block.
 
+<a id="nestedblock--spec--source--helm--file_parameter"></a>
+### Nested Schema for `spec.source.helm.file_parameter`
+
+Required:
+
+- `name` (String) Name of the Helm parameter.
+- `path` (String) Path to the file containing the values for the Helm parameter.
+
+
 <a id="nestedblock--spec--source--helm--parameter"></a>
 ### Nested Schema for `spec.source.helm.parameter`