Merge pull request #33 from schwamster/next

Merge contains 2 changes:

* resolved Issue #31  - plugin now supports the default enable property, that allows the user to disable the plugin
* #32 - Support for new variableResolutionMode of the serverless framework

Author: schwamster

Readme.md

@@ -143,6 +143,11 @@ Since version 1.2.0 of this plugin you can use the following syntax to access th
 
         ${certificate:${self:custom.customCertificate.certificateName}:CertificateArn}
 
+If you are on version >= 2.27.0 of serverless & have elected to use the new variable resolver: `variablesResolutionMode: 20210219`.
+You must use the new supported syntax which is:
+
+        ${certificate:${self:custom.customCertificate.certificateName}.CertificateArn}
+
 see the serverless [docs](https://serverless.com/framework/docs/providers/aws/guide/plugins#custom-variable-types) for more information
 
 ### License

index.js

@@ -5,11 +5,15 @@ const fs = require('fs');
 const path = require('path');
 const YAML = require('yamljs');
 const mkdirp = require('mkdirp');
+const semver = require('semver')
 var packageJson = require('./package.json');
 
 const unsupportedRegionPrefixes = ['cn-'];
 
 class CreateCertificatePlugin {
+  getEchoTestValue(src) {
+    return src.slice(5);
+  }
   constructor(serverless, options) {
     this.serverless = serverless;
     this.options = options;
@@ -481,8 +485,24 @@ class CreateCertificatePlugin {
   }
 
   getCertificateProperty(src) {
+    if (!this.enabled) {
+      return Promise.resolve('');
+    }
     this.initializeVariables();
-    let [s, domainName, property] = src.split(':');
+    let s, domainName, property;
+    let currentVersion = this.serverless.utils.getVersion();
+
+    if (semver.gte(currentVersion, '3.0.0') || (this.serverless.configurationInput && this.serverless.configurationInput.variablesResolutionMode === 20210219)) {
+      // User has set variablesResolutionMode: 20210219 (https://github.com/serverless/serverless/pull/8987/files)
+      // Nested paths must be resolved with '.' instead of ':'
+      const srcAsArray = src.split(':')[1].split('.');
+      property = srcAsArray.pop();
+      domainName = srcAsArray.join('.');
+    } else {
+      // Deprecated once Serverless V3 released & new variable resolver becomes the default.
+      [s, domainName, property] = src.split(':');
+    }
+
     return this.listCertificates()
       .then(({ CertificateSummaryList }) => {
         let cert = CertificateSummaryList.filter(({ DomainName }) => DomainName == domainName)[0];

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-certificate-creator",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "creates a certificate that can be used for custom domains for your api gateway",
   "main": "index.js",
   "scripts": {
@@ -13,6 +13,7 @@
     "chalk": "^2.4.2",
     "delay": "^4.3.0",
     "mkdirp": "^1.0.4",
+    "semver": "^7.3.4",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {},