Skip to content

Commit 68bd185

Browse files
CodelaxMonitob
Codelax
and
Monitob
authored
tests: enable account and iam sweepers (#2009)
* fix(account_project): enable sweeper * change constant to function * update account datasource tests * tests(iam_api_key): enable sweeper * tests(iam_application): enable sweeper and update tests * tests(iam_group): enable sweeper and update tests * tests(iam_ssh_key): enable sweeper and update tests --------- Co-authored-by: jaime Bernabe <[email protected]>
1 parent 438a6ff commit 68bd185

26 files changed

+2826
-2934
lines changed

‎scaleway/data_source_account_project_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestAccScalewayDataSourceAccountProject_Basic(t *testing.T) {
2424
{
2525
Config: fmt.Sprintf(`
2626
resource scaleway_account_project "project" {
27-
name = "test-terraform-account-project"
27+
name = "tf-tests-terraform-account-project"
2828
}
2929
3030
data scaleway_account_project "by_name" {

‎scaleway/data_source_iam_application_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,59 +19,59 @@ func TestAccScalewayDataSourceIamApplication_Basic(t *testing.T) {
1919
{
2020
Config: `
2121
resource "scaleway_iam_application" "app_ds_basic" {
22-
name = "test_data_source_basic"
22+
name = "tf_tests_data_source_basic"
2323
}
2424
`,
2525
},
2626
{
2727
Config: `
2828
resource "scaleway_iam_application" "app_ds_basic" {
29-
name = "test_data_source_basic"
29+
name = "tf_tests_data_source_basic"
3030
}
3131
3232
data "scaleway_iam_application" "find_by_id_basic" {
3333
application_id = scaleway_iam_application.app_ds_basic.id
3434
}
3535
data "scaleway_iam_application" "find_by_name_basic" {
36-
name = "test_data_source_basic"
36+
name = "tf_tests_data_source_basic"
3737
}
3838
`,
3939
Check: resource.ComposeTestCheckFunc(
4040
testAccCheckScalewayIamApplicationExists(tt, "scaleway_iam_application.app_ds_basic"),
41-
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_id_basic", "name", "test_data_source_basic"),
42-
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_name_basic", "name", "test_data_source_basic"),
41+
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_id_basic", "name", "tf_tests_data_source_basic"),
42+
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_name_basic", "name", "tf_tests_data_source_basic"),
4343
resource.TestCheckResourceAttrPair("data.scaleway_iam_application.find_by_id_basic", "id", "scaleway_iam_application.app_ds_basic", "id"),
4444
resource.TestCheckResourceAttrPair("data.scaleway_iam_application.find_by_name_basic", "id", "scaleway_iam_application.app_ds_basic", "id"),
4545
),
4646
},
4747
{
4848
Config: `
4949
resource "scaleway_iam_application" "app_ds_basic" {
50-
name = "test_data_source_basic_renamed"
51-
description = "test_data_source_basic_description"
50+
name = "tf_tests_data_source_basic_renamed"
51+
description = "tf_tests_data_source_basic_description"
5252
}
5353
`,
5454
},
5555
{
5656
Config: `
5757
resource "scaleway_iam_application" "app_ds_basic" {
58-
name = "test_data_source_basic_renamed"
59-
description = "test_data_source_basic_description"
58+
name = "tf_tests_data_source_basic_renamed"
59+
description = "tf_tests_data_source_basic_description"
6060
}
6161
6262
data "scaleway_iam_application" "find_by_id_basic" {
6363
application_id = scaleway_iam_application.app_ds_basic.id
6464
}
6565
data "scaleway_iam_application" "find_by_name_basic" {
66-
name = "test_data_source_basic_renamed"
66+
name = "tf_tests_data_source_basic_renamed"
6767
}
6868
`,
6969
Check: resource.ComposeTestCheckFunc(
7070
testAccCheckScalewayIamApplicationExists(tt, "scaleway_iam_application.app_ds_basic"),
71-
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_id_basic", "name", "test_data_source_basic_renamed"),
72-
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_name_basic", "name", "test_data_source_basic_renamed"),
73-
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_id_basic", "description", "test_data_source_basic_description"),
74-
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_name_basic", "description", "test_data_source_basic_description"),
71+
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_id_basic", "name", "tf_tests_data_source_basic_renamed"),
72+
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_name_basic", "name", "tf_tests_data_source_basic_renamed"),
73+
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_id_basic", "description", "tf_tests_data_source_basic_description"),
74+
resource.TestCheckResourceAttr("data.scaleway_iam_application.find_by_name_basic", "description", "tf_tests_data_source_basic_description"),
7575
resource.TestCheckResourceAttrPair("data.scaleway_iam_application.find_by_id_basic", "id", "scaleway_iam_application.app_ds_basic", "id"),
7676
resource.TestCheckResourceAttrPair("data.scaleway_iam_application.find_by_name_basic", "id", "scaleway_iam_application.app_ds_basic", "id"),
7777
),

‎scaleway/data_source_iam_group_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestAccScalewayDataSourceIamGroup_Basic(t *testing.T) {
1919
{
2020
Config: `
2121
resource "scaleway_iam_group" "main_ds_basic" {
22-
name = "test_data_source_basic"
22+
name = "tf_test_data_source_basic"
2323
}
2424
2525
data "scaleway_iam_group" "find_by_id_basic" {
@@ -33,8 +33,8 @@ func TestAccScalewayDataSourceIamGroup_Basic(t *testing.T) {
3333
`,
3434
Check: resource.ComposeTestCheckFunc(
3535
testAccCheckScalewayIamGroupExists(tt, "scaleway_iam_group.main_ds_basic"),
36-
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_id_basic", "name", "test_data_source_basic"),
37-
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_name_basic", "name", "test_data_source_basic"),
36+
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_id_basic", "name", "tf_test_data_source_basic"),
37+
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_name_basic", "name", "tf_test_data_source_basic"),
3838
resource.TestCheckResourceAttrPair("data.scaleway_iam_group.find_by_id_basic", "id", "scaleway_iam_group.main_ds_basic", "id"),
3939
resource.TestCheckResourceAttrPair("data.scaleway_iam_group.find_by_name_basic", "id", "scaleway_iam_group.main_ds_basic", "id"),
4040
),
@@ -56,7 +56,7 @@ func TestAccScalewayDataSourceIamGroup_UsersAndApplications(t *testing.T) {
5656
{
5757
Config: `
5858
resource "scaleway_iam_application" "app00" {
59-
name = "app"
59+
name = "tf_tests_iam_group_ds_app"
6060
}
6161
6262
data "scaleway_iam_user" "user00" {
@@ -67,7 +67,7 @@ func TestAccScalewayDataSourceIamGroup_UsersAndApplications(t *testing.T) {
6767
}
6868
6969
resource "scaleway_iam_group" "main_ds_mix" {
70-
name = "test_data_source_mix"
70+
name = "tf_test_data_source_mix"
7171
application_ids = [
7272
scaleway_iam_application.app00.id,
7373
]
@@ -89,8 +89,8 @@ func TestAccScalewayDataSourceIamGroup_UsersAndApplications(t *testing.T) {
8989
`,
9090
Check: resource.ComposeTestCheckFunc(
9191
testAccCheckScalewayIamGroupExists(tt, "scaleway_iam_group.main_ds_mix"),
92-
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_id_mix", "name", "test_data_source_mix"),
93-
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_name_mix", "name", "test_data_source_mix"),
92+
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_id_mix", "name", "tf_test_data_source_mix"),
93+
resource.TestCheckResourceAttr("data.scaleway_iam_group.find_by_name_mix", "name", "tf_test_data_source_mix"),
9494
resource.TestCheckResourceAttrPair("data.scaleway_iam_group.find_by_id_mix", "id", "scaleway_iam_group.main_ds_mix", "id"),
9595
resource.TestCheckTypeSetElemAttrPair("data.scaleway_iam_group.find_by_name_mix", "id", "scaleway_iam_group.main_ds_mix", "id"),
9696
resource.TestCheckTypeSetElemAttrPair("data.scaleway_iam_group.find_by_id_mix", "user_ids.*", "data.scaleway_iam_user.user00", "user_id"),

‎scaleway/data_source_iam_ssh_key_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func TestAccScalewayDataSourceIamSSHKey_Basic(t *testing.T) {
1111
dataSourceIamSSHKey := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHy/M5FVm5ydLGcal3e5LNcfTalbeN7QL/ZGCvDEdqJ [email protected]"
12-
sshKeyName := "TestAccScalewayDataSourceIamSSHKey_Basic"
12+
sshKeyName := "tf-test-ds-iam-ssh-key-basic"
1313
tt := NewTestTools(t)
1414
defer tt.Cleanup()
1515
resource.ParallelTest(t, resource.TestCase{

‎scaleway/resource_account_project_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import (
1111
)
1212

1313
func init() {
14-
if !terraformBetaEnabled {
15-
return
16-
}
1714
resource.AddTestSweepers("scaleway_account_project", &resource.Sweeper{
1815
Name: "scaleway_account_project",
1916
F: testSweepAccountProject,
@@ -26,12 +23,12 @@ func testSweepAccountProject(_ string) error {
2623

2724
l.Debugf("sweeper: destroying the project")
2825

29-
listProjects, err := accountAPI.ListProjects(&accountV2.ListProjectsRequest{})
26+
listProjects, err := accountAPI.ListProjects(&accountV2.ListProjectsRequest{}, scw.WithAllPages())
3027
if err != nil {
3128
return fmt.Errorf("failed to list projects: %w", err)
3229
}
3330
for _, project := range listProjects.Projects {
34-
if project.Name == "default" {
31+
if project.Name == "default" || !isTestResource(project.Name) {
3532
continue
3633
}
3734
err = accountAPI.DeleteProject(&accountV2.DeleteProjectRequest{

‎scaleway/resource_iam_api_key_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import (
1111
)
1212

1313
func init() {
14-
if !terraformBetaEnabled {
15-
return
16-
}
1714
resource.AddTestSweepers("scaleway_iam_api_key", &resource.Sweeper{
1815
Name: "scaleway_iam_api_key",
1916
F: testSweepIamAPIKey,
@@ -26,13 +23,16 @@ func testSweepIamAPIKey(_ string) error {
2623

2724
l.Debugf("sweeper: destroying the api keys")
2825

29-
listAPIKeys, err := api.ListAPIKeys(&iam.ListAPIKeysRequest{})
26+
listAPIKeys, err := api.ListAPIKeys(&iam.ListAPIKeysRequest{}, scw.WithAllPages())
3027
if err != nil {
3128
return fmt.Errorf("failed to list api keys: %w", err)
3229
}
33-
for _, app := range listAPIKeys.APIKeys {
30+
for _, key := range listAPIKeys.APIKeys {
31+
if !isTestResource(key.Description) {
32+
continue
33+
}
3434
err = api.DeleteAPIKey(&iam.DeleteAPIKeyRequest{
35-
AccessKey: app.AccessKey,
35+
AccessKey: key.AccessKey,
3636
})
3737
if err != nil {
3838
return fmt.Errorf("failed to delete api key: %w", err)
@@ -60,13 +60,13 @@ func TestAccScalewayIamApiKey_WithApplication(t *testing.T) {
6060
6161
resource "scaleway_iam_api_key" "main" {
6262
application_id = scaleway_iam_application.main.id
63-
description = "a description"
63+
description = "tf_tests_with_application"
6464
}
6565
`,
6666
Check: resource.ComposeTestCheckFunc(
6767
testAccCheckScalewayIamAPIKeyExists(tt, "scaleway_iam_api_key.main"),
6868
resource.TestCheckResourceAttrPair("scaleway_iam_api_key.main", "application_id", "scaleway_iam_application.main", "id"),
69-
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "a description"),
69+
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "tf_tests_with_application"),
7070
resource.TestCheckResourceAttrSet("scaleway_iam_api_key.main", "secret_key"),
7171
),
7272
},
@@ -78,13 +78,13 @@ func TestAccScalewayIamApiKey_WithApplication(t *testing.T) {
7878
7979
resource "scaleway_iam_api_key" "main" {
8080
application_id = scaleway_iam_application.main.id
81-
description = "another description"
81+
description = "tf_tests_with_application_changed"
8282
}
8383
`,
8484
Check: resource.ComposeTestCheckFunc(
8585
testAccCheckScalewayIamAPIKeyExists(tt, "scaleway_iam_api_key.main"),
8686
resource.TestCheckResourceAttrPair("scaleway_iam_api_key.main", "application_id", "scaleway_iam_application.main", "id"),
87-
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "another description"),
87+
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "tf_tests_with_application_changed"),
8888
resource.TestCheckResourceAttrSet("scaleway_iam_api_key.main", "secret_key"),
8989
),
9090
},
@@ -116,14 +116,14 @@ func TestAccScalewayIamApiKey_Expires(t *testing.T) {
116116
117117
resource "scaleway_iam_api_key" "main" {
118118
application_id = scaleway_iam_application.main.id
119-
description = "an api key with an expiration date"
119+
description = "tf_tests_expires"
120120
expires_at = "2025-07-06T09:00:00Z"
121121
}
122122
`,
123123
Check: resource.ComposeTestCheckFunc(
124124
testAccCheckScalewayIamAPIKeyExists(tt, "scaleway_iam_api_key.main"),
125125
resource.TestCheckResourceAttrPair("scaleway_iam_api_key.main", "application_id", "scaleway_iam_application.main", "id"),
126-
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "an api key with an expiration date"),
126+
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "tf_tests_expires"),
127127
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "expires_at", "2025-07-06T09:00:00Z"),
128128
),
129129
},
@@ -147,13 +147,13 @@ func TestAccScalewayIamApiKey_NoUpdate(t *testing.T) {
147147
148148
resource "scaleway_iam_api_key" "main" {
149149
application_id = scaleway_iam_application.main.id
150-
description = "no update"
150+
description = "tf_tests_no_update"
151151
}
152152
`,
153153
Check: resource.ComposeTestCheckFunc(
154154
testAccCheckScalewayIamAPIKeyExists(tt, "scaleway_iam_api_key.main"),
155155
resource.TestCheckResourceAttrPair("scaleway_iam_api_key.main", "application_id", "scaleway_iam_application.main", "id"),
156-
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "no update"),
156+
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "tf_tests_no_update"),
157157
),
158158
},
159159
{
@@ -164,13 +164,13 @@ func TestAccScalewayIamApiKey_NoUpdate(t *testing.T) {
164164
165165
resource "scaleway_iam_api_key" "main" {
166166
application_id = scaleway_iam_application.main.id
167-
description = "no update"
167+
description = "tf_tests_no_update"
168168
}
169169
`,
170170
Check: resource.ComposeTestCheckFunc(
171171
testAccCheckScalewayIamAPIKeyExists(tt, "scaleway_iam_api_key.main"),
172172
resource.TestCheckResourceAttrPair("scaleway_iam_api_key.main", "application_id", "scaleway_iam_application.main", "id"),
173-
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "no update"),
173+
resource.TestCheckResourceAttr("scaleway_iam_api_key.main", "description", "tf_tests_no_update"),
174174
),
175175
},
176176
},

‎scaleway/resource_iam_application_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import (
1111
)
1212

1313
func init() {
14-
if !terraformBetaEnabled {
15-
return
16-
}
1714
resource.AddTestSweepers("scaleway_iam_application", &resource.Sweeper{
1815
Name: "scaleway_iam_application",
1916
F: testSweepIamApplication,
@@ -29,6 +26,10 @@ func testSweepIamApplication(_ string) error {
2926
return fmt.Errorf("failed to list applications: %w", err)
3027
}
3128
for _, app := range listApps.Applications {
29+
if !isTestResource(app.Name) {
30+
continue
31+
}
32+
3233
err = api.DeleteApplication(&iam.DeleteApplicationRequest{
3334
ApplicationID: app.ID,
3435
})

0 commit comments

Comments
 (0)