Fix tests (#96)

Author: norbjd

examples/container-schedule/serverless.yml

@@ -5,11 +5,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/container/serverless.yml

@@ -5,11 +5,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/go/serverless.yml

@@ -6,11 +6,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/go113/serverless.yml

@@ -6,11 +6,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/multiple/serverless.yml

@@ -6,11 +6,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/nodejs-es-modules/serverless.yml

@@ -6,11 +6,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/nodejs-schedule/serverless.yml

@@ -6,11 +6,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

examples/nodejs/serverless.yml

@@ -7,11 +7,6 @@ provider:
   # Global Environment variables - used in every functions
   env:
     test: test
-  # the path to the credentials file needs to be absolute
-  scwToken: <scw-token>
-  scwProject: <scw-project-id>
-  # region in which the deployment will happen
-  scwRegion: fr-par
 
 plugins:
   - serverless-scaleway-functions

package.json

@@ -13,6 +13,7 @@
     "test:functions": "jest --maxWorkers 5 tests/functions",
     "test:containers": "jest --maxWorkers 5 tests/containers",
     "test:multi-region": "jest --maxWorkers 5 tests/multi-region",
+    "test:provider": "jest --maxWorkers 5 tests/provider",
     "test:runtimes": "jest --maxWorkers 5 tests/runtimes",
     "test:triggers": "jest --maxWorkers 5 tests/triggers",
     "coverage": "jest --coverage",

provider/scalewayProvider.js

@@ -48,7 +48,8 @@ class ScalewayProvider {
     // On serverless info command we do not want log pollution from authentication.
     // This is necessary to use it in an automated environment.
     let hideLog = false;
-    if (this.serverless.configurationInput.service &&
+    if (this.serverless.configurationInput &&
+        this.serverless.configurationInput.service &&
         this.serverless.configurationInput.service === 'serverlessInfo') {
       hideLog = true;
     }

tests/containers/containers.test.js

@@ -6,7 +6,7 @@ const axios = require('axios');
 const { expect } = require('chai');
 
 const { getTmpDirPath, replaceTextInFile } = require('../utils/fs');
-const { getServiceName, sleep } = require('../utils/misc');
+const { getServiceName, sleep, serverlessDeploy, serverlessRemove} = require('../utils/misc');
 const { ContainerApi, RegistryApi } = require('../../shared/api');
 const { CONTAINERS_API_URL, REGISTRY_API_URL } = require('../../shared/constants');
 const { execSync, execCaptureOutput } = require('../../shared/child-process');
@@ -18,7 +18,7 @@ describe('Service Lifecyle Integration Test', () => {
   const tmpDir = getTmpDirPath();
   let oldCwd;
   let serviceName;
-  const scwRegion = 'fr-par';
+  const scwRegion = process.env.SCW_REGION;
   const scwProject = process.env.SCW_DEFAULT_PROJECT_ID || process.env.SCW_PROJECT;
   const scwToken = process.env.SCW_SECRET_KEY || process.env.SCW_TOKEN;
   const apiUrl = `${CONTAINERS_API_URL}/${scwRegion}`;
@@ -46,13 +46,12 @@ describe('Service Lifecyle Integration Test', () => {
     replaceTextInFile('serverless.yml', 'scaleway-container', serviceName);
     replaceTextInFile('serverless.yml', '<scw-token>', scwToken);
     replaceTextInFile('serverless.yml', '<scw-project-id>', scwProject);
-    replaceTextInFile('serverless.yml', 'scwRegion: fr-par', `scwRegion: ${scwRegion}`);
     expect(fs.existsSync(path.join(tmpDir, 'serverless.yml'))).to.be.equal(true);
     expect(fs.existsSync(path.join(tmpDir, 'my-container'))).to.be.equal(true);
   });
 
   it('should deploy service/container to scaleway', async () => {
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
     namespace = await api.getNamespaceFromList(serviceName);
     namespace.containers = await api.listContainers(namespace.id);
     containerName = namespace.containers[0].name;
@@ -68,7 +67,7 @@ describe('Service Lifecyle Integration Test', () => {
 
   it('should deploy updated service/container to scaleway', () => {
     replaceTextInFile('my-container/server.py', 'Hello, World from Scaleway Container !', 'Container successfully updated');
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
   });
 
   it('should invoke updated container from scaleway', async () => {
@@ -79,7 +78,7 @@ describe('Service Lifecyle Integration Test', () => {
   });
 
   it('should remove service from scaleway', async () => {
-    execSync(`${serverlessExec} remove`);
+    serverlessRemove();
     try {
       await api.getNamespace(namespace.id);
     } catch (err) {
@@ -95,7 +94,7 @@ describe('Service Lifecyle Integration Test', () => {
   it('should throw error container directory not found', () => {
     replaceTextInFile('serverless.yml', 'my-container', 'doesnotexist');
     try {
-      expect(execSync(`${serverlessExec} deploy`)).rejects.toThrow(Error);
+      expect(serverlessDeploy()).rejects.toThrow(Error);
     } catch (err) {
       // if not try catch, test would fail
     }

tests/functions/functions.test.js

@@ -6,7 +6,7 @@ const { expect } = require('chai');
 const { expect: jestExpect, it } = require('@jest/globals');
 
 const { getTmpDirPath, replaceTextInFile } = require('../utils/fs');
-const { getServiceName, sleep } = require('../utils/misc');
+const { getServiceName, sleep, serverlessDeploy, serverlessRemove} = require('../utils/misc');
 const { FunctionApi, RegistryApi } = require('../../shared/api');
 const { FUNCTIONS_API_URL, REGISTRY_API_URL } = require('../../shared/constants');
 const { execSync, execCaptureOutput } = require('../../shared/child-process');
@@ -23,7 +23,7 @@ describe('Service Lifecyle Integration Test', () => {
   const tmpDir = getTmpDirPath();
   let oldCwd;
   let serviceName;
-  const scwRegion = 'fr-par';
+  const scwRegion = process.env.SCW_REGION;
   const scwProject = process.env.SCW_DEFAULT_PROJECT_ID || process.env.SCW_PROJECT;
   const scwToken = process.env.SCW_SECRET_KEY || process.env.SCW_TOKEN;
   const apiUrl = `${FUNCTIONS_API_URL}/${scwRegion}`;
@@ -51,13 +51,12 @@ describe('Service Lifecyle Integration Test', () => {
     replaceTextInFile(serverlessFile, 'scaleway-nodeXX', serviceName);
     replaceTextInFile(serverlessFile, '<scw-token>', scwToken);
     replaceTextInFile(serverlessFile, '<scw-project-id>', scwProject);
-    replaceTextInFile(serverlessFile, 'scwRegion: fr-par', `scwRegion: ${scwRegion}`);
     expect(fs.existsSync(path.join(tmpDir, serverlessFile))).to.be.equal(true);
     expect(fs.existsSync(path.join(tmpDir, 'handler.js'))).to.be.equal(true);
   });
 
   it('should deploy service to scaleway', async () => {
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
     namespace = await api.getNamespaceFromList(serviceName);
     namespace.functions = await api.listFunctions(namespace.id);
     functionName = namespace.functions[0].name;
@@ -83,7 +82,7 @@ module.exports.handle = (event, context, cb) => {
 `;
 
     fs.writeFileSync(path.join(tmpDir, 'handler.js'), newJsHandler);
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
   });
 
   it('should create and deploy second function', async () => {
@@ -94,7 +93,7 @@ module.exports.handle = (event, context, cb) => {
     // add a 'second' function to serverless.yml
     fs.appendFileSync(`${tmpDir}/${serverlessFile}`, appendData);
 
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
   });
 
   it('should invoke first and second function', async () => {
@@ -113,7 +112,7 @@ module.exports.handle = (event, context, cb) => {
     replaceTextInFile(serverlessFile, `    handler: handler.handle ${stringIdentifier}`, '');
 
     // redeploy, func 2 should be removed
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
 
     const outputInvoke = execCaptureOutput(serverlessExec, ['invoke', '--function', namespace.functions[0].name]);
     expect(outputInvoke).to.be.equal('{"message":"Serverless Update Succeeded"}');
@@ -145,7 +144,7 @@ def handle(event, context):
   }
 `;
     fs.writeFileSync(path.join(tmpDir, 'handler.py'), pythonHandler);
-    execSync(`${serverlessExec} deploy`);
+    serverlessDeploy();
   });
 
   it('should invoke function with runtime updated from scaleway', async () => {
@@ -156,7 +155,7 @@ def handle(event, context):
   });
 
   it('should remove service from scaleway', async () => {
-    execSync(`${serverlessExec} remove`);
+    serverlessRemove();
     try {
       await api.getNamespace(namespace.id);
     } catch (err) {
@@ -172,7 +171,7 @@ def handle(event, context):
   it('should throw error handler not found', () => {
     replaceTextInFile(serverlessFile, 'handler.handle', 'doesnotexist.handle');
     try {
-      expect(execSync(`${serverlessExec} deploy`)).rejects.toThrow(Error);
+      expect(serverlessDeploy()).rejects.toThrow(Error);
     } catch (err) {
       // if not try catch, test would fail
     }
@@ -182,7 +181,7 @@ def handle(event, context):
   it('should throw error runtime does not exist', () => {
     replaceTextInFile(serverlessFile, 'node16', 'doesnotexist');
     try {
-      expect(execSync(`${serverlessExec} deploy`)).rejects.toThrow(Error);
+      expect(serverlessDeploy()).rejects.toThrow(Error);
     } catch (err) {
       // if not try catch, test would fail
     }

tests/multi-region/multi_region.test.js

@@ -6,7 +6,7 @@ const axios = require('axios');
 const { expect } = require('chai');
 const { execSync } = require('../../shared/child-process');
 const { getTmpDirPath, replaceTextInFile } = require('../utils/fs');
-const { getServiceName, sleep } = require('../utils/misc');
+const { getServiceName, sleep, serverlessDeploy, serverlessRemove} = require('../utils/misc');
 const { FunctionApi, RegistryApi } = require('../../shared/api');
 const { REGISTRY_API_URL, FUNCTIONS_API_URL } = require('../../shared/constants');
 
@@ -36,14 +36,13 @@ describe.each(regions)(
       replaceTextInFile('serverless.yml', 'scaleway-python3', serviceName);
       replaceTextInFile('serverless.yml', '<scw-token>', scwToken);
       replaceTextInFile('serverless.yml', '<scw-project-id>', scwProject);
-      replaceTextInFile('serverless.yml', 'scwRegion: fr-par', `scwRegion: ${region}`);
       expect(fs.existsSync(path.join(tmpDir, 'serverless.yml'))).to.be.equal(true);
       expect(fs.existsSync(path.join(tmpDir, 'handler.py'))).to.be.equal(true);
 
       // deploy function
       apiUrl = `${FUNCTIONS_API_URL}/${region}`;
       api = new FunctionApi(apiUrl, scwToken);
-      execSync(`${serverlessExec} deploy`);
+      serverlessDeploy({ env: { SCW_REGION: region } });
       namespace = await api.getNamespaceFromList(serviceName);
       namespace.functions = await api.listFunctions(namespace.id);
 
@@ -55,7 +54,7 @@ describe.each(regions)(
       expect(response.data.message).to.be.equal('Hello From Python3 runtime on Serverless Framework and Scaleway Functions');
 
       // delete function
-      execSync(`${serverlessExec} remove`);
+      serverlessRemove({ env: { SCW_REGION: region } });
       try {
         await api.getNamespace(namespace.id);
       } catch (err) {

tests/provider/scalewayProvider.test.js

@@ -25,6 +25,11 @@ class MockServerless {
 };
 
 describe('Scaleway credentials test', () => {
+  if (process.env.SCW_SECRET_KEY || process.env.SCW_DEFAULT_PROJECT_ID ||
+    process.env.SCW_TOKEN || process.env.SCW_PROJECT) {
+    throw new Error("No credentials should be passed in environment variables for this test");
+  }
+
   this.expectedToken = null;
   this.expectedProject = null;
 
@@ -134,4 +139,3 @@ describe('Scaleway credentials test', () => {
     this.checkCreds(options);
   });
 });
-

tests/runtimes/runtimes.test.js

@@ -6,13 +6,11 @@ const axios = require('axios');
 const { expect } = require('chai');
 const { execSync } = require('../../shared/child-process');
 const { getTmpDirPath } = require('../utils/fs');
-const { getServiceName, createTestService, sleep } = require('../utils/misc');
+const { getServiceName, createTestService, sleep, serverlessDeploy, serverlessRemove} = require('../utils/misc');
 const { FunctionApi, RegistryApi, ContainerApi } = require('../../shared/api');
 const { FUNCTIONS_API_URL, REGISTRY_API_URL, CONTAINERS_API_URL } = require('../../shared/constants');
 
-const serverlessExec = 'serverless';
-
-const scwRegion = 'nl-ams';
+const scwRegion = process.env.SCW_REGION;
 const scwProject = process.env.SCW_DEFAULT_PROJECT_ID || process.env.SCW_PROJECT;
 const scwToken = process.env.SCW_SECRET_KEY || process.env.SCW_TOKEN;
 const functionApiUrl = `${FUNCTIONS_API_URL}/${scwRegion}`;
@@ -59,9 +57,9 @@ describe.each(exampleRepositories)(
       process.chdir(tmpDir);
       let options = {};
       if (runtime === 'secrets') {
-        options = { env: { PATH: process.env.PATH, ENV_SECRETC: 'valueC', ENV_SECRET3: 'value3' } };
+        options = { env: { ENV_SECRETC: 'valueC', ENV_SECRET3: 'value3' } };
       }
-      execSync(`${serverlessExec} deploy`, options);
+      serverlessDeploy(options);
       // If runtime is container => get container
       if (isContainer) {
         api = new ContainerApi(containerApiUrl, scwToken);
@@ -98,7 +96,7 @@ describe.each(exampleRepositories)(
 
     it(`should remove service for runtime ${runtime} from scaleway`, async () => {
       process.chdir(tmpDir);
-      execSync(`${serverlessExec} remove`);
+      serverlessRemove();
       try {
         await api.getNamespace(namespace.id);
       } catch (err) {