Modify DNS Record resource code to use PatchRRSetRequest instead of PatchZoneRecordsRequest

Author: abhilash-av

CHANGELOG.md

@@ -4,6 +4,9 @@ Enable regional Subnets by making Availability Domain optional when creating a S
 ### Added
 - Adding description property to rules in Steering Policies in DNS
 
+### Fixed
+- DNS Record now requires domain and rtype as mandatory arguments. Managing DNS record resources now requires DNS_RECORD* level policy entitlements instead of DNS_ZONE*. [Permissions List](https://docs.cloud.oracle.com/iaas/Content/Identity/Reference/dnspolicyreference.htm) 
+
 ## 3.15.0 (February 12, 2019)
 
 ### Added

oci/dns_record_resource.go

@@ -11,10 +11,10 @@ package provider
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"fmt"
 	"net"
 	"regexp"
 
@@ -45,7 +45,8 @@ func DnsRecordResource() *schema.Resource {
 			// Optional
 			"domain": {
 				Type:     schema.TypeString,
-				Optional: true,
+				ForceNew: true,
+				Required: true,
 			},
 			"rdata": {
 				Type:     schema.TypeString,
@@ -57,7 +58,8 @@ func DnsRecordResource() *schema.Resource {
 			},
 			"rtype": {
 				Type:     schema.TypeString,
-				Optional: true,
+				ForceNew: true,
+				Required: true,
 			},
 			"ttl": {
 				Type:     schema.TypeInt,
@@ -126,32 +128,30 @@ func (s *DnsRecordResourceCrud) ID() string {
 }
 
 func (s *DnsRecordResourceCrud) Create() error {
-	request := oci_dns.PatchZoneRecordsRequest{}
+	request := oci_dns.PatchRRSetRequest{}
 	ro := oci_dns.RecordOperation{Operation: oci_dns.RecordOperationOperationAdd}
 
 	zoneNameOrId := s.D.Get("zone_name_or_id").(string)
 	request.ZoneNameOrId = &zoneNameOrId
 
+	domain := s.D.Get("domain").(string)
+	request.Domain = &domain
+	ro.Domain = &domain
+
+	rtype := s.D.Get("rtype").(string)
+	request.Rtype = &rtype
+	ro.Rtype = &rtype
+
 	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)
-		ro.Domain = &tmp
-	}
-
 	if rdata, ok := s.D.GetOkExists("rdata"); ok {
 		tmp := rdata.(string)
 		ro.Rdata = &tmp
 	}
 
-	if rtype, ok := s.D.GetOkExists("rtype"); ok {
-		tmp := rtype.(string)
-		ro.Rtype = &tmp
-	}
-
 	if ttl, ok := s.D.GetOkExists("ttl"); ok {
 		tmp := ttl.(int)
 		ro.Ttl = &tmp
@@ -160,14 +160,14 @@ func (s *DnsRecordResourceCrud) Create() error {
 	request.Items = []oci_dns.RecordOperation{ro}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "dns")
-	response, err := s.Client.PatchZoneRecords(context.Background(), request)
+	response, err := s.Client.PatchRRSet(context.Background(), request)
 	if err != nil {
 		return err
 	}
 
 	// The patch operation can add a record, but it returns ALL records, so there is no absolute way to map to this new item.
 	// Since there cant be duplicate records, try to match on the rType and rData that was just used
-	item, err := findItem(&response.RecordCollection, s.D)
+	item, err := findItem(&response.Items, s.D)
 
 	if err != nil {
 		//PatchZoneRecords only returns 50 records we need to do a Get with pagination to make sure we can't find the item
@@ -192,11 +192,17 @@ func (s *DnsRecordResourceCrud) Create() error {
 }
 
 func (s *DnsRecordResourceCrud) Get() error {
-	request := oci_dns.GetZoneRecordsRequest{}
+	request := oci_dns.GetRRSetRequest{}
 
 	zoneNameOrId := s.D.Get("zone_name_or_id").(string)
 	request.ZoneNameOrId = &zoneNameOrId
 
+	domain := s.D.Get("domain").(string)
+	request.Domain = &domain
+
+	rtype := s.D.Get("rtype").(string)
+	request.Rtype = &rtype
+
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
 		tmp := compartmentId.(string)
 		request.CompartmentId = &tmp
@@ -206,11 +212,11 @@ func (s *DnsRecordResourceCrud) Get() error {
 
 	var err error
 	for true {
-		response, err := s.Client.GetZoneRecords(context.Background(), request)
+		response, err := s.Client.GetRRSet(context.Background(), request)
 		if err != nil {
 			return err
 		}
-		item, err := findItem(&response.RecordCollection, s.D)
+		item, err := findItem(&response.Items, s.D)
 		if err == nil {
 			s.Res = item
 			return nil
@@ -225,9 +231,11 @@ func (s *DnsRecordResourceCrud) Get() error {
 
 func (s *DnsRecordResourceCrud) Update() error {
 	zoneNameOrId := s.D.Get("zone_name_or_id").(string)
-	request := oci_dns.PatchZoneRecordsRequest{ZoneNameOrId: &zoneNameOrId}
+	domain := s.D.Get("domain").(string)
+	rtype := s.D.Get("rtype").(string)
+	request := oci_dns.PatchRRSetRequest{ZoneNameOrId: &zoneNameOrId, Domain: &domain, Rtype: &rtype}
 
-	// "Update" using PatchZoneRecords requires removing the target record then adding the updated version.
+	// "Update" using PatchRRSetRequest requires removing the target record then adding the updated version.
 	recordHash := s.D.Get("record_hash").(string)
 	removeOp := oci_dns.RecordOperation{Operation: oci_dns.RecordOperationOperationRemove, RecordHash: &recordHash}
 	addOp := oci_dns.RecordOperation{Operation: oci_dns.RecordOperationOperationAdd}
@@ -237,21 +245,14 @@ func (s *DnsRecordResourceCrud) Update() error {
 		request.CompartmentId = &tmp
 	}
 
-	if domain, ok := s.D.GetOkExists("domain"); ok {
-		tmp := domain.(string)
-		addOp.Domain = &tmp
-	}
+	addOp.Domain = &domain
+	addOp.Rtype = &rtype
 
 	if rdata, ok := s.D.GetOkExists("rdata"); ok {
 		tmp := rdata.(string)
 		addOp.Rdata = &tmp
 	}
 
-	if rtype, ok := s.D.GetOkExists("rtype"); ok {
-		tmp := rtype.(string)
-		addOp.Rtype = &tmp
-	}
-
 	if ttl, ok := s.D.GetOkExists("ttl"); ok {
 		tmp := ttl.(int)
 		addOp.Ttl = &tmp
@@ -260,11 +261,11 @@ func (s *DnsRecordResourceCrud) Update() error {
 	request.Items = []oci_dns.RecordOperation{removeOp, addOp}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "dns")
-	response, err := s.Client.PatchZoneRecords(context.Background(), request)
+	response, err := s.Client.PatchRRSet(context.Background(), request)
 	if err != nil {
 		return err
 	}
-	item, err := findItem(&response.RecordCollection, s.D)
+	item, err := findItem(&response.Items, s.D)
 
 	if err != nil {
 		//PatchZoneRecords only returns 50 records we need to do a Get with pagination to make sure we can't find the item
@@ -280,12 +281,18 @@ func (s *DnsRecordResourceCrud) Update() error {
 }
 
 func (s *DnsRecordResourceCrud) Delete() error {
-	request := oci_dns.PatchZoneRecordsRequest{}
+	request := oci_dns.PatchRRSetRequest{}
 	ro := oci_dns.RecordOperation{Operation: oci_dns.RecordOperationOperationRemove}
 
 	zoneNameOrId := s.D.Get("zone_name_or_id").(string)
 	request.ZoneNameOrId = &zoneNameOrId
 
+	domain := s.D.Get("domain").(string)
+	request.Domain = &domain
+
+	rtype := s.D.Get("rtype").(string)
+	request.Rtype = &rtype
+
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
 		tmp := compartmentId.(string)
 		request.CompartmentId = &tmp
@@ -299,7 +306,7 @@ func (s *DnsRecordResourceCrud) Delete() error {
 	request.Items = []oci_dns.RecordOperation{ro}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "dns")
-	_, err := s.Client.PatchZoneRecords(context.Background(), request)
+	_, err := s.Client.PatchRRSet(context.Background(), request)
 	return err
 }
 
@@ -337,15 +344,15 @@ func (s *DnsRecordResourceCrud) SetData() error {
 	return nil
 }
 
-func findItem(rc *oci_dns.RecordCollection, r *schema.ResourceData) (*oci_dns.Record, error) {
+func findItem(rc *[]oci_dns.Record, r *schema.ResourceData) (*oci_dns.Record, error) {
 	rType := r.Get("rtype").(string)
 	rData := r.Get("rdata").(string)
 	rDomain := r.Get("domain").(string)
 	rTtl := r.Get("ttl").(int)
 	rData = normalizeRData(rType, rData)
 	rHash, rHashOk := r.GetOk("record_hash")
 
-	for _, item := range rc.Items {
+	for _, item := range *rc {
 		// prefer exact match by record hash
 		if rHashOk && rHash == *item.RecordHash {
 			return &item, nil
@@ -357,7 +364,7 @@ func findItem(rc *oci_dns.RecordCollection, r *schema.ResourceData) (*oci_dns.Re
 		}
 	}
 
-	return nil, fmt.Errorf("target %s record could not be matched against data %s\nfrom set %+v", rType, rData, rc.Items)
+	return nil, fmt.Errorf("target %s record could not be matched against data %s\nfrom set %+v", rType, rData, rc)
 }
 
 // Match dns service transforms of rdata

oci/dns_record_test.go

@@ -7,10 +7,11 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/terraform/helper/schema"
+
 	"regexp"
 
 	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/oci-go-sdk/common"
 	oci_dns "github.com/oracle/oci-go-sdk/dns"
@@ -369,7 +370,7 @@ func testAccCheckDnsRecordDestroy(s *terraform.State) error {
 					recordCollection.Items = append(recordCollection.Items, listResponse.Items...)
 					request.Page = listResponse.OpcNextPage
 				}
-				_, err = findItem(&response.RecordCollection, resourceData)
+				_, err = findItem(&response.Items, resourceData)
 				if err == nil {
 					return fmt.Errorf("resource still exists")
 				}

website/docs/r/dns_record.html.markdown

@@ -22,12 +22,12 @@ request body, the record will be removed from the zone.
 resource "oci_dns_record" "test_record" {
 	#Required
 	zone_name_or_id = "${oci_dns_zone_name_or.test_zone_name_or.id}"
+	domain = "${var.record_items_domain}"
+	rtype = "${var.record_items_rtype}"
 
 	#Optional
 	compartment_id = "${var.compartment_id}"
-	domain = "${var.record_items_domain}"
 	rdata = "${var.record_items_rdata}"
-	rtype = "${var.record_items_rtype}"
 	ttl = "${var.record_items_ttl}"
 }
 ```
@@ -37,9 +37,9 @@ resource "oci_dns_record" "test_record" {
 The following arguments are supported:
 
 * `compartment_id` - (Optional) (Updatable) The OCID of the compartment the resource belongs to. If supplied, it must match the Zone's compartment ocid. 
-* `domain` - (Optional) (Updatable) The fully qualified domain name where the record can be located.  
+* `domain` - (Required) The fully qualified domain name where the record can be located.  
 * `rdata` - (Optional) (Updatable) 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) 
-* `rtype` - (Optional) (Updatable) 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). 
+* `rtype` - (Required) 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` - (Optional) (Updatable) The Time To Live for the record, in seconds.
 * `zone_name_or_id` - (Required) The name or OCID of the target zone.