fix(tests): Update serverless package + Fix texts update tests to get…

.github/workflows/main.yml

@@ -16,15 +16,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install
-        run: npm ci
+        run: npm install
       - name: Lint
         run: npm run lint
       - name: Test
-        run: npm test
+        run: |
+          npm i
+          npm test
   local-builds:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -43,6 +45,7 @@ jobs:
       - name: Build
         shell: bash
         run: |
+          npm i
           cd tests/integration/test-func
           npm i -D ../../.. --silent
           npx serverless package

index.js

@@ -14,6 +14,8 @@ const DEFAULT_DOCKER_TAG = "latest";
 const DEFAULT_DOCKER_IMAGE = "rustserverless/lambda-rust";
 const NO_OUTPUT_CAPTURE = { stdio: ["ignore", process.stdout, process.stderr] };
 const MUSL_PLATFORMS = ["darwin", "win32", "linux"];
+const RUST_RUNTIME = "rust";
+const BASE_RUNTIME = "provided.al2";
 
 function includeInvokeHook(serverlessVersion) {
   let [major, minor] = serverlessVersion.split(".");
@@ -49,7 +51,7 @@ class RustPlugin {
         inWorkspace: false,
       },
       (this.serverless.service.custom && this.serverless.service.custom.rust) ||
-        {},
+        {}
     );
 
     // Docker can't access resources outside of the current build directory.
@@ -74,14 +76,13 @@ class RustPlugin {
       ""
     ).split(/\s+/);
 
-    let target = (funcArgs || {}).target || this.custom.target
+    let target = (funcArgs || {}).target || this.custom.target;
 
-    const targetArgs =
-      target ?
-        ['--target', target]
-        : MUSL_PLATFORMS.includes(platform)
-          ? ["--target", "x86_64-unknown-linux-musl"]
-          : [];
+    const targetArgs = target
+      ? ["--target", target]
+      : MUSL_PLATFORMS.includes(platform)
+      ? ["--target", "x86_64-unknown-linux-musl"]
+      : [];
     return [
       ...defaultArgs,
       ...profileArgs,
@@ -103,19 +104,18 @@ class RustPlugin {
           [`CC_${target || "x86_64_unknown_linux_musl"}`]: linker,
         }
       : "win32" === platform
-        ? {
-            RUSTFLAGS: (env["RUSTFLAGS"] || "") + " -Clinker=rust-lld",
-            TARGET_CC: "rust-lld",
-            CC_x86_64_unknown_linux_musl: "rust-lld",
-          }
-        : "darwin" === platform
-          ? {
-              RUSTFLAGS:
-                (env["RUSTFLAGS"] || "") + " -Clinker=x86_64-linux-musl-gcc",
-              TARGET_CC: "x86_64-linux-musl-gcc",
-              CC_x86_64_unknown_linux_musl: "x86_64-linux-musl-gcc",
-            }
-          : {};
+      ? {
+          RUSTFLAGS: (env["RUSTFLAGS"] || "") + " -Clinker=rust-lld",
+          TARGET_CC: "rust-lld",
+          CC_x86_64_unknown_linux_musl: "rust-lld",
+        }
+      : "darwin" === platform
+      ? {
+          RUSTFLAGS: (env["RUSTFLAGS"] || "") + " -Clinker=rust-lld",
+          TARGET_CC: "rust-lld",
+          CC_x86_64_unknown_linux_musl: "rust-lld",
+        }
+      : {};
     return {
       ...defaultEnv,
       ...platformEnv,
@@ -128,7 +128,7 @@ class RustPlugin {
       let target = (funcArgs || {}).target || this.custom.target;
       executable = path.join(
         executable,
-        target ? target : "x86_64-unknown-linux-musl",
+        target ? target : "x86_64-unknown-linux-musl"
       );
     }
     return path.join(executable, profile !== "dev" ? "release" : "debug");
@@ -138,7 +138,7 @@ class RustPlugin {
     return path.join(
       "target",
       "lambda",
-      profile !== "dev" ? "release" : "debug",
+      profile !== "dev" ? "release" : "debug"
     );
   }
 
@@ -148,7 +148,7 @@ class RustPlugin {
       cargoPackage,
       binary,
       profile,
-      platform(),
+      platform()
     );
 
     const env = this.localBuildEnv(funcArgs, process.env, platform());
@@ -168,9 +168,11 @@ class RustPlugin {
     const zip = new AdmZip();
     zip.addFile(
       "bootstrap",
-      readFileSync(path.join(this.custom.inWorkspace ? '..' : '', sourceDir, binary)),
+      readFileSync(
+        path.join(this.custom.inWorkspace ? ".." : "", sourceDir, binary)
+      ),
       "",
-      0o755,
+      "755"
     );
     const targetDir = this.localArtifactDir(profile);
     try {
@@ -196,7 +198,7 @@ class RustPlugin {
     srcPath,
     cargoRegistry,
     cargoDownloads,
-    env,
+    env
   ) {
     const defaultArgs = [
       "run",
@@ -252,7 +254,7 @@ class RustPlugin {
       this.srcPath,
       cargoRegistry,
       cargoDownloads,
-      process.env,
+      process.env
     );
 
     this.serverless.cli.log("Running containerized build");
@@ -290,7 +292,7 @@ class RustPlugin {
     let rustFunctionsFound = false;
     this.functions().forEach((funcName) => {
       const func = service.getFunction(funcName);
-      const isRustFunction = !!func.tags?.rust
+      const isRustFunction = !!func.tags?.rust;
       if (!isRustFunction) {
         // skip functions which don't apply to rust
         return;
@@ -300,7 +302,7 @@ class RustPlugin {
       func.package = func.package || {};
       if (func.package.artifact && func.package.artifact !== "") {
         this.serverless.cli.log(
-          `Artifact defined for ${func.handler}, skipping build...`,
+          `Artifact defined for ${func.handler}, skipping build...`
         );
       } else {
         const { cargoPackage, binary } = this.cargoBinary(func);
@@ -313,7 +315,7 @@ class RustPlugin {
           : this.dockerBuild(func.rust, cargoPackage, binary, profile);
         if (res.error || res.status > 0) {
           this.serverless.cli.log(
-            `Rust build encountered an error: ${res.error} ${res.status}.`,
+            `Rust build encountered an error: ${res.error} ${res.status}.`
           );
           throw new Error(res.error);
         }
@@ -329,7 +331,7 @@ class RustPlugin {
         const artifactPath = path.join(
           this.srcPath,
           `target/lambda/${"dev" === profile ? "debug" : "release"}`,
-          `${binary}.zip`,
+          `${binary}.zip`
         );
         func.package = func.package || {};
         func.package.artifact = artifactPath;