Mix testS

mtojek · mtojek · commit ae28cfef9ac6 · 2024-01-12T13:25:26.000+01:00
diff --git a/0 b/0
@@ -0,0 +1,15 @@
+: 1705060750:0;curl --http-proxy 103.48.69.113:83 ip.me
+: 1705060770:0;curl -x 103.48.69.113:83 ip.me
+: 1705060780:0;curl -x 223.247.46.182:8089\
+ ip.me
+: 1705060783:0;curl -x 223.247.46.182:8089 ip .me\
+ ip.me
+: 1705060786:0;curl -x 223.247.46.182:8089 ip.me\
+ ip.me
+: 1705060791:0;curl -x 223.247.46.182:8089 tojek.pl\
+ ip.me
+: 1705060799:0;curl -x 134.122.5.111:48978 tojek.pl
+: 1705060807:0;curl -x 193.56.255.181:3128 tojek.pl
+: 1705060813:0;curl -x 210.200.169.134:33333 tojek.pl
+: 1705062310:0;gss
+: 1705062312:0;git add --all
diff --git a/cli/templatevariables.go b/cli/templatevariables.go
@@ -267,5 +267,8 @@ func combineVariableValues(valuesSets ...[]codersdk.VariableValue) []codersdk.Va
 		result = append(result, codersdk.VariableValue{Name: name, Value: value})
 	}
 
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Name < result[j].Name
+	})
 	return result
 }
diff --git a/cli/templatevariables_test.go b/cli/templatevariables_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/cli"
+	"github.com/coder/coder/v2/codersdk"
 )
 
 func TestDiscoverVarsFiles(t *testing.T) {
@@ -60,3 +61,56 @@ func TestDiscoverVarsFiles(t *testing.T) {
 	}
 	require.EqualValues(t, expected, found)
 }
+
+func TestParseVariableValuesFromVarsFiles(t *testing.T) {
+	t.Parallel()
+
+	// Given
+	const (
+		hclFilename1  = "file1.tfvars"
+		hclFilename2  = "file2.tfvars"
+		jsonFilename3 = "file3.tfvars.json"
+		jsonFilename4 = "file4.tfvars.json"
+
+		hclContent1 = `region = "us-east-1"
+cores = 2`
+		hclContent2 = `region = "us-west-2"
+go_image = ["1.19","1.20","1.21"]`
+		jsonContent3 = `{"cat": "foobar", "cores": 3}`
+		jsonContent4 = `{"dog": 4, "go_image": "[\"1.19\",\"1.20\"]"}`
+	)
+
+	// Prepare the .tfvars files
+	tempDir, err := os.MkdirTemp(os.TempDir(), "test-parse-variable-values-from-vars-files-*")
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		_ = os.RemoveAll(tempDir)
+	})
+
+	err = os.WriteFile(filepath.Join(tempDir, hclFilename1), []byte(hclContent1), 0o600)
+	require.NoError(t, err)
+	err = os.WriteFile(filepath.Join(tempDir, hclFilename2), []byte(hclContent2), 0o600)
+	require.NoError(t, err)
+	err = os.WriteFile(filepath.Join(tempDir, jsonFilename3), []byte(jsonContent3), 0o600)
+	require.NoError(t, err)
+	err = os.WriteFile(filepath.Join(tempDir, jsonFilename4), []byte(jsonContent4), 0o600)
+	require.NoError(t, err)
+
+	// When
+	actual, err := cli.ParseUserVariableValues([]string{
+		filepath.Join(tempDir, hclFilename1),
+		filepath.Join(tempDir, hclFilename2),
+		filepath.Join(tempDir, jsonFilename3),
+		filepath.Join(tempDir, jsonFilename4),
+	}, "", nil)
+	require.NoError(t, err)
+
+	// Then
+	expected := []codersdk.VariableValue{
+		{Name: "cat", Value: "foobar"},
+		{Name: "cores", Value: "3"},
+		{Name: "dog", Value: "4"},
+		{Name: "go_image", Value: "[\"1.19\",\"1.20\"]"},
+		{Name: "region", Value: "us-west-2"}}
+	require.Equal(t, expected, actual)
+}

Original file line number	Diff line number	Diff line change
`@@ -267,5 +267,8 @@ func combineVariableValues(valuesSets ...[]codersdk.VariableValue) []codersdk.Va`
`267`	`267`	`result = append(result, codersdk.VariableValue{Name: name, Value: value})`
`268`	`268`	`}`
`269`	`269`
	`270`	`+ sort.Slice(result, func(i, j int) bool {`
	`271`	`+ return result[i].Name < result[j].Name`
	`272`	`+ })`
`270`	`273`	`return result`
`271`	`274`	`}`