Skip to content

Commit 533c8e3

Browse files
varmax2511varmax2511
committed
test fix with random names
1 parent 8c29d48 commit 533c8e3

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

‎oci/database_autonomous_database_resource_test.go‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ var (
1414
adbDedicatedName = randomString(1, charsetWithoutDigits) + randomString(13, charset)
1515
adbDedicatedUpdateName = randomString(1, charsetWithoutDigits) + randomString(13, charset)
1616
adbDedicatedCloneName = randomString(1, charsetWithoutDigits) + randomString(13, charset)
17+
adDedicatedName = randomString(1, charsetWithoutDigits) + randomString(13, charset)
18+
adDedicatedUpdateName = randomString(1, charsetWithoutDigits) + randomString(13, charset)
1719

1820
AutonomousDatabaseDedicatedRequiredOnlyResource = AutonomousDatabaseDedicatedResourceDependencies +
1921
generateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", Required, Create, autonomousDatabaseDedicatedRepresentation)
@@ -25,21 +27,24 @@ var (
2527
autonomousDatabaseDataSourceRepresentation,
2628
map[string]interface{}{
2729
"autonomous_container_database_id": Representation{repType: Optional, create: `${oci_database_autonomous_container_database.test_autonomous_container_database.id}`},
30+
"display_name": Representation{repType: Optional, create: adDedicatedName, update: adDedicatedUpdateName},
2831
})
2932

3033
autonomousDatabaseDedicatedRepresentation = representationCopyWithNewProperties(
3134
representationCopyWithRemovedProperties(getUpdatedRepresentationCopy("db_name", Representation{repType: Required, create: adbDedicatedName}, autonomousDatabaseRepresentation), []string{"license_model"}),
3235
map[string]interface{}{
3336
"autonomous_container_database_id": Representation{repType: Optional, create: `${oci_database_autonomous_container_database.test_autonomous_container_database.id}`},
3437
"is_dedicated": Representation{repType: Optional, create: `true`},
38+
"display_name": Representation{repType: Optional, create: adDedicatedName, update: adDedicatedUpdateName},
3539
})
3640

3741
autonomousDatabaseDedicatedRepresentationForClone = representationCopyWithNewProperties(
3842
representationCopyWithRemovedProperties(getUpdatedRepresentationCopy("db_name", Representation{repType: Required, create: adbDedicatedCloneName}, autonomousDatabaseDedicatedRepresentation), []string{"license_model"}),
3943
map[string]interface{}{
40-
"clone_type": Representation{repType: Optional, create: `FULL`},
41-
"source": Representation{repType: Optional, create: `DATABASE`},
42-
"source_id": Representation{repType: Optional, create: `${oci_database_autonomous_database.test_autonomous_database_source.id}`},
44+
"clone_type": Representation{repType: Optional, create: `FULL`},
45+
"display_name": Representation{repType: Optional, create: "example_autonomous_database_dedicated"},
46+
"source": Representation{repType: Optional, create: `DATABASE`},
47+
"source_id": Representation{repType: Optional, create: `${oci_database_autonomous_database.test_autonomous_database_source.id}`},
4348
})
4449

4550
AutonomousDatabaseDedicatedResourceDependencies = AutonomousContainerDatabaseResourceConfig
@@ -80,7 +85,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
8085
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedName),
8186
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
8287
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
83-
resource.TestCheckResourceAttr(resourceName, "display_name", "example_autonomous_database"),
88+
resource.TestCheckResourceAttr(resourceName, "display_name", adDedicatedName),
8489
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
8590
resource.TestCheckResourceAttrSet(resourceName, "id"),
8691
resource.TestCheckResourceAttr(resourceName, "is_dedicated", "true"),
@@ -106,7 +111,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
106111
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedName),
107112
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
108113
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
109-
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
114+
resource.TestCheckResourceAttr(resourceName, "display_name", adDedicatedUpdateName),
110115
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
111116
resource.TestCheckResourceAttrSet(resourceName, "id"),
112117
resource.TestCheckResourceAttr(resourceName, "is_dedicated", "true"),
@@ -134,7 +139,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
134139
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedUpdateName),
135140
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
136141
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
137-
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
142+
resource.TestCheckResourceAttr(resourceName, "display_name", adDedicatedUpdateName),
138143
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
139144
resource.TestCheckResourceAttrSet(resourceName, "id"),
140145
resource.TestCheckResourceAttr(resourceName, "is_dedicated", "true"),
@@ -151,7 +156,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
151156
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_id"),
152157
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
153158
resource.TestCheckResourceAttr(datasourceName, "db_workload", "OLTP"),
154-
resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
159+
resource.TestCheckResourceAttr(datasourceName, "display_name", adDedicatedUpdateName),
155160
resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
156161

157162
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.#", "1"),
@@ -165,7 +170,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
165170
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.db_version"),
166171
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.db_workload", "OLTP"),
167172
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.defined_tags.%", "1"),
168-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.display_name", "displayName2"),
173+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.display_name", adDedicatedUpdateName),
169174
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.freeform_tags.%", "1"),
170175
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.id"),
171176
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.is_dedicated", "true"),
@@ -192,7 +197,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
192197
resource.TestCheckResourceAttr(singularDatasourceName, "db_workload", "OLTP"),
193198
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
194199
resource.TestCheckResourceAttr(singularDatasourceName, "defined_tags.%", "1"),
195-
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
200+
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", adDedicatedUpdateName),
196201
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
197202
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
198203
resource.TestCheckResourceAttr(singularDatasourceName, "is_dedicated", "true"),
@@ -239,7 +244,7 @@ func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
239244
resource.TestCheckResourceAttr(resourceName, "db_name", adbDedicatedCloneName),
240245
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
241246
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
242-
resource.TestCheckResourceAttr(resourceName, "display_name", "example_autonomous_database"),
247+
resource.TestCheckResourceAttr(resourceName, "display_name", "example_autonomous_database_dedicated"),
243248
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
244249
resource.TestCheckResourceAttrSet(resourceName, "id"),
245250
resource.TestCheckResourceAttr(resourceName, "source", "DATABASE"),

‎oci/identity_tag_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ resource "oci_identity_tag_namespace" "tag-namespace1" {
3434
resource "oci_identity_tag" "tag1" {
3535
#Required
3636
description = "example tag"
37-
name = "example-tag-test"
37+
name = "example-tag"
3838
tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace1.id}"
3939
4040
is_retired = false

‎oci/ons_notification_topic_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
)
1919

2020
var (
21-
topicNameRequiredOnly = `t` + "topicrequired"
22-
topicName = `t` + "topic"
21+
topicNameRequiredOnly = `t` + randomString(10, charset)
22+
topicName = `t` + randomString(10, charset)
2323
NotificationTopicRequiredOnlyResource = NotificationTopicResourceDependencies +
2424
generateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, representationCopyWithNewProperties(notificationTopicRepresentation, map[string]interface{}{
2525
"name": Representation{repType: Required, create: topicNameRequiredOnly},

0 commit comments

Comments
 (0)