Skip to content

Commit 5a1235f

Browse files
rashik-bhasinrashik-bhasin
committed
Test fix for DNS and remove RD for new DNS resources
1 parent ac0cf21 commit 5a1235f

File tree

9 files changed

+56
-100
lines changed

9 files changed

+56
-100
lines changed

‎oci/dns_resolver_endpoint_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package oci
66
import (
77
"fmt"
88
"log"
9-
"strconv"
109
"testing"
1110
"time"
1211

@@ -138,11 +137,12 @@ func TestDnsResolverEndpointResource_basic(t *testing.T) {
138137

139138
func(s *terraform.State) (err error) {
140139
resId, err = fromInstanceState(s, resourceName, "id")
141-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
142-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
143-
return errExport
144-
}
145-
}
140+
// Resource discovery is disabled for Resolver Endpoints
141+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
142+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
143+
// return errExport
144+
// }
145+
//}
146146
return err
147147
},
148148
),

‎oci/dns_resolver_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package oci
66
import (
77
"fmt"
88
"log"
9-
"strconv"
109
"testing"
1110
"time"
1211

@@ -187,11 +186,12 @@ func TestDnsResolverResource_basic(t *testing.T) {
187186

188187
func(s *terraform.State) (err error) {
189188
resId, err = fromInstanceState(s, resourceName, "id")
190-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
191-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
192-
return errExport
193-
}
194-
}
189+
// Resource discovery is disabled for Resolver
190+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
191+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
192+
// return errExport
193+
// }
194+
//}
195195
return err
196196
},
197197
),

‎oci/dns_rrset_resource_test.go‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,12 @@ func TestResourceDnsRrsetResource_basic(t *testing.T) {
198198

199199
func(s *terraform.State) (err error) {
200200
resId, err = fromInstanceState(s, resourceName, "id")
201-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
202-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
203-
return errExport
204-
}
205-
}
201+
// Resource discovery is not supported for Rrset resources created using scope field
202+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
203+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
204+
// return errExport
205+
// }
206+
//}
206207
return err
207208
},
208209
),
@@ -253,11 +254,11 @@ func TestResourceDnsRrsetResource_basic(t *testing.T) {
253254

254255
func(s *terraform.State) (err error) {
255256
resId, err = fromInstanceState(s, resourceName, "id")
256-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
257-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
258-
return errExport
259-
}
260-
}
257+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
258+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
259+
// return errExport
260+
// }
261+
//}
261262
return err
262263
},
263264
),
@@ -275,11 +276,11 @@ func TestResourceDnsRrsetResource_basic(t *testing.T) {
275276

276277
func(s *terraform.State) (err error) {
277278
resId, err = fromInstanceState(s, resourceName, "id")
278-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
279-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
280-
return errExport
281-
}
282-
}
279+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
280+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
281+
// return errExport
282+
// }
283+
//}
283284
return err
284285
},
285286
),
@@ -301,11 +302,11 @@ func TestResourceDnsRrsetResource_basic(t *testing.T) {
301302

302303
func(s *terraform.State) (err error) {
303304
resId, err = fromInstanceState(s, resourceName, "id")
304-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
305-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
306-
return errExport
307-
}
308-
}
305+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
306+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
307+
// return errExport
308+
// }
309+
//}
309310
return err
310311
},
311312
),
@@ -327,11 +328,11 @@ func TestResourceDnsRrsetResource_basic(t *testing.T) {
327328

328329
func(s *terraform.State) (err error) {
329330
resId, err = fromInstanceState(s, resourceName, "id")
330-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
331-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
332-
return errExport
333-
}
334-
}
331+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
332+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
333+
// return errExport
334+
// }
335+
//}
335336
return err
336337
},
337338
),

‎oci/dns_rrset_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package oci
66
import (
77
"context"
88
"fmt"
9-
"strconv"
109
"testing"
1110

1211
"github.com/oracle/oci-go-sdk/v27/common"
@@ -133,11 +132,12 @@ func TestDnsRrsetResource_basic(t *testing.T) {
133132

134133
func(s *terraform.State) (err error) {
135134
resId, err = fromInstanceState(s, resourceName, "id")
136-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
137-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
138-
return errExport
139-
}
140-
}
135+
// Resource discovery is not supported for Rrset resources created using scope field
136+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
137+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
138+
// return errExport
139+
// }
140+
//}
141141
return err
142142
},
143143
),

‎oci/dns_view_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package oci
66
import (
77
"context"
88
"fmt"
9-
"strconv"
109
"testing"
1110
"time"
1211

@@ -123,11 +122,12 @@ func TestDnsViewResource_basic(t *testing.T) {
123122

124123
func(s *terraform.State) (err error) {
125124
resId, err = fromInstanceState(s, resourceName, "id")
126-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
127-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
128-
return errExport
129-
}
130-
}
125+
// Resource discovery is disabled for Views
126+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
127+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
128+
// return errExport
129+
// }
130+
//}
131131
return err
132132
},
133133
),

‎oci/dns_zone_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"context"
88
"fmt"
99
"regexp"
10-
"strconv"
1110
"testing"
1211
"time"
1312

@@ -151,11 +150,12 @@ func TestDnsZoneResource_basic(t *testing.T) {
151150

152151
func(s *terraform.State) (err error) {
153152
resId, err = fromInstanceState(s, resourceName, "id")
154-
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
155-
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
156-
return errExport
157-
}
158-
}
153+
// Resource discovery is not supported for Zone resources created using scope field
154+
//if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
155+
// if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
156+
// return errExport
157+
// }
158+
//}
159159
return err
160160
},
161161
),

‎oci/export_definitions.go‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -934,38 +934,6 @@ var exportDnsRrsetHints = &TerraformResourceHints{
934934
resourceAbbreviation: "rrset",
935935
}
936936

937-
var exportDnsResolverHints = &TerraformResourceHints{
938-
resourceClass: "oci_dns_resolver",
939-
datasourceClass: "oci_dns_resolvers",
940-
datasourceItemsAttr: "resolvers",
941-
resourceAbbreviation: "resolver",
942-
requireResourceRefresh: true,
943-
discoverableLifecycleStates: []string{
944-
string(oci_dns.ResolverLifecycleStateActive),
945-
},
946-
}
947-
948-
var exportDnsResolverEndpointHints = &TerraformResourceHints{
949-
resourceClass: "oci_dns_resolver_endpoint",
950-
datasourceClass: "oci_dns_resolver_endpoints",
951-
datasourceItemsAttr: "resolver_endpoints",
952-
resourceAbbreviation: "resolver_endpoint",
953-
requireResourceRefresh: true,
954-
discoverableLifecycleStates: []string{
955-
string(oci_dns.ResolverEndpointLifecycleStateActive),
956-
},
957-
}
958-
959-
var exportDnsViewHints = &TerraformResourceHints{
960-
resourceClass: "oci_dns_view",
961-
datasourceClass: "oci_dns_views",
962-
datasourceItemsAttr: "views",
963-
resourceAbbreviation: "view",
964-
discoverableLifecycleStates: []string{
965-
string(oci_dns.ViewLifecycleStateActive),
966-
},
967-
}
968-
969937
var exportDatacatalogCatalogHints = &TerraformResourceHints{
970938
resourceClass: "oci_datacatalog_catalog",
971939
datasourceClass: "oci_datacatalog_catalogs",

‎oci/export_graphs.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,6 @@ var dnsResourceGraph = TerraformResourceGraph{
413413
{TerraformResourceHints: exportDnsSteeringPolicyHints},
414414
{TerraformResourceHints: exportDnsSteeringPolicyAttachmentHints},
415415
{TerraformResourceHints: exportDnsTsigKeyHints},
416-
{TerraformResourceHints: exportDnsResolverHints},
417-
{TerraformResourceHints: exportDnsViewHints},
418416
},
419417
"oci_dns_zone": {
420418
{
@@ -424,14 +422,6 @@ var dnsResourceGraph = TerraformResourceGraph{
424422
},
425423
},
426424
},
427-
"oci_dns_resolver": {
428-
{
429-
TerraformResourceHints: exportDnsResolverEndpointHints,
430-
datasourceQueryParams: map[string]string{
431-
"resolver_id": "id",
432-
},
433-
},
434-
},
435425
}
436426

437427
var emailResourceGraph = TerraformResourceGraph{

‎website/docs/guides/resource_discovery.html.markdown‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,6 @@ dns
388388
* oci\_dns\_steering\_policy\_attachment
389389
* oci\_dns\_tsig\_key
390390
* oci\_dns\_rrset
391-
* oci\_dns\_resolver
392-
* oci\_dns\_resolver\_endpoint
393-
* oci\_dns\_view
394391

395392
email
396393

0 commit comments

Comments
 (0)