Fix

coder · mtojek · Mar 16, 2023 · Mar 16, 2023 · Mar 16, 2023 · Mar 16, 2023
commit fb82fd47797aa74b0047e76cc0209a4fb7e797fb
diff --git a/cli/create_test.go b/cli/create_test.go
@@ -650,6 +650,48 @@ func TestCreateValidateRichParameters(t *testing.T) {
 		}
 		<-doneChan
 	})
+
+	t.Run("ValidateListOfStrings_YAMLFile", func(t *testing.T) {
+		t.Parallel()
+
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(listOfStringsRichParameters))
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+
+		tempDir := t.TempDir()
+		removeTmpDirUntilSuccessAfterTest(t, tempDir)
+		parameterFile, _ := os.CreateTemp(tempDir, "testParameterFile*.yaml")
+		_, _ = parameterFile.WriteString(listOfStringsParameterName + `:
+  - ddd
+  - eee
+  - fff`)
+		cmd, root := clitest.New(t, "create", "my-workspace", "--template", template.Name, "--rich-parameter-file", parameterFile.Name())
+		clitest.SetupConfig(t, client, root)
+		doneChan := make(chan struct{})
+		pty := ptytest.New(t)
+		cmd.SetIn(pty.Input())
+		cmd.SetOut(pty.Output())
+		go func() {
+			defer close(doneChan)
+			err := cmd.Execute()
+			assert.NoError(t, err)
+		}()
+
+		matches := []string{
+			"Confirm create?", "yes",
+		}
+		for i := 0; i < len(matches); i += 2 {
+			match := matches[i]
+			value := matches[i+1]
+			pty.ExpectMatch(match)
+			if value != "" {
+				pty.WriteLine(value)
+			}
+		}
+		<-doneChan
+	})
 }
 
 func TestCreateWithGitAuth(t *testing.T) {

diff --git a/cli/parameter.go b/cli/parameter.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/json"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -15,19 +16,32 @@ import (
 // Throws an error if the file name is empty.
 func createParameterMapFromFile(parameterFile string) (map[string]string, error) {
 	if parameterFile != "" {
-		parameterMap := make(map[string]string)
-
 		parameterFileContents, err := os.ReadFile(parameterFile)
 		if err != nil {
 			return nil, err
 		}
 
-		err = yaml.Unmarshal(parameterFileContents, &parameterMap)
-
+		mapStringInterface := make(map[string]interface{})
+		err = yaml.Unmarshal(parameterFileContents, &mapStringInterface)
 		if err != nil {
 			return nil, err
 		}
 
+		parameterMap := map[string]string{}
+		for k, v := range mapStringInterface {
+			switch val := v.(type) {
+			case string:
+				parameterMap[k] = val
+			case []interface{}:
+				b, err := json.Marshal(&val)
+				if err != nil {
+					return nil, err
+				}
+				parameterMap[k] = string(b)
+			default:
+				return nil, xerrors.Errorf("invalid parameter type: %T", v)
+			}
+		}
 		return parameterMap, nil
 	}
 

diff --git a/cli/parameter_internal_test.go b/cli/parameter_internal_test.go
@@ -60,7 +60,7 @@ func TestCreateParameterMapFromFile(t *testing.T) {
 		parameterMapFromFile, err := createParameterMapFromFile(parameterFile.Name())
 
 		assert.Nil(t, parameterMapFromFile)
-		assert.EqualError(t, err, "yaml: unmarshal errors:\n  line 1: cannot unmarshal !!str `region ...` into map[string]string")
+		assert.EqualError(t, err, "yaml: unmarshal errors:\n  line 1: cannot unmarshal !!str `region ...` into map[string]interface {}")
 
 		removeTmpDirUntilSuccess(t, tempDir)
 	})