#6 fetch should handle >100 resources (#7)

* fetch should handle >100 resources * lint fixes, update test * lint fixes * lint fixes * Removed trailing commas because they cause istanbul to fail, Change lint rule to allow trailing commas instead of requiring * Lint fixes * Fixed bug in test
rurri · Jan 3, 2018 · f0a5033 · f0a5033
1 parent 96f45ec
commit f0a5033
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,6 +4,7 @@ module.exports = {
     strict: 0, /* remove after Chrome supports strict mode in modules OR Babel is integrated */
     'no-unused-vars': [2, { args: 'after-used', argsIgnorePattern: '^_' }],
     'no-param-reassign': [2, { props: false }],
+    'comma-dangle': ['error', 'only-multiline'],
   },
   globals: {},
   env: {

diff --git a/index.js b/index.js
@@ -132,8 +132,39 @@ class ServerlessResourcesEnv {
   fetchCFResources() {
     const stackName = this.getStackName();
     this.serverless.cli.log(`[serverless-resources-env] Looking up resources for CF Named: ${stackName}`);
-    return Promise.promisify(this.cloudFormation.describeStackResources.bind(this.cloudFormation))({
-      StackName: stackName,
+    return this.fetchCFResourcesPages(stackName, null, []);
+  }
+
+  /**
+   * Recursively look up the CF Resource pages for this stack from AWS
+   * and concatenate the resource pages
+   * @returns {Promise.<String>}
+   */
+  fetchCFResourcesPages(stackName, nextToken, resourceSummaries) {
+    const self = this;
+    return new Promise((resolve, reject) => {
+      self.cloudFormation.listStackResources(
+          { StackName: stackName, NextToken: nextToken },
+          (err, resourceResultPage) => {
+            if (err == null) {
+              if (resourceResultPage.NextToken == null) {
+                const results = resourceSummaries.concat(resourceResultPage.StackResourceSummaries);
+                self.serverless.cli.log(`[serverless-resources-env] Returned ${results.length} ResourceSummaries`);
+                resolve({ StackResources: results });
+              } else {
+                self.serverless.cli.log('[serverless-resources-env] Getting next Resources page');
+                const allSummaries =
+                    resourceSummaries.concat(resourceResultPage.StackResourceSummaries);
+                resolve(self.fetchCFResourcesPages(
+                    stackName,
+                    resourceResultPage.NextToken,
+                    allSummaries));
+              }
+            } else {
+              reject(err);
+            }
+          }
+      );
     });
   }
 

diff --git a/test/plugin-test.js b/test/plugin-test.js
@@ -134,10 +134,10 @@ describe('serverless-fetch-stack-resource', () => {
         { LogicalResourceId: 'b', PhysicalResourceId: '2' },
         { LogicalResourceId: 'c', PhysicalResourceId: '3' },
       ];
-      instance.cloudFormation.describeStackResources =
+      instance.cloudFormation.listStackResources =
           (params, callback) => {
             callback(null, {
-              StackResources: resources,
+              StackResourceSummaries: resources,
             });
           };