chore: bump version before release + fixes

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.5.0
+
+### Added
+
+- Implement `buildArgs` parameter for container build
+
+### Changed
+
+- Handle deprecation of `redeploy: false` parameter in `UpdateContainer`
+
+### Fixed
+
+- When pushing a built to the remote registry, use the correct credentials instead of relying on the local docker configuration.
+
 ## 0.4.18
 
 ### Fixed

deploy/lib/buildAndPushContainers.js

@@ -178,21 +178,28 @@ module.exports = {
 
     const { containers } = this.provider.serverless.service.custom;
 
-    const buildPromises = Object.keys(containers).map((containerName) => {
-      const containerConfig = Object.assign(containers[containerName], {
-        name: containerName,
+    const buildPromises = Object.keys(containers)
+      .map((containerName) => {
+        const containerConfig = {
+          ...containers[containerName],
+          name: containerName,
+        };
+        return containerConfig;
+      })
+      // If directory is not specified, the container does not need to be built,
+      // we can directly create it from the registry image.
+      .filter((containerConfig) => containerConfig.directory !== undefined)
+      .map((containerConfig) => {
+        validateContainerConfigBeforeBuild(containerConfig);
+
+        return buildAndPushContainer.call(
+          this,
+          registryAuth,
+          auth,
+          containerConfig
+        );
       });
 
-      validateContainerConfigBeforeBuild(containerConfig);
-
-      return buildAndPushContainer.call(
-        this,
-        registryAuth,
-        auth,
-        containerConfig
-      );
-    });
-
     await Promise.all(buildPromises);
   },
 };

deploy/lib/createContainers.js

@@ -180,10 +180,18 @@ module.exports = {
 
     this.serverless.cli.log(`Creating container ${container.name}...`);
 
-    return this.createContainer(params);
+    return this.createContainer(params).then((createdContainer) => {
+      return this.deployContainer(createdContainer.id);
+    });
   },
 
   async updateSingleContainer(container, foundContainer) {
+    // Assign domains to the container before updating it, as it's not possible to manage domains
+    // while the container is updating or pending, and we already wait for the container
+    // to be in a final status before updating it.
+    // => This order of operation is simpler and does not require performing two separate waits.
+    this.applyDomainsContainer(foundContainer.id, container.custom_domains);
+
     let privateNetworkId = container.privateNetworkId;
     const hasToDeletePrivateNetwork =
       foundContainer.private_network_id && !container.privateNetworkId;
@@ -225,9 +233,22 @@ module.exports = {
 
     this.serverless.cli.log(`Updating container ${container.name}...`);
 
-    // assign domains
-    this.applyDomainsContainer(foundContainer.id, container.custom_domains);
+    return this.updateContainer(foundContainer.id, params).then(
+      (updatedContainer) => {
+        // If the container is updating, no need to do anything, a redeploy is already in progress.
+        if (
+          updatedContainer.status === "pending" ||
+          updatedContainer.status === "updating"
+        ) {
+          return updatedContainer;
+        }
 
-    return this.updateContainer(foundContainer.id, params);
+        this.serverless.cli.log(
+          `Redeploying container ${container.name} to apply changes...`
+        );
+
+        return this.deployContainer(updatedContainer.id);
+      }
+    );
   },
 };

deploy/lib/deployContainers.js

@@ -18,7 +18,7 @@ module.exports = {
 
           this.waitDomainsAreDeployedContainer(container.id).then((domains) => {
             domains.forEach((domain) => {
-              this.serverless.cli.log(`Domain ready : ${domain.hostname}`);
+              this.serverless.cli.log(`Domain ready: ${domain.hostname}`);
             });
           });
         });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-scaleway-functions",
-  "version": "0.4.18",
+  "version": "0.5.0",
   "description": "Provider plugin for the Serverless Framework v3.x which adds support for Scaleway Functions.",
   "main": "index.js",
   "author": "scaleway.com",

shared/api/utils.js

@@ -1,7 +1,7 @@
 const axios = require("axios");
 const https = require("https");
 
-const version = "0.4.18";
+const version = "0.5.0";
 
 const invalidArgumentsType = "invalid_arguments";
 

tests/utils/misc/index.js

@@ -110,10 +110,23 @@ function sleep(ms) {
 
 async function createProject() {
   const accountApi = new AccountApi(ACCOUNT_API_URL, secretKey);
-  return accountApi.createProject({
+
+  // Unfortunately, there's a small delay between the creation of a project and its availability for API calls.
+  // We wait 1 minute to ensure there's no issue with IAM cache.
+  const project = await accountApi.createProject({
     name: `test-slsframework-${crypto.randomBytes(6).toString("hex")}`,
     organization_id: organizationId,
   });
+
+  console.log(
+    `Project ${project.name} created, waiting for it to be available...`
+  );
+
+  await sleep(60000);
+
+  console.log(`Project ${project.name} is now available.`);
+
+  return project;
 }
 
 module.exports = {