all os.Env

Author: mtojek

provider/agent.go

@@ -3,10 +3,10 @@ package provider
 import (
 	"context"
 	"fmt"
-	"os"
 	"reflect"
 	"strings"
 
+	"github.com/coder/terraform-provider-coder/provider/helpers"
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -363,7 +363,7 @@ func updateInitScript(resourceData *schema.ResourceData, i interface{}) diag.Dia
 	if err != nil {
 		return diag.Errorf("parse access url: %s", err)
 	}
-	script := os.Getenv(fmt.Sprintf("CODER_AGENT_SCRIPT_%s_%s", operatingSystem, arch))
+	script := helpers.OptionalEnv(fmt.Sprintf("CODER_AGENT_SCRIPT_%s_%s", operatingSystem, arch))
 	if script != "" {
 		script = strings.ReplaceAll(script, "${ACCESS_URL}", accessURL.String())
 		script = strings.ReplaceAll(script, "${AUTH_TYPE}", auth)

provider/externalauth.go

@@ -3,8 +3,8 @@ package provider
 import (
 	"context"
 	"fmt"
-	"os"
 
+	"github.com/coder/terraform-provider-coder/provider/helpers"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -20,7 +20,7 @@ func externalAuthDataSource() *schema.Resource {
 			}
 			rd.SetId(id)
 
-			accessToken := os.Getenv(ExternalAuthAccessTokenEnvironmentVariable(id))
+			accessToken := helpers.OptionalEnv(ExternalAuthAccessTokenEnvironmentVariable(id))
 			rd.Set("access_token", accessToken)
 			return nil
 		},

provider/gitauth.go

@@ -3,8 +3,8 @@ package provider
 import (
 	"context"
 	"fmt"
-	"os"
 
+	"github.com/coder/terraform-provider-coder/provider/helpers"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -25,7 +25,7 @@ func gitAuthDataSource() *schema.Resource {
 			}
 			rd.SetId(id)
 
-			accessToken := os.Getenv(GitAuthAccessTokenEnvironmentVariable(id))
+			accessToken := helpers.OptionalEnv(GitAuthAccessTokenEnvironmentVariable(id))
 			rd.Set("access_token", accessToken)
 
 			return nil

provider/workspace.go

@@ -3,7 +3,6 @@ package provider
 import (
 	"context"
 	"encoding/json"
-	"os"
 	"reflect"
 	"strconv"
 
@@ -17,12 +16,9 @@ func workspaceDataSource() *schema.Resource {
 	return &schema.Resource{
 		Description: "Use this data source to get information for the active workspace build.",
 		ReadContext: func(c context.Context, rd *schema.ResourceData, i interface{}) diag.Diagnostics {
-			transition := os.Getenv("CODER_WORKSPACE_TRANSITION")
-			if transition == "" {
-				// Default to start!
-				transition = "start"
-			}
+			transition := helpers.OptionalEnvOrDefault("CODER_WORKSPACE_TRANSITION", "start") // Default to start!
 			_ = rd.Set("transition", transition)
+
 			count := 0
 			if transition == "start" {
 				count = 1