Skip to content

Commit 4863479

Browse files
Codelaxremyleone
andauthored
tests: rename test resources to expected test name (#2739)
* tests: rename test resources to expected test name * record tests * use IsTestResource --------- Co-authored-by: Rémy Léone <[email protected]>
1 parent b508603 commit 4863479

24 files changed

+37389
-23759
lines changed

internal/services/iot/routes_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func TestAccRoute_S3(t *testing.T) {
8686
}
8787
tt := acctest.NewTestTools(t)
8888
defer tt.Cleanup()
89-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iot-route-s3")
89+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-iot-route-s3")
9090

9191
resource.ParallelTest(t, resource.TestCase{
9292
PreCheck: func() { acctest.PreCheck(t) },

internal/services/object/bucket_acl_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const (
2525
func TestAccObjectBucketACL_Basic(t *testing.T) {
2626
tt := acctest.NewTestTools(t)
2727
defer tt.Cleanup()
28-
testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-basic")
28+
testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-basic")
2929

3030
resource.Test(t, resource.TestCase{
3131
PreCheck: func() { acctest.PreCheck(t) },
@@ -75,7 +75,7 @@ func TestAccObjectBucketACL_Basic(t *testing.T) {
7575
func TestAccObjectBucketACL_Grantee(t *testing.T) {
7676
tt := acctest.NewTestTools(t)
7777
defer tt.Cleanup()
78-
testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-grantee")
78+
testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-grantee")
7979

8080
ownerID := "105bdce1-64c0-48ab-899d-868455867ecf"
8181
ownerIDChild := "50ab77d5-56bd-4981-a118-4e0fa5309b59"
@@ -178,7 +178,7 @@ func TestAccObjectBucketACL_Grantee(t *testing.T) {
178178
func TestAccObjectBucketACL_GranteeWithOwner(t *testing.T) {
179179
tt := acctest.NewTestTools(t)
180180
defer tt.Cleanup()
181-
testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-owner")
181+
testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-owner")
182182
ownerID := "105bdce1-64c0-48ab-899d-868455867ecf"
183183
resource.Test(t, resource.TestCase{
184184
PreCheck: func() { acctest.PreCheck(t) },
@@ -230,7 +230,7 @@ func TestAccObjectBucketACL_GranteeWithOwner(t *testing.T) {
230230
func TestAccObjectBucketACL_WithBucketName(t *testing.T) {
231231
tt := acctest.NewTestTools(t)
232232
defer tt.Cleanup()
233-
testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-name")
233+
testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-name")
234234

235235
resource.Test(t, resource.TestCase{
236236
PreCheck: func() { acctest.PreCheck(t) },
@@ -278,7 +278,7 @@ func TestAccObjectBucketACL_WithBucketName(t *testing.T) {
278278
func TestAccObjectBucketACL_Remove(t *testing.T) {
279279
tt := acctest.NewTestTools(t)
280280
defer tt.Cleanup()
281-
testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-remove")
281+
testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-remove")
282282

283283
resource.Test(t, resource.TestCase{
284284
PreCheck: func() { acctest.PreCheck(t) },

internal/services/object/bucket_policy_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
)
2020

2121
func TestAccObjectBucketPolicy_Basic(t *testing.T) {
22-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scw-obp-basic")
22+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-obp-basic")
2323

2424
tfConfig := fmt.Sprintf(`
2525
resource "scaleway_object_bucket" "bucket" {
@@ -107,7 +107,7 @@ func TestAccObjectBucketPolicy_Basic(t *testing.T) {
107107
}
108108

109109
func TestAccObjectBucketPolicy_OtherRegionWithBucketID(t *testing.T) {
110-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scw-obp-with-bucket-id")
110+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-obp-with-bucket-id")
111111

112112
tfConfig := fmt.Sprintf(`
113113
resource "scaleway_object_bucket" "bucket" {
@@ -193,7 +193,7 @@ func TestAccObjectBucketPolicy_OtherRegionWithBucketID(t *testing.T) {
193193
}
194194

195195
func TestAccObjectBucketPolicy_OtherRegionWithBucketName(t *testing.T) {
196-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scw-obp-with-bucket-name")
196+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-obp-with-bucket-name")
197197

198198
tt := acctest.NewTestTools(t)
199199
defer tt.Cleanup()

internal/services/object/bucket_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ func TestAccObjectBucket_Basic(t *testing.T) {
2727
defer tt.Cleanup()
2828
testBucketACL := "private"
2929
testBucketUpdatedACL := "public-read"
30-
bucketBasic := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-basic")
31-
bucketMainRegion := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-main-region")
32-
bucketSecondary := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-secondary")
30+
bucketBasic := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-basic")
31+
bucketMainRegion := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-main-region")
32+
bucketSecondary := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-secondary")
3333
objectBucketTestMainRegion := scw.RegionFrPar
3434
objectBucketTestSecondaryRegion := scw.RegionNlAms
3535
objectBucketTestDefaultRegion, _ := tt.Meta.ScwClient().GetDefaultRegion()
@@ -121,7 +121,7 @@ func TestAccObjectBucket_Basic(t *testing.T) {
121121
func TestAccObjectBucket_Lifecycle(t *testing.T) {
122122
tt := acctest.NewTestTools(t)
123123
defer tt.Cleanup()
124-
bucketLifecycle := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-lifecycle")
124+
bucketLifecycle := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-lifecycle")
125125
resourceNameLifecycle := "scaleway_object_bucket.main-bucket-lifecycle"
126126
resource.ParallelTest(t, resource.TestCase{
127127
PreCheck: func() { acctest.PreCheck(t) },
@@ -407,7 +407,7 @@ func TestAccObjectBucket_Lifecycle(t *testing.T) {
407407
func TestAccObjectBucket_ObjectLock(t *testing.T) {
408408
tt := acctest.NewTestTools(t)
409409
defer tt.Cleanup()
410-
bucketObjectLock := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-lock")
410+
bucketObjectLock := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-lock")
411411
resource.ParallelTest(t, resource.TestCase{
412412
PreCheck: func() { acctest.PreCheck(t) },
413413
ProviderFactories: tt.ProviderFactories,
@@ -473,7 +473,7 @@ func TestAccObjectBucket_Cors_Update(t *testing.T) {
473473
defer tt.Cleanup()
474474

475475
resourceName := "scaleway_object_bucket.bucket-cors-update"
476-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-cors-update")
476+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-cors-update")
477477
resource.ParallelTest(t, resource.TestCase{
478478
PreCheck: func() { acctest.PreCheck(t) },
479479
ProviderFactories: tt.ProviderFactories,
@@ -576,7 +576,7 @@ func TestAccObjectBucket_Cors_Delete(t *testing.T) {
576576
ctx := context.Background()
577577

578578
resourceName := "scaleway_object_bucket.bucket"
579-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-cors-delete")
579+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-cors-delete")
580580
deleteBucketCors := func(tt *acctest.TestTools, n string) resource.TestCheckFunc {
581581
return func(s *terraform.State) error {
582582
rs, ok := s.RootModule().Resources[n]
@@ -631,7 +631,7 @@ func TestAccObjectBucket_Cors_EmptyOrigin(t *testing.T) {
631631
tt := acctest.NewTestTools(t)
632632
defer tt.Cleanup()
633633

634-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-cors-empty-origin")
634+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-cors-empty-origin")
635635
resource.ParallelTest(t, resource.TestCase{
636636
PreCheck: func() { acctest.PreCheck(t) },
637637
ProviderFactories: tt.ProviderFactories,
@@ -701,7 +701,7 @@ func TestAccObjectBucket_DestroyForce(t *testing.T) {
701701
defer tt.Cleanup()
702702

703703
resourceName := "scaleway_object_bucket.bucket"
704-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-force")
704+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-force")
705705

706706
addObjectToBucket := func(tt *acctest.TestTools, n string) resource.TestCheckFunc {
707707
return func(s *terraform.State) error {

internal/services/object/data_source_object_bucket_policy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func TestAccDataSourceObjectBucketPolicy_Basic(t *testing.T) {
1616
tt := acctest.NewTestTools(t)
1717
defer tt.Cleanup()
1818

19-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scw-obp-data-basic")
19+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-obp-data-basic")
2020

2121
expectedPolicyText := `{
2222
"Version":"2012-10-17",

internal/services/object/data_source_object_bucket_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
func TestAccDataSourceObjectBucket_Basic(t *testing.T) {
1818
tt := acctest.NewTestTools(t)
1919
defer tt.Cleanup()
20-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket")
20+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket")
2121
objectBucketTestDefaultRegion, _ := tt.Meta.ScwClient().GetDefaultRegion()
2222

2323
resource.ParallelTest(t, resource.TestCase{
@@ -90,7 +90,7 @@ func TestAccDataSourceObjectBucket_Basic(t *testing.T) {
9090
func TestAccDataSourceObjectBucket_ProjectIDAllowed(t *testing.T) {
9191
tt := acctest.NewTestTools(t)
9292
defer tt.Cleanup()
93-
bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket")
93+
bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket")
9494

9595
project, iamAPIKey, terminateFakeSideProject, err := acctest.CreateFakeSideProject(tt)
9696
require.NoError(t, err)

0 commit comments

Comments
 (0)