feat(aws-cloudfront): allow setting CloudFront distribution aliases (#654)

Author: dpowell

README.md

@@ -183,6 +183,7 @@ myNextApplication:
               minTTL: 10
               maxTTL: 10
               defaultTTL: 10
+      aliases: ["foo.example.com", "bar.example.com"]
       priceClass: "PriceClass_100"
       # You can add custom error responses
       errorPages:

packages/serverless-components/aws-cloudfront/README.md

@@ -55,6 +55,7 @@ distribution:
     region: us-east-1
     enabled: true # optional
     comment: 'My distribution' # optional
+    aliases: ['foo.example.com', 'bar.example.com']
     priceClass: 'PriceClass_All' # optional
     errorPages: # optional
       - code: 503

packages/serverless-components/aws-cloudfront/__tests__/__snapshots__/custom-url-origin.test.js.snap

@@ -112,6 +112,10 @@ Object {
 exports[`Input origin as a custom url updates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
+    "Aliases": Object {
+      "Items": Array [],
+      "Quantity": 0,
+    },
     "CacheBehaviors": Object {
       "Items": Array [],
       "Quantity": 0,

packages/serverless-components/aws-cloudfront/__tests__/__snapshots__/origin-with-path-pattern.test.js.snap

@@ -150,6 +150,10 @@ Object {
 exports[`Input origin with path pattern updates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
+    "Aliases": Object {
+      "Items": Array [],
+      "Quantity": 0,
+    },
     "CacheBehaviors": Object {
       "Items": Array [
         Object {

packages/serverless-components/aws-cloudfront/__tests__/__snapshots__/s3-origin.test.js.snap

@@ -267,6 +267,10 @@ Object {
 exports[`S3 origins When origin is an S3 bucket URL updates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
+    "Aliases": Object {
+      "Items": Array [],
+      "Quantity": 0,
+    },
     "CacheBehaviors": Object {
       "Items": Array [],
       "Quantity": 0,
@@ -439,6 +443,10 @@ Object {
 exports[`S3 origins when origin is outside of us-east-1 updates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
+    "Aliases": Object {
+      "Items": Array [],
+      "Quantity": 0,
+    },
     "CacheBehaviors": Object {
       "Items": Array [],
       "Quantity": 0,

packages/serverless-components/aws-cloudfront/__tests__/general-options.test.js

@@ -96,6 +96,40 @@ describe("General options propagation", () => {
     );
   });
 
+  it("create distribution with aliases and update it", async () => {
+    await component.default({
+      aliases: ["foo.example.com"],
+      origins
+    });
+
+    expect(mockCreateDistribution).toBeCalledWith(
+      expect.objectContaining({
+        DistributionConfig: expect.objectContaining({
+          Aliases: {
+            Items: ["foo.example.com"],
+            Quantity: 1
+          }
+        })
+      })
+    );
+
+    await component.default({
+      aliases: ["bar.example.com"],
+      origins
+    });
+
+    expect(mockUpdateDistribution).toBeCalledWith(
+      expect.objectContaining({
+        DistributionConfig: expect.objectContaining({
+          Aliases: {
+            Items: ["bar.example.com"],
+            Quantity: 1
+          }
+        })
+      })
+    );
+  });
+
   it("create distribution with priceClass and update it", async () => {
     await component.default({
       priceClass: "PriceClass_All",

packages/serverless-components/aws-cloudfront/lib/index.js

@@ -28,8 +28,8 @@ const createCloudFrontDistribution = async (cf, s3, inputs) => {
       CallerReference: String(Date.now()),
       Comment: inputs.comment,
       Aliases: {
-        Quantity: 0,
-        Items: []
+        Quantity: inputs.aliases.length,
+        Items: inputs.aliases
       },
       Origins: {
         Quantity: 0,
@@ -112,6 +112,10 @@ const updateCloudFrontDistribution = async (cf, s3, distributionId, inputs) => {
 
   params.DistributionConfig.Enabled = inputs.enabled;
   params.DistributionConfig.Comment = inputs.comment;
+  params.DistributionConfig.Aliases = {
+    Items: inputs.aliases,
+    Quantity: inputs.aliases.length
+  };
   params.DistributionConfig.PriceClass = inputs.priceClass;
 
   let s3CanonicalUserId;

packages/serverless-components/aws-cloudfront/serverless.js

@@ -25,6 +25,7 @@ class CloudFront extends Component {
       inputs.comment === null || inputs.comment === undefined
         ? ""
         : String(inputs.comment);
+    inputs.aliases = inputs.aliases || [];
     inputs.priceClass = [
       "PriceClass_All",
       "PriceClass_200",
@@ -56,6 +57,7 @@ class CloudFront extends Component {
         !equals(this.state.defaults, inputs.defaults) ||
         !equals(this.state.enabled, inputs.enabled) ||
         !equals(this.state.comment, inputs.comment) ||
+        !equals(this.state.aliases, inputs.aliases) ||
         !equals(this.state.priceClass, inputs.priceClass) ||
         !equals(this.state.errorPages, inputs.errorPages)
       ) {
@@ -79,6 +81,7 @@ class CloudFront extends Component {
     this.state.region = inputs.region;
     this.state.enabled = inputs.enabled;
     this.state.comment = inputs.comment;
+    this.state.aliases = inputs.aliases;
     this.state.priceClass = inputs.priceClass;
     this.state.origins = inputs.origins;
     this.state.errorPages = inputs.errorPages;

packages/serverless-components/nextjs-component/src/component.ts

@@ -206,6 +206,7 @@ class NextjsComponent extends Component {
     const {
       defaults: cloudFrontDefaultsInputs,
       origins: cloudFrontOriginsInputs,
+      aliases: cloudFrontAliasesInputs,
       priceClass: cloudFrontPriceClassInputs,
       errorPages: cloudFrontErrorPagesInputs,
       distributionId: cloudFrontDistributionId = null,
@@ -535,6 +536,9 @@ class NextjsComponent extends Component {
         compress: true
       },
       origins: cloudFrontOrigins,
+      ...(cloudFrontAliasesInputs && {
+        aliases: cloudFrontAliasesInputs
+      }),
       ...(cloudFrontPriceClassInputs && {
         priceClass: cloudFrontPriceClassInputs
       }),