Fixed logic with resource record mapping (#2231)

Fixes ENG-1026

GitOrigin-RevId: 117e3e7268af888b32afc1a942afe391325cae21

Author: dylanratcliffe

aws-source/adapters/route53-resource-record-set.go

@@ -17,6 +17,26 @@ func resourceRecordSetGetFunc(ctx context.Context, client *route53.Client, scope
 	return nil, errors.New("get is not supported for route53-resource-record-set. Use search")
 }
 
+// constructRecordFQDN constructs the full FQDN for a Route53 record based on
+// the record name and the hosted zone name. This handles the various edge cases
+// where the record name might already contain the full domain.
+func constructRecordFQDN(recordName, hostedZoneName string) string {
+	// If the name is the same as the FQDN of the hosted zone, we don't have
+	// to append it otherwise it'll be in there twice. It seems that NS and
+	// MX records sometimes have the full FQDN in the name
+	zoneFQDN := strings.TrimSuffix(hostedZoneName, ".")
+
+	if recordName == zoneFQDN {
+		return recordName
+	} else if strings.HasSuffix(recordName, "."+zoneFQDN) || strings.HasSuffix(recordName, hostedZoneName) {
+		// Record name already contains the full domain
+		return recordName
+	} else {
+		// Calculate the full FQDN based on the hosted zone name and the record name
+		return recordName + "." + hostedZoneName
+	}
+}
+
 // ResourceRecordSetSearchFunc Search func that accepts a hosted zone or a
 // terraform ID in the format {hostedZone}_{recordName}_{type}. Unfortunately
 // the "name" means the record name within the scope of the hosted zone, not the
@@ -51,17 +71,7 @@ func resourceRecordSetSearchFunc(ctx context.Context, client *route53.Client, sc
 			return nil, fmt.Errorf("hosted zone %s not found", hostedZoneID)
 		}
 
-		// If the name is the same as the FQDN of the hosted zone, we don't have
-		// to append it otherwise it'll be in there twice. It seems that NS and
-		// MX records sometimes have the full FQDN in the name
-		zoneFQDN := strings.TrimSuffix(*zoneResp.HostedZone.Name, ".")
-		var fullName string
-		if recordName == zoneFQDN {
-			fullName = recordName
-		} else {
-			// Calculate the full FQDN based on the hosted zone name and the record name
-			fullName = recordName + "." + *zoneResp.HostedZone.Name
-		}
+		fullName := constructRecordFQDN(recordName, *zoneResp.HostedZone.Name)
 
 		var maxItems int32 = 1
 		req := route53.ListResourceRecordSetsInput{

aws-source/adapters/route53-resource-record-set_test.go

@@ -113,6 +113,93 @@ func TestResourceRecordSetItemMapper(t *testing.T) {
 	tests.Execute(t, item)
 }
 
+// TestConstructRecordFQDN tests the FQDN construction logic
+// for various record name formats
+func TestConstructRecordFQDN(t *testing.T) {
+	type testCase struct {
+		name           string
+		hostedZoneName string
+		recordName     string
+		expectedFQDN   string
+		description    string
+	}
+
+	testCases := []testCase{
+		{
+			name:           "simple_subdomain",
+			hostedZoneName: "example.com.",
+			recordName:     "www",
+			expectedFQDN:   "www.example.com.",
+			description:    "Simple subdomain record",
+		},
+		{
+			name:           "already_full_fqdn_with_trailing_dot",
+			hostedZoneName: "example.com.",
+			recordName:     "subdomain.example.com.",
+			expectedFQDN:   "subdomain.example.com.",
+			description:    "Record name already contains full FQDN with trailing dot",
+		},
+		{
+			name:           "already_full_fqdn_without_trailing_dot",
+			hostedZoneName: "example.com.",
+			recordName:     "subdomain.example.com",
+			expectedFQDN:   "subdomain.example.com",
+			description:    "Record name already contains full FQDN without trailing dot",
+		},
+		{
+			name:           "apex_record_matches_zone",
+			hostedZoneName: "example.com.",
+			recordName:     "example.com",
+			expectedFQDN:   "example.com",
+			description:    "Apex record where name matches zone FQDN (without trailing dot)",
+		},
+		{
+			name:           "complex_subdomain_case",
+			hostedZoneName: "a2d-dev.tv.",
+			recordName:     "davidtest-other.a2d-dev.tv",
+			expectedFQDN:   "davidtest-other.a2d-dev.tv",
+			description:    "Complex case from the bug report - prevents double domain concatenation",
+		},
+		{
+			name:           "nested_subdomain",
+			hostedZoneName: "example.com.",
+			recordName:     "deep.nested.subdomain",
+			expectedFQDN:   "deep.nested.subdomain.example.com.",
+			description:    "Nested subdomain that needs zone appended",
+		},
+		{
+			name:           "ns_record_with_full_domain",
+			hostedZoneName: "example.com.",
+			recordName:     "ns.example.com.",
+			expectedFQDN:   "ns.example.com.",
+			description:    "NS record with full domain (common pattern)",
+		},
+		{
+			name:           "zone_without_trailing_dot",
+			hostedZoneName: "example.com",
+			recordName:     "www",
+			expectedFQDN:   "www.example.com",
+			description:    "Hosted zone name without trailing dot",
+		},
+		{
+			name:           "record_already_ends_with_zone_no_dot",
+			hostedZoneName: "example.com",
+			recordName:     "subdomain.example.com",
+			expectedFQDN:   "subdomain.example.com",
+			description:    "Record already ends with zone name (no trailing dots)",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			result := constructRecordFQDN(tc.recordName, tc.hostedZoneName)
+			if result != tc.expectedFQDN {
+				t.Errorf("Expected FQDN %q but got %q. %s", tc.expectedFQDN, result, tc.description)
+			}
+		})
+	}
+}
+
 func TestNewRoute53ResourceRecordSetAdapter(t *testing.T) {
 	client, account, region := route53GetAutoConfig(t)