remove -tags test in favor of testing.Testing()

.github/workflows/ci-core.yml

@@ -85,7 +85,7 @@ jobs:
       - name: Download Go vendor packages
         run: go mod download
       - name: Build binary
-        run: go build -tags test -o chainlink.test .
+        run: go build -o chainlink.test .
       - name: Setup DB
         run: ./chainlink.test local db preparetest
       - name: Increase Race Timeout
@@ -163,7 +163,7 @@ jobs:
       - name: Download Go vendor packages
         run: go mod download
       - name: Build binary
-        run: go build -tags test -o chainlink.test .
+        run: go build -o chainlink.test .
       - name: Setup DB
         run: ./chainlink.test local db preparetest
       - name: Load test outputs

GNUmakefile

@@ -51,7 +51,7 @@ chainlink-dev: operator-ui ## Build a dev build of chainlink binary.
 	go build -tags dev $(GOFLAGS) .
 
 chainlink-test: operator-ui ## Build a test build of chainlink binary.
-	go build -tags test $(GOFLAGS) .
+	go build $(GOFLAGS) .
 
 .PHONY: chainlink-local-start
 chainlink-local-start:
@@ -105,11 +105,11 @@ testscripts-update: ## Update testdata/scripts/* files via testscript.
 
 .PHONY: testdb
 testdb: ## Prepares the test database.
-	go run -tags test . local db preparetest
+	go run . local db preparetest
 
 .PHONY: testdb
 testdb-user-only: ## Prepares the test database with user only.
-	go run -tags test . local db preparetest --user-only
+	go run . local db preparetest --user-only
 
 # Format for CI
 .PHONY: presubmit

README.md

@@ -183,7 +183,7 @@ If you do end up modifying the migrations for the database, you will need to rer
 7. Run tests:
 
 ```bash
-go test -tags test ./...
+go test ./...
 ```
 
 #### Notes

core/build/build.go

@@ -1,14 +1,19 @@
+// Package build utilizes build tags and package testing API to determine the environment that this binary was built to target.
+//   - Prod is the default
+//   - Test is automatically set in test binaries, e.g. when using `go test`
+//   - Dev can be set with the 'dev' build tag, for standard builds or test binaries
 package build
 
-// The build module utilizes build tags to determine the environment that this binary was built to target
-// the currently supported build modes are dev, test. Setting both tags is not allowed and will result to compilation errors.
-
 const (
 	Prod = "prod"
 	Dev  = "dev"
 	Test = "test"
 )
 
+var mode string
+
+func Mode() string { return mode }
+
 func IsDev() bool {
 	return mode == Dev
 }

core/build/init.go

@@ -0,0 +1,13 @@
+//go:build !dev
+
+package build
+
+import "testing"
+
+func init() {
+	if testing.Testing() {
+		mode = Test
+	} else {
+		mode = Prod
+	}
+}

core/build/dev.go → core/build/init_dev.go

@@ -2,4 +2,4 @@
 
 package build
 
-const mode = Dev
+func init() { mode = Dev }

core/config/toml/types.go

@@ -141,9 +141,13 @@ func validateDBURL(dbURI url.URL) error {
 }
 
 func (d *DatabaseSecrets) ValidateConfig() (err error) {
+	return d.validateConfig(build.Mode())
+}
+
+func (d *DatabaseSecrets) validateConfig(buildMode string) (err error) {
 	if d.URL == nil || (*url.URL)(d.URL).String() == "" {
 		err = multierr.Append(err, configutils.ErrEmpty{Name: "URL", Msg: "must be provided and non-empty"})
-	} else if *d.AllowSimplePasswords && build.IsProd() {
+	} else if *d.AllowSimplePasswords && buildMode == build.Prod {
 		err = multierr.Append(err, configutils.ErrInvalid{Name: "AllowSimplePasswords", Value: true, Msg: "insecure configs are not allowed on secure builds"})
 	} else if !*d.AllowSimplePasswords {
 		if verr := validateDBURL((url.URL)(*d.URL)); verr != nil {
@@ -1142,14 +1146,18 @@ type Insecure struct {
 }
 
 func (ins *Insecure) ValidateConfig() (err error) {
-	if build.IsDev() {
+	return ins.validateConfig(build.Mode())
+}
+
+func (ins *Insecure) validateConfig(buildMode string) (err error) {
+	if buildMode == build.Dev {
 		return
 	}
 	if ins.DevWebServer != nil && *ins.DevWebServer {
 		err = multierr.Append(err, configutils.ErrInvalid{Name: "DevWebServer", Value: *ins.DevWebServer, Msg: "insecure configs are not allowed on secure builds"})
 	}
-	// OCRDevelopmentMode is allowed on test builds.
-	if ins.OCRDevelopmentMode != nil && *ins.OCRDevelopmentMode && !build.IsTest() {
+	// OCRDevelopmentMode is allowed on dev/test builds.
+	if ins.OCRDevelopmentMode != nil && *ins.OCRDevelopmentMode && buildMode == build.Prod {
 		err = multierr.Append(err, configutils.ErrInvalid{Name: "OCRDevelopmentMode", Value: *ins.OCRDevelopmentMode, Msg: "insecure configs are not allowed on secure builds"})
 	}
 	if ins.InfiniteDepthQueries != nil && *ins.InfiniteDepthQueries {

core/config/toml/types_test.go

@@ -107,7 +107,7 @@ func Test_validateDBURL(t *testing.T) {
 	}
 }
 
-func TestValidateConfig(t *testing.T) {
+func TestDatabaseSecrets_ValidateConfig(t *testing.T) {
 	validUrl := models.URL(url.URL{Scheme: "https", Host: "localhost"})
 	validSecretURL := *models.NewSecretURL(&validUrl)
 
@@ -120,7 +120,7 @@ func TestValidateConfig(t *testing.T) {
 	tests := []struct {
 		name                string
 		input               *DatabaseSecrets
-		skip                bool
+		buildMode           string
 		expectedErrContains []string
 	}{
 		{
@@ -143,7 +143,7 @@ func TestValidateConfig(t *testing.T) {
 				URL:                  &validSecretURL,
 				AllowSimplePasswords: &[]bool{true}[0],
 			},
-			skip:                !build.IsProd(),
+			buildMode:           build.Prod,
 			expectedErrContains: []string{"insecure configs are not allowed on secure builds"},
 		},
 		{
@@ -159,11 +159,11 @@ func TestValidateConfig(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// needed while -tags test is supported
-			if tt.skip {
-				t.SkipNow()
+			buildMode := build.Mode()
+			if tt.buildMode != "" {
+				buildMode = tt.buildMode
 			}
-			err := tt.input.ValidateConfig()
+			err := tt.input.validateConfig(buildMode)
 			if err == nil && len(tt.expectedErrContains) > 0 {
 				t.Errorf("expected errors but got none")
 				return

tools/bin/go_core_race_tests

@@ -12,7 +12,7 @@ use_tee() {
     cat > "$@"
   fi
 }
-GORACE="log_path=$PWD/race" go test -json -tags test -race -ldflags "$GO_LDFLAGS" -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | use_tee "$OUTPUT_FILE"
+GORACE="log_path=$PWD/race" go test -json -race -ldflags "$GO_LDFLAGS" -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | use_tee "$OUTPUT_FILE"
 EXITCODE=${PIPESTATUS[0]}
 # Fail if any race logs are present.
 if ls race.* &>/dev/null

tools/bin/go_core_tests

@@ -16,7 +16,7 @@ use_tee() {
     cat > "$@"
   fi
 }
-go test -json -ldflags "$GO_LDFLAGS" -tags test,integration $TEST_FLAGS -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt $1 | use_tee $OUTPUT_FILE
+go test -json -ldflags "$GO_LDFLAGS" -tags integration $TEST_FLAGS -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt $1 | use_tee $OUTPUT_FILE
 EXITCODE=${PIPESTATUS[0]}
 
 # Assert no known sensitive strings present in test logger output