Simplified the slice copy/update logic. Removed the panics for non required interface functions, the impl was trivial, added simple tests to ensure they work as expected.

coder · spikecurtis · Apr 8, 2025 · Mar 28, 2025 · Apr 7, 2025 · Apr 7, 2025
commit 228410861961be1768ab3dcf78c4e0f9ebde2f04
diff --git a/provisioner/terraform/otelenv.go b/provisioner/terraform/otelenv.go
@@ -43,23 +43,37 @@ func (c *envCarrier) Set(key, value string) {
 		if strings.HasPrefix(e, key+"=") {
 			// don't directly update the slice so we don't modify the slice
 			// passed in
-			newEnv := slices.Clone(c.Env)
-			newEnv = append(newEnv[:i], append([]string{fmt.Sprintf("%s=%s", key, value)}, newEnv[i+1:]...)...)
-			c.Env = newEnv
+			c.Env = slices.Clone(c.Env)
+			c.Env[i] = fmt.Sprintf("%s=%s", key, value)
 			return
 		}
 	}
 	c.Env = append(c.Env, fmt.Sprintf("%s=%s", key, value))
 }
 
-func (*envCarrier) Get(_ string) string {
-	// Get not necessary to inject environment variables
-	panic("Not implemented")
+func (c *envCarrier) Get(key string) string {
+	if c == nil {
+		return ""
+	}
+	key = toKey(key)
+	for _, e := range c.Env {
+		if strings.HasPrefix(e, key+"=") {
+			return strings.TrimPrefix(e, key+"=")
+		}
+	}
+	return ""
 }
 
-func (*envCarrier) Keys() []string {
-	// Keys not necessary to inject environment variables
-	panic("Not implemented")
+func (c *envCarrier) Keys() []string {
+	if c == nil {
+		return nil
+	}
+	keys := make([]string, len(c.Env))
+	for i, e := range c.Env {
+		k, _, _ := strings.Cut(e, "=")
+		keys[i] = k
+	}
+	return keys
 }
 
 // otelEnvInject will add add any necessary environment variables for the span

diff --git a/provisioner/terraform/otelenv_test.go → ...sioner/terraform/otelenv_internal_test.go b/provisioner/terraform/otelenv_test.go → ...sioner/terraform/otelenv_internal_test.go
@@ -1,4 +1,4 @@
-package terraform // nolint:testpackage
+package terraform
 
 import (
 	"context"
@@ -61,3 +61,25 @@ func TestOtelEnvInject(t *testing.T) {
 		"TERM=xterm",
 	}, got)
 }
+
+func TestEnvCarrierSet(t *testing.T) {
+	t.Parallel()
+	c := &envCarrier{
+		Env: []string{"PATH=/usr/bin:/bin", "TERM=xterm"},
+	}
+	c.Set("PATH", "/usr/local/bin")
+	c.Set("NEWVAR", "newval")
+	require.Equal(t, []string{
+		"PATH=/usr/local/bin",
+		"TERM=xterm",
+		"NEWVAR=newval",
+	}, c.Env)
+}
+
+func TestEnvCarrierKeys(t *testing.T) {
+	t.Parallel()
+	c := &envCarrier{
+		Env: []string{"PATH=/usr/bin:/bin", "TERM=xterm"},
+	}
+	require.Equal(t, []string{"PATH", "TERM"}, c.Keys())
+}