fix expected/actual order

options_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/coder/envbuilder"
 	"github.com/coder/serpent"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -104,36 +105,36 @@ func TestLegacyEnvVars(t *testing.T) {
 
 	o := runCLI()
 
-	require.Equal(t, o.SetupScript, legacyEnvs["SETUP_SCRIPT"])
-	require.Equal(t, o.InitScript, legacyEnvs["INIT_SCRIPT"])
-	require.Equal(t, o.InitCommand, legacyEnvs["INIT_COMMAND"])
-	require.Equal(t, o.InitArgs, legacyEnvs["INIT_ARGS"])
-	require.Equal(t, o.CacheRepo, legacyEnvs["CACHE_REPO"])
-	require.Equal(t, o.BaseImageCacheDir, legacyEnvs["BASE_IMAGE_CACHE_DIR"])
-	require.Equal(t, o.LayerCacheDir, legacyEnvs["LAYER_CACHE_DIR"])
-	require.Equal(t, o.DevcontainerDir, legacyEnvs["DEVCONTAINER_DIR"])
-	require.Equal(t, o.DevcontainerJSONPath, legacyEnvs["DEVCONTAINER_JSON_PATH"])
-	require.Equal(t, o.DockerfilePath, legacyEnvs["DOCKERFILE_PATH"])
-	require.Equal(t, o.BuildContextPath, legacyEnvs["BUILD_CONTEXT_PATH"])
-	require.Equal(t, o.CacheTTLDays, int64(7))
-	require.Equal(t, o.DockerConfigBase64, legacyEnvs["DOCKER_CONFIG_BASE64"])
-	require.Equal(t, o.FallbackImage, legacyEnvs["FALLBACK_IMAGE"])
-	require.Equal(t, o.ExitOnBuildFailure, true)
-	require.Equal(t, o.ForceSafe, true)
-	require.Equal(t, o.Insecure, true)
-	require.Equal(t, o.IgnorePaths, []string{"/var/run", "/tmp"})
-	require.Equal(t, o.SkipRebuild, true)
-	require.Equal(t, o.GitURL, legacyEnvs["GIT_URL"])
-	require.Equal(t, o.GitCloneDepth, int64(1))
-	require.Equal(t, o.GitCloneSingleBranch, true)
-	require.Equal(t, o.GitUsername, legacyEnvs["GIT_USERNAME"])
-	require.Equal(t, o.GitPassword, legacyEnvs["GIT_PASSWORD"])
-	require.Equal(t, o.GitSSHPrivateKeyPath, legacyEnvs["GIT_SSH_PRIVATE_KEY_PATH"])
-	require.Equal(t, o.GitHTTPProxyURL, legacyEnvs["GIT_HTTP_PROXY_URL"])
-	require.Equal(t, o.WorkspaceFolder, legacyEnvs["WORKSPACE_FOLDER"])
-	require.Equal(t, o.SSLCertBase64, legacyEnvs["SSL_CERT_BASE64"])
-	require.Equal(t, o.ExportEnvFile, legacyEnvs["EXPORT_ENV_FILE"])
-	require.Equal(t, o.PostStartScriptPath, legacyEnvs["POST_START_SCRIPT_PATH"])
+	assert.Equal(t, legacyEnvs["SETUP_SCRIPT"], o.SetupScript)
+	assert.Equal(t, legacyEnvs["INIT_SCRIPT"], o.InitScript)
+	assert.Equal(t, legacyEnvs["INIT_COMMAND"], o.InitCommand)
+	assert.Equal(t, legacyEnvs["INIT_ARGS"], o.InitArgs)
+	assert.Equal(t, legacyEnvs["CACHE_REPO"], o.CacheRepo)
+	assert.Equal(t, legacyEnvs["BASE_IMAGE_CACHE_DIR"], o.BaseImageCacheDir)
+	assert.Equal(t, legacyEnvs["LAYER_CACHE_DIR"], o.LayerCacheDir)
+	assert.Equal(t, legacyEnvs["DEVCONTAINER_DIR"], o.DevcontainerDir)
+	assert.Equal(t, legacyEnvs["DEVCONTAINER_JSON_PATH"], o.DevcontainerJSONPath)
+	assert.Equal(t, legacyEnvs["DOCKERFILE_PATH"], o.DockerfilePath)
+	assert.Equal(t, legacyEnvs["BUILD_CONTEXT_PATH"], o.BuildContextPath)
+	assert.Equal(t, int64(7), o.CacheTTLDays)
+	assert.Equal(t, legacyEnvs["DOCKER_CONFIG_BASE64"], o.DockerConfigBase64)
+	assert.Equal(t, legacyEnvs["FALLBACK_IMAGE"], o.FallbackImage)
+	assert.Equal(t, true, o.ExitOnBuildFailure)
+	assert.Equal(t, true, o.ForceSafe)
+	assert.Equal(t, true, o.Insecure)
+	assert.Equal(t, []string{"/var/run", "/tmp"}, o.IgnorePaths)
+	assert.Equal(t, true, o.SkipRebuild)
+	assert.Equal(t, legacyEnvs["GIT_URL"], o.GitURL)
+	assert.Equal(t, int64(1), o.GitCloneDepth)
+	assert.Equal(t, true, o.GitCloneSingleBranch)
+	assert.Equal(t, legacyEnvs["GIT_USERNAME"], o.GitUsername)
+	assert.Equal(t, legacyEnvs["GIT_PASSWORD"], o.GitPassword)
+	assert.Equal(t, legacyEnvs["GIT_SSH_PRIVATE_KEY_PATH"], o.GitSSHPrivateKeyPath)
+	assert.Equal(t, legacyEnvs["GIT_HTTP_PROXY_URL"], o.GitHTTPProxyURL)
+	assert.Equal(t, legacyEnvs["WORKSPACE_FOLDER"], o.WorkspaceFolder)
+	assert.Equal(t, legacyEnvs["SSL_CERT_BASE64"], o.SSLCertBase64)
+	assert.Equal(t, legacyEnvs["EXPORT_ENV_FILE"], o.ExportEnvFile)
+	assert.Equal(t, legacyEnvs["POST_START_SCRIPT_PATH"], o.PostStartScriptPath)
 }
 
 // UpdateGoldenFiles indicates golden files should be updated.