From 077986f84388551bbc96c34dcea1019ca91e2ce5 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1+github@gmail.com>
Date: Wed, 7 Aug 2019 15:48:44 +0100
Subject: [PATCH] Fix review comments

Co-Authored-By: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 .../resource_arm_private_dns_cname_record.go  | 32 +++++++++++--------
 ...ource_arm_private_dns_cname_record_test.go | 10 +++---
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/azurerm/resource_arm_private_dns_cname_record.go b/azurerm/resource_arm_private_dns_cname_record.go
index d94472e9ac1e..2bf66e04569d 100644
--- a/azurerm/resource_arm_private_dns_cname_record.go
+++ b/azurerm/resource_arm_private_dns_cname_record.go
@@ -2,7 +2,8 @@ package azurerm
 
 import (
 	"fmt"
-	"net/http"
+	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 
 	"github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -23,27 +24,32 @@ func resourceArmPrivateDnsCNameRecord() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				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,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 
 			"record": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 
 			"ttl": {
-				Type:     schema.TypeInt,
-				Required: true,
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntBetween(1, 2147483647),
 			},
 
 			"tags": tagsSchema(),
@@ -68,7 +74,7 @@ func resourceArmPrivateDnsCNameRecordCreateUpdate(d *schema.ResourceData, meta i
 		}
 
 		if existing.ID != nil && *existing.ID != "" {
-			return tf.ImportAsExistsError("azurerm_dns_cname_record", *existing.ID)
+			return tf.ImportAsExistsError("azurerm_private_dns_cname_record", *existing.ID)
 		}
 	}
 
@@ -158,8 +164,8 @@ func resourceArmPrivateDnsCNameRecordDelete(d *schema.ResourceData, meta interfa
 	name := id.Path["CNAME"]
 	zoneName := id.Path["privateDnsZones"]
 
-	resp, err := dnsClient.Get(ctx, resGroup, zoneName, privatedns.CNAME, name)
-	if resp.StatusCode != http.StatusOK {
+	_, err = dnsClient.Get(ctx, resGroup, zoneName, privatedns.CNAME, name)
+	if err != nil {
 		return fmt.Errorf("Error deleting Private DNS CNAME Record %s: %+v", name, err)
 	}
 
diff --git a/azurerm/resource_arm_private_dns_cname_record_test.go b/azurerm/resource_arm_private_dns_cname_record_test.go
index 96d86cc86193..031dc7e50415 100644
--- a/azurerm/resource_arm_private_dns_cname_record_test.go
+++ b/azurerm/resource_arm_private_dns_cname_record_test.go
@@ -226,7 +226,7 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_cname_record" "test" {
-  name                = "mycnamerecord%d"
+  name                = "acctestcname%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   zone_name           = "${azurerm_private_dns_zone.test.name}"
   ttl                 = 300
@@ -263,7 +263,7 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_cname_record" "test" {
-  name                = "mycnamerecord%d"
+  name                = "acctestcname%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   zone_name           = "${azurerm_private_dns_zone.test.name}"
   ttl                 = 300
@@ -285,7 +285,7 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_cname_record" "test" {
-  name                = "mycnamerecord%d"
+  name                = "acctestcname%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   zone_name           = "${azurerm_private_dns_zone.test.name}"
   ttl                 = 300
@@ -307,7 +307,7 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_cname_record" "test" {
-  name                = "mycnamerecord%d"
+  name                = "acctestcname%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   zone_name           = "${azurerm_private_dns_zone.test.name}"
   ttl                 = 300
@@ -334,7 +334,7 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_cname_record" "test" {
-  name                = "mycnamerecord%d"
+  name                = "acctestcname%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   zone_name           = "${azurerm_private_dns_zone.test.name}"
   ttl                 = 300