feat: Make spec.source.helm.values field accepts either a string or a rawExtension

USERS.md

@@ -141,6 +141,7 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [Quipper](https://www.quipper.com/)
 1. [Recreation.gov](https://www.recreation.gov/)
 1. [Red Hat](https://www.redhat.com/)
+1. [Renault Group](https://www.renaultgroup.com/)
 1. [RightRev](https://rightrev.com/)
 1. [Rise](https://www.risecard.eu/)
 1. [Riskified](https://www.riskified.com/)
@@ -175,6 +176,7 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [Tiger Analytics](https://www.tigeranalytics.com/)
 1. [Tigera](https://www.tigera.io/)
 1. [Toss](https://toss.im/en)
+1. [Trendyol](https://www.trendyol.com/)
 1. [tru.ID](https://tru.id)
 1. [Twilio SendGrid](https://sendgrid.com)
 1. [tZERO](https://www.tzero.com/)
@@ -202,4 +204,3 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [Yubo](https://www.yubo.live/)
 1. [Zimpler](https://www.zimpler.com/)
 1. [ZOZO](https://corp.zozo.com/)
-1. [Trendyol](https://www.trendyol.com/)

assets/swagger.json

@@ -4946,8 +4946,7 @@
           }
         },
         "values": {
-          "type": "string",
-          "title": "Values specifies Helm values to be passed to helm template, typically defined as a block"
+          "$ref": "#/definitions/v1alpha1StringOrObject"
         },
         "version": {
           "type": "string",
@@ -6459,6 +6458,9 @@
         }
       }
     },
+    "v1alpha1StringOrObject": {
+      "description": "Either a string or an object"
+    },
     "v1alpha1SyncOperation": {
       "description": "SyncOperation contains details about a sync operation.",
       "type": "object",

cmd/argocd/commands/app.go

@@ -647,7 +647,7 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
 					}
 				}
 				if valuesLiteral {
-					app.Spec.Source.Helm.Values = ""
+					app.Spec.Source.Helm.Values = argoappv1.NewStringOrObjectFromString("")
 					updated = true
 				}
 				for _, valuesFile := range valuesFiles {

cmd/util/app.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/argoproj/gitops-engine/pkg/utils/kube"
-
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -74,6 +73,7 @@ type AppOptions struct {
 	retryBackoffDuration            time.Duration
 	retryBackoffMaxDuration         time.Duration
 	retryBackoffFactor              int64
+	valuesRaw                       string
 }
 
 func AddAppFlags(command *cobra.Command, opts *AppOptions) {
@@ -89,7 +89,8 @@ func AddAppFlags(command *cobra.Command, opts *AppOptions) {
 	command.Flags().StringArrayVarP(&opts.Parameters, "parameter", "p", []string{}, "set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)")
 	command.Flags().StringArrayVar(&opts.valuesFiles, "values", []string{}, "Helm values file(s) to use")
 	command.Flags().BoolVar(&opts.ignoreMissingValueFiles, "ignore-missing-value-files", false, "Ignore locally missing valueFiles when setting helm template --values")
-	command.Flags().StringVar(&opts.values, "values-literal-file", "", "Filename or URL to import as a literal Helm values block")
+	command.Flags().StringVar(&opts.values, "values-literal-file", "", "Filename or URL to import as a literal Helm values block (as a string)")
+	command.Flags().StringVar(&opts.valuesRaw, "values-raw-literal-file", "", "Filename or URL to import as a literal Helm values block (as a map)")
 	command.Flags().StringVar(&opts.releaseName, "release-name", "", "Helm release-name")
 	command.Flags().StringVar(&opts.helmVersion, "helm-version", "", "Helm version")
 	command.Flags().BoolVar(&opts.helmPassCredentials, "helm-pass-credentials", false, "Pass credentials to all domain")
@@ -152,17 +153,13 @@ func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
 		case "ignore-missing-value-files":
 			setHelmOpt(&spec.Source, helmOpts{ignoreMissingValueFiles: appOpts.ignoreMissingValueFiles})
 		case "values-literal-file":
-			var data []byte
-
-			// read uri
-			parsedURL, err := url.ParseRequestURI(appOpts.values)
-			if err != nil || !(parsedURL.Scheme == "http" || parsedURL.Scheme == "https") {
-				data, err = ioutil.ReadFile(appOpts.values)
-			} else {
-				data, err = config.ReadRemoteFile(appOpts.values)
-			}
+			data, err := getValuesFromRef(appOpts.values)
 			errors.CheckError(err)
 			setHelmOpt(&spec.Source, helmOpts{values: string(data)})
+		case "values-raw-literal-file":
+			data, err := getValuesFromRef(appOpts.valuesRaw)
+			errors.CheckError(err)
+			setHelmOpt(&spec.Source, helmOpts{valuesRaw: data})
 		case "release-name":
 			setHelmOpt(&spec.Source, helmOpts{releaseName: appOpts.releaseName})
 		case "helm-version":
@@ -316,6 +313,20 @@ func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
 	return visited
 }
 
+// getValuesFromRef gets values file contents, either from and http(s) source or from disk.
+func getValuesFromRef(valuesRef string) ([]byte, error) {
+	var data []byte
+
+	// read uri
+	parsedURL, err := url.ParseRequestURI(valuesRef)
+	if err != nil || !(parsedURL.Scheme == "http" || parsedURL.Scheme == "https") {
+		data, err = ioutil.ReadFile(valuesRef)
+	} else {
+		data, err = config.ReadRemoteFile(valuesRef)
+	}
+	return data, err
+}
+
 type kustomizeOpts struct {
 	namePrefix             string
 	nameSuffix             string
@@ -378,6 +389,7 @@ type helmOpts struct {
 	valueFiles              []string
 	ignoreMissingValueFiles bool
 	values                  string
+	valuesRaw               []byte
 	releaseName             string
 	version                 string
 	helmSets                []string
@@ -398,7 +410,13 @@ func setHelmOpt(src *argoappv1.ApplicationSource, opts helmOpts) {
 		src.Helm.IgnoreMissingValueFiles = opts.ignoreMissingValueFiles
 	}
 	if len(opts.values) > 0 {
-		src.Helm.Values = opts.values
+		src.Helm.Values.SetStringValue(opts.values)
+	}
+	if len(opts.valuesRaw) > 0 {
+		err := src.Helm.Values.SetYAMLValue(opts.valuesRaw)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
 	if opts.releaseName != "" {
 		src.Helm.ReleaseName = opts.releaseName

cmd/util/app_test.go

@@ -1,6 +1,8 @@
 package util
 
 import (
+	"github.com/ghodss/yaml"
+	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
 	"testing"
@@ -192,6 +194,102 @@ func Test_setAppSpecOptions(t *testing.T) {
 	})
 }
 
+var configMapUrl = "https://raw.githubusercontent.com/argoproj/argo-cd/db547567b9eafcba44e3df2883a40b8d03c71bf0/manifests/base/config/argocd-cm.yaml"
+var congigMapYaml = `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-cm
+  labels:
+    app.kubernetes.io/name: argocd-cm
+    app.kubernetes.io/part-of: argocd
+`
+
+func Test_setAppSpecOptions_valuesLiteralFile(t *testing.T) {
+	testCases := []struct{
+		name string
+		sourceUrl string
+		expectedYaml string
+	}{
+		{
+			name: "valid yaml",
+			sourceUrl: writeTempFile(t, "some: yaml"),
+			expectedYaml: "some: yaml",
+		},
+		{
+			name: "invalid yaml",
+			sourceUrl: writeTempFile(t, "{some invalid yaml"),
+			expectedYaml: "{some invalid yaml",
+		},
+		{
+			name:         "ConfigMap from URL",
+			sourceUrl:    configMapUrl,
+			expectedYaml: congigMapYaml,
+		},
+	}
+
+	for _, testCase := range testCases {
+		testCaseCopy := testCase
+
+		t.Run(testCaseCopy.name, func(t *testing.T) {
+			t.Parallel()
+
+			f := newAppOptionsFixture()
+			assert.NoError(t, f.SetFlag("values-literal-file", testCaseCopy.sourceUrl))
+			assert.Equal(t, testCaseCopy.expectedYaml, string(f.spec.Source.Helm.Values.YAML()))
+		})
+	}
+}
+
+func Test_setAppSpecOptions_valuesRawLiteralFile(t *testing.T) {
+	// Unmarshal and re-marshal so it's sorted.
+	var unmarshalledYaml interface{}
+	err := yaml.Unmarshal([]byte(congigMapYaml), &unmarshalledYaml)
+	require.NoError(t, err)
+	marshalledYaml, err := yaml.Marshal(unmarshalledYaml)
+	require.NoError(t, err)
+
+	testCases := []struct{
+		name string
+		sourceUrl string
+		expectedYaml string
+	}{
+		{
+			name: "valid yaml",
+			sourceUrl: writeTempFile(t, "some: yaml"),
+			expectedYaml: "some: yaml\n",
+		},
+		{
+			name:         "ConfigMap from URL",
+			sourceUrl:    configMapUrl,
+			expectedYaml: string(marshalledYaml),
+		},
+	}
+
+	for _, testCase := range testCases {
+		testCaseCopy := testCase
+
+		t.Run(testCaseCopy.name, func(t *testing.T) {
+			t.Parallel()
+
+			f := newAppOptionsFixture()
+			assert.NoError(t, f.SetFlag("values-raw-literal-file", testCaseCopy.sourceUrl))
+			assert.Equal(t, testCaseCopy.expectedYaml, string(f.spec.Source.Helm.Values.YAML()))
+		})
+	}
+}
+
+func writeTempFile(t *testing.T, contents string) string {
+	tempYaml, err := ioutil.TempFile(t.TempDir(), "")
+	require.NoError(t, err)
+	_, err = tempYaml.WriteString(contents)
+	require.NoError(t, err)
+	err = tempYaml.Sync()
+	require.NoError(t, err)
+	err = tempYaml.Close()
+	require.NoError(t, err)
+	return tempYaml.Name()
+}
+
 func Test_setAnnotations(t *testing.T) {
 	t.Run("Annotations", func(t *testing.T) {
 		app := v1alpha1.Application{}

docs/user-guide/commands/argocd_admin_app_generate-spec.md

@@ -88,7 +88,8 @@ argocd admin app generate-spec APPNAME [flags]
       --sync-retry-limit int                       Max number of allowed sync retries
       --validate                                   Validation of repo and cluster (default true)
       --values stringArray                         Helm values file(s) to use
-      --values-literal-file string                 Filename or URL to import as a literal Helm values block
+      --values-literal-file string                 Filename or URL to import as a literal Helm values block (as a string)
+      --values-raw-literal-file string             Filename or URL to import as a literal Helm values block (as a map)
 ```
 
 ### Options inherited from parent commands

docs/user-guide/commands/argocd_app_create.md

@@ -87,7 +87,8 @@ argocd app create APPNAME [flags]
       --upsert                                     Allows to override application with the same name even if supplied application spec is different from existing spec
       --validate                                   Validation of repo and cluster (default true)
       --values stringArray                         Helm values file(s) to use
-      --values-literal-file string                 Filename or URL to import as a literal Helm values block
+      --values-literal-file string                 Filename or URL to import as a literal Helm values block (as a string)
+      --values-raw-literal-file string             Filename or URL to import as a literal Helm values block (as a map)
 ```
 
 ### Options inherited from parent commands

docs/user-guide/commands/argocd_app_set.md

@@ -58,7 +58,8 @@ argocd app set APPNAME [flags]
       --sync-retry-limit int                       Max number of allowed sync retries
       --validate                                   Validation of repo and cluster (default true)
       --values stringArray                         Helm values file(s) to use
-      --values-literal-file string                 Filename or URL to import as a literal Helm values block
+      --values-literal-file string                 Filename or URL to import as a literal Helm values block (as a string)
+      --values-raw-literal-file string             Filename or URL to import as a literal Helm values block (as a map)
 ```
 
 ### Options inherited from parent commands

hack/generate-proto.sh

@@ -109,7 +109,12 @@ EOF
     rm -f "${SWAGGER_OUT}"
 
     find "${SWAGGER_ROOT}" -name '*.swagger.json' -exec swagger mixin -c "${EXPECTED_COLLISIONS}" "${PRIMARY_SWAGGER}" '{}' \+ > "${COMBINED_SWAGGER}"
-    jq -r 'del(.definitions[].properties[]? | select(."$ref"!=null and .description!=null).description) | del(.definitions[].properties[]? | select(."$ref"!=null and .title!=null).title)' "${COMBINED_SWAGGER}" > "${SWAGGER_OUT}"
+    jq -r 'del(.definitions[].properties[]? | select(."$ref"!=null and .description!=null).description) |
+           del(.definitions[].properties[]? | select(."$ref"!=null and .title!=null).title) |
+           del(.definitions.runtimeRawExtension) |
+           if .definitions.v1alpha1StringOrObject then .definitions.v1alpha1StringOrObject = {"description": "Either a string or an object"} else . end' \
+        "${COMBINED_SWAGGER}" > "${SWAGGER_OUT}"
+
 
     /bin/rm "${PRIMARY_SWAGGER}" "${COMBINED_SWAGGER}"
 }
@@ -121,7 +126,7 @@ clean_swagger() {
 }
 
 echo "If additional types are added, the number of expected collisions may need to be increased"
-EXPECTED_COLLISION_COUNT=62
+EXPECTED_COLLISION_COUNT=63
 collect_swagger server ${EXPECTED_COLLISION_COUNT}
 clean_swagger server
 clean_swagger reposerver