From 7a103148b2786e767b04881694840447bf1ae4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andy=20M=C3=A9ry?= Date: Wed, 27 Nov 2024 16:53:51 +0100 Subject: [PATCH 1/3] feat(ci): add simple publish workflow + add userAgent --- .github/workflows/publish.yml | 26 ++++++++++++++++++++++++++ package.json | 2 +- shared/api/index.js | 3 +++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..1355287 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,26 @@ +--- +name: "publish" + +on: + release: + types: [published] + +jobs: + release: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + + - name: "Set up Node" + uses: actions/setup-node@v4 + with: + node-version: 20.x + registry-url: "https://registry.npmjs.org" + + - name: "Install dependencies" + run: npm ci + + - name: "Publish package on NPM" + run: npm publish --access public + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index e439916..450aa5a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serverless-scaleway-functions", - "version": "0.4.12", + "version": "0.4.13", "description": "Provider plugin for the Serverless Framework v1.x which adds support for Scaleway Functions.", "main": "index.js", "author": "scaleway.com", diff --git a/shared/api/index.js b/shared/api/index.js index 68219ba..cc13110 100644 --- a/shared/api/index.js +++ b/shared/api/index.js @@ -14,10 +14,13 @@ const runtimesApi = require("./runtimes"); // Registry const RegistryApi = require("./registry"); +const version = "0.4.13"; + function getApiManager(apiUrl, token) { return axios.create({ baseURL: apiUrl, headers: { + "User-Agent": `serverless-scaleway-functions/${version}`, "X-Auth-Token": token, }, httpsAgent: new https.Agent({ From 2fe94cfcaefbaaf07998f44f374347dbac9c0d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andy=20M=C3=A9ry?= Date: Wed, 27 Nov 2024 16:57:06 +0100 Subject: [PATCH 2/3] fix: do the same for registry client --- shared/api/registry.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/shared/api/registry.js b/shared/api/registry.js index 9212d31..b0d7b24 100644 --- a/shared/api/registry.js +++ b/shared/api/registry.js @@ -1,20 +1,11 @@ "use strict"; -const axios = require("axios"); -const https = require("https"); +const { getApiManager } = require("./index"); const { manageError } = require("./utils"); class RegistryApi { constructor(registryApiUrl, token) { - this.apiManager = axios.create({ - baseURL: registryApiUrl, - headers: { - "X-Auth-Token": token, - }, - httpsAgent: new https.Agent({ - rejectUnauthorized: false, - }), - }); + this.apiManager = getApiManager(registryApiUrl, token); } listRegistryNamespace(projectId) { From 63ef10ae66c0a2ae80a61744ec2953461963695d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andy=20M=C3=A9ry?= Date: Wed, 27 Nov 2024 17:02:37 +0100 Subject: [PATCH 3/3] fix: updated changelog entry + lock --- CHANGELOG.md | 6 ++++++ package-lock.json | 27 +++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e509ef0..7ea2019 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.4.13 + +### Changed + +- HTTP calls to `api.scaleway.com` are now made with a custom user agent #245 + ## 0.4.12 ### Fixed diff --git a/package-lock.json b/package-lock.json index 025bf68..1d96c57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "serverless-scaleway-functions", - "version": "0.4.12", + "version": "0.4.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "serverless-scaleway-functions", - "version": "0.4.12", + "version": "0.4.13", "license": "MIT", "dependencies": { "@serverless/utils": "^6.13.1", @@ -1793,9 +1793,10 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -2494,10 +2495,11 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -5619,12 +5621,13 @@ "dev": true }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": {