Skip to content

Commit 2474922

Browse files
author
Ravi Tandon
committed
Update Object Storage Lifecycle tests to use random buckets and consolidate other tests for same random string generation
1 parent 8349600 commit 2474922

5 files changed

+17
-22
lines changed

‎oci/database_autonomous_data_warehouse_backup_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestDatabaseAutonomousDataWarehouseBackupResource_basic(t *testing.T) {
4747
datasourceName := "data.oci_database_autonomous_data_warehouse_backups.test_autonomous_data_warehouse_backups"
4848
singularDatasourceName := "data.oci_database_autonomous_data_warehouse_backup.test_autonomous_data_warehouse_backup"
4949

50-
testResourceName := GenerateTestResourceName("adwdb1", 14)
50+
testResourceName := randomString(14, charset)
5151
setEnvSetting("TF_VAR_autonomous_data_warehouse_db_name", testResourceName)
5252

5353
resource.Test(t, resource.TestCase{

‎oci/database_autonomous_data_warehouse_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var (
3636
"values": Representation{repType: Required, create: []string{`${oci_database_autonomous_data_warehouse.test_autonomous_data_warehouse.id}`}},
3737
}
3838

39-
adwName = GenerateTestResourceName("adw", 14)
39+
adwName = randomString(14, charset)
4040

4141
autonomousDataWarehouseRepresentation = map[string]interface{}{
4242
"admin_password": Representation{repType: Required, create: `BEstrO0ng_#11`, update: `BEstrO0ng_#12`},

‎oci/database_autonomous_database_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var (
3636
"values": Representation{repType: Required, create: []string{`${oci_database_autonomous_database.test_autonomous_database.id}`}},
3737
}
3838

39-
adbName = GenerateTestResourceName("adb", 14)
39+
adbName = randomString(14, charset)
4040

4141
autonomousDatabaseRepresentation = map[string]interface{}{
4242
"admin_password": Representation{repType: Required, create: `BEstrO0ng_#11`, update: `BEstrO0ng_#12`},

‎oci/object_storage_object_lifecycle_policy_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@ var (
2020
ObjectLifecyclePolicyResourceConfig = ObjectLifecyclePolicyResourceDependencies +
2121
generateResourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Optional, Update, objectLifecyclePolicyRepresentation)
2222

23+
bucketName = randomString(32, charset)
24+
bucketName2 = randomString(32, charset)
25+
bucketName3 = randomString(32, charset)
26+
2327
objectLifecyclePolicySingularDataSourceRepresentation = map[string]interface{}{
24-
"bucket": Representation{repType: Required, create: `lifecycle-policy-test-1`},
28+
"bucket": Representation{repType: Required, create: bucketName},
2529
"namespace": Representation{repType: Required, create: `${data.oci_objectstorage_namespace.t.namespace}`},
2630
}
2731

2832
objectLifecyclePolicyRepresentation = map[string]interface{}{
29-
"bucket": Representation{repType: Required, create: `lifecycle-policy-test-1`},
33+
"bucket": Representation{repType: Required, create: bucketName},
3034
"namespace": Representation{repType: Required, create: `${data.oci_objectstorage_namespace.t.namespace}`},
3135
"rules": RepresentationGroup{Optional, objectLifecyclePolicyRulesRepresentation},
3236
}
@@ -39,12 +43,12 @@ var (
3943
"object_name_filter": RepresentationGroup{Optional, objectLifecyclePolicyRulesObjectNameFilterRepresentation},
4044
}
4145
objectLifecyclePolicyRulesObjectNameFilterRepresentation = map[string]interface{}{
42-
"inclusion_prefixes": Representation{repType: Optional, create: []string{`lifecycle-policy-test-1`, `lifecycle-policy-test-2`}, update: []string{`lifecycle-policy-test-1`, `lifecycle-policy-test-2`, `lifecycle-policy-test-3`}},
46+
"inclusion_prefixes": Representation{repType: Optional, create: []string{bucketName, bucketName2}, update: []string{bucketName, bucketName2, bucketName3}},
4347
}
4448

4549
ObjectLifecyclePolicyResourceDependencies = BucketResourceDependencies +
4650
generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Required, Create,
47-
getUpdatedRepresentationCopy("name", Representation{repType: Required, create: `lifecycle-policy-test-1`}, bucketRepresentation))
51+
getUpdatedRepresentationCopy("name", Representation{repType: Required, create: bucketName}, bucketRepresentation))
4852
)
4953

5054
func TestObjectStorageObjectLifecyclePolicyResource_basic(t *testing.T) {
@@ -72,7 +76,7 @@ func TestObjectStorageObjectLifecyclePolicyResource_basic(t *testing.T) {
7276
Config: config + compartmentIdVariableStr + ObjectLifecyclePolicyResourceDependencies +
7377
generateResourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Required, Create, objectLifecyclePolicyRepresentation),
7478
Check: resource.ComposeAggregateTestCheckFunc(
75-
resource.TestCheckResourceAttr(resourceName, "bucket", "lifecycle-policy-test-1"),
79+
resource.TestCheckResourceAttr(resourceName, "bucket", bucketName),
7680
resource.TestCheckResourceAttr(resourceName, "rules.#", "0"),
7781
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
7882

@@ -92,7 +96,7 @@ func TestObjectStorageObjectLifecyclePolicyResource_basic(t *testing.T) {
9296
Config: config + compartmentIdVariableStr + ObjectLifecyclePolicyResourceDependencies +
9397
generateResourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Optional, Create, objectLifecyclePolicyRepresentation),
9498
Check: resource.ComposeAggregateTestCheckFunc(
95-
resource.TestCheckResourceAttr(resourceName, "bucket", "lifecycle-policy-test-1"),
99+
resource.TestCheckResourceAttr(resourceName, "bucket", bucketName),
96100
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
97101
resource.TestCheckResourceAttr(resourceName, "rules.#", "1"),
98102
CheckResourceSetContainsElementWithProperties(resourceName, "rules", map[string]string{
@@ -118,7 +122,7 @@ func TestObjectStorageObjectLifecyclePolicyResource_basic(t *testing.T) {
118122
Config: config + compartmentIdVariableStr + ObjectLifecyclePolicyResourceDependencies +
119123
generateResourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Optional, Update, objectLifecyclePolicyRepresentation),
120124
Check: resource.ComposeAggregateTestCheckFunc(
121-
resource.TestCheckResourceAttr(resourceName, "bucket", "lifecycle-policy-test-1"),
125+
resource.TestCheckResourceAttr(resourceName, "bucket", bucketName),
122126
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
123127
resource.TestCheckResourceAttr(resourceName, "rules.#", "1"),
124128
CheckResourceSetContainsElementWithProperties(resourceName, "rules", map[string]string{
@@ -147,7 +151,7 @@ func TestObjectStorageObjectLifecyclePolicyResource_basic(t *testing.T) {
147151
generateDataSourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Required, Create, objectLifecyclePolicySingularDataSourceRepresentation) +
148152
compartmentIdVariableStr + ObjectLifecyclePolicyResourceConfig,
149153
Check: resource.ComposeAggregateTestCheckFunc(
150-
resource.TestCheckResourceAttr(singularDatasourceName, "bucket", "lifecycle-policy-test-1"),
154+
resource.TestCheckResourceAttr(singularDatasourceName, "bucket", bucketName),
151155
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
152156
resource.TestCheckResourceAttr(singularDatasourceName, "rules.#", "1"),
153157
CheckResourceSetContainsElementWithProperties(singularDatasourceName, "rules", map[string]string{},
@@ -204,7 +208,7 @@ func TestObjectStorageObjectLifecyclePolicyResource_validations(t *testing.T) {
204208
Config: config + compartmentIdVariableStr + ObjectLifecyclePolicyResourceDependencies +
205209
generateResourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Optional, Create, objectLifecyclePolicyRepresentation),
206210
Check: resource.ComposeAggregateTestCheckFunc(
207-
resource.TestCheckResourceAttr(resourceName, "bucket", "lifecycle-policy-test-1"),
211+
resource.TestCheckResourceAttr(resourceName, "bucket", bucketName),
208212
resource.TestCheckResourceAttr(resourceName, "rules.#", "1"),
209213
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
210214

@@ -218,7 +222,7 @@ func TestObjectStorageObjectLifecyclePolicyResource_validations(t *testing.T) {
218222
{
219223
Config: config + compartmentIdVariableStr + ObjectLifecyclePolicyResourceDependencies +
220224
generateResourceFromRepresentationMap("oci_objectstorage_object_lifecycle_policy", "test_object_lifecycle_policy", Optional, Create,
221-
getUpdatedRepresentationCopy("rules.object_name_filter.inclusion_prefixes", Representation{repType: Optional, create: []string{`lifecycle-policy-test-2`, `lifecycle-policy-test-1`}}, objectLifecyclePolicyRepresentation)),
225+
getUpdatedRepresentationCopy("rules.object_name_filter.inclusion_prefixes", Representation{repType: Optional, create: []string{bucketName2, bucketName}}, objectLifecyclePolicyRepresentation)),
222226
PlanOnly: true,
223227
ExpectNonEmptyPlan: false,
224228
},

‎oci/test_helpers.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,6 @@ func generateResourceFromMap(representationType RepresentationType, representati
307307
return buffer.String()
308308
}
309309

310-
func GenerateTestResourceName(prefix string, maxLength int) string {
311-
t := time.Now()
312-
resourceName := fmt.Sprintf("%s%d", prefix, t.Unix())
313-
if len(resourceName) > maxLength {
314-
resourceName = resourceName[:maxLength]
315-
}
316-
return resourceName
317-
}
318-
319310
func setEnvSetting(s, v string) error {
320311
error := os.Setenv(s, v)
321312
if error != nil {

0 commit comments

Comments
 (0)