Skip to content

Commit 3b3aae2

Browse files
alexng-canuckalexng-canuck
committed
Fix hyphenation usage in generated object storage and subnet tests
This was a result of Ramy's change to fix hyphenation in the code generator. Keeping the two in sync.
1 parent 981dad7 commit 3b3aae2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎provider/core_subnet_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ resource "oci_core_subnet" "test_subnet" {
3939
}
4040
`
4141
SubnetPropertyVariables = `
42-
variable "subnet_availability_domain" { default = "crmS:PHXAD1" }
42+
variable "subnet_availability_domain" { default = "crmS:PHX-AD-1" }
4343
variable "subnet_cidr_block" { default = "10.0.0.0/16" }
4444
variable "subnet_display_name" { default = "MySubnet" }
4545
variable "subnet_dns_label" { default = "dnslabel" }
@@ -76,7 +76,7 @@ func TestCoreSubnetResource_basic(t *testing.T) {
7676
ImportStateVerify: true,
7777
Config: config + SubnetPropertyVariables + compartmentIdVariableStr + SubnetRequiredOnlyResource,
7878
Check: resource.ComposeAggregateTestCheckFunc(
79-
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHXAD1"),
79+
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHX-AD-1"),
8080
resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
8181
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
8282
resource.TestCheckResourceAttrSet(resourceName, "dhcp_options_id"),
@@ -98,7 +98,7 @@ func TestCoreSubnetResource_basic(t *testing.T) {
9898
{
9999
Config: config + SubnetPropertyVariables + compartmentIdVariableStr + SubnetResourceConfig,
100100
Check: resource.ComposeAggregateTestCheckFunc(
101-
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHXAD1"),
101+
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHX-AD-1"),
102102
resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
103103
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
104104
resource.TestCheckResourceAttrSet(resourceName, "dhcp_options_id"),
@@ -123,7 +123,7 @@ func TestCoreSubnetResource_basic(t *testing.T) {
123123
// verify updates to updatable parameters
124124
{
125125
Config: config + `
126-
variable "subnet_availability_domain" { default = "crmS:PHXAD1" }
126+
variable "subnet_availability_domain" { default = "crmS:PHX-AD-1" }
127127
variable "subnet_cidr_block" { default = "10.0.0.0/16" }
128128
variable "subnet_display_name" { default = "displayName2" }
129129
variable "subnet_dns_label" { default = "dnslabel" }
@@ -133,7 +133,7 @@ variable "subnet_state" { default = "state" }
133133
134134
` + compartmentIdVariableStr + SubnetResourceConfig,
135135
Check: resource.ComposeAggregateTestCheckFunc(
136-
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHXAD1"),
136+
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHX-AD-1"),
137137
resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
138138
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
139139
resource.TestCheckResourceAttrSet(resourceName, "dhcp_options_id"),
@@ -271,7 +271,7 @@ func TestCoreSubnetResource_forcenew(t *testing.T) {
271271
{
272272
Config: config + SubnetPropertyVariables + compartmentIdVariableStr + SubnetResourceConfig,
273273
Check: resource.ComposeAggregateTestCheckFunc(
274-
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHXAD1"),
274+
resource.TestCheckResourceAttr(resourceName, "availability_domain", "crmS:PHX-AD-1"),
275275
resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
276276
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
277277
resource.TestCheckResourceAttrSet(resourceName, "dhcp_options_id"),

‎provider/object_storage_bucket_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resource "oci_object_storage_bucket" "test_bucket" {
3535
BucketPropertyVariables = `
3636
variable "bucket_access_type" { default = "accessType" }
3737
variable "bucket_metadata" { default = object{} }
38-
variable "bucket_name" { default = "myTest1" }
38+
variable "bucket_name" { default = "my-test-1" }
3939
variable "bucket_namespace" { default = "example_namespace" }
4040
4141
`
@@ -68,7 +68,7 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
6868
Config: config + BucketPropertyVariables + compartmentIdVariableStr + BucketRequiredOnlyResource,
6969
Check: resource.ComposeAggregateTestCheckFunc(
7070
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
71-
resource.TestCheckResourceAttr(resourceName, "name", "myTest1"),
71+
resource.TestCheckResourceAttr(resourceName, "name", "my-test-1"),
7272
resource.TestCheckResourceAttr(resourceName, "namespace", "example_namespace"),
7373

7474
func(s *terraform.State) (err error) {
@@ -91,7 +91,7 @@ func TestObjectStorageBucketResource_basic(t *testing.T) {
9191
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
9292
resource.TestCheckResourceAttrSet(resourceName, "etag"),
9393
//resource.TestCheckResourceAttr(resourceName, "metadata", object{}),
94-
resource.TestCheckResourceAttr(resourceName, "name", "myTest1"),
94+
resource.TestCheckResourceAttr(resourceName, "name", "my-test-1"),
9595
resource.TestCheckResourceAttr(resourceName, "namespace", "example_namespace"),
9696
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
9797
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -228,7 +228,7 @@ func TestObjectStorageBucketResource_forcenew(t *testing.T) {
228228
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
229229
resource.TestCheckResourceAttrSet(resourceName, "etag"),
230230
//resource.TestCheckResourceAttr(resourceName, "metadata", object{}),
231-
resource.TestCheckResourceAttr(resourceName, "name", "myTest1"),
231+
resource.TestCheckResourceAttr(resourceName, "name", "my-test-1"),
232232
resource.TestCheckResourceAttr(resourceName, "namespace", "example_namespace"),
233233
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
234234
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -245,7 +245,7 @@ func TestObjectStorageBucketResource_forcenew(t *testing.T) {
245245
Config: config + `
246246
variable "bucket_access_type" { default = "accessType" }
247247
variable "bucket_metadata" { default = object{} }
248-
variable "bucket_name" { default = "myTest1" }
248+
variable "bucket_name" { default = "my-test-1" }
249249
variable "bucket_namespace" { default = "example_namespace" }
250250
` + compartmentIdVariableStr2 + BucketResourceConfig,
251251
Check: resource.ComposeAggregateTestCheckFunc(
@@ -254,7 +254,7 @@ variable "bucket_namespace" { default = "example_namespace" }
254254
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
255255
resource.TestCheckResourceAttrSet(resourceName, "etag"),
256256
//resource.TestCheckResourceAttr(resourceName, "metadata", object{}),
257-
resource.TestCheckResourceAttr(resourceName, "name", "myTest1"),
257+
resource.TestCheckResourceAttr(resourceName, "name", "my-test-1"),
258258
resource.TestCheckResourceAttr(resourceName, "namespace", "example_namespace"),
259259
resource.TestCheckResourceAttrSet(resourceName, "namespace"),
260260
resource.TestCheckResourceAttrSet(resourceName, "time_created"),

0 commit comments

Comments
 (0)