Merge pull request #1440 from snyk/fix/route53_record_name_parsing

Fix route53 record name parsing

Author: eliecharra

pkg/remote/aws/route53_record_enumerator.go

@@ -1,6 +1,7 @@
 package aws
 
 import (
+	"strconv"
 	"strings"
 
 	"github.com/snyk/driftctl/pkg/remote/aws/repository"
@@ -75,7 +76,7 @@ func (e *Route53RecordEnumerator) listRecordsForZone(zoneId string) ([]*resource
 			results,
 			e.factory.CreateAbstractResource(
 				string(e.SupportedType()),
-				strings.Join(vars, "_"),
+				e.cleanRecordName(strings.Join(vars, "_")),
 				map[string]interface{}{
 					"type": rawType,
 				},
@@ -85,3 +86,16 @@ func (e *Route53RecordEnumerator) listRecordsForZone(zoneId string) ([]*resource
 
 	return results, nil
 }
+
+// cleanRecordName
+// Route 53 stores certain characters with the octal equivalent in ASCII format.
+// This function converts all of these characters back into the original character.
+// E.g. "*" is stored as "\\052" and "@" as "\\100"
+func (e *Route53RecordEnumerator) cleanRecordName(name string) string {
+	str := name
+	s, err := strconv.Unquote(`"` + str + `"`)
+	if err != nil {
+		return str
+	}
+	return s
+}

pkg/remote/aws_route53_scanner_test.go

@@ -324,7 +324,7 @@ func TestRoute53_Record(t *testing.T) {
 						Type: awssdk.String("A"),
 					},
 					{
-						Name: awssdk.String("test3"),
+						Name: awssdk.String("*.test4."),
 						Type: awssdk.String("A"),
 					},
 				}, nil)

pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test3_A.res.golden.json renamed to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G__.test4_A.res.golden.json

@@ -1 +1 @@
-{"Typ":"WyJvYmplY3QiLHsiYWxpYXMiOlsic2V0IixbIm9iamVjdCIseyJldmFsdWF0ZV90YXJnZXRfaGVhbHRoIjoiYm9vbCIsIm5hbWUiOiJzdHJpbmciLCJ6b25lX2lkIjoic3RyaW5nIn1dXSwiYWxsb3dfb3ZlcndyaXRlIjoiYm9vbCIsImZhaWxvdmVyX3JvdXRpbmdfcG9saWN5IjpbImxpc3QiLFsib2JqZWN0Iix7InR5cGUiOiJzdHJpbmcifV1dLCJmcWRuIjoic3RyaW5nIiwiZ2VvbG9jYXRpb25fcm91dGluZ19wb2xpY3kiOlsibGlzdCIsWyJvYmplY3QiLHsiY29udGluZW50Ijoic3RyaW5nIiwiY291bnRyeSI6InN0cmluZyIsInN1YmRpdmlzaW9uIjoic3RyaW5nIn1dXSwiaGVhbHRoX2NoZWNrX2lkIjoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsYXRlbmN5X3JvdXRpbmdfcG9saWN5IjpbImxpc3QiLFsib2JqZWN0Iix7InJlZ2lvbiI6InN0cmluZyJ9XV0sIm11bHRpdmFsdWVfYW5zd2VyX3JvdXRpbmdfcG9saWN5IjoiYm9vbCIsIm5hbWUiOiJzdHJpbmciLCJyZWNvcmRzIjpbInNldCIsInN0cmluZyJdLCJzZXRfaWRlbnRpZmllciI6InN0cmluZyIsInR0bCI6Im51bWJlciIsInR5cGUiOiJzdHJpbmciLCJ3ZWlnaHRlZF9yb3V0aW5nX3BvbGljeSI6WyJsaXN0IixbIm9iamVjdCIseyJ3ZWlnaHQiOiJudW1iZXIifV1dLCJ6b25lX2lkIjoic3RyaW5nIn1d","Val":"eyJhbGlhcyI6bnVsbCwiYWxsb3dfb3ZlcndyaXRlIjpudWxsLCJmYWlsb3Zlcl9yb3V0aW5nX3BvbGljeSI6bnVsbCwiZnFkbiI6InRlc3QzLmZvby0wLmNvbSIsImdlb2xvY2F0aW9uX3JvdXRpbmdfcG9saWN5IjpudWxsLCJoZWFsdGhfY2hlY2tfaWQiOiIiLCJpZCI6IloxMDM1MzYwR0xJQjgyVDFFSDJHX3Rlc3QzX0EiLCJsYXRlbmN5X3JvdXRpbmdfcG9saWN5IjpudWxsLCJtdWx0aXZhbHVlX2Fuc3dlcl9yb3V0aW5nX3BvbGljeSI6bnVsbCwibmFtZSI6InRlc3QzIiwicmVjb3JkcyI6WyIxLjIuMy40Il0sInNldF9pZGVudGlmaWVyIjoiIiwidHRsIjozMDAsInR5cGUiOiJBIiwid2VpZ2h0ZWRfcm91dGluZ19wb2xpY3kiOm51bGwsInpvbmVfaWQiOiJaMTAzNTM2MEdMSUI4MlQxRUgyRyJ9","Err":null}
+{"Typ":"WyJvYmplY3QiLHsiYWxpYXMiOlsic2V0IixbIm9iamVjdCIseyJldmFsdWF0ZV90YXJnZXRfaGVhbHRoIjoiYm9vbCIsIm5hbWUiOiJzdHJpbmciLCJ6b25lX2lkIjoic3RyaW5nIn1dXSwiYWxsb3dfb3ZlcndyaXRlIjoiYm9vbCIsImZhaWxvdmVyX3JvdXRpbmdfcG9saWN5IjpbImxpc3QiLFsib2JqZWN0Iix7InR5cGUiOiJzdHJpbmcifV1dLCJmcWRuIjoic3RyaW5nIiwiZ2VvbG9jYXRpb25fcm91dGluZ19wb2xpY3kiOlsibGlzdCIsWyJvYmplY3QiLHsiY29udGluZW50Ijoic3RyaW5nIiwiY291bnRyeSI6InN0cmluZyIsInN1YmRpdmlzaW9uIjoic3RyaW5nIn1dXSwiaGVhbHRoX2NoZWNrX2lkIjoic3RyaW5nIiwiaWQiOiJzdHJpbmciLCJsYXRlbmN5X3JvdXRpbmdfcG9saWN5IjpbImxpc3QiLFsib2JqZWN0Iix7InJlZ2lvbiI6InN0cmluZyJ9XV0sIm11bHRpdmFsdWVfYW5zd2VyX3JvdXRpbmdfcG9saWN5IjoiYm9vbCIsIm5hbWUiOiJzdHJpbmciLCJyZWNvcmRzIjpbInNldCIsInN0cmluZyJdLCJzZXRfaWRlbnRpZmllciI6InN0cmluZyIsInR0bCI6Im51bWJlciIsInR5cGUiOiJzdHJpbmciLCJ3ZWlnaHRlZF9yb3V0aW5nX3BvbGljeSI6WyJsaXN0IixbIm9iamVjdCIseyJ3ZWlnaHQiOiJudW1iZXIifV1dLCJ6b25lX2lkIjoic3RyaW5nIn1d","Val":"eyJhbGlhcyI6bnVsbCwiYWxsb3dfb3ZlcndyaXRlIjpudWxsLCJmYWlsb3Zlcl9yb3V0aW5nX3BvbGljeSI6bnVsbCwiZnFkbiI6IioudGVzdDQuZm9vLTAuY29tIiwiZ2VvbG9jYXRpb25fcm91dGluZ19wb2xpY3kiOm51bGwsImhlYWx0aF9jaGVja19pZCI6IiIsImlkIjoiWjEwMzUzNjBHTElCODJUMUVIMkdfKi50ZXN0NC5fQSIsImxhdGVuY3lfcm91dGluZ19wb2xpY3kiOm51bGwsIm11bHRpdmFsdWVfYW5zd2VyX3JvdXRpbmdfcG9saWN5IjpudWxsLCJuYW1lIjoiKi50ZXN0NCIsInJlY29yZHMiOlsiMS4yLjMuNCJdLCJzZXRfaWRlbnRpZmllciI6IiIsInR0bCI6MzAwLCJ0eXBlIjoiQSIsIndlaWdodGVkX3JvdXRpbmdfcG9saWN5IjpudWxsLCJ6b25lX2lkIjoiWjEwMzUzNjBHTElCODJUMUVIMkcifQ==","Err":null}

pkg/remote/test/aws_route53_record_multiples/results.golden.json

@@ -86,13 +86,13 @@
     "alias": null,
     "allow_overwrite": null,
     "failover_routing_policy": null,
-    "fqdn": "test3.foo-0.com",
+    "fqdn": "*.test4.foo-0.com",
     "geolocation_routing_policy": null,
     "health_check_id": "",
-    "id": "Z1035360GLIB82T1EH2G_test3_A",
+    "id": "Z1035360GLIB82T1EH2G_*.test4._A",
     "latency_routing_policy": null,
     "multivalue_answer_routing_policy": null,
-    "name": "test3",
+    "name": "*.test4",
     "records": [
       "1.2.3.4"
     ],

pkg/resource/aws/aws_route53_record_test.go

@@ -23,7 +23,7 @@ func TestAcc_Aws_Route53Record_WithFQDNAsId(t *testing.T) {
 					}
 					result.AssertDriftCountTotal(0)
 					result.Equal(0, result.Summary().TotalDeleted)
-					result.Equal(8, result.Summary().TotalManaged)
+					result.Equal(9, result.Summary().TotalManaged)
 				},
 			},
 		},

pkg/resource/aws/testdata/acc/aws_route53_record/route53.tf

@@ -65,3 +65,11 @@ resource "aws_route53_record" "foo-record-4-a" {
   ttl     = 300
   records = ["192.0.1.5"]
 }
+
+resource "aws_route53_record" "foo-record-4-b" {
+  zone_id = aws_route53_zone.foo-zone.zone_id
+  name    = "*.test4."
+  type    = "A"
+  ttl     = 300
+  records = ["192.0.1.5"]
+}