Move redact tests to the redact package

internal/job/executor_test.go

@@ -5,9 +5,7 @@ import (
 	"testing"
 
 	"github.com/buildkite/agent/v3/internal/job/shell"
-	"github.com/buildkite/agent/v3/internal/redact"
 	"github.com/buildkite/agent/v3/tracetools"
-	"github.com/google/go-cmp/cmp"
 	"github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer"
@@ -46,43 +44,6 @@ func TestDirForRepository(t *testing.T) {
 	}
 }
 
-func TestValuesToRedact(t *testing.T) {
-	t.Parallel()
-
-	redactConfig := []string{
-		"*_PASSWORD",
-		"*_TOKEN",
-	}
-	environment := map[string]string{
-		"BUILDKITE_PIPELINE": "unit-test",
-		// These are example values, and are not leaked credentials
-		"DATABASE_USERNAME": "AzureDiamond",
-		"DATABASE_PASSWORD": "hunter2",
-	}
-
-	got := redact.Values(shell.DiscardLogger, redactConfig, environment)
-	want := []string{"hunter2"}
-
-	if diff := cmp.Diff(got, want); diff != "" {
-		t.Errorf("redact.Values(%q, %q) diff (-got +want)\n%s", redactConfig, environment, diff)
-	}
-}
-
-func TestValuesToRedactEmpty(t *testing.T) {
-	t.Parallel()
-
-	redactConfig := []string{}
-	environment := map[string]string{
-		"FOO":                "BAR",
-		"BUILDKITE_PIPELINE": "unit-test",
-	}
-
-	got := redact.Values(shell.DiscardLogger, redactConfig, environment)
-	if len(got) != 0 {
-		t.Errorf("redact.Values(%q, %q) = %q, want empty slice", redactConfig, environment, got)
-	}
-}
-
 func TestStartTracing_NoTracingBackend(t *testing.T) {
 	var err error
 

internal/redact/redact_test.go

@@ -0,0 +1,45 @@
+package redact
+
+import (
+	"testing"
+
+	"github.com/buildkite/agent/v3/internal/job/shell"
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestValuesToRedact(t *testing.T) {
+	t.Parallel()
+
+	redactConfig := []string{
+		"*_PASSWORD",
+		"*_TOKEN",
+	}
+	environment := map[string]string{
+		"BUILDKITE_PIPELINE": "unit-test",
+		// These are example values, and are not leaked credentials
+		"DATABASE_USERNAME": "AzureDiamond",
+		"DATABASE_PASSWORD": "hunter2",
+	}
+
+	got := Values(shell.DiscardLogger, redactConfig, environment)
+	want := []string{"hunter2"}
+
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf("Values(%q, %q) diff (-got +want)\n%s", redactConfig, environment, diff)
+	}
+}
+
+func TestValuesToRedactEmpty(t *testing.T) {
+	t.Parallel()
+
+	redactConfig := []string{}
+	environment := map[string]string{
+		"FOO":                "BAR",
+		"BUILDKITE_PIPELINE": "unit-test",
+	}
+
+	got := Values(shell.DiscardLogger, redactConfig, environment)
+	if len(got) != 0 {
+		t.Errorf("Values(%q, %q) = %q, want empty slice", redactConfig, environment, got)
+	}
+}