From a56fd1ab466856ec423223fc15b0fefdd3bb6db9 Mon Sep 17 00:00:00 2001 From: Suraj Aswal Date: Mon, 28 Nov 2022 09:37:00 +0530 Subject: [PATCH 01/18] Create surajaswal.json --- sub-logs/surajaswal.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 sub-logs/surajaswal.json diff --git a/sub-logs/surajaswal.json b/sub-logs/surajaswal.json new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/sub-logs/surajaswal.json @@ -0,0 +1 @@ + From 776e8da2f58242b4ec3a6064e3602e2422c06bb3 Mon Sep 17 00:00:00 2001 From: Suraj Aswal Date: Mon, 28 Nov 2022 09:42:36 +0530 Subject: [PATCH 02/18] Update surajaswal.json --- sub-logs/surajaswal.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sub-logs/surajaswal.json b/sub-logs/surajaswal.json index 8b13789..e6454e9 100644 --- a/sub-logs/surajaswal.json +++ b/sub-logs/surajaswal.json @@ -1 +1,27 @@ +{ + "repo": "", + + "owner": { + + "username": "", + + "email": "" + + }, + + "target": { + + "record-type": { + + "name": "", + + "value": "" + + } + + }, + + "proxied": false + +} From ce12339b49ad07f0faa4dd94dc37e0fff3dd8c8d Mon Sep 17 00:00:00 2001 From: Suraj Aswal Date: Mon, 28 Nov 2022 09:50:40 +0530 Subject: [PATCH 03/18] Update surajaswal.json --- sub-logs/surajaswal.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sub-logs/surajaswal.json b/sub-logs/surajaswal.json index e6454e9..10863db 100644 --- a/sub-logs/surajaswal.json +++ b/sub-logs/surajaswal.json @@ -1,12 +1,12 @@ { - "repo": "", + "repo": "https://github.com/surajaswal-dev/surajaswal", "owner": { - "username": "", + "username": "surajaswal-dev", - "email": "" + "email": "surajaswal29@gmail.com" }, @@ -14,7 +14,7 @@ "record-type": { - "name": "", + "name": "surajaswal", "value": "" From f535685cd7879ab0b5da2e85b755f8027b562558 Mon Sep 17 00:00:00 2001 From: Suraj Aswal Date: Mon, 28 Nov 2022 10:02:39 +0530 Subject: [PATCH 04/18] Update surajaswal.json --- sub-logs/surajaswal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/surajaswal.json b/sub-logs/surajaswal.json index 10863db..c26756b 100644 --- a/sub-logs/surajaswal.json +++ b/sub-logs/surajaswal.json @@ -16,7 +16,7 @@ "name": "surajaswal", - "value": "" + "value": "surajaswal-dev.github.io" } From 4ca524e84490e76278a9e98fd74960b623fe4559 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Mon, 28 Nov 2022 15:47:32 +0800 Subject: [PATCH 05/18] fix: record type --- sub-logs/surajaswal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/surajaswal.json b/sub-logs/surajaswal.json index c26756b..316e660 100644 --- a/sub-logs/surajaswal.json +++ b/sub-logs/surajaswal.json @@ -12,7 +12,7 @@ "target": { - "record-type": { + "CNAME": { "name": "surajaswal", From d730258c94e0863032f5d350fa788cb83b8707c3 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Mon, 28 Nov 2022 15:48:47 +0800 Subject: [PATCH 06/18] prettier --- sub-logs/surajaswal.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sub-logs/surajaswal.json b/sub-logs/surajaswal.json index 316e660..9795717 100644 --- a/sub-logs/surajaswal.json +++ b/sub-logs/surajaswal.json @@ -1,25 +1,16 @@ { - "repo": "https://github.com/surajaswal-dev/surajaswal", "owner": { - "username": "surajaswal-dev", - "email": "surajaswal29@gmail.com" - }, "target": { - "CNAME": { - "name": "surajaswal", - "value": "surajaswal-dev.github.io" - } - }, "proxied": false From c0761bec639ff7913c80ad54fef36c056f593fcf Mon Sep 17 00:00:00 2001 From: William Harrison Date: Tue, 29 Nov 2022 08:41:44 +0800 Subject: [PATCH 07/18] Update and rename addRecords.yml to update-records.yml --- .../workflows/{addRecords.yml => update-records.yml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{addRecords.yml => update-records.yml} (84%) diff --git a/.github/workflows/addRecords.yml b/.github/workflows/update-records.yml similarity index 84% rename from .github/workflows/addRecords.yml rename to .github/workflows/update-records.yml index 05e3bb8..7a11bb3 100644 --- a/.github/workflows/addRecords.yml +++ b/.github/workflows/update-records.yml @@ -1,7 +1,7 @@ -name: Add DNS records +name: Update Records on: push: - branches: [ main ] + branches: [main] jobs: validation: @@ -13,17 +13,17 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - name: Get changed files + - name: Get Files id: changed-files uses: tj-actions/changed-files@v34 with: files: | sub-logs/** reserved/** - - name: Install modules + - name: Install Modules if: steps.changed-files.outputs.any_changed == 'true' run: yarn - - name: Add records + - name: Publish Records if: steps.changed-files.outputs.any_changed == 'true' id: tests run: yarn add-records From a6748afe4c833e604662d42b07d4c7d1e98f9434 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Tue, 29 Nov 2022 08:52:35 +0800 Subject: [PATCH 08/18] Update validation.yml --- .github/workflows/validation.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index bb9a728..12e6135 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -25,19 +25,17 @@ jobs: env: FILES: ${{ steps.changed-files.outputs.all_changed_files }} actions_path: ${{ github.workspace }} - - name: Post message + - name: Comment Results if: steps.tests.outputs.shouldComment == 'true' uses: mshick/add-pr-comment@v1 with: - message: | - **Validation Results** - - Information Validation - ${{steps.tests.outputs.infoMessage}} - ${{steps.tests.outputs.infoReason}} - - DNS Record Validation - ${{steps.tests.outputs.recordMessage}} - ${{steps.tests.outputs.recordInfo}} - - JSON File Content + message: | + ## Validation Results + | Information Validation | Record Validation | + |-|-| + | ${{steps.tests.outputs.infoMessage}}\n${{steps.tests.outputs.infoReason}} | ${{steps.tests.outputs.recordMessage}}\n${{steps.tests.outputs.recordInfo}} | + + ### JSON File Content ```json ${{steps.tests.outputs.jsonData}} ``` From 1b644ca631975432b6fc3cbe233b44d7a32ad6d0 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Tue, 29 Nov 2022 09:03:31 +0800 Subject: [PATCH 09/18] Update validation.yml --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 12e6135..1caa953 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -33,7 +33,7 @@ jobs: ## Validation Results | Information Validation | Record Validation | |-|-| - | ${{steps.tests.outputs.infoMessage}}\n${{steps.tests.outputs.infoReason}} | ${{steps.tests.outputs.recordMessage}}\n${{steps.tests.outputs.recordInfo}} | + | ${{steps.tests.outputs.infoMessage}}${{steps.tests.outputs.infoReason}} | ${{steps.tests.outputs.recordMessage}}${{steps.tests.outputs.recordInfo}} | ### JSON File Content ```json From 9023c88c357e45763cf8bbad3097750cd9525381 Mon Sep 17 00:00:00 2001 From: Tweak Date: Mon, 28 Nov 2022 18:21:33 -0700 Subject: [PATCH 10/18] Update validation.yml --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 1caa953..6bf50a3 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -33,7 +33,7 @@ jobs: ## Validation Results | Information Validation | Record Validation | |-|-| - | ${{steps.tests.outputs.infoMessage}}${{steps.tests.outputs.infoReason}} | ${{steps.tests.outputs.recordMessage}}${{steps.tests.outputs.recordInfo}} | + | ${{steps.tests.outputs.infoMessage}} ${{steps.tests.outputs.infoReason}} | ${{steps.tests.outputs.recordMessage}} ${{steps.tests.outputs.recordInfo}} | ### JSON File Content ```json From c2380f9b24bd2b735952f3cd6cd862b2404ead77 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Tue, 29 Nov 2022 10:39:36 +0800 Subject: [PATCH 11/18] prettier --- tests/json.test.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/json.test.js b/tests/json.test.js index 614f73b..011b781 100644 --- a/tests/json.test.js +++ b/tests/json.test.js @@ -3,25 +3,29 @@ const getJSON = require('../utils/getJSON.js'); const checkInfo = require('../utils/checkInfo.js'); const checkRecords = require('../utils/checkRecords.js'); const data = getJSON(process.env.FILES); + if (data == false) { core.setOutput('shouldComment', 'false') console.log('Not a subdomain file') process.exit(0) } + core.setOutput('infoMessage', "Could not validate info."); core.setOutput('recordMessage', "Could not validate records."); core.setOutput('jsonData', data) core.setOutput('shouldComment', 'true') test('check if json file has required info', async () => { const passed = await checkInfo(data); - let infoMessage = passed === true ? "Valid Info Provided." : passed === "unknown" ? "Error Verifying Email.\nA maintainer will have to manually verify your email.\nReason:" : "Invalid Info Provided.\nPlease check your provided info.\nReason:"; + let infoMessage = passed === true ? "Valid information provided." : passed === "unknown" ? "Error verifying email address.\nA maintainer will have to manually verify your email address.\nReason:" : "Invalid information provided.\nPlease check your provided information.\nReason:"; + core.setOutput('infoMessage', infoMessage); expect(passed).toBeTruthy(); }, 15000); -test('check if json file follows format', () => { +test('Check if JSON file follows format', () => { const passed = checkRecords(data); - let recordMessage = passed === true ? "Valid Records Provided." : "Invalid Records Provided.\nPlease check your provided records.\nThey should only be of type `CNAME` or `A` or `TXT`, and should follow their respective formats."; + let recordMessage = passed === true ? "Valid records provided." : "Invalid records provided.\nPlease check your provided records.\nThey should only be of type `A`, `CNAME` or `TXT`, and should follow their respective formats."; + core.setOutput('recordMessage', recordMessage); expect(passed).toBe(true); }); From 629be87cdaf8d78d7d0056a7768129b4abca91ca Mon Sep 17 00:00:00 2001 From: William Harrison Date: Tue, 29 Nov 2022 10:43:20 +0800 Subject: [PATCH 12/18] Update validation.yml --- .github/workflows/validation.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 6bf50a3..591f182 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -8,24 +8,24 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Get changed files + - name: Get Files id: changed-files uses: tj-actions/changed-files@v34 with: files: | sub-logs/** reserved/** - - name: Install modules + - name: Install Modules if: steps.changed-files.outputs.any_changed == 'true' run: yarn - - name: Run tests + - name: Run Tests if: steps.changed-files.outputs.any_changed == 'true' id: tests run: yarn test env: FILES: ${{ steps.changed-files.outputs.all_changed_files }} actions_path: ${{ github.workspace }} - - name: Comment Results + - name: Comment if: steps.tests.outputs.shouldComment == 'true' uses: mshick/add-pr-comment@v1 with: @@ -42,5 +42,4 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} proxy-url: https://api.is-a-good.dev/github-proxy/ repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens - allow-repeats: false # This is the default - + allow-repeats: false # Default: false From 838ed40fd0fe6e52753f4e986362636b0e26bfcb Mon Sep 17 00:00:00 2001 From: Avalynn <100826194+avalynndev@users.noreply.github.com> Date: Tue, 29 Nov 2022 20:20:48 +0530 Subject: [PATCH 13/18] Create avalynn.json --- sub-logs/avalynn.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sub-logs/avalynn.json diff --git a/sub-logs/avalynn.json b/sub-logs/avalynn.json new file mode 100644 index 0000000..893cbfe --- /dev/null +++ b/sub-logs/avalynn.json @@ -0,0 +1,17 @@ +{ + "repo": "https://github.com/uzukidev/avalynndev", + + "owner": { + "username": "avalynndev", + "email": "avalynndev@gmail.com" + }, + + "target": { + "CNAME": { + "name": "avalynn", + "value": "cname.vercel-dns.com" + } + }, + + "proxied": false +} From 23f791603e3686688b62e488dbadcebfaaac253a Mon Sep 17 00:00:00 2001 From: Avalynn <100826194+avalynndev@users.noreply.github.com> Date: Wed, 30 Nov 2022 06:49:54 +0530 Subject: [PATCH 14/18] and TXT record !! --- sub-logs/avalynn.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sub-logs/avalynn.json b/sub-logs/avalynn.json index 893cbfe..a8d182d 100644 --- a/sub-logs/avalynn.json +++ b/sub-logs/avalynn.json @@ -11,6 +11,10 @@ "name": "avalynn", "value": "cname.vercel-dns.com" } + "TXT": { + "name": "_vercel", + "value": "vc-domain-verify=avalynn.is-a-good.dev,3a44282059a77b85f618" + } }, "proxied": false From 47d6aee767f25388ede2a49031af13dae157dbf9 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Nov 2022 09:47:18 +0800 Subject: [PATCH 15/18] prettier --- sub-logs/avalynn.json | 1 + 1 file changed, 1 insertion(+) diff --git a/sub-logs/avalynn.json b/sub-logs/avalynn.json index a8d182d..a76e732 100644 --- a/sub-logs/avalynn.json +++ b/sub-logs/avalynn.json @@ -11,6 +11,7 @@ "name": "avalynn", "value": "cname.vercel-dns.com" } + "TXT": { "name": "_vercel", "value": "vc-domain-verify=avalynn.is-a-good.dev,3a44282059a77b85f618" From a5f9bf38bed19460bb8550d957147d36bee2b81a Mon Sep 17 00:00:00 2001 From: Tweak Date: Wed, 30 Nov 2022 09:07:54 -0700 Subject: [PATCH 16/18] Fix format. --- sub-logs/avalynn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/avalynn.json b/sub-logs/avalynn.json index a76e732..0c3f0ca 100644 --- a/sub-logs/avalynn.json +++ b/sub-logs/avalynn.json @@ -10,7 +10,7 @@ "CNAME": { "name": "avalynn", "value": "cname.vercel-dns.com" - } + }, "TXT": { "name": "_vercel", From 9c6913eb59409eaa8b79569b86e8363c20cf4639 Mon Sep 17 00:00:00 2001 From: Tweak Date: Wed, 30 Nov 2022 09:09:01 -0700 Subject: [PATCH 17/18] Update getJSON.js --- utils/getJSON.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/getJSON.js b/utils/getJSON.js index 08f971c..5b35aab 100644 --- a/utils/getJSON.js +++ b/utils/getJSON.js @@ -16,12 +16,12 @@ function getJSON(file, filename) { return data; // Return true or false, depending if tests pass or fail. } - return false; // It doesn't exist + return 3; // It doesn't exist } catch(err) { console.error(err); } - return false; + return 3; } module.exports = getJSON; From 553f84ea4a63bcb28be716e2920b64e75e7a5c9e Mon Sep 17 00:00:00 2001 From: Tweak Date: Wed, 30 Nov 2022 09:10:33 -0700 Subject: [PATCH 18/18] Fix. --- tests/json.test.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/json.test.js b/tests/json.test.js index 011b781..73e9ae4 100644 --- a/tests/json.test.js +++ b/tests/json.test.js @@ -4,6 +4,13 @@ const checkInfo = require('../utils/checkInfo.js'); const checkRecords = require('../utils/checkRecords.js'); const data = getJSON(process.env.FILES); +if (data == 3) { + core.setOutput('infoMessage', "Could not validate info."); + core.setOutput('recordMessage', "Could not validate records."); + core.setOutput('jsonData', "Could not read the JSON file, did you have an error in your syntax?") + core.setOutput('shouldComment', 'true') +} + if (data == false) { core.setOutput('shouldComment', 'false') console.log('Not a subdomain file')