Merge pull request #609 from amplify-education/hosted-zone-filtering-fix

Hosted zone filtering fix

CHANGELOG.md

@@ -4,10 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.3.2] - 2023-12-07
+
+### Fixed 
+- Fixed hosted zone filtering, when the domain `api.mydomain.com` equals the host name `api.mydomain.com`.
+
 ## [7.3.1] - 2023-12-01
 
 ### Fixed 
-- Fixed hosted zone filtering.
+- Fixed hosted zone filtering, when the domain `serverlessdevapi.mydomain.com` contains the host name `api.mydomain.com`.
 
 ## [7.3.0] - 2023-11-30
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-domain-manager",
-  "version": "7.3.1",
+  "version": "7.3.2",
   "engines": {
     "node": ">=14"
   },

src/aws/route53-wrapper.ts

@@ -69,7 +69,7 @@ class Route53Wrapper {
             })
             .filter((hostedZone) => {
                 const hostedZoneName = hostedZone.Name.replace(/\.$/, "");
-                return domainNameHost.endsWith(hostedZoneName);
+                return domain.givenDomainName === hostedZoneName || domainNameHost.endsWith(hostedZoneName);
             })
             .sort((zone1, zone2) => zone2.Name.length - zone1.Name.length)
             .shift();

test/unit-tests/aws/route53-wrapper.test.ts

@@ -169,13 +169,13 @@ describe("Route53 wrapper checks", () => {
                     Name: "api.test_domain",
                 }, {
                     CallerReference: "",
-                    Config: {PrivateZone: true},
-                    Id: "dummy_host_id",
-                    Name: "test_domain",
+                    Config: {PrivateZone: false},
+                    Id: testId,
+                    Name: "devapi.test_domain",
                 }, {
                     CallerReference: "",
                     Config: {PrivateZone: false},
-                    Id: testId,
+                    Id: "dummy_host_id",
                     Name: "test_domain",
                 },
             ]