Add project id to namespace API call (#118)

Author: thibaultjunin

deploy/lib/createNamespace.js

@@ -6,7 +6,7 @@ const secrets = require('../../shared/secrets');
 module.exports = {
   createServerlessNamespace() {
     return BbPromise.bind(this)
-      .then(() => this.getNamespaceFromList(this.namespaceName))
+      .then(() => this.getNamespaceFromList(this.namespaceName, this.provider.getScwProject()))
       .then(this.createIfNotExists);
   },
 

info/lib/display.js

@@ -6,7 +6,7 @@ module.exports = {
   displayInfo() {
     const configInput = this.serverless.configurationInput;
 
-    this.getNamespaceFromList(configInput.service).then((namespace) => {
+    this.getNamespaceFromList(configInput.service, this.provider.getScwProject()).then((namespace) => {
       if (namespace === undefined || namespace === null ||
          namespace.id === undefined || namespace.id === null) {
         return;

invoke/scalewayInvoke.js

@@ -72,7 +72,7 @@ class ScalewayInvoke {
         .then(this.validate),
       'invoke:invoke': () => BbPromise.bind(this)
         .then(validateFunctionOrContainer)
-        .then(() => this.getNamespaceFromList(this.namespaceName))
+        .then(() => this.getNamespaceFromList(this.namespaceName, this.provider.getScwProject()))
         .then(lookUpFunctionOrContainer)
         .then(doInvoke)
     };

jwt/lib/getJwt.js

@@ -7,14 +7,14 @@ module.exports = {
   getJwt() {
     if (typeof this.listFunctions === 'function') {
       return BbPromise.bind(this)
-        .then(() => this.getNamespaceFromList(this.namespaceName))
+        .then(() => this.getNamespaceFromList(this.namespaceName, this.provider.getScwProject()))
         .then(this.setNamespace)
         .then(this.getJwtNamespace)
         .then(() => this.listFunctions(this.namespace.id))
         .then(this.getJwtFunctions);
     } if (typeof this.listContainers === 'function') {
       return BbPromise.bind(this)
-        .then(() => this.getNamespaceFromList(this.namespaceName))
+        .then(() => this.getNamespaceFromList(this.namespaceName, this.provider.getScwProject()))
         .then(this.setNamespace)
         .then(this.getJwtNamespace)
         .then(() => this.listContainers(this.namespace.id))

logs/lib/getLogs.js

@@ -5,7 +5,7 @@ const BbPromise = require('bluebird');
 module.exports = {
   getLogs() {
     return BbPromise.bind(this)
-      .then(() => this.getNamespaceFromList(this.namespaceName))
+      .then(() => this.getNamespaceFromList(this.namespaceName, this.provider.getScwProject()))
       .then(this.listApplications)
       .all()
       .then(this.getApplicationId)

remove/lib/removeNamespace.js

@@ -6,7 +6,7 @@ module.exports = {
   removeNamespace() {
     this.serverless.cli.log('Removing namespace and associated functions/triggers...');
     return BbPromise.bind(this)
-      .then(() => this.getNamespaceFromList(this.namespaceName))
+      .then(() => this.getNamespaceFromList(this.namespaceName, this.provider.getScwProject()))
       .then(this.removeSingleNamespace);
   },
 

shared/api/namespaces.js

@@ -3,18 +3,20 @@
 const { manageError } = require('./utils');
 
 module.exports = {
-  listNamespaces() {
-    return this.apiManager.get('namespaces?page_size=100')
+  listNamespaces(projectId) {
+    const projectIdReq = projectId === undefined ? '' : `&project_id=${projectId}`;
+    return this.apiManager.get(`namespaces?page_size=100${projectIdReq}`)
       .then(response => response.data.namespaces || [])
       .catch(manageError);
   },
 
-  getNamespaceFromList(namespaceName) {
+  getNamespaceFromList(namespaceName, projectId) {
+    const projectIdReq = projectId === undefined ? '' : `&project_id=${projectId}`;
     // query Scaleway API to check if space exists
-    return this.apiManager.get(`namespaces?name=${namespaceName}`)
+    return this.apiManager.get(`namespaces?name=${namespaceName}${projectIdReq}`)
       .then((response) => {
         const { namespaces } = response.data;
-        return namespaces.find(ns => ns.name === namespaceName);
+        return namespaces[0];
       })
       .catch(manageError);
   },

tests/containers/containers.test.js

@@ -55,7 +55,7 @@ describe('Service Lifecyle Integration Test', () => {
 
   it('should deploy service/container to scaleway', async () => {
     serverlessDeploy();
-    namespace = await api.getNamespaceFromList(serviceName);
+    namespace = await api.getNamespaceFromList(serviceName, scwProject);
     namespace.containers = await api.listContainers(namespace.id);
     expect(namespace.containers[0].description).to.be.equal(descriptionTest);
     containerName = namespace.containers[0].name;

tests/containers/containers_private_registry.test.js

@@ -82,7 +82,7 @@ describe('Build and deploy on container with a base image private', () => {
 
   it('should deploy service/container to scaleway', async () => {
     serverlessDeploy();
-    namespace = await api.getNamespaceFromList(serviceName);
+    namespace = await api.getNamespaceFromList(serviceName, scwProject);
     namespace.containers = await api.listContainers(namespace.id);
     containerName = namespace.containers[0].name;
   });

tests/functions/functions.test.js

@@ -59,9 +59,9 @@ describe('Service Lifecyle Integration Test', () => {
 
   it('should deploy service to scaleway', async () => {
     serverlessDeploy();
-    namespace = await api.getNamespaceFromList(serviceName);
+    namespace = await api.getNamespaceFromList(serviceName, scwProject);
     namespace.functions = await api.listFunctions(namespace.id);
-    expect(namespace.containers[0].description).to.be.equal(descriptionTest);
+    expect(namespace.functions[0].description).to.be.equal(descriptionTest);
     functionName = namespace.functions[0].name;
   });
 

tests/multi-region/multi_region.test.js

@@ -43,7 +43,7 @@ describe.each(regions)(
       apiUrl = `${FUNCTIONS_API_URL}/${region}`;
       api = new FunctionApi(apiUrl, scwToken);
       serverlessDeploy({ env: { SCW_REGION: region } });
-      namespace = await api.getNamespaceFromList(serviceName);
+      namespace = await api.getNamespaceFromList(serviceName, scwProject);
       namespace.functions = await api.listFunctions(namespace.id);
 
       // Invoke function

tests/runtimes/runtimes.test.js

@@ -62,11 +62,11 @@ describe.each(exampleRepositories)(
       // If runtime is container => get container
       if (isContainer) {
         api = new ContainerApi(containerApiUrl, scwToken);
-        namespace = await api.getNamespaceFromList(runtimeServiceName);
+        namespace = await api.getNamespaceFromList(runtimeServiceName, scwProject);
         namespace.containers = await api.listContainers(namespace.id);
       } else {
         api = new FunctionApi(functionApiUrl, scwToken);
-        namespace = await api.getNamespaceFromList(runtimeServiceName);
+        namespace = await api.getNamespaceFromList(runtimeServiceName, scwProject);
         namespace.functions = await api.listFunctions(namespace.id);
       }
     });

tests/triggers/triggers.test.js

@@ -57,11 +57,11 @@ describe.each(runtimesToTest)(
       serverlessDeploy();
       if (runtime.isFunction) {
         api = new FunctionApi(functionApiUrl, scwToken);
-        namespace = await api.getNamespaceFromList(runtimeServiceName);
+        namespace = await api.getNamespaceFromList(runtimeServiceName, scwProject);
         namespace.functions = await api.listFunctions(namespace.id);
       } else {
         api = new ContainerApi(containerApiUrl, scwToken);
-        namespace = await api.getNamespaceFromList(runtimeServiceName);
+        namespace = await api.getNamespaceFromList(runtimeServiceName, scwProject);
         namespace.containers = await api.listContainers(namespace.id);
       }
     });