Skip to content

Commit e09d5ff

Browse files
codycushingcodycushing
authored
Avoid name collisions with concurrent tests pt2 (#311)
* Integrate in remaining areas of potential conflict
1 parent 5a513f6 commit e09d5ff

17 files changed

+78
-60
lines changed

‎data_source_obmcs_identity_api_keys_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ type DatasourceIdentityAPIKeysTestSuite struct {
2323
}
2424

2525
func (s *DatasourceIdentityAPIKeysTestSuite) SetupTest() {
26+
_, tokenFn := tokenize()
2627
s.Client = testAccClient
2728
s.Provider = testAccProvider
2829
s.Providers = testAccProviders
29-
s.Config = testProviderConfig() + `
30+
s.Config = testProviderConfig() + tokenFn(`
3031
resource "oci_identity_user" "t" {
3132
name = "-tf-test"
3233
description = "automated test user"
@@ -45,7 +46,7 @@ mXlrQB7nNKsJrrv5fHwaPDrAY4iNP2W0q3LRpyNigJ6cgRuGJhHa82iHPmxgIx8m
4546
fwIDAQAB
4647
-----END PUBLIC KEY-----
4748
EOF
48-
}`
49+
}`, nil)
4950
s.ResourceName = "data.oci_identity_api_keys.t"
5051
}
5152

‎data_source_obmcs_identity_groups_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ type DatasourceIdentityGroupsTestSuite struct {
1919
Provider terraform.ResourceProvider
2020
Providers map[string]terraform.ResourceProvider
2121
ResourceName string
22-
List *baremetal.ListGroups
2322
}
2423

2524
func (s *DatasourceIdentityGroupsTestSuite) SetupTest() {
25+
_, tokenFn := tokenize()
2626
s.Client = testAccClient
2727
s.Provider = testAccProvider
2828
s.Providers = testAccProviders
29-
s.Config = testProviderConfig() + `
29+
s.Config = testProviderConfig() + tokenFn(`
3030
resource "oci_identity_group" "t" {
31-
name = "-tf-group"
31+
name = "{{.token}}"
3232
description = "automated test group"
33-
}`
33+
}`, nil)
3434
s.ResourceName = "data.oci_identity_groups.t"
3535
}
3636

‎data_source_obmcs_identity_policies_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ package main
44

55
import (
66
"testing"
7-
"time"
87

98
"github.com/hashicorp/terraform/helper/resource"
109
"github.com/hashicorp/terraform/terraform"
@@ -17,32 +16,32 @@ type DatasourceIdentityPolicyTestSuite struct {
1716
Client *baremetal.Client
1817
Provider terraform.ResourceProvider
1918
Providers map[string]terraform.ResourceProvider
20-
TimeCreated time.Time
2119
Config string
2220
ResourceName string
2321
}
2422

2523
func (s *DatasourceIdentityPolicyTestSuite) SetupTest() {
24+
_, tokenFn := tokenize()
2625
s.Client = testAccClient
2726
s.Provider = testAccProvider
2827
s.Providers = testAccProviders
29-
s.Config = testProviderConfig() + `
28+
s.Config = testProviderConfig() + tokenFn(`
3029
resource "oci_identity_compartment" "t" {
3130
name = "-tf-compartment"
3231
description = "tf test compartment"
3332
}
3433
3534
resource "oci_identity_group" "t" {
36-
name = "-tf-group"
35+
name = "{{.token}}"
3736
description = "automated test group"
3837
}
3938
4039
resource "oci_identity_policy" "p" {
41-
name = "-tf-policy"
40+
name = "{{.token}}"
4241
description = "automated test policy"
4342
compartment_id = "${oci_identity_compartment.t.id}"
4443
statements = ["Allow group ${oci_identity_group.t.name} to read instances in compartment ${oci_identity_compartment.t.name}"]
45-
}`
44+
}`, nil)
4645
s.ResourceName = "data.oci_identity_policies.p"
4746
}
4847

‎data_source_obmcs_identity_swift_passwords_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ type DatasourceIdentitySwiftPasswordsTestSuite struct {
2121
}
2222

2323
func (s *DatasourceIdentitySwiftPasswordsTestSuite) SetupTest() {
24+
_, tokenFn := tokenize()
2425
s.Client = testAccClient
2526
s.Provider = testAccProvider
2627
s.Providers = testAccProviders
27-
s.Config = testProviderConfig() + `
28+
s.Config = testProviderConfig() + tokenFn(`
2829
resource "oci_identity_user" "t" {
29-
name = "-tf-user"
30+
name = "{{.token}}"
3031
description = "tf test user"
3132
}
3233
resource "oci_identity_swift_password" "t" {
3334
user_id = "${oci_identity_user.t.id}"
3435
description = "tf test user swift password"
35-
}`
36+
}`, nil)
3637
s.ResourceName = "data.oci_identity_swift_passwords.p"
3738
}
3839

‎data_source_obmcs_identity_user_group_memberships_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,26 @@ type DatasourceIdentityUserGroupMembershipsTestSuite struct {
2121
}
2222

2323
func (s *DatasourceIdentityUserGroupMembershipsTestSuite) SetupTest() {
24+
_, tokenFn := tokenize()
2425
s.Client = testAccClient
2526
s.Provider = testAccProvider
2627
s.Providers = testAccProviders
27-
s.Config = testProviderConfig() + `
28+
s.Config = testProviderConfig() + tokenFn(`
2829
resource "oci_identity_user" "t" {
29-
name = "-tf-user"
30+
name = "{{.token}}"
3031
description = "tf test user"
3132
}
3233
3334
resource "oci_identity_group" "t" {
34-
name = "-tf-group"
35+
name = "{{.token}}"
3536
description = "tf test group"
3637
}
3738
3839
resource "oci_identity_user_group_membership" "t" {
3940
compartment_id = "${var.tenancy_ocid}"
4041
user_id = "${oci_identity_user.t.id}"
4142
group_id = "${oci_identity_group.t.id}"
42-
}`
43+
}`, nil)
4344
s.ResourceName = "data.oci_identity_user_group_memberships.t"
4445
}
4546

‎data_source_obmcs_identity_users_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@ type DatasourceIdentityUsersTestSuite struct {
1919
Provider terraform.ResourceProvider
2020
Providers map[string]terraform.ResourceProvider
2121
ResourceName string
22-
List *baremetal.ListUsers
2322
}
2423

2524
func (s *DatasourceIdentityUsersTestSuite) SetupTest() {
25+
_, tokenFn := tokenize()
2626
s.Client = testAccClient
2727
s.Provider = testAccProvider
2828
s.Providers = testAccProviders
29-
s.Config = testProviderConfig() + `
29+
s.Config = testProviderConfig() + tokenFn(`
3030
resource "oci_identity_user" "t" {
31-
name = "-tf-user"
31+
name = "{{.token}}"
3232
description = "automated test user"
33-
}
34-
`
33+
}`, nil)
3534
s.ResourceName = "data.oci_identity_users.t"
3635
}
3736

‎data_source_obmcs_objectstorage_bucketsummary_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,24 @@ type DatasourceObjectstorageBucketSummaryTestSuite struct {
1919
Provider terraform.ResourceProvider
2020
Providers map[string]terraform.ResourceProvider
2121
ResourceName string
22+
Token string
23+
TokenFn func(string, map[string]string) string
2224
}
2325

2426
func (s *DatasourceObjectstorageBucketSummaryTestSuite) SetupTest() {
27+
s.Token, s.TokenFn = tokenize()
2528
s.Client = testAccClient
2629
s.Provider = testAccProvider
2730
s.Providers = testAccProviders
28-
s.Config = testProviderConfig() + `
31+
s.Config = testProviderConfig() + s.TokenFn(`
2932
data "oci_objectstorage_namespace" "t" {
3033
}
3134
3235
resource "oci_objectstorage_bucket" "t" {
3336
compartment_id = "${var.compartment_id}"
3437
namespace = "${data.oci_objectstorage_namespace.t.namespace}"
35-
name = "-tf-bucket"
36-
}`
38+
name = "{{.token}}"
39+
}`, nil)
3740
s.ResourceName = "data.oci_objectstorage_bucket_summaries.t"
3841
}
3942

@@ -58,7 +61,7 @@ func (s *DatasourceObjectstorageBucketSummaryTestSuite) TestAccDatasourceObjects
5861
resource.TestCheckResourceAttrSet(s.ResourceName, "namespace"),
5962
resource.TestCheckResourceAttrSet(s.ResourceName, "bucket_summaries.#"),
6063
resource.TestCheckResourceAttr(s.ResourceName, "bucket_summaries.#", "1"),
61-
resource.TestCheckResourceAttr(s.ResourceName, "bucket_summaries.0.name", "-tf-bucket"),
64+
resource.TestCheckResourceAttr(s.ResourceName, "bucket_summaries.0.name", s.Token),
6265
),
6366
},
6467
},

‎data_source_obmcs_objectstorage_object_head_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,23 @@ type DatasourceObjectstorageObjectHeadTestSuite struct {
1919
Providers map[string]terraform.ResourceProvider
2020
Config string
2121
ResourceName string
22+
Token string
23+
TokenFn func(string, map[string]string) string
2224
}
2325

2426
func (s *DatasourceObjectstorageObjectHeadTestSuite) SetupTest() {
27+
s.Token, s.TokenFn = tokenize()
2528
s.Client = testAccClient
2629
s.Provider = testAccProvider
2730
s.Providers = testAccProviders
28-
s.Config = testProviderConfig() + `
31+
s.Config = testProviderConfig() + s.TokenFn(`
2932
data "oci_objectstorage_namespace" "t" {
3033
}
3134
3235
resource "oci_objectstorage_bucket" "t" {
3336
compartment_id = "${var.compartment_id}"
3437
namespace = "${data.oci_objectstorage_namespace.t.namespace}"
35-
name = "-tf-bucket"
38+
name = "{{.token}}"
3639
access_type="ObjectRead"
3740
}
3841
@@ -44,7 +47,7 @@ func (s *DatasourceObjectstorageObjectHeadTestSuite) SetupTest() {
4447
metadata = {
4548
"content-type" = "text/plain"
4649
}
47-
}`
50+
}`, nil)
4851
s.ResourceName = "data.oci_objectstorage_object_head.t"
4952
}
5053

@@ -63,7 +66,7 @@ func (s *DatasourceObjectstorageObjectHeadTestSuite) TestObjectstorageObjectHead
6366
}`,
6467
Check: resource.ComposeTestCheckFunc(
6568
resource.TestCheckResourceAttrSet(s.ResourceName, "namespace"),
66-
resource.TestCheckResourceAttr(s.ResourceName, "bucket", "-tf-bucket"),
69+
resource.TestCheckResourceAttr(s.ResourceName, "bucket", s.Token),
6770
resource.TestCheckResourceAttr(s.ResourceName, "object", "-tf-object"),
6871
resource.TestCheckResourceAttr(s.ResourceName, "metadata.content-type", "text/plain"),
6972
),

‎data_source_obmcs_objectstorage_object_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,23 @@ type DatasourceObjectstorageObjectTestSuite struct {
1919
Providers map[string]terraform.ResourceProvider
2020
Config string
2121
ResourceName string
22+
Token string
23+
TokenFn func(string, map[string]string) string
2224
}
2325

2426
func (s *DatasourceObjectstorageObjectTestSuite) SetupTest() {
27+
s.Token, s.TokenFn = tokenize()
2528
s.Client = testAccClient
2629
s.Provider = testAccProvider
2730
s.Providers = testAccProviders
28-
s.Config = testProviderConfig() + `
31+
s.Config = testProviderConfig() + s.TokenFn(`
2932
data "oci_objectstorage_namespace" "t" {
3033
}
3134
3235
resource "oci_objectstorage_bucket" "t" {
3336
compartment_id = "${var.compartment_id}"
3437
namespace = "${data.oci_objectstorage_namespace.t.namespace}"
35-
name = "-tf-bucket"
38+
name = "{{.token}}"
3639
access_type="ObjectRead"
3740
}
3841
@@ -41,7 +44,7 @@ func (s *DatasourceObjectstorageObjectTestSuite) SetupTest() {
4144
bucket = "${oci_objectstorage_bucket.t.name}"
4245
object = "-tf-object"
4346
content = "123"
44-
}`
47+
}`, nil)
4548

4649
s.ResourceName = "data.oci_objectstorage_objects.t"
4750
}
@@ -67,7 +70,7 @@ func (s *DatasourceObjectstorageObjectTestSuite) TestAccDatasourceObjectstorageO
6770
}`,
6871
Check: resource.ComposeTestCheckFunc(
6972
resource.TestCheckResourceAttrSet(s.ResourceName, "namespace"),
70-
resource.TestCheckResourceAttr(s.ResourceName, "bucket", "-tf-bucket"),
73+
resource.TestCheckResourceAttr(s.ResourceName, "bucket", s.Token),
7174
resource.TestCheckResourceAttr(s.ResourceName, "objects.#", "1"),
7275
resource.TestCheckResourceAttr(s.ResourceName, "objects.0.name", "-tf-object"),
7376
resource.TestCheckResourceAttr(s.ResourceName, "objects.0.size", "3"),

‎resource_obmcs_identity_api_key_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ type ResourceIdentityAPIKeyTestSuite struct {
2222
}
2323

2424
func (s *ResourceIdentityAPIKeyTestSuite) SetupTest() {
25+
_, tokenFn := tokenize()
2526
s.Client = testAccClient
2627
s.Provider = testAccProvider
2728
s.Providers = testAccProviders
28-
s.Config = testProviderConfig() + `
29+
s.Config = testProviderConfig() + tokenFn(`
2930
resource "oci_identity_user" "t" {
30-
name = "-tf-user"
31+
name = "{{.token}}"
3132
description = "automated test user"
3233
}
3334
resource "oci_identity_api_key" "t" {
@@ -43,7 +44,7 @@ mXlrQB7nNKsJrrv5fHwaPDrAY4iNP2W0q3LRpyNigJ6cgRuGJhHa82iHPmxgIx8m
4344
fwIDAQAB
4445
-----END PUBLIC KEY-----
4546
EOF
46-
}`
47+
}`, nil)
4748
s.ResourceName = "oci_identity_api_key.t"
4849
}
4950

0 commit comments

Comments
 (0)