Skip to content

chore(tests): sweep account last, match iam resources name with sweep #3516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
estellesoulard wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

chore(tests): sweep account last, match iam resources name with sweep #3516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SWEEP?=all_regions
SWEEP_DIR?=./internal/services/*
SWEEP_ACCOUNT_DIR?=./internal/services/account
SWEEP_DIR?=$(filter-out $(SWEEP_ACCOUNT_DIR), $(wildcard ./internal/services/*))
TEST?=$$(go list ./... |grep -v 'vendor')
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
WEBSITE_REPO=github.com/hashicorp/terraform-website
Expand All @@ -14,6 +15,7 @@ build: fmtcheck
sweep:
@echo "WARNING: This will destroy infrastructure. Use only in development accounts."
go test $(SWEEP_DIR) -v -sweep=$(SWEEP) $(SWEEPARGS) -timeout 60m
go test $(SWEEP_ACCOUNT_DIR) -v -sweep=$(SWEEP) $(SWEEPARGS) -timeout 60m

test: fmtcheck
go test $(TEST) || exit 1
Expand Down
12 changes: 6 additions & 6 deletions internal/acctest/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ func CreateFakeIAMManager(tt *TestTools) (*account.Project, *iam.APIKey, *iam.Po
return nil
}

projectName := sdkacctest.RandomWithPrefix("test-acc-scaleway-project")
iamApplicationName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-app")
iamPolicyName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-policy")
projectName := sdkacctest.RandomWithPrefix("tf-test-scaleway-project")
iamApplicationName := sdkacctest.RandomWithPrefix("tf-test-scaleway-iam-app")
iamPolicyName := sdkacctest.RandomWithPrefix("tf-test-scaleway-iam-policy")

projectAPI := account.NewProjectAPI(tt.Meta.ScwClient())

Expand Down Expand Up @@ -175,9 +175,9 @@ func CreateFakeSideProject(tt *TestTools) (*account.Project, *iam.APIKey, FakeSi
return nil
}

projectName := sdkacctest.RandomWithPrefix("test-acc-scaleway-project")
iamApplicationName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-app")
iamPolicyName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-policy")
projectName := sdkacctest.RandomWithPrefix("tf-test-scaleway-project")
iamApplicationName := sdkacctest.RandomWithPrefix("tf-test-scaleway-iam-app")
iamPolicyName := sdkacctest.RandomWithPrefix("tf-test-scaleway-iam-policy")

projectAPI := account.NewProjectAPI(tt.Meta.ScwClient())

Expand Down
Loading