Merge branch 'master' into issue-56-unzip_failed

.github/workflows/ci.yml

@@ -1,62 +1,58 @@
 name: CI
+
 on:
-    pull_request:
-    push:
-        branches:
-            - master
-        tags:
-            - 'v*.*.*'
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
-    ci:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-
-            - name: Setup MetaCall CLI
-              run: wget -O - https://raw.githubusercontent.com/metacall/install/master/install.sh | sh
-
-            - name: Setup NodeJS
-              uses: actions/setup-node@v2
-              with:
-                  node-version: '18'
-                  registry-url: https://registry.npmjs.org
-
-            - name: Update NPM
-              run: npm install -g npm@latest
-
-            - name: Installing Dependencies
-              run: npm i
-
-            - name: Lint
-              run: npm run lint
-
-            - name: Build
-              run: npm run build
-
-            # TODO: Have working unit tests generated
-            # - name: Run Unit Tests
-            #   run: |
-            #       npm run test
-
-            # Integration tests, first docker compose up runs the normal test.
-            # The second one runs the test without deleting the FaaS container,
-            # and the environment varialbe TEST_FAAS_STARTUP_DEPLOY forces the
-            # test to avoid deploying again all the deployments. By this we are
-            # testing if the startup initialization works because the deployments
-            # are persisted from the previous run.
-            - name: Run Integration Tests
-              shell: bash
-              run: |
-                  docker compose build
-                  docker compose up --exit-code-from test
-                  TEST_FAAS_STARTUP_DEPLOY=true docker compose up --exit-code-from test
-                  docker compose down
-
-            - name: Publish
-              uses: JS-DevTools/npm-publish@v1
-              if: startsWith(github.ref, 'refs/tags/')
-              with:
-                  access: 'public'
-                  token: ${{ secrets.NPM_AUTH_TOKEN }}
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup MetaCall CLI
+        run: wget -O - https://raw.githubusercontent.com/metacall/install/master/install.sh | sh
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          registry-url: https://registry.npmjs.org
+
+      - name: Update NPM
+        run: npm install -g npm@latest
+
+      - name: Installing Dependencies
+        run: npm i
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Build
+        run: npm run build
+
+      # TODO: Have working unit tests generated
+      # - name: Run Unit Tests
+      #   run: |
+      #     npm run test
+
+      - name: Run Integration Tests
+        shell: bash
+        run: ./test.sh
+
+      - name: Publish
+        uses: JS-DevTools/npm-publish@v3
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          access: 'public'
+          token: ${{ secrets.NPM_AUTH_TOKEN }}

.github/workflows/docker-hub.yml

@@ -0,0 +1,43 @@
+name: DockerHub
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*.*.*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  IMAGE_NAME: index.docker.io/metacall/faas
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run Integration Tests
+        shell: bash
+        run: ./test.sh
+
+      - name: Login to DockerHub
+        run: docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" -p "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}"
+
+      - name: Push MetaCall FaaS Docker Image to DockerHub
+        run: |
+          docker tag metacall/faas ${{ env.IMAGE_NAME }}:latest
+          docker push ${{ env.IMAGE_NAME }}:latest
+          if [[ "${{ contains(github.ref, 'refs/tags/') }}" = true ]]; then
+            TAG=${GITHUB_REF#refs/*/}
+            VERSION=${TAG#v}
+            docker tag metacall/faas ${{ env.IMAGE_NAME }}:${VERSION}
+            docker push ${{ env.IMAGE_NAME }}:${VERSION}
+          fi
+
+      - name: Logout from DockerHub
+        run: docker logout

Dockerfile

@@ -39,7 +39,7 @@ RUN npm install \
 FROM base as faas
 
 RUN apt-get update \
-	&& apt-get install wget ca-certificates -y --no-install-recommends \
+	&& apt-get install wget ca-certificates git -y --no-install-recommends \
 	&& wget -O - https://raw.githubusercontent.com/metacall/install/master/install.sh | sh
 
 COPY --from=deps /metacall/node_modules node_modules
@@ -52,5 +52,5 @@ CMD ["node", "dist/index.js"]
 FROM base AS test
 
 RUN apt-get update \
-	&& apt-get install curl ca-certificates jq -y --no-install-recommends \
+	&& apt-get install curl ca-certificates jq git expect -y --no-install-recommends \
 	&& npm install -g @metacall/deploy

docker-compose.yml

@@ -29,6 +29,8 @@ services:
       target: faas
     ports:
       - "9000:9000"
+    volumes:
+      - ./logs:/metacall/logs
 
   test:
     image: metacall/faas:test
@@ -39,7 +41,6 @@ services:
       target: test
     environment:
       TEST_FAAS_STARTUP_DEPLOY: ${TEST_FAAS_STARTUP_DEPLOY:-false}
-      TEST_FAAS_DEPENDENCY_DEPLOY: ${TEST_FAAS_DEPENDENCY_DEPLOY:-true}
     network_mode: host
     depends_on:
       - faas

package.json

@@ -1,8 +1,11 @@
 {
 	"name": "@metacall/faas",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"description": "Reimplementation of MetaCall FaaS platform written in TypeScript.",
 	"main": "dist/index.js",
+	"bin": {
+		"metacall-faas": "dist/index.js"
+	},
 	"scripts": {
 		"test": "npm run build && mocha dist/test",
 		"prepublishOnly": "npm run build",
@@ -86,7 +89,23 @@
 					"caughtErrorsIgnorePattern": "^_"
 				}
 			]
-		}
+		},
+		"overrides": [
+			{
+				"files": [
+					"*.js"
+				],
+				"rules": {
+					"@typescript-eslint/no-unused-vars": "off",
+					"@typescript-eslint/no-floating-promises": "off",
+					"@typescript-eslint/no-unsafe-assignment": "off",
+					"@typescript-eslint/no-unsafe-member-access": "off",
+					"@typescript-eslint/no-unsafe-call": "off",
+					"@typescript-eslint/no-var-requires": "off",
+					"@typescript-eslint/no-unsafe-return": "off"
+				}
+			}
+		]
 	},
 	"dependencies": {
 		"@metacall/protocol": "^0.1.26",

src/controller/inspect.ts

@@ -12,7 +12,7 @@ export const inspect = (_req: Request, res: Response): Response => {
 			if (!application.deployment.packages) {
 				throw new Error('Packages is undefined or null');
 			}
-			deployments.push(application.deployment);
+			deployments.unshift(application.deployment);
 		}
 	}