Refactor

index.ts

@@ -75,7 +75,7 @@ class ServerlessCustomDomain {
             this.serverless.cli.log("serverless-domain-manager: Custom domain is disabled.");
             return;
         } else {
-            await lifecycleFunc();
+            return await lifecycleFunc.call(this);
         }
     }
 
@@ -84,73 +84,58 @@ class ServerlessCustomDomain {
      * Wraps creating a domain and resource record set
      */
     public async createDomain(): Promise<boolean> {
-        try {
-            const certArn = await this.getCertArn();
-            const domainInfo = await this.createCustomDomain(certArn);
-            await this.changeResourceRecordSet("UPSERT", domainInfo);
-            this.serverless.cli.log(`Custom domain ${this.givenDomainName} was created/updated.
-            New domains may take up to 40 minutes to be initialized.`);
-            return true;
-        } catch (error) {
-            return false;
-        }
+        const certArn = await this.getCertArn();
+        const domainInfo = await this.createCustomDomain(certArn);
+        await this.changeResourceRecordSet("UPSERT", domainInfo);
+        this.serverless.cli.log(
+            `Custom domain ${this.givenDomainName} was created/updated.
+            New domains may take up to 40 minutes to be initialized.`,
+        );
+        return true;
     }
 
     /**
      * Lifecycle function to delete a domain
      * Wraps deleting a domain and resource record set
      */
     public async deleteDomain(): Promise<boolean> {
-        try {
-            const domainInfo = await this.getDomainInfo();
+        const domainInfo = await this.getDomainInfo();
+        if (domainInfo) {
             await this.deleteCustomDomain();
             await this.changeResourceRecordSet("DELETE", domainInfo);
             this.serverless.cli.log(`Custom domain ${this.givenDomainName} was deleted.`);
             return true;
-        } catch (error) {
-            return false;
         }
+        return false;
     }
 
     /**
      * Lifecycle function to create basepath mapping
      * Wraps creation of basepath mapping and adds domain name info as output to cloudformation stack
      */
     public async setupBasePathMapping(): Promise<boolean> {
-        try {
-            const basePathCreated = await this.createBasePathMapping();
-            const domainInfo = await this.getDomainInfo();
-            this.addOutputs(domainInfo);
-            await this.printDomainSummary(domainInfo);
-            return basePathCreated ? true : false;
-        } catch (error) {
-            return false;
-        }
+        const basePathCreated = await this.createBasePathMapping();
+        const domainInfo = await this.getDomainInfo();
+        this.addOutputs(domainInfo);
+        await this.printDomainSummary(domainInfo);
+        return basePathCreated ? true : false;
     }
 
     /**
      * Lifecycle function to delete basepath mapping
      * Wraps deletion of basepath mapping
      */
     public async removeBasePathMapping(): Promise<boolean> {
-        try {
-            return await this.deleteBasePathMapping();
-        } catch (error) {
-            return false;
-        }
+        return await this.deleteBasePathMapping();
     }
 
     /**
      * Lifecycle function to print domain summary
      * Wraps printing of all domain manager related info
      */
     public async domainSummary(): Promise<boolean> {
-        try {
-            const domainInfo = await this.getDomainInfo();
-            return this.printDomainSummary(domainInfo);
-        } catch (error) {
-            return false;
-        }
+        const domainInfo = await this.getDomainInfo();
+        return this.printDomainSummary(domainInfo);
     }
 
     /**
@@ -287,6 +272,9 @@ class ServerlessCustomDomain {
             domainInfo = await this.apigateway.getDomainName({ domainName: this.givenDomainName }).promise();
             return new DomainResponse(domainInfo);
         } catch (err) {
+            if (err.code === "NotFoundException") {
+                return null;
+            }
             throw new Error(`Error: Unable to fetch information about ${this.givenDomainName}`);
         }
     }

test/unit-tests/index.test.ts

@@ -866,7 +866,7 @@ describe("Custom Domain Plugin", () => {
     it("createDomain should do nothing when domain manager is disabled", async () => {
       const plugin = constructPlugin({ enabled: false });
 
-      const result = await plugin.hookWrapper(plugin.createDomain());
+      const result = await plugin.hookWrapper(plugin.createDomain);
 
       expect(plugin.initialized).to.equal(true);
       expect(plugin.enabled).to.equal(false);
@@ -876,7 +876,7 @@ describe("Custom Domain Plugin", () => {
     it("deleteDomain should do nothing when domain manager is disabled", async () => {
       const plugin = constructPlugin({ enabled: false });
 
-      const result = await plugin.hookWrapper(plugin.deleteDomain());
+      const result = await plugin.hookWrapper(plugin.deleteDomain);
 
       expect(plugin.initialized).to.equal(true);
       expect(plugin.enabled).to.equal(false);
@@ -886,7 +886,7 @@ describe("Custom Domain Plugin", () => {
     it("setUpBasePathMapping should do nothing when domain manager is disabled", async () => {
       const plugin = constructPlugin({ enabled: false });
 
-      const result = await plugin.hookWrapper(plugin.setupBasePathMapping());
+      const result = await plugin.hookWrapper(plugin.setupBasePathMapping);
 
       expect(plugin.initialized).to.equal(true);
       expect(plugin.enabled).to.equal(false);
@@ -896,7 +896,7 @@ describe("Custom Domain Plugin", () => {
     it("removeBasePathMapping should do nothing when domain manager is disabled", async () => {
       const plugin = constructPlugin({ enabled: false });
 
-      const result = await plugin.hookWrapper(plugin.removeBasePathMapping());
+      const result = await plugin.hookWrapper(plugin.removeBasePathMapping);
 
       expect(plugin.initialized).to.equal(true);
       expect(plugin.enabled).to.equal(false);
@@ -906,7 +906,7 @@ describe("Custom Domain Plugin", () => {
     it("domainSummary should do nothing when domain manager is disabled", async () => {
       const plugin = constructPlugin({ enabled: false });
 
-      const result = await plugin.hookWrapper(plugin.domainSummary());
+      const result = await plugin.hookWrapper(plugin.domainSummary);
 
       expect(plugin.initialized).to.equal(true);
       expect(plugin.enabled).to.equal(false);