Switch to OptionalEnv

Author: mtojek

.gitignore

@@ -32,4 +32,7 @@ website/vendor
 !command/test-fixtures/**/.terraform/
 
 # Keep windows files with windows line endings
-*.winfile eol=crlf
+*.winfile eol=crlf
+
+# Binary
+terraform-provider-coder

integration/integration_test.go

@@ -91,6 +91,8 @@ func TestIntegration(t *testing.T) {
 			ctrID := setup(ctx, t, tt.name)
 			// Import named template
 			_, rc := execContainer(ctx, t, ctrID, fmt.Sprintf(`coder templates push %s --directory /src/integration/%s --var output_path=/tmp/%s.json --yes`, tt.name, tt.name, tt.name))
+			time.Sleep(10 * time.Minute)
+
 			require.Equal(t, 0, rc)
 			// Create a workspace
 			_, rc = execContainer(ctx, t, ctrID, fmt.Sprintf(`coder create %s -t %s --yes`, tt.name, tt.name))
@@ -165,6 +167,8 @@ func setup(ctx context.Context, t *testing.T, name string) string {
 			"CODER_IN_MEMORY=true",                     // We don't necessarily care about real persistence here.
 			"CODER_TELEMETRY_ENABLE=false",             // Avoid creating noise.
 			"TF_CLI_CONFIG_FILE=/tmp/integration.tfrc", // Our custom tfrc from above.
+			"TF_LOG=DEBUG",
+			"CODER_VERBOSE=TRUE",
 		},
 		Labels: map[string]string{},
 	}, &container.HostConfig{

provider/workspace.go

@@ -62,16 +62,13 @@ func workspaceDataSource() *schema.Resource {
 			id := helpers.OptionalEnvOrDefault("CODER_WORKSPACE_ID", uuid.NewString())
 			rd.SetId(id)
 
-			templateID := helpers.OptionalEnv("CODER_WORKSPACE_TEMPLATE_ID")
+			templateID := helpers.OptionalEnv("CODER_WORKSPACE_TEMPLATE_ID") // FIXME switch to `helpers.RequireEnv(...)`
 			_ = rd.Set("template_id", templateID)
 
-			templateName := helpers.OptionalEnv("CODER_WORKSPACE_TEMPLATE_NAME")
+			templateName := helpers.OptionalEnv("CODER_WORKSPACE_TEMPLATE_NAME") // FIXME switch to `helpers.RequireEnv(...)`
 			_ = rd.Set("template_name", templateName)
 
-			templateVersion, err := helpers.RequireEnv("CODER_WORKSPACE_TEMPLATE_VERSION")
-			if err != nil {
-				return diag.Errorf("undefined env: %v", err)
-			}
+			templateVersion := helpers.OptionalEnv("CODER_WORKSPACE_TEMPLATE_VERSION") // FIXME switch to `helpers.RequireEnv(...)`
 			_ = rd.Set("template_version", templateVersion)
 
 			config, valid := i.(config)