From c65d550262c063c9f0dae0bb6ca060041a4c8aff Mon Sep 17 00:00:00 2001 From: Liela Rotschy Date: Mon, 9 Sep 2024 19:58:00 +0000 Subject: [PATCH 01/10] Update elliptic version --- package-lock.json | 18 ++++++++++-------- package.json | 11 ++++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01d9346..4710655 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", "dayjs": "^1.11.7", + "elliptic": "6.5.7", "libsodium-wrappers": "^0.7.10", "path-browserify": "^1.0.1", "ssh-config": "^3.0.0", @@ -3883,9 +3884,10 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", - "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "license": "MIT", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -12602,7 +12604,7 @@ "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.5", + "elliptic": "6.5.7", "hash-base": "~3.0", "inherits": "^2.0.4", "parse-asn1": "^5.1.7", @@ -12931,7 +12933,7 @@ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "requires": { "bn.js": "^4.1.0", - "elliptic": "^6.5.3" + "elliptic": "6.5.7" }, "dependencies": { "bn.js": { @@ -13230,9 +13232,9 @@ "dev": true }, "elliptic": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", - "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "requires": { "bn.js": "^4.11.9", "brorand": "^1.1.0", diff --git a/package.json b/package.json index eeb6770..c232871 100644 --- a/package.json +++ b/package.json @@ -568,6 +568,7 @@ "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", "dayjs": "^1.11.7", + "elliptic": "6.5.7", "libsodium-wrappers": "^0.7.10", "path-browserify": "^1.0.1", "ssh-config": "^3.0.0", @@ -577,5 +578,13 @@ "util": "^0.12.1", "uuid": "^3.3.3", "vscode-languageclient": "^8.0.2" + }, + "overrides": { + "browserify-sign": { + "elliptic": "6.5.7" + }, + "create-ecdh": { + "elliptic": "6.5.7" + } } -} +} \ No newline at end of file From 0922e89744671d20bc9e94c3cba36058ed093503 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 10 Sep 2024 18:16:37 +0000 Subject: [PATCH 02/10] Release extension version 0.26.5 --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4710655..42789f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@github/vscode-github-actions", - "version": "0.26.4", + "version": "0.26.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@github/vscode-github-actions", - "version": "0.26.4", + "version": "0.26.5", "license": "MIT", "dependencies": { "@actions/languageserver": "*", diff --git a/package.json b/package.json index c232871..1879f54 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/github/vscode-github-actions" }, "description": "GitHub Actions workflows and runs for github.com hosted repositories in VS Code", - "version": "0.26.4", + "version": "0.26.5", "engines": { "vscode": "^1.72.0", "node": ">= 16" @@ -587,4 +587,4 @@ "elliptic": "6.5.7" } } -} \ No newline at end of file +} From 33dd25f8dea52a6d6107af21098f437a918f2bb5 Mon Sep 17 00:00:00 2001 From: lrotschy Date: Tue, 10 Sep 2024 18:16:55 +0000 Subject: [PATCH 03/10] Apply automatic changes --- package-lock.json | 80 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42789f5..2bb1fd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,20 +56,20 @@ } }, "node_modules/@actions/expressions": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/expressions/-/expressions-0.3.12.tgz", - "integrity": "sha512-hAfcDFH05WyP3hyIrcLOtsOOUkQqo7c2EUoAxz00MQ37tIXASr8njIiT+L6TeI+4LT3CX8MEdPXjS099jD0XIQ==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/expressions/-/expressions-0.3.13.tgz", + "integrity": "sha512-T7DzRitCRN0rU4lNWQsgQhxbJ4X/qnvxCcLUYZfbgK1xpN+gM1lGq8yGLDn8efhMsa03DmdDBzW02DL917QilA==", "engines": { "node": ">= 16.15" } }, "node_modules/@actions/languageserver": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/languageserver/-/languageserver-0.3.12.tgz", - "integrity": "sha512-Nm0FkZKNkvpWblK722dzZvy1XX9gHx37TaXirF0/PDWT+SP+9fYrl0YDZpshmrO/sZG3G5EBWyfVGt/Cv7J/Ew==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/languageserver/-/languageserver-0.3.13.tgz", + "integrity": "sha512-GqM81G5f29BGCeXeZOLqTg8CR+y/NnVpd5Mijv1/HF0M7gfnFrGdmeML1HgWRraaenQYMOnFsaNuvn2WwjORWg==", "dependencies": { - "@actions/languageservice": "^0.3.12", - "@actions/workflow-parser": "^0.3.12", + "@actions/languageservice": "^0.3.13", + "@actions/workflow-parser": "^0.3.13", "@octokit/rest": "^19.0.7", "@octokit/types": "^9.0.0", "vscode-languageserver": "^8.0.2", @@ -94,12 +94,12 @@ } }, "node_modules/@actions/languageservice": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/languageservice/-/languageservice-0.3.12.tgz", - "integrity": "sha512-earZZF0IfvUNT/6/1OAVKkycf00/+u2Z7ZBgHmsllfFkz6N67dE51/MfTnoROObL42Bp4ucuFFhVtQkzbVSvOQ==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/languageservice/-/languageservice-0.3.13.tgz", + "integrity": "sha512-1yWHGPyosvmzDiaqH/KlsSfbq1rMlmhS+QEI/IEnhptDgORcEdqgmRX206ZiDrnA9HQIaBTE5TuGA2z5XDbUcg==", "dependencies": { - "@actions/expressions": "^0.3.12", - "@actions/workflow-parser": "^0.3.12", + "@actions/expressions": "^0.3.13", + "@actions/workflow-parser": "^0.3.13", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "vscode-uri": "^3.0.8", @@ -110,11 +110,11 @@ } }, "node_modules/@actions/workflow-parser": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/workflow-parser/-/workflow-parser-0.3.12.tgz", - "integrity": "sha512-uyOklbMrFPvXDccVZE9kp3Zyn1yNV2diBZrx+uBnqm5g0TIlbqm5gg6L47cFSPPFtTFCf8hviwIIUSnmrui3+g==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/workflow-parser/-/workflow-parser-0.3.13.tgz", + "integrity": "sha512-mXYw8K4Q8G5YV6V8Gaegi0oMhiT0I1nCnJJAdksJGET3XCp6i7KOI8BoQCVaNwd/9ASc+Mb+px9rbgGyUtL6hg==", "dependencies": { - "@actions/expressions": "^0.3.12", + "@actions/expressions": "^0.3.13", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, @@ -10122,9 +10122,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", - "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", "bin": { "yaml": "bin.mjs" }, @@ -10200,17 +10200,17 @@ }, "dependencies": { "@actions/expressions": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/expressions/-/expressions-0.3.12.tgz", - "integrity": "sha512-hAfcDFH05WyP3hyIrcLOtsOOUkQqo7c2EUoAxz00MQ37tIXASr8njIiT+L6TeI+4LT3CX8MEdPXjS099jD0XIQ==" + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/expressions/-/expressions-0.3.13.tgz", + "integrity": "sha512-T7DzRitCRN0rU4lNWQsgQhxbJ4X/qnvxCcLUYZfbgK1xpN+gM1lGq8yGLDn8efhMsa03DmdDBzW02DL917QilA==" }, "@actions/languageserver": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/languageserver/-/languageserver-0.3.12.tgz", - "integrity": "sha512-Nm0FkZKNkvpWblK722dzZvy1XX9gHx37TaXirF0/PDWT+SP+9fYrl0YDZpshmrO/sZG3G5EBWyfVGt/Cv7J/Ew==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/languageserver/-/languageserver-0.3.13.tgz", + "integrity": "sha512-GqM81G5f29BGCeXeZOLqTg8CR+y/NnVpd5Mijv1/HF0M7gfnFrGdmeML1HgWRraaenQYMOnFsaNuvn2WwjORWg==", "requires": { - "@actions/languageservice": "^0.3.12", - "@actions/workflow-parser": "^0.3.12", + "@actions/languageservice": "^0.3.13", + "@actions/workflow-parser": "^0.3.13", "@octokit/rest": "^19.0.7", "@octokit/types": "^9.0.0", "vscode-languageserver": "^8.0.2", @@ -10234,12 +10234,12 @@ } }, "@actions/languageservice": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/languageservice/-/languageservice-0.3.12.tgz", - "integrity": "sha512-earZZF0IfvUNT/6/1OAVKkycf00/+u2Z7ZBgHmsllfFkz6N67dE51/MfTnoROObL42Bp4ucuFFhVtQkzbVSvOQ==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/languageservice/-/languageservice-0.3.13.tgz", + "integrity": "sha512-1yWHGPyosvmzDiaqH/KlsSfbq1rMlmhS+QEI/IEnhptDgORcEdqgmRX206ZiDrnA9HQIaBTE5TuGA2z5XDbUcg==", "requires": { - "@actions/expressions": "^0.3.12", - "@actions/workflow-parser": "^0.3.12", + "@actions/expressions": "^0.3.13", + "@actions/workflow-parser": "^0.3.13", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "vscode-uri": "^3.0.8", @@ -10247,11 +10247,11 @@ } }, "@actions/workflow-parser": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@actions/workflow-parser/-/workflow-parser-0.3.12.tgz", - "integrity": "sha512-uyOklbMrFPvXDccVZE9kp3Zyn1yNV2diBZrx+uBnqm5g0TIlbqm5gg6L47cFSPPFtTFCf8hviwIIUSnmrui3+g==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@actions/workflow-parser/-/workflow-parser-0.3.13.tgz", + "integrity": "sha512-mXYw8K4Q8G5YV6V8Gaegi0oMhiT0I1nCnJJAdksJGET3XCp6i7KOI8BoQCVaNwd/9ASc+Mb+px9rbgGyUtL6hg==", "requires": { - "@actions/expressions": "^0.3.12", + "@actions/expressions": "^0.3.13", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" } @@ -17928,9 +17928,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yaml": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", - "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==" }, "yargs": { "version": "17.6.2", From b853e75c23f0e16248e557bc6fad82a48171fbbf Mon Sep 17 00:00:00 2001 From: Felipe Suero <85468376+felipesu19@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:33:35 -0400 Subject: [PATCH 04/10] Ditch VSX publish --- .github/workflows/publish.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7c3c3e9..cfc35b6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -147,20 +147,3 @@ jobs: pat: ${{ secrets.PUBLISHER_KEY }} registryUrl: https://marketplace.visualstudio.com extensionFile: ./vscode-github-actions-${{ needs.release.outputs.version }}.vsix - - open-vsx-publish: - name: Publish to Open VSX Registry - needs: release - environment: publish-open-vsx - runs-on: ubuntu-latest - env: - OPEN_VSX_TOKEN: ${{ secrets.OPEN_VSX_TOKEN }} - steps: - - name: Download artifact - uses: actions/download-artifact@v4 - with: - name: vscode-github-actions-${{ needs.release.outputs.version }}.vsix - - - name: Publish to Registry - run: | - npx ovsx publish -p $OPEN_VSX_TOKEN *.vsix From a715be2c1ce60e9c752b7cc8f53c431daa079ebe Mon Sep 17 00:00:00 2001 From: Felipe Suero <85468376+felipesu19@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:34:41 -0400 Subject: [PATCH 05/10] Update configuration.ts --- src/configuration/configuration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts index 1be6a0b..82a2dd3 100644 --- a/src/configuration/configuration.ts +++ b/src/configuration/configuration.ts @@ -71,7 +71,7 @@ export function useEnterprise(): boolean { export function getGitHubApiUri(): string { if (!useEnterprise()) return DEFAULT_GITHUB_API; const base = getConfiguration().get("github-enterprise.uri", DEFAULT_GITHUB_API).replace(/\/$/, ""); - return base === DEFAULT_GITHUB_API ? base : `${base}/api/v3`; + return base === DEFAULT_GITHUB_API ? base : `api.${base}`; } async function updateLanguageServerApiUrl(context: vscode.ExtensionContext) { From c5da3eb90465b417b2d8d5b31e071b72718f6ea3 Mon Sep 17 00:00:00 2001 From: Felipe Suero <85468376+felipesu19@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:38:37 -0400 Subject: [PATCH 06/10] Handle legitimate GHES cases --- src/configuration/configuration.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts index 82a2dd3..0415e29 100644 --- a/src/configuration/configuration.ts +++ b/src/configuration/configuration.ts @@ -71,7 +71,16 @@ export function useEnterprise(): boolean { export function getGitHubApiUri(): string { if (!useEnterprise()) return DEFAULT_GITHUB_API; const base = getConfiguration().get("github-enterprise.uri", DEFAULT_GITHUB_API).replace(/\/$/, ""); - return base === DEFAULT_GITHUB_API ? base : `api.${base}`; + if(base === DEFAULT_GITHUB_API) { + return base; + } + + if(base.includes(".ghe.com")){ + return `api.${base}` + }else{ + return `${base}/api/v3`; + } + } async function updateLanguageServerApiUrl(context: vscode.ExtensionContext) { From 29dddf03c3a8945d07635fe0008cee9e7c65ad78 Mon Sep 17 00:00:00 2001 From: Felipe Suero <85468376+felipesu19@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:39:29 -0400 Subject: [PATCH 07/10] nit --- src/configuration/configuration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts index 0415e29..897ff6e 100644 --- a/src/configuration/configuration.ts +++ b/src/configuration/configuration.ts @@ -77,7 +77,7 @@ export function getGitHubApiUri(): string { if(base.includes(".ghe.com")){ return `api.${base}` - }else{ + } else { return `${base}/api/v3`; } From 5e7951148d85b16c626b2929615a516ec5bd7008 Mon Sep 17 00:00:00 2001 From: Felipe Suero <85468376+felipesu19@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:41:52 -0400 Subject: [PATCH 08/10] Updates from editor --- src/configuration/configuration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts index 897ff6e..ef5cda7 100644 --- a/src/configuration/configuration.ts +++ b/src/configuration/configuration.ts @@ -75,7 +75,7 @@ export function getGitHubApiUri(): string { return base; } - if(base.includes(".ghe.com")){ + if(base.endsWith(".ghe.com")){ return `api.${base}` } else { return `${base}/api/v3`; From d76d110e242b3ea2cbf0f7dda01a98bc039b61c5 Mon Sep 17 00:00:00 2001 From: Felipe Suero Date: Tue, 24 Sep 2024 13:48:19 -0400 Subject: [PATCH 09/10] pretty --- src/configuration/configuration.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts index ef5cda7..d45ff4b 100644 --- a/src/configuration/configuration.ts +++ b/src/configuration/configuration.ts @@ -71,16 +71,15 @@ export function useEnterprise(): boolean { export function getGitHubApiUri(): string { if (!useEnterprise()) return DEFAULT_GITHUB_API; const base = getConfiguration().get("github-enterprise.uri", DEFAULT_GITHUB_API).replace(/\/$/, ""); - if(base === DEFAULT_GITHUB_API) { + if (base === DEFAULT_GITHUB_API) { return base; - } + } - if(base.endsWith(".ghe.com")){ - return `api.${base}` + if (base.endsWith(".ghe.com")) { + return `api.${base}`; } else { return `${base}/api/v3`; } - } async function updateLanguageServerApiUrl(context: vscode.ExtensionContext) { From 51531893359eca97c072802cd32a551e25896af4 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 24 Sep 2024 18:19:24 +0000 Subject: [PATCH 10/10] Release extension version 0.27.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2bb1fd8..fc06c12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@github/vscode-github-actions", - "version": "0.26.5", + "version": "0.27.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@github/vscode-github-actions", - "version": "0.26.5", + "version": "0.27.0", "license": "MIT", "dependencies": { "@actions/languageserver": "*", diff --git a/package.json b/package.json index 1879f54..a87a778 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/github/vscode-github-actions" }, "description": "GitHub Actions workflows and runs for github.com hosted repositories in VS Code", - "version": "0.26.5", + "version": "0.27.0", "engines": { "vscode": "^1.72.0", "node": ">= 16"