Support RD for rrset resource

Author: jotruon

CHANGELOG.md

@@ -10,6 +10,9 @@
 - Support for `mount_type_details`, `mount_type`, `nfs_server` and `nfs_server_export` attributes in `oci_database_backup_destination` resource
 - Support resource discovery for `ons` resources
 - Support resource discovery for `analytics` resources
+- Support resource discovery for `dns` resources
+- Support datasource for `oci_dns_rrset`
+
 ### Fixed
 - Fix issue where discovering object storage buckets without lifecycle policies, results in an error
 

examples/dns/rrset.tf

@@ -43,3 +43,9 @@ resource "oci_dns_rrset" "rrset-cname" {
     ttl    = 86400
   }
 }
+
+data "oci_dns_rrset" "test_rrset" {
+  domain          = "el.${oci_dns_zone.zone3.name}"
+  rtype           = "CNAME"
+  zone_name_or_id = "${oci_dns_zone.zone3.id}"
+}

oci/dns_rrset_data_source.go

@@ -0,0 +1,113 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	oci_dns "github.com/oracle/oci-go-sdk/dns"
+)
+
+func init() {
+	RegisterDatasource("oci_dns_rrset", DnsRrsetDataSource())
+}
+
+func DnsRrsetDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["compartment_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Optional: true,
+	}
+	fieldMap["domain"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	fieldMap["rtype"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	fieldMap["zone_name_or_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	fieldMap["zone_version"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Optional: true,
+	}
+	return GetSingularDataSourceItemSchema(DnsRrsetResource(), fieldMap, readSingularDnsRrset)
+}
+
+func readSingularDnsRrset(d *schema.ResourceData, m interface{}) error {
+	sync := &DnsRrsetDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).dnsClient()
+
+	return ReadResource(sync)
+}
+
+type DnsRrsetDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_dns.DnsClient
+	Res    *oci_dns.GetRRSetResponse
+}
+
+func (s *DnsRrsetDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *DnsRrsetDataSourceCrud) Get() error {
+	request := oci_dns.GetRRSetRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if domain, ok := s.D.GetOkExists("domain"); ok {
+		tmp := domain.(string)
+		request.Domain = &tmp
+	}
+
+	if rtype, ok := s.D.GetOkExists("rtype"); ok {
+		tmp := rtype.(string)
+		request.Rtype = &tmp
+	}
+
+	if zoneNameOrId, ok := s.D.GetOkExists("zone_name_or_id"); ok {
+		tmp := zoneNameOrId.(string)
+		request.ZoneNameOrId = &tmp
+	}
+
+	if zoneVersion, ok := s.D.GetOkExists("zone_version"); ok {
+		tmp := zoneVersion.(string)
+		request.ZoneVersion = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "dns")
+
+	response, err := s.Client.GetRRSet(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *DnsRrsetDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceID())
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, RecordToMap(item))
+	}
+	s.D.Set("items", items)
+
+	return nil
+}

oci/dns_rrset_test.go

@@ -23,6 +23,16 @@ var (
 	RrsetRequiredOnlyResource = RrsetResourceDependencies +
 		generateResourceFromRepresentationMap("oci_dns_rrset", "test_rrset", Required, Create, rrsetRepresentation)
 
+	RrsetResourceConfig = RrsetResourceDependencies +
+		generateResourceFromRepresentationMap("oci_dns_rrset", "test_rrset", Optional, Update, rrsetRepresentation)
+
+	rrsetSingularDataSourceRepresentation = map[string]interface{}{
+		"domain":          Representation{repType: Required, create: dnsDomainName},
+		"rtype":           Representation{repType: Required, create: `A`},
+		"zone_name_or_id": Representation{repType: Required, create: `${oci_dns_zone.test_zone.id}`},
+		"compartment_id":  Representation{repType: Optional, create: `${var.compartment_id}`},
+	}
+
 	dnsDomainName       = randomString(5, charsetWithoutDigits) + ".token.oci-record-test"
 	rrsetRepresentation = map[string]interface{}{
 		"domain":          Representation{repType: Required, create: dnsDomainName},
@@ -64,6 +74,8 @@ func TestDnsRrsetResource_basic(t *testing.T) {
 
 	resourceName := "oci_dns_rrset.test_rrset"
 
+	singularDatasourceName := "data.oci_dns_rrset.test_rrset"
+
 	var resId, resId2 string
 
 	resource.Test(t, resource.TestCase{
@@ -150,6 +162,34 @@ func TestDnsRrsetResource_basic(t *testing.T) {
 					},
 				),
 			},
+			// verify singular datasource
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_dns_rrset", "test_rrset", Required, Create, rrsetSingularDataSourceRepresentation) +
+					compartmentIdVariableStr + RrsetResourceConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(singularDatasourceName, "domain", dnsDomainName),
+					resource.TestCheckResourceAttr(singularDatasourceName, "rtype", "A"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "zone_name_or_id"),
+
+					resource.TestCheckResourceAttr(singularDatasourceName, "items.#", "1"),
+					CheckResourceSetContainsElementWithProperties(singularDatasourceName, "items", map[string]string{
+						"domain": dnsDomainName,
+						"rdata":  "77.77.77.77",
+						"rtype":  "A",
+						"ttl":    "1000",
+					},
+						[]string{
+							"is_protected",
+							"record_hash",
+							"rrset_version",
+						}),
+				),
+			},
+			// remove singular datasource from previous step so that it doesn't conflict with import tests
+			{
+				Config: config + compartmentIdVariableStr + RrsetResourceConfig,
+			},
 			// verify resource import
 			{
 				Config:            config,

oci/export_definitions.go

@@ -737,6 +737,12 @@ var exportDnsTsigKeyHints = &TerraformResourceHints{
 	},
 }
 
+var exportDnsRrsetHints = &TerraformResourceHints{
+	resourceClass:        "oci_dns_rrset",
+	datasourceClass:      "oci_dns_rrset",
+	resourceAbbreviation: "rrset",
+}
+
 var exportDatacatalogCatalogHints = &TerraformResourceHints{
 	resourceClass:        "oci_datacatalog_catalog",
 	datasourceClass:      "oci_datacatalog_catalogs",

oci/export_graphs.go

@@ -339,6 +339,14 @@ var dnsResourceGraph = TerraformResourceGraph{
 		{TerraformResourceHints: exportDnsSteeringPolicyAttachmentHints},
 		{TerraformResourceHints: exportDnsTsigKeyHints},
 	},
+	"oci_dns_zone": {
+		{
+			TerraformResourceHints: exportDnsRrsetHints,
+			datasourceQueryParams: map[string]string{
+				"zone_name_or_id": "id",
+			},
+		},
+	},
 }
 
 var datacatalogResourceGraph = TerraformResourceGraph{

oci/export_resource_helpers.go

@@ -11,6 +11,8 @@ import (
 	"strconv"
 	"strings"
 
+	oci_dns "github.com/oracle/oci-go-sdk/dns"
+
 	"github.com/hashicorp/hcl2/hclwrite"
 
 	"github.com/fatih/color"
@@ -382,6 +384,78 @@ func init() {
 	exportKmsKeyHints.processDiscoveredResourcesFn = processKmsKey
 
 	exportKmsKeyVersionHints.getIdFn = getKmsKeyVersionId
+
+	exportDnsRrsetHints.getIdFn = getDnsRrsetId
+	exportDnsRrsetHints.findResourcesOverrideFn = findDnsRrset
+	exportDnsRrsetHints.processDiscoveredResourcesFn = processDnsRrset
+}
+
+func processDnsRrset(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
+
+	for _, record := range resources {
+		// Populate config file from compositeId
+		record.compartmentId = record.parent.compartmentId
+		domain, rtype, zoneNameOrId, err := parseRrsetCompositeId(record.id)
+		if err == nil {
+			record.sourceAttributes["domain"] = domain
+			record.sourceAttributes["rtype"] = rtype
+			record.sourceAttributes["zone_name_or_id"] = zoneNameOrId
+		}
+	}
+	return resources, nil
+}
+
+func findDnsRrset(clients *OracleClients, tfMeta *TerraformResourceAssociation, parent *OCIResource) (resources []*OCIResource, err error) {
+	// Rrset is singular datasource only
+	// and need to use GetZoneRecordsRequest to list all records
+	zoneId := parent.id
+	request := oci_dns.GetZoneRecordsRequest{}
+	request.ZoneNameOrId = &zoneId
+	response, err := clients.dnsClient().GetZoneRecords(context.Background(), request)
+
+	if err != nil {
+		return resources, err
+	}
+
+	for _, record := range response.Items {
+		recordResource := resourcesMap[tfMeta.resourceClass]
+		d := recordResource.TestResourceData()
+		zoneId := parent.id
+		domain := record.Domain
+		rtype := record.Rtype
+		d.SetId(getRrsetCompositeId(*domain, *rtype, zoneId))
+		if err := recordResource.Read(d, clients); err != nil {
+			return resources, err
+		}
+		resource := &OCIResource{
+			compartmentId:    parent.compartmentId,
+			sourceAttributes: convertResourceDataToMap(recordResource.Schema, d),
+			rawResource:      record,
+			TerraformResource: TerraformResource{
+				id:             d.Id(),
+				terraformClass: tfMeta.resourceClass,
+				terraformName:  fmt.Sprintf("%s_%s", parent.parent.terraformName, *record.RecordHash),
+			},
+			getHclStringFn: getHclStringFromGenericMap,
+			parent:         parent,
+		}
+		resources = append(resources, resource)
+	}
+
+	return resources, err
+}
+
+func getDnsRrsetId(resource *OCIResource) (string, error) {
+	domain, ok := resource.sourceAttributes["domain"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find domain for DnsRrset")
+	}
+	rtype, ok := resource.sourceAttributes["rtype"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find rtype for DnsRrset")
+	}
+	zoneId := resource.parent.id
+	return getRrsetCompositeId(domain, rtype, zoneId), nil
 }
 
 func getDatacatalogDataAssetId(resource *OCIResource) (string, error) {

website/docs/d/dns_rrset.html.markdown

@@ -0,0 +1,54 @@
+---
+subcategory: "Dns"
+layout: "oci"
+page_title: "Oracle Cloud Infrastructure: oci_dns_rrset"
+sidebar_current: "docs-oci-datasource-dns-rrset"
+description: |-
+  Provides details about a specific Rrset in Oracle Cloud Infrastructure Dns service
+---
+
+# Data Source: oci_dns_rrset
+This data source provides details about a specific Rrset resource in Oracle Cloud Infrastructure Dns service.
+
+Gets a list of all records in the specified RRSet. The results are
+sorted by `recordHash` by default.
+
+
+## Example Usage
+
+```hcl
+data "oci_dns_rrset" "test_rrset" {
+	#Required
+	domain = "${var.rrset_domain}"
+	rtype = "${var.rrset_rtype}"
+	zone_name_or_id = "${oci_dns_zone.test_zone.id}"
+
+	#Optional
+	compartment_id = "${var.compartment_id}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `compartment_id` - (Optional) The OCID of the compartment the resource belongs to.
+* `domain` - (Required) The target fully-qualified domain name (FQDN) within the target zone.
+* `rtype` - (Required) The type of the target RRSet within the target zone.
+* `zone_name_or_id` - (Required) The name or OCID of the target zone.
+* `zone_version` - (Optional) The version of the zone for which data is requested. 
+
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `items` - 
+	* `domain` - The fully qualified domain name where the record can be located. 
+	* `is_protected` - A Boolean flag indicating whether or not parts of the record are unable to be explicitly managed. 
+	* `rdata` - The record's data, as whitespace-delimited tokens in type-specific presentation format. All RDATA is normalized and the returned presentation of your RDATA may differ from its initial input. For more information about RDATA, see [Supported DNS Resource Record Types](https://docs.cloud.oracle.com/iaas/Content/DNS/Reference/supporteddnsresource.htm) 
+	* `record_hash` - A unique identifier for the record within its zone. 
+	* `rrset_version` - The latest version of the record's zone in which its RRSet differs from the preceding version. 
+	* `rtype` - The canonical name for the record's type, such as A or CNAME. For more information, see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4). 
+	* `ttl` - The Time To Live for the record, in seconds.
+

website/docs/guides/resource_discovery.html.markdown

@@ -326,6 +326,7 @@ dns
 * oci\_dns\_steering\_policy
 * oci\_dns\_steering\_policy\_attachment
 * oci\_dns\_tsig\_key
+* oci\_dns\_rrset
 
 email
 

website/oci.erb

@@ -1204,6 +1204,9 @@
                         <li>
                             <a href="/docs/providers/oci/d/dns_records.html">oci_dns_records</a>
                         </li>
+                        <li>
+                            <a href="/docs/providers/oci/d/dns_rrset.html">oci_dns_rrset</a>
+                        </li>
                         <li>
                             <a href="/docs/providers/oci/d/dns_steering_policies.html">oci_dns_steering_policies</a>
                         </li>