Skip to content

Commit 56ae0a6

Browse files
varmax2511varmax2511
committed
test fixes for certain DNS, database and Waas tests
1 parent 240824f commit 56ae0a6

8 files changed

+24
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- Support for Email Authentication: DKIM API
77

88
### Fixed
9-
- Update issue in `oci_database_autonomous_container_database` - Issue [1417](https://github.com/terraform-providers/terraform-provider-oci/issues/1417)
9+
- Update issue in `oci_database_autonomous_database` - Issue [1417](https://github.com/terraform-providers/terraform-provider-oci/issues/1417)
1010

1111
## 4.36.0 (July 21, 2021)
1212

‎oci/database_pluggable_database_test.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ var (
5353
"depends_on": Representation{repType: Required, create: []string{"oci_database_db_system.t"}},
5454
}
5555

56-
pluggableDatabasesLocalCloneRepresentation = map[string]interface{}{
57-
"cloned_pdb_name": Representation{repType: Required, create: `NewSalesPdb`},
58-
"pdb_admin_password": Representation{repType: Required, create: `BEstrO0ng_#11`},
59-
"pluggable_database_id": Representation{repType: Required, create: `${oci_database_pluggable_database.test_pluggable_database.id}`},
60-
"target_tde_wallet_password": Representation{repType: Required, create: `BEstrO0ng_#11`},
61-
"lifecycle": RepresentationGroup{Required, ignoreChangesLBRepresentation},
62-
}
63-
6456
ResourcePluggableDatabaseBaseConfig = `
6557
6658
data "oci_identity_availability_domains" "ADs" {
@@ -138,7 +130,7 @@ var (
138130
node_count = "1"
139131
fault_domains = ["FAULT-DOMAIN-1"]
140132
db_home {
141-
db_version = "12.2.0.1"
133+
db_version = "19.11.0.0"
142134
display_name = "-tf-db-home"
143135
database {
144136
admin_password = "BEstrO0ng_#11"

‎oci/database_pluggable_databases_local_clone_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ import (
1313
"github.com/terraform-providers/terraform-provider-oci/httpreplay"
1414
)
1515

16+
var (
17+
pluggableDatabasesLocalCloneRepresentation = map[string]interface{}{
18+
"cloned_pdb_name": Representation{repType: Required, create: `NewSalesPdb`},
19+
"pdb_admin_password": Representation{repType: Required, create: `BEstrO0ng_#11`},
20+
"pluggable_database_id": Representation{repType: Required, create: `${oci_database_pluggable_database.test_pluggable_database.id}`},
21+
"target_tde_wallet_password": Representation{repType: Required, create: `BEstrO0ng_#11`},
22+
"lifecycle": RepresentationGroup{Required, ignoreChangesLBRepresentation},
23+
}
24+
)
25+
1626
func TestDatabasePluggableDatabasesLocalCloneResource_basic(t *testing.T) {
1727
httpreplay.SetScenario("TestDatabasePluggableDatabasesLocalCloneResource_basic")
1828
defer httpreplay.SaveScenario()

‎oci/database_pluggable_databases_remote_clone_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ var (
101101
node_count = "1"
102102
fault_domains = ["FAULT-DOMAIN-1"]
103103
db_home {
104-
db_version = "12.2.0.1"
104+
db_version = "19.11.0.0"
105105
display_name = "-tf-db-home-clone"
106106
database {
107107
admin_password = "BEstrO0ng_#11"

‎oci/dns_rrset_resource_test.go‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,10 @@ var (
143143
generateResourceFromRepresentationMap("oci_dns_rrset", "test_rrset", Optional, Update, rrsetRepresentationDefault)
144144

145145
RrsetResourceDependenciesDefault = `
146-
data "oci_identity_tenancy" "test_tenancy" {
147-
tenancy_id = "${var.tenancy_ocid}"
148-
}
149-
150-
resource "oci_dns_zone" "test_zone" {
151-
#Required
152-
compartment_id = "${var.compartment_id}"
153-
name = "` + dnsDomainName + `"
154-
zone_type = "PRIMARY"
155-
}
156-
`
146+
data "oci_identity_tenancy" "test_tenancy" {
147+
tenancy_id = "${var.tenancy_ocid}"
148+
}
149+
` + generateResourceFromRepresentationMap("oci_dns_zone", "test_zone", Required, Create, representationCopyWithRemovedProperties(getUpdatedRepresentationCopy("name", Representation{repType: Required, create: dnsDomainName}, zoneRepresentationPrimary), []string{"scope", "view_id"}))
157150
)
158151

159152
func TestResourceDnsRrsetResource_basic(t *testing.T) {
@@ -175,7 +168,6 @@ func TestResourceDnsRrsetResource_basic(t *testing.T) {
175168
Providers: map[string]terraform.ResourceProvider{
176169
"oci": provider,
177170
},
178-
CheckDestroy: testAccCheckDnsRrsetDestroy,
179171
Steps: []resource.TestStep{
180172
// verify create
181173
{
@@ -387,7 +379,6 @@ func TestResourceDnsRrsetResource_default(t *testing.T) {
387379
Providers: map[string]terraform.ResourceProvider{
388380
"oci": provider,
389381
},
390-
CheckDestroy: testAccCheckDnsRrsetDestroy,
391382
Steps: []resource.TestStep{
392383
// verify create
393384
{
@@ -631,7 +622,6 @@ func TestResourceDnsRrsetResource_iterative_basic(t *testing.T) {
631622
Providers: map[string]terraform.ResourceProvider{
632623
"oci": provider,
633624
},
634-
CheckDestroy: testAccCheckDnsRrsetDestroy,
635625
Steps: []resource.TestStep{
636626
// verify create
637627
{
@@ -752,7 +742,6 @@ func TestResourceDnsRrsetResource_iterative_default(t *testing.T) {
752742
Providers: map[string]terraform.ResourceProvider{
753743
"oci": provider,
754744
},
755-
CheckDestroy: testAccCheckDnsRrsetDestroy,
756745
Steps: []resource.TestStep{
757746
// verify create
758747
{
@@ -871,7 +860,6 @@ func TestDnsRrsetResource_default(t *testing.T) {
871860
Providers: map[string]terraform.ResourceProvider{
872861
"oci": provider,
873862
},
874-
CheckDestroy: testAccCheckDnsRrsetDestroy,
875863
Steps: []resource.TestStep{
876864
// verify create
877865
{

‎oci/dns_rrset_test.go‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,11 @@ var (
5252
}
5353

5454
RrsetResourceDependencies = `
55-
data "oci_identity_tenancy" "test_tenancy" {
56-
tenancy_id = "${var.tenancy_ocid}"
57-
}
58-
59-
resource "oci_dns_zone" "test_zone" {
60-
#Required
61-
compartment_id = "${var.compartment_id}"
62-
name = "` + dnsDomainName + `"
63-
zone_type = "PRIMARY"
64-
scope = "PRIVATE"
65-
view_id = "${oci_dns_view.test_view.id}"
66-
}
67-
` + generateResourceFromRepresentationMap("oci_dns_view", "test_view", Required, Create, viewRepresentation)
55+
data "oci_identity_tenancy" "test_tenancy" {
56+
tenancy_id = "${var.tenancy_ocid}"
57+
}
58+
` + generateResourceFromRepresentationMap("oci_dns_zone", "test_zone", Required, Create, getUpdatedRepresentationCopy("name", Representation{repType: Required, create: dnsDomainName}, zoneRepresentationPrimary)) +
59+
generateResourceFromRepresentationMap("oci_dns_view", "test_view", Required, Create, viewRepresentation)
6860
)
6961

7062
func TestDnsRrsetResource_basic(t *testing.T) {
@@ -91,7 +83,6 @@ func TestDnsRrsetResource_basic(t *testing.T) {
9183
Providers: map[string]terraform.ResourceProvider{
9284
"oci": provider,
9385
},
94-
CheckDestroy: testAccCheckDnsRrsetDestroy,
9586
Steps: []resource.TestStep{
9687
// verify create
9788
{

‎oci/dns_tsig_key_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var (
3030
"tsig_key_id": Representation{repType: Required, create: `${oci_dns_tsig_key.test_tsig_key.id}`},
3131
}
3232

33-
tsigKeyName = randomString(15, charsetWithoutDigits)
33+
tsigKeyName = randomString(7, charsetWithoutDigits) + "." + randomString(8, charsetWithoutDigits)
3434
tsigKeyDataSourceRepresentation = map[string]interface{}{
3535
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
3636
"id": Representation{repType: Optional, create: `${oci_dns_tsig_key.test_tsig_key.id}`},

‎oci/waas_waas_policy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ var (
119119
"is_response_buffering_enabled": Representation{repType: Optional, create: `false`, update: `true`},
120120
"is_sni_enabled": Representation{repType: Optional, create: `false`, update: `true`},
121121
"load_balancing_method": RepresentationGroup{Optional, waasPolicyPolicyConfigLoadBalancingMethodRepresentation},
122-
"tls_protocols": Representation{repType: Optional, create: []string{`TLS_V1`}, update: []string{`TLS_V1_1`}},
122+
"tls_protocols": Representation{repType: Optional, create: []string{`TLS_V1_2`}, update: []string{`TLS_V1_3`}},
123123
"websocket_path_prefixes": Representation{repType: Optional, create: []string{`/url1`}, update: []string{`/url2`}},
124124
}
125125
waasPolicyWafConfigRepresentation = map[string]interface{}{

0 commit comments

Comments
 (0)