Update validation messages, and order Set up => validation

Author: AmFlint

deploy/scalewayDeploy.js

@@ -17,54 +17,54 @@ class ScalewayDeploy {
     this.provider = this.serverless.getProvider('scaleway');
 
     Object.assign(
-        this,
-        validate,
-        setUpDeployment,
-        createNamespace,
-        createFunctions,
-        createContainers,
-        pushContainers,
-        uploadCode,
-        deployFunctions,
-        deployContainers,
-        namespaceUtils,
+      this,
+      validate,
+      setUpDeployment,
+      createNamespace,
+      createFunctions,
+      createContainers,
+      pushContainers,
+      uploadCode,
+      deployFunctions,
+      deployContainers,
+      namespaceUtils,
     );
 
     function chainContainers() {
-      if (this.provider.serverless.service.custom && 
-          this.provider.serverless.service.custom.containers &&
-          Object.keys(this.provider.serverless.service.custom.containers).length !== 0) {
+      if (this.provider.serverless.service.custom
+          && this.provider.serverless.service.custom.containers
+          && Object.keys(this.provider.serverless.service.custom.containers).length !== 0) {
         return this.createContainers()
-                .then(this.pushContainers)
-                .then(this.deployContainers)
+          .then(this.pushContainers)
+          .then(this.deployContainers);
       }
-    };
+    }
 
     function chainFunctions() {
-      if (this.provider.serverless.service.functions && 
-        Object.keys(this.provider.serverless.service.functions).length !== 0) {
+      if (this.provider.serverless.service.functions
+        && Object.keys(this.provider.serverless.service.functions).length !== 0) {
         return this.createFunctions()
-                .then(this.uploadCode)
-                .then(this.deployFunctions)
+          .then(this.uploadCode)
+          .then(this.deployFunctions);
       }
-    };
+    }
 
     this.hooks = {
       // Validate serverless.yml, set up default values, configure deployment...
       'before:deploy:deploy': () => BbPromise.bind(this)
         .then(this.provider.initialize(this.serverless, this.options))
-        .then(this.validate)
-        .then(this.setUpDeployment),
+        .then(this.setUpDeployment)
+        .then(this.validate),
       // Every tasks related to functions deployment:
       // - Create a namespace if it does not exist
       // - Create each functions in API if it does not exist
       // - Zip code - zip each function
       // - Get Presigned URL and Push code for each function to S3
       // - Deploy each function / container
       'deploy:deploy': () => BbPromise.bind(this)
-          .then(this.createNamespace)
-          .then(chainContainers)
-          .then(chainFunctions)
+        .then(this.createNamespace)
+        .then(chainContainers)
+        .then(chainFunctions),
     };
   }
 }

provider/scalewayProvider.js

@@ -43,7 +43,7 @@ class ScalewayProvider {
 
     return new BbPromise((resolve) => {
       this.setCredentials(options);
-      
+
       this.apiUrl = 'https://api.scaleway.com/functions/v1alpha2/regions/fr-par';
       this.apiManager = axios.create({
         baseURL: this.apiUrl,

remove/scalewayRemove.js

@@ -11,19 +11,19 @@ class ScalewayDeploy {
     this.provider = this.serverless.getProvider('scaleway');
 
     Object.assign(
-        this,
-        setUpDeployment,
-        removeNamespace,
-        namespaceUtils,
-        validate,
+      this,
+      setUpDeployment,
+      removeNamespace,
+      namespaceUtils,
+      validate,
     );
 
     this.hooks = {
       // Validate serverless.yml, set up default values, configure deployment...
       'before:remove:remove': () => BbPromise.bind(this)
         .then(this.provider.initialize(this.serverless, this.options))
-        .then(this.validate)
-        .then(this.setUpDeployment),
+        .then(this.setUpDeployment)
+        .then(this.validate),
       // Every tasks related to space deletion:
       // - Delete given space if it exists
       'remove:remove': () => BbPromise.bind(this)

shared/setUpDeployment.js

@@ -1,7 +1,7 @@
 module.exports = {
   setUpDeployment() {
-    const service = this.provider.serverless.service;
-    const provider = service.provider;
+    const { service } = this.provider.serverless;
+    const { provider } = service;
     this.namespaceName = service.service;
     this.namespaceVariables = provider.env || {};
     this.runtime = provider.runtime;

shared/validate.js

@@ -103,7 +103,7 @@ module.exports = {
             throw new Error('File does not exists');
           }
         } catch (error) {
-          const message = `Handler defined for function ${functionName} does not exist.`;
+          const message = `Handler file defined for function ${functionName} does not exist (${func.handler}).`;
           functionErrors.push(message);
         }
       });