disable distribution on removal

Author: eahefnawy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless/aws-cloudfront",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "main": "./serverless.js",
   "publishConfig": {
     "access": "public"

serverless.js

@@ -33,18 +33,18 @@ class CloudFront extends Component {
     if (this.state.id) {
       if (!equals(this.state.origins, inputs.origins)) {
         this.context.debug(`Updating CloudFront distribution of ID ${this.state.id}.`)
-        this.state = await updateCloudFrontDistribution(cf, this.state.id, inputs.origins)
+        this.state = await updateCloudFrontDistribution(cf, this.state.id, inputs)
       }
     } else {
       this.context.debug(`Creating CloudFront distribution in the ${inputs.region} region.`)
-      this.state = await createCloudFrontDistribution(cf, inputs.origins)
+      this.state = await createCloudFrontDistribution(cf, inputs)
     }
 
     this.state.region = inputs.region
     this.state.origins = inputs.origins
     await this.save()
 
-    this.context.debug(`CloudFront deployed successfully with URL: https://${this.state.url}.`)
+    this.context.debug(`CloudFront deployed successfully with URL: ${this.state.url}.`)
 
     return this.state
   }

utils.js

@@ -12,7 +12,7 @@ const getOriginConfig = (origin) => {
   }
 
   if (origin.includes('s3')) {
-    const bucketName = origin.replace('http://', '').split('.')[0]
+    const bucketName = origin.replace('https://', '').split('.')[0]
     originConfig.Id = bucketName
     originConfig.DomainName = `${bucketName}.s3.amazonaws.com`
   }
@@ -97,7 +97,7 @@ const createCloudFrontDistribution = async (cf, inputs) => {
   return {
     id: res.Distribution.Id,
     arn: res.Distribution.ARN,
-    url: res.Distribution.DomainName
+    url: `https://${res.Distribution.DomainName}`
   }
 }
 
@@ -133,7 +133,27 @@ const updateCloudFrontDistribution = async (cf, distributionId, inputs) => {
   return {
     id: res.Distribution.Id,
     arn: res.Distribution.ARN,
-    url: res.Distribution.DomainName
+    url: `https://${res.Distribution.DomainName}`
+  }
+}
+
+const disableCloudFrontDistribution = async (cf, distributionId) => {
+  const params = await cf.getDistributionConfig({ Id: distributionId }).promise()
+
+  params.IfMatch = params.ETag
+
+  delete params.ETag
+
+  params.Id = distributionId
+
+  params.DistributionConfig.Enabled = false
+
+  const res = await cf.updateDistribution(params).promise()
+
+  return {
+    id: res.Distribution.Id,
+    arn: res.Distribution.ARN,
+    url: `https://${res.Distribution.DomainName}`
   }
 }
 
@@ -144,7 +164,9 @@ const deleteCloudFrontDistribution = async (cf, distributionId) => {
     const params = { Id: distributionId, IfMatch: res.ETag }
     await cf.deleteDistribution(params).promise()
   } catch (e) {
-    if (e.code !== '') {
+    if (e.code === 'DistributionNotDisabled') {
+      await disableCloudFrontDistribution(cf, distributionId)
+    } else {
       throw e
     }
   }