From a2f3459668b1e1356d8c3305b8d1c012ceb69320 Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:19:12 -0800 Subject: [PATCH 1/9] Update workflow to run format-check --- .github/workflows/buildtest.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index f6b5e87..a0c01b3 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -7,19 +7,33 @@ on: branches: [ "main" ] jobs: - build: + prepare-npm: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - - name: Use Node.js 16.x + - name: Use Node.js 16.15 uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 16.15 cache: 'npm' registry-url: 'https://npm.pkg.github.com' + build: + runs-on: ubuntu-latest + needs: prepare-npm + steps: - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run build -ws - - run: npm test -ws + test: + runs-on: ubuntu-latest + needs: prepare-npm + steps: + - run: npm test -ws + format: + runs-on: ubuntu-latest + needs: prepare-npm + steps: + - run: npm run format-check -ws + + From 64c406e3dca9035ecb1450e7b1a49d977bba5a5c Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:24:13 -0800 Subject: [PATCH 2/9] Remove refactor and add format as a step --- .github/workflows/buildtest.yml | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index a0c01b3..3174539 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -7,33 +7,20 @@ on: branches: [ "main" ] jobs: - prepare-npm: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 16.15 - uses: actions/setup-node@v3 - with: - node-version: 16.15 - cache: 'npm' - registry-url: 'https://npm.pkg.github.com' build: runs-on: ubuntu-latest - needs: prepare-npm + steps: + - uses: actions/checkout@v3 + - name: Use Node.js 16.x + uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'npm' + registry-url: 'https://npm.pkg.github.com' - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run build -ws - test: - runs-on: ubuntu-latest - needs: prepare-npm - steps: - - run: npm test -ws - format: - runs-on: ubuntu-latest - needs: prepare-npm - steps: - - run: npm run format-check -ws - - + - run: npm test -ws + - run: npm run format-check -ws From 3f3e3fcb3b3d12d0e6a34585fa889f1fbf7bbbf7 Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:29:48 -0800 Subject: [PATCH 3/9] Apply formatting changes --- .../src/context-providers/secrets.ts | 12 ++++++---- .../src/context-providers/variables.ts | 22 ++++++++++++------- .../src/value-providers/runs-on.ts | 15 ++++++------- .../src/workflows/workflow-schema.ts | 2 +- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/actions-languageserver/src/context-providers/secrets.ts b/actions-languageserver/src/context-providers/secrets.ts index 092dc2e..6cff0ce 100644 --- a/actions-languageserver/src/context-providers/secrets.ts +++ b/actions-languageserver/src/context-providers/secrets.ts @@ -92,13 +92,15 @@ async function getRemoteSecrets( async function fetchSecrets(octokit: Octokit, owner: string, name: string): Promise { try { - return await octokit.paginate(octokit.actions.listRepoSecrets, + return await octokit.paginate( + octokit.actions.listRepoSecrets, { owner, repo: name, per_page: 100 }, - response => response.data.map(secret => new StringData(secret.name))); + response => response.data.map(secret => new StringData(secret.name)) + ); } catch (e) { console.log("Failure to retrieve secrets: ", e); } @@ -112,13 +114,15 @@ async function fetchEnvironmentSecrets( environmentName: string ): Promise { try { - return await octokit.paginate(octokit.actions.listEnvironmentSecrets, + return await octokit.paginate( + octokit.actions.listEnvironmentSecrets, { repository_id: repositoryId, environment_name: environmentName, per_page: 100 }, - response => response.data.map(secret => new StringData(secret.name))); + response => response.data.map(secret => new StringData(secret.name)) + ); } catch (e) { console.log("Failure to retrieve environment secrets: ", e); } diff --git a/actions-languageserver/src/context-providers/variables.ts b/actions-languageserver/src/context-providers/variables.ts index a2e8336..bde04b7 100644 --- a/actions-languageserver/src/context-providers/variables.ts +++ b/actions-languageserver/src/context-providers/variables.ts @@ -94,15 +94,18 @@ export async function getRemoteVariables( async function fetchVariables(octokit: Octokit, owner: string, name: string): Promise { try { - return await octokit.paginate(octokit.actions.listRepoVariables, + return await octokit.paginate( + octokit.actions.listRepoVariables, { owner: owner, repo: name, per_page: 100 }, - response => response.data.map(variable => { - return {key: variable.name, value: new StringData(variable.value)}; - })); + response => + response.data.map(variable => { + return {key: variable.name, value: new StringData(variable.value)}; + }) + ); } catch (e) { console.log("Failure to retrieve variables: ", e); } @@ -116,15 +119,18 @@ async function fetchEnvironmentVariables( environmentName: string ): Promise { try { - return await octokit.paginate(octokit.actions.listEnvironmentVariables, + return await octokit.paginate( + octokit.actions.listEnvironmentVariables, { repository_id: repositoryId, environment_name: environmentName, per_page: 100 }, - response => response.data.map(variable => { - return {key: variable.name, value: new StringData(variable.value)}; - })); + response => + response.data.map(variable => { + return {key: variable.name, value: new StringData(variable.value)}; + }) + ); } catch (e) { console.log("Failure to retrieve environment variables: ", e); } diff --git a/actions-languageserver/src/value-providers/runs-on.ts b/actions-languageserver/src/value-providers/runs-on.ts index 43a16b6..29284b0 100644 --- a/actions-languageserver/src/value-providers/runs-on.ts +++ b/actions-languageserver/src/value-providers/runs-on.ts @@ -33,20 +33,19 @@ export async function getRunnerLabels(client: Octokit, cache: TTLCache, owner: s async function fetchRunnerLabels(client: Octokit, owner: string, name: string): Promise> { const labels = new Set(); try { - const itor = client.paginate.iterator(client.actions.listSelfHostedRunnersForRepo, - { - owner, - repo: name, - per_page: 100 - }); + const itor = client.paginate.iterator(client.actions.listSelfHostedRunnersForRepo, { + owner, + repo: name, + per_page: 100 + }); - for await (const response of itor) { + for await (const response of itor) { for (const runner of response.data) { for (const label of runner.labels) { labels.add(label.name); } } - } + } } catch (e) { console.log("Failure to retrieve runner labels: ", e); } diff --git a/actions-workflow-parser/src/workflows/workflow-schema.ts b/actions-workflow-parser/src/workflows/workflow-schema.ts index 3bc77e2..df45e88 100644 --- a/actions-workflow-parser/src/workflows/workflow-schema.ts +++ b/actions-workflow-parser/src/workflows/workflow-schema.ts @@ -1,6 +1,6 @@ import {JSONObjectReader} from "../templates/json-object-reader"; import {TemplateSchema} from "../templates/schema"; -import WorkflowSchema from "../workflow-v1.0.json" assert { type: 'json' }; +import WorkflowSchema from "../workflow-v1.0.json" assert {type: "json"}; let schema: TemplateSchema; From a7841d4405f1f95c00267189b9eb9165b5d85735 Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:35:31 -0800 Subject: [PATCH 4/9] Use more precise version of node --- .github/workflows/buildtest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 3174539..04249a4 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Use Node.js 16.x + - name: Use Node.js 16.15 uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 16.15 cache: 'npm' registry-url: 'https://npm.pkg.github.com' - run: npm ci From 66d51c70c1521634ac1831392dbfcfdc275b67de Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:42:02 -0800 Subject: [PATCH 5/9] Move format before build --- .github/workflows/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 04249a4..3021880 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -21,6 +21,6 @@ jobs: - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: npm run format-check -ws - run: npm run build -ws - run: npm test -ws - - run: npm run format-check -ws From 12ccf97637d01cc51fd5370a6b8a04da4c954312 Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:45:27 -0800 Subject: [PATCH 6/9] Move format before ci --- .github/workflows/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 3021880..cd4e113 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -18,9 +18,9 @@ jobs: node-version: 16.15 cache: 'npm' registry-url: 'https://npm.pkg.github.com' + - run: npm run format-check -ws - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: npm run format-check -ws - run: npm run build -ws - run: npm test -ws From 561e0f2c05f6e53f6f937d3505f9a26619b0b58f Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:52:12 -0800 Subject: [PATCH 7/9] Add *.d.ts to ignore file? --- .github/workflows/buildtest.yml | 2 +- actions-languageservice/.prettierignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index cd4e113..3021880 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -18,9 +18,9 @@ jobs: node-version: 16.15 cache: 'npm' registry-url: 'https://npm.pkg.github.com' - - run: npm run format-check -ws - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: npm run format-check -ws - run: npm run build -ws - run: npm test -ws diff --git a/actions-languageservice/.prettierignore b/actions-languageservice/.prettierignore index ce98533..6bcb9ea 100644 --- a/actions-languageservice/.prettierignore +++ b/actions-languageservice/.prettierignore @@ -3,3 +3,4 @@ dist *.md *.js *.json +*.d.ts From 3a8b7d4e4b4bf3025b4d1b62116ca37b1a83ca4e Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 11:58:21 -0800 Subject: [PATCH 8/9] Move ignore to top level file --- .prettierignore | 1 + actions-languageservice/.prettierignore | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index ce98533..323e10d 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,4 @@ dist *.md *.js *.json +*.d.ts \ No newline at end of file diff --git a/actions-languageservice/.prettierignore b/actions-languageservice/.prettierignore index 6bcb9ea..ce98533 100644 --- a/actions-languageservice/.prettierignore +++ b/actions-languageservice/.prettierignore @@ -3,4 +3,3 @@ dist *.md *.js *.json -*.d.ts From d554993d8b3363416d050f98f0779aa2a27218fd Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Mon, 30 Jan 2023 12:37:29 -0800 Subject: [PATCH 9/9] Update prettier to 2.8.x --- actions-expressions/package.json | 2 +- actions-languageserver/package.json | 2 +- actions-languageservice/package.json | 2 +- actions-workflow-parser/package.json | 2 +- package-lock.json | 28 ++++++++++++++-------------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/actions-expressions/package.json b/actions-expressions/package.json index 9db07cb..268d89d 100755 --- a/actions-expressions/package.json +++ b/actions-expressions/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@types/jest": "^29.0.3", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.7.4" diff --git a/actions-languageserver/package.json b/actions-languageserver/package.json index 62fb267..48e8858 100644 --- a/actions-languageserver/package.json +++ b/actions-languageserver/package.json @@ -55,7 +55,7 @@ "@types/jest": "^29.0.3", "fetch-mock": "^9.11.0", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" diff --git a/actions-languageservice/package.json b/actions-languageservice/package.json index a7e9bb9..bfddb96 100644 --- a/actions-languageservice/package.json +++ b/actions-languageservice/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@types/jest": "^29.0.3", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" diff --git a/actions-workflow-parser/package.json b/actions-workflow-parser/package.json index f796fc9..7351e93 100644 --- a/actions-workflow-parser/package.json +++ b/actions-workflow-parser/package.json @@ -56,7 +56,7 @@ "@typescript-eslint/parser": "^5.40.0", "eslint": "7.32.0", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" diff --git a/package-lock.json b/package-lock.json index b13a249..3b1f2c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "devDependencies": { "@types/jest": "^29.0.3", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.7.4" @@ -48,7 +48,7 @@ "@types/jest": "^29.0.3", "fetch-mock": "^9.11.0", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" @@ -71,7 +71,7 @@ "devDependencies": { "@types/jest": "^29.0.3", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" @@ -95,7 +95,7 @@ "@typescript-eslint/parser": "^5.40.0", "eslint": "7.32.0", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" @@ -11024,9 +11024,9 @@ } }, "node_modules/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", + "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -14561,7 +14561,7 @@ "requires": { "@types/jest": "^29.0.3", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.7.4" @@ -14576,7 +14576,7 @@ "@types/jest": "^29.0.3", "fetch-mock": "^9.11.0", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4", @@ -14592,7 +14592,7 @@ "@github/actions-workflow-parser": "^0.1.104", "@types/jest": "^29.0.3", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4", @@ -14611,7 +14611,7 @@ "cronstrue": "^2.21.0", "eslint": "7.32.0", "jest": "^29.0.3", - "prettier": "^2.7.1", + "prettier": "^2.8.3", "rimraf": "^3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4", @@ -22564,9 +22564,9 @@ "dev": true }, "prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", + "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true }, "pretty-format": {