Skip to content

Commit 35600df

Browse files
committed
refactor: remove conditional build tags
1 parent 80a6f8e commit 35600df

File tree

156 files changed

+8
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+8
-163
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Lint
1616
uses: golangci/golangci-lint-action@v2
1717
with:
18-
args: --timeout 30m --build-tags unit,tf_acc_sysdig_monitor,tf_acc_sysdig_secure,tf_acc_ibm_monitor,tf_acc_ibm_secure
18+
args: --timeout 30m
1919

2020
test:
2121
name: Unit Tests

GNUmakefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
SWEEP?=us-east-1,us-west-2
22
TEST?=./...
3-
TEST_SUITE?=tf_acc_sysdig_monitor,tf_acc_sysdig_secure
43
PKG_NAME=sysdig
54
WEBSITE_REPO=github.com/hashicorp/terraform-website
65
VERSION=$(shell [ ! -z `git tag -l --contains HEAD` ] && git tag -l --contains HEAD || git rev-parse --short HEAD)
@@ -35,14 +34,14 @@ sweep:
3534
go test $(TEST) -v -sweep=$(SWEEP) $(SWEEPARGS)
3635

3736
test: fmtcheck
38-
go test $(TEST) -tags=unit -timeout=30s -parallel=4
37+
go test $(TEST) -timeout=30s -parallel=4
3938

4039
testacc: fmtcheck
41-
CGO_ENABLED=1 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -tags=$(TEST_SUITE) -timeout 120m -race -parallel=1
40+
CGO_ENABLED=1 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m -race -parallel=1
4241

4342
junit-report: fmtcheck
4443
@go install github.com/jstemmer/go-junit-report/v2@latest
45-
CGO_ENABLED=1 TF_ACC=1 TF_LOG=DEBUG go test $(TEST) -v $(TESTARGS) -tags=$(TEST_SUITE) -timeout 120m -race -parallel=1 2>&1 | tee output.txt
44+
CGO_ENABLED=1 TF_ACC=1 TF_LOG=DEBUG go test $(TEST) -v $(TESTARGS) -timeout 120m -race -parallel=1 2>&1 | tee output.txt
4645
! grep -q "\[build failed\]" output.txt
4746
go-junit-report -in output.txt -out junit-report.xml
4847

buildinfo/ibm_monitor.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_ibm_monitor
21

32
package buildinfo
43

buildinfo/ibm_secure.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_ibm_secure
21

32
package buildinfo
43

buildinfo/onprem_monitor.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_onprem_monitor
21

32
package buildinfo
43

buildinfo/onprem_secure.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_onprem_secure
21

32
package buildinfo
43

buildinfo/sysdig_monitor.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_sysdig_monitor
21

32
package buildinfo
43

buildinfo/sysdig_secure.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_sysdig_secure
21

32
package buildinfo
43

sysdig/data_source_agent_access_keys_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_sysdig_monitor || tf_acc_sysdig_secure
21

32
package sysdig_test
43

sysdig/data_source_sysdig_current_user_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//go:build tf_acc_sysdig_monitor || tf_acc_sysdig_secure || tf_acc_ibm_monitor || tf_acc_onprem_monitor || tf_acc_onprem_secure
21

32
package sysdig_test
43

0 commit comments

Comments
 (0)