fix: Fix handling of pre-releases in frameworkVersion validation

serverless · Sep 2, 2020 · c0fb04a · c0fb04a
1 parent 7aad819
commit c0fb04a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
@@ -68,7 +68,11 @@ class Service {
     // basic service level validation
     const version = this.serverless.utils.getVersion();
     const ymlVersion = serverlessFile.frameworkVersion;
-    if (ymlVersion && !semver.satisfies(version, ymlVersion)) {
+    if (
+      ymlVersion &&
+      version !== ymlVersion &&
+      !semver.satisfies(semver.coerce(version).raw, ymlVersion)
+    ) {
       const errorMessage = [
         `The Serverless version (${version}) does not satisfy the`,
         ` "frameworkVersion" (${ymlVersion}) in ${this.serviceFilename}`,

diff --git a/lib/classes/Service.test.js b/lib/classes/Service.test.js
@@ -140,12 +140,32 @@ describe('Service', () => {
       ).to.eventually.be.rejected.and.have.property('code', 'FRAMEWORK_VERSION_MISMATCH'));
 
     it('should pass if frameworkVersion is satisfied', () =>
-      fixtures.extend('configTypeYml', { frameworkVersion: version }).then(fixturePath =>
-        runServerless({
-          cwd: fixturePath,
-          cliArgs: ['print'],
-        })
-      ));
+      fixtures
+        .extend('configTypeYml', { frameworkVersion: version })
+        .then(fixturePath =>
+          runServerless({
+            cwd: fixturePath,
+            cliArgs: ['print'],
+          })
+        )
+        .then(() =>
+          fixtures.extend('configTypeYml', { frameworkVersion: '*' }).then(fixturePath =>
+            runServerless({
+              cwd: fixturePath,
+              cliArgs: ['print'],
+            })
+          )
+        )
+        .then(() =>
+          fixtures
+            .extend('configTypeYml', { frameworkVersion: version.split('.')[0] })
+            .then(fixturePath =>
+              runServerless({
+                cwd: fixturePath,
+                cliArgs: ['print'],
+              })
+            )
+        ));
   });
 
   describe('#mergeArrays', () => {