Merge pull request serverless#6831 from serverless/revert-6780-mfa-pause

Revert "Pause for mfa input"
chinanathan · Oct 14, 2019 · 1569e93 · 1569e93
2 parents a434223 + fe04475
commit 1569e93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
@@ -51,9 +51,9 @@ class AwsPackage {
        * Outer lifecycle hooks
        */
       'package:cleanup': () =>
-        BbPromise.bind(this).then(() =>
-          this.serverless.pluginManager.spawn('aws:common:cleanupTempDir')
-        ),
+        BbPromise.bind(this)
+          .then(() => this.serverless.pluginManager.spawn('aws:common:validate'))
+          .then(() => this.serverless.pluginManager.spawn('aws:common:cleanupTempDir')),
 
       'package:initialize': () => BbPromise.bind(this).then(this.generateCoreTemplate),
 

diff --git a/lib/plugins/aws/package/index.test.js b/lib/plugins/aws/package/index.test.js
@@ -109,12 +109,16 @@ describe('AwsPackage', () => {
     });
 
     it('should run "package:cleanup" hook', () => {
+      const spawnAwsCommonValidateStub = spawnStub.withArgs('aws:common:validate').resolves();
       const spawnAwsCommonCleanupTempDirStub = spawnStub
         .withArgs('aws:common:cleanupTempDir')
         .resolves();
 
       return awsPackage.hooks['package:cleanup']().then(() => {
-        expect(spawnAwsCommonCleanupTempDirStub.calledOnce).to.equal(true);
+        expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
+        expect(spawnAwsCommonCleanupTempDirStub.calledAfter(spawnAwsCommonValidateStub)).to.equal(
+          true
+        );
       });
     });