Merge pull request serverless#5297 from fruffin/fix-4188

Fixed serverless#4188 - Package generating incorrect package artifact path in serverless-state.json
chinanathan · Mar 14, 2019 · fe86fde · fe86fde
2 parents 5d73e81 + 2a846ca
commit fe86fde
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 0 deletions.
diff --git a/lib/plugins/aws/package/lib/saveServiceState.js b/lib/plugins/aws/package/lib/saveServiceState.js
@@ -27,6 +27,16 @@ module.exports = {
     const selfReferences = findReferences(strippedService, this.serverless.service);
     _.forEach(selfReferences, refPath => _.set(strippedService, refPath, '${self:}'));
 
+    _.forEach(strippedService.functions, func => {
+      const packageRef = func.package;
+      if (!_.isEmpty(packageRef)) {
+        packageRef.artifact = path.join(
+          this.packagePath,
+          packageRef.artifact.substr(packageRef.artifact.lastIndexOf('\\') + 1)
+        );
+      }
+    });
+
     const state = {
       service: strippedService,
       package: {

diff --git a/lib/plugins/aws/package/lib/saveServiceState.test.js b/lib/plugins/aws/package/lib/saveServiceState.test.js
@@ -101,4 +101,57 @@ describe('#saveServiceState()', () => {
         .to.equal(true);
     });
   });
+
+  it('should resolve package artifact paths on function levels', () => {
+    const filePath = path.join(
+      awsPackage.serverless.config.servicePath,
+      '.serverless',
+      'service-state.json'
+    );
+
+    const distPath = path.join('..', 'dist');
+    const firstFuncArtifactPath = path.join('..', 'artifacts', 'first.zip');
+
+    awsPackage.packagePath = distPath;
+    serverless.service.package.path = distPath;
+    serverless.service.functions = {
+      first: {
+        package: {
+          artifact: firstFuncArtifactPath,
+        },
+      },
+      second: {
+        package: {},
+      },
+    };
+
+    return awsPackage.saveServiceState().then(() => {
+      const expectedStateFileContent = {
+        service: {
+          provider: {
+            compiledCloudFormationTemplate: 'compiled content',
+          },
+          functions: {
+            first: {
+              package: {
+                artifact: firstFuncArtifactPath,
+              },
+            },
+            second: {
+              package: {},
+            },
+          },
+        },
+        package: {
+          individually: false,
+          artifactDirectoryName: 'artifact-directory',
+          artifact: 'service.zip',
+        },
+      };
+
+      expect(getServiceStateFileNameStub.calledOnce).to.equal(true);
+      expect(writeFileSyncStub.calledWithExactly(filePath, expectedStateFileContent, true))
+        .to.equal(true);
+    });
+  });
 });