From 86819c423cc795aa4612c51f563bd0ac2161a599 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Thu, 24 Oct 2019 10:41:09 +0200 Subject: [PATCH 1/9] azurerm_private_dns_ptr_record - new resource type --- azurerm/provider.go | 1 + .../resource_arm_private_dns_ptr_record.go | 209 ++++++++++++ ...esource_arm_private_dns_ptr_record_test.go | 303 ++++++++++++++++++ .../r/private_dns_ptr_record.html.markdown | 63 ++++ 4 files changed, 576 insertions(+) create mode 100644 azurerm/resource_arm_private_dns_ptr_record.go create mode 100644 azurerm/resource_arm_private_dns_ptr_record_test.go create mode 100644 website/docs/r/private_dns_ptr_record.html.markdown diff --git a/azurerm/provider.go b/azurerm/provider.go index f01044a9c91c..4f0af9d4a978 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -374,6 +374,7 @@ func Provider() terraform.ResourceProvider { "azurerm_private_dns_zone": resourceArmPrivateDnsZone(), "azurerm_private_dns_a_record": resourceArmPrivateDnsARecord(), "azurerm_private_dns_cname_record": resourceArmPrivateDnsCNameRecord(), + "azurerm_private_dns_ptr_record": resourceArmPrivateDnsPtrRecord(), "azurerm_private_dns_zone_virtual_network_link": resourceArmPrivateDnsZoneVirtualNetworkLink(), "azurerm_proximity_placement_group": resourceArmProximityPlacementGroup(), "azurerm_public_ip": resourceArmPublicIp(), diff --git a/azurerm/resource_arm_private_dns_ptr_record.go b/azurerm/resource_arm_private_dns_ptr_record.go new file mode 100644 index 000000000000..70e619d25bee --- /dev/null +++ b/azurerm/resource_arm_private_dns_ptr_record.go @@ -0,0 +1,209 @@ +package azurerm + +import ( + "fmt" + "time" + + "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmPrivateDnsPtrRecord() *schema.Resource { + return &schema.Resource{ + Create: resourceArmPrivateDnsPtrRecordCreateUpdate, + Read: resourceArmPrivateDnsPtrRecordRead, + Update: resourceArmPrivateDnsPtrRecordCreateUpdate, + Delete: resourceArmPrivateDnsPtrRecordDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + // TODO: make this case sensitive once the API's fixed https://github.com/Azure/azure-rest-api-specs/issues/6641 + "resource_group_name": azure.SchemaResourceGroupNameDiffSuppress(), + + "zone_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "records": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + + "ttl": { + Type: schema.TypeInt, + Required: true, + ValidateFunc: validation.IntBetween(1, 2147483647), + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmPrivateDnsPtrRecordCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).PrivateDns.RecordSetsClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*ArmClient).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resGroup := d.Get("resource_group_name").(string) + zoneName := d.Get("zone_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resGroup, zoneName, privatedns.PTR, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Private DNS PTR Record %q (Zone %q / Resource Group %q): %s", name, zoneName, resGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_private_dns_ptr_record", *existing.ID) + } + } + + ttl := int64(d.Get("ttl").(int)) + t := d.Get("tags").(map[string]interface{}) + + parameters := privatedns.RecordSet{ + Name: &name, + RecordSetProperties: &privatedns.RecordSetProperties{ + Metadata: tags.Expand(t), + TTL: &ttl, + PtrRecords: expandAzureRmPrivateDnsPtrRecords(d), + }, + } + + eTag := "" + ifNoneMatch := "" // set to empty to allow updates to records after creation + if _, err := client.CreateOrUpdate(ctx, resGroup, zoneName, privatedns.PTR, name, parameters, eTag, ifNoneMatch); err != nil { + return fmt.Errorf("Error creating/updating Private DNS PTR Record %q (Zone %q / Resource Group %q): %s", name, zoneName, resGroup, err) + } + + resp, err := client.Get(ctx, resGroup, zoneName, privatedns.PTR, name) + if err != nil { + return fmt.Errorf("Error retrieving Private DNS PTR Record %q (Zone %q / Resource Group %q): %s", name, zoneName, resGroup, err) + } + + if resp.ID == nil { + return fmt.Errorf("Cannot read Private DNS PTR Record %s (resource group %s) ID", name, resGroup) + } + + d.SetId(*resp.ID) + + return resourceArmPrivateDnsPtrRecordRead(d, meta) +} + +func resourceArmPrivateDnsPtrRecordRead(d *schema.ResourceData, meta interface{}) error { + dnsClient := meta.(*ArmClient).PrivateDns.RecordSetsClient + ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + + resGroup := id.ResourceGroup + name := id.Path["PTR"] + zoneName := id.Path["privateDnsZones"] + + resp, err := dnsClient.Get(ctx, resGroup, zoneName, privatedns.PTR, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error reading Private DNS PTR record %s: %+v", name, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resGroup) + d.Set("zone_name", zoneName) + d.Set("ttl", resp.TTL) + + if props := resp.RecordSetProperties; props != nil { + if err := d.Set("records", flattenAzureRmPrivateDnsPtrRecords(resp.PtrRecords)); err != nil { + return err + } + } + + return tags.FlattenAndSet(d, resp.Metadata) +} + +func resourceArmPrivateDnsPtrRecordDelete(d *schema.ResourceData, meta interface{}) error { + dnsClient := meta.(*ArmClient).PrivateDns.RecordSetsClient + ctx, cancel := timeouts.ForDelete(meta.(*ArmClient).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + + resGroup := id.ResourceGroup + name := id.Path["PTR"] + zoneName := id.Path["privateDnsZones"] + + _, err = dnsClient.Get(ctx, resGroup, zoneName, privatedns.PTR, name) + if err != nil { + return fmt.Errorf("Error deleting Private DNS PTR Record %s: %+v", name, err) + } + + return nil +} + +func flattenAzureRmPrivateDnsPtrRecords(records *[]privatedns.PtrRecord) []string { + results := make([]string, 0, len(*records)) + + if records != nil { + for _, record := range *records { + results = append(results, *record.Ptrdname) + } + } + + return results +} + +func expandAzureRmPrivateDnsPtrRecords(d *schema.ResourceData) *[]privatedns.PtrRecord { + recordStrings := d.Get("records").(*schema.Set).List() + records := make([]privatedns.PtrRecord, len(recordStrings)) + + for i, v := range recordStrings { + fqdn := v.(string) + records[i] = privatedns.PtrRecord{ + Ptrdname: &fqdn, + } + } + + return &records +} diff --git a/azurerm/resource_arm_private_dns_ptr_record_test.go b/azurerm/resource_arm_private_dns_ptr_record_test.go new file mode 100644 index 000000000000..c7250f176cba --- /dev/null +++ b/azurerm/resource_arm_private_dns_ptr_record_test.go @@ -0,0 +1,303 @@ +package azurerm + +import ( + "fmt" + "net/http" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" +) + +func TestAccAzureRMPrivateDnsPtrRecord_basic(t *testing.T) { + resourceName := "azurerm_private_dns_ptr_record.test" + ri := tf.AccRandTimeInt() + config := testAccAzureRMPrivateDnsPtrRecord_basic(ri, testLocation()) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPrivateDnsPtrRecordDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPrivateDnsPtrRecordExists(resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMPrivateDnsPtrRecord_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + resourceName := "azurerm_private_dns_ptr_record.test" + ri := tf.AccRandTimeInt() + location := testLocation() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPrivateDnsPtrRecordDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMPrivateDnsPtrRecord_basic(ri, location), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPrivateDnsPtrRecordExists(resourceName), + ), + }, + { + Config: testAccAzureRMPrivateDnsPtrRecord_requiresImport(ri, location), + ExpectError: testRequiresImportError("azurerm_private_dns_ptr_record"), + }, + }, + }) +} + +func TestAccAzureRMPrivateDnsPtrRecord_updateRecords(t *testing.T) { + resourceName := "azurerm_private_dns_ptr_record.test" + ri := tf.AccRandTimeInt() + location := testLocation() + preConfig := testAccAzureRMPrivateDnsPtrRecord_basic(ri, location) + postConfig := testAccAzureRMPrivateDnsPtrRecord_updateRecords(ri, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPrivateDnsPtrRecordDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPrivateDnsPtrRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "records.#", "2"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPrivateDnsPtrRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "records.#", "3"), + ), + }, + }, + }) +} + +func TestAccAzureRMPrivateDnsPtrRecord_withTags(t *testing.T) { + resourceName := "azurerm_private_dns_ptr_record.test" + ri := tf.AccRandTimeInt() + location := testLocation() + preConfig := testAccAzureRMPrivateDnsPtrRecord_withTags(ri, location) + postConfig := testAccAzureRMPrivateDnsPtrRecord_withTagsUpdate(ri, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMPrivateDnsPtrRecordDestroy, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPrivateDnsPtrRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMPrivateDnsPtrRecordExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testCheckAzureRMPrivateDnsPtrRecordExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + ptrName := rs.Primary.Attributes["name"] + zoneName := rs.Primary.Attributes["zone_name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Private DNS PTR record: %s", ptrName) + } + + conn := testAccProvider.Meta().(*ArmClient).PrivateDns.RecordSetsClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.PTR, ptrName) + if err != nil { + return fmt.Errorf("Bad: Get PTR RecordSet: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Private DNS PTR record %s (resource group: %s) does not exist", ptrName, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMPrivateDnsPtrRecordDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*ArmClient).PrivateDns.RecordSetsClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_private_dns_ptr_record" { + continue + } + + ptrName := rs.Primary.Attributes["name"] + zoneName := rs.Primary.Attributes["zone_name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.PTR, ptrName) + + if err != nil { + if resp.StatusCode == http.StatusNotFound { + return nil + } + + return err + } + + return fmt.Errorf("Private DNS PTR record still exists:\n%#v", resp.RecordSetProperties) + } + + return nil +} + +func testAccAzureRMPrivateDnsPtrRecord_basic(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_private_dns_zone" "test" { + name = "%d.0.10.in-addr.arpa" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_private_dns_ptr_record" "test" { + name = "%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_private_dns_zone.test.name}" + ttl = 300 + records = ["test.contoso.com", "test2.contoso.com"] +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMPrivateDnsPtrRecord_requiresImport(rInt int, location string) string { + template := testAccAzureRMPrivateDnsPtrRecord_basic(rInt, location) + return fmt.Sprintf(` +%s + +resource "azurerm_private_dns_ptr_record" "import" { + name = "${azurerm_private_dns_ptr_record.test.name}" + resource_group_name = "${azurerm_private_dns_ptr_record.test.resource_group_name}" + zone_name = "${azurerm_private_dns_ptr_record.test.zone_name}" + ttl = 300 + records = ["test.contoso.com", "test2.contoso.com"] +} +`, template) +} + +func testAccAzureRMPrivateDnsPtrRecord_updateRecords(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_private_dns_zone" "test" { + name = "%d.0.10.in-addr.arpa" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_private_dns_ptr_record" "test" { + name = "%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_private_dns_zone.test.name}" + ttl = 300 + records = ["test.contoso.com", "test2.contoso.com", "test3.contoso.com"] +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMPrivateDnsPtrRecord_withTags(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_private_dns_zone" "test" { + name = "%d.0.10.in-addr.arpa" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_private_dns_ptr_record" "test" { + name = "%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_private_dns_zone.test.name}" + ttl = 300 + records = ["test.contoso.com", "test2.contoso.com"] + + tags = { + environment = "Production" + cost_center = "MSFT" + } +} +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMPrivateDnsPtrRecord_withTagsUpdate(rInt int, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_private_dns_zone" "test" { + name = "%d.0.10.in-addr.arpa" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_private_dns_ptr_record" "test" { + name = "%d" + resource_group_name = "${azurerm_resource_group.test.name}" + zone_name = "${azurerm_private_dns_zone.test.name}" + ttl = 300 + records = ["test.contoso.com", "test2.contoso.com"] + + tags = { + environment = "staging" + } +} +`, rInt, location, rInt, rInt) +} diff --git a/website/docs/r/private_dns_ptr_record.html.markdown b/website/docs/r/private_dns_ptr_record.html.markdown new file mode 100644 index 000000000000..2769cf22a686 --- /dev/null +++ b/website/docs/r/private_dns_ptr_record.html.markdown @@ -0,0 +1,63 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_private_dns_ptr_record" +sidebar_current: "docs-azurerm-resource-private-dns-ptr-record" +description: |- + Manages a Private DNS PTR Record. +--- + +# azurerm_private_dns_ptr_record + +Enables you to manage DNS PTR Records within Azure Private DNS. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "acceptanceTestResourceGroup1" + location = "West US" +} + +resource "azurerm_private_dns_zone" "test" { + name = "2.0.192.in-addr.arpa" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_private_dns_ptr_record" "test" { + name = "15" + zone_name = "${azurerm_private_dns_zone.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + ttl = 300 + records = ["test.example.com"] +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the DNS PTR Record. + +* `resource_group_name` - (Required) Specifies the resource group where the resource exists. Changing this forces a new resource to be created. + +* `zone_name` - (Required) Specifies the Private DNS Zone where the resource exists. Changing this forces a new resource to be created. + +* `TTL` - (Required) The Time To Live (TTL) of the DNS record in seconds. + +* `records` - (Required) List of Fully Qualified Domain Names. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Private DNS PTR Record ID. + +## Import + +Private DNS PTR Records can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_private_dns_ptr_record.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/privateDnsZones/2.0.192.in-addr.arpa/PTR/15 +``` From dbf5e30f70697986dd620563ba41801cc05ff057 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 08:38:06 +0100 Subject: [PATCH 2/9] Update azurerm/resource_arm_private_dns_ptr_record.go Co-Authored-By: Tom Harvey --- azurerm/resource_arm_private_dns_ptr_record.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_private_dns_ptr_record.go b/azurerm/resource_arm_private_dns_ptr_record.go index 70e619d25bee..59fdb260ef7a 100644 --- a/azurerm/resource_arm_private_dns_ptr_record.go +++ b/azurerm/resource_arm_private_dns_ptr_record.go @@ -174,7 +174,7 @@ func resourceArmPrivateDnsPtrRecordDelete(d *schema.ResourceData, meta interface name := id.Path["PTR"] zoneName := id.Path["privateDnsZones"] - _, err = dnsClient.Get(ctx, resGroup, zoneName, privatedns.PTR, name) + _, err = dnsClient.Delete(ctx, resGroup, zoneName, privatedns.PTR, name) if err != nil { return fmt.Errorf("Error deleting Private DNS PTR Record %s: %+v", name, err) } From f27c926ba5330ca8611b718cb7f0b9994b928f7d Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 08:38:16 +0100 Subject: [PATCH 3/9] Update azurerm/resource_arm_private_dns_ptr_record.go Co-Authored-By: Tom Harvey --- azurerm/resource_arm_private_dns_ptr_record.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_private_dns_ptr_record.go b/azurerm/resource_arm_private_dns_ptr_record.go index 59fdb260ef7a..1ab0a05387b2 100644 --- a/azurerm/resource_arm_private_dns_ptr_record.go +++ b/azurerm/resource_arm_private_dns_ptr_record.go @@ -183,7 +183,7 @@ func resourceArmPrivateDnsPtrRecordDelete(d *schema.ResourceData, meta interface } func flattenAzureRmPrivateDnsPtrRecords(records *[]privatedns.PtrRecord) []string { - results := make([]string, 0, len(*records)) + results := make([]string, 0) if records != nil { for _, record := range *records { From 92a947076897c1c5cac76fa10400eeed9e193406 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 08:39:08 +0100 Subject: [PATCH 4/9] Update azurerm/resource_arm_private_dns_ptr_record.go Co-Authored-By: Tom Harvey --- azurerm/resource_arm_private_dns_ptr_record.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azurerm/resource_arm_private_dns_ptr_record.go b/azurerm/resource_arm_private_dns_ptr_record.go index 1ab0a05387b2..ebf56bf2311b 100644 --- a/azurerm/resource_arm_private_dns_ptr_record.go +++ b/azurerm/resource_arm_private_dns_ptr_record.go @@ -187,6 +187,9 @@ func flattenAzureRmPrivateDnsPtrRecords(records *[]privatedns.PtrRecord) []strin if records != nil { for _, record := range *records { + if record.Ptrdname == nil { + continue + } results = append(results, *record.Ptrdname) } } From b95ea9d39c9b1decbadd693ce0e61f0323bee392 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 08:39:15 +0100 Subject: [PATCH 5/9] Update azurerm/resource_arm_private_dns_ptr_record.go Co-Authored-By: Tom Harvey --- azurerm/resource_arm_private_dns_ptr_record.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_private_dns_ptr_record.go b/azurerm/resource_arm_private_dns_ptr_record.go index ebf56bf2311b..822da3ddf040 100644 --- a/azurerm/resource_arm_private_dns_ptr_record.go +++ b/azurerm/resource_arm_private_dns_ptr_record.go @@ -153,7 +153,7 @@ func resourceArmPrivateDnsPtrRecordRead(d *schema.ResourceData, meta interface{} if props := resp.RecordSetProperties; props != nil { if err := d.Set("records", flattenAzureRmPrivateDnsPtrRecords(resp.PtrRecords)); err != nil { - return err + return fmt.Errorf("Error setting `records`: %+v", err) } } From f81683f6f79ea70dd220e24ebeac4fa44b0c1403 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 08:39:22 +0100 Subject: [PATCH 6/9] Update website/docs/r/private_dns_ptr_record.html.markdown Co-Authored-By: Tom Harvey --- website/docs/r/private_dns_ptr_record.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/private_dns_ptr_record.html.markdown b/website/docs/r/private_dns_ptr_record.html.markdown index 2769cf22a686..1587df8edbc9 100644 --- a/website/docs/r/private_dns_ptr_record.html.markdown +++ b/website/docs/r/private_dns_ptr_record.html.markdown @@ -36,7 +36,7 @@ resource "azurerm_private_dns_ptr_record" "test" { The following arguments are supported: -* `name` - (Required) The name of the DNS PTR Record. +* `name` - (Required) The name of the DNS PTR Record. Changing this forces a new resource to be created. * `resource_group_name` - (Required) Specifies the resource group where the resource exists. Changing this forces a new resource to be created. From c99d77fc102a16c1235df3a84cbda3e30f235b43 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 08:39:33 +0100 Subject: [PATCH 7/9] Update website/docs/r/private_dns_ptr_record.html.markdown Co-Authored-By: Tom Harvey --- website/docs/r/private_dns_ptr_record.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/private_dns_ptr_record.html.markdown b/website/docs/r/private_dns_ptr_record.html.markdown index 1587df8edbc9..2784d327e1c4 100644 --- a/website/docs/r/private_dns_ptr_record.html.markdown +++ b/website/docs/r/private_dns_ptr_record.html.markdown @@ -42,7 +42,7 @@ The following arguments are supported: * `zone_name` - (Required) Specifies the Private DNS Zone where the resource exists. Changing this forces a new resource to be created. -* `TTL` - (Required) The Time To Live (TTL) of the DNS record in seconds. +* `ttl ` - (Required) The Time To Live (TTL) of the DNS record in seconds. * `records` - (Required) List of Fully Qualified Domain Names. From b6d281e7c83a1a903b31abb86efcfd64b957cea7 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Wed, 30 Oct 2019 10:52:30 +0100 Subject: [PATCH 8/9] fix on dnsclient delete (missing parameter) --- azurerm/resource_arm_private_dns_ptr_record.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_private_dns_ptr_record.go b/azurerm/resource_arm_private_dns_ptr_record.go index 822da3ddf040..f2d0ad2534a4 100644 --- a/azurerm/resource_arm_private_dns_ptr_record.go +++ b/azurerm/resource_arm_private_dns_ptr_record.go @@ -174,7 +174,7 @@ func resourceArmPrivateDnsPtrRecordDelete(d *schema.ResourceData, meta interface name := id.Path["PTR"] zoneName := id.Path["privateDnsZones"] - _, err = dnsClient.Delete(ctx, resGroup, zoneName, privatedns.PTR, name) + _, err = dnsClient.Delete(ctx, resGroup, zoneName, privatedns.PTR, name, "") if err != nil { return fmt.Errorf("Error deleting Private DNS PTR Record %s: %+v", name, err) } From b01c64d4ee308e2f8ac777ee0f680accf1de3821 Mon Sep 17 00:00:00 2001 From: Philipp Resch Date: Thu, 31 Oct 2019 17:11:43 +0100 Subject: [PATCH 9/9] Added link to sidebar --- website/azurerm.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/azurerm.erb b/website/azurerm.erb index feab96257f32..482a7b8478f0 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1632,6 +1632,9 @@
  • azurerm_private_dns_cname_record
    • +
  • + azurerm_private_dns_ptr_record +
  • azurerm_private_dns_zone