From c4e2ae1849c58b6f1b0926f179ca715ed241093e Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 16:59:47 -0600 Subject: [PATCH 01/18] Update --- .github/workflows/validation.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 09ef417..23f372a 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -10,10 +10,16 @@ jobs: fetch-depth: 0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v32 + uses: tj-actions/changed-files@v34 + with: + files: | + sub-logs/** + reserved/** - name: Install modules + if: steps.changed-files-specific.outputs.any_changed == 'true' run: yarn - name: Run tests + if: steps.changed-files-specific.outputs.any_changed == 'true' id: tests run: yarn test env: From 77f905ab7d1253ab028afae7d555485c7fb30c75 Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:05:21 -0600 Subject: [PATCH 02/18] Create addRecords.yml --- .github/workflows/addRecords.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/addRecords.yml diff --git a/.github/workflows/addRecords.yml b/.github/workflows/addRecords.yml new file mode 100644 index 0000000..064a991 --- /dev/null +++ b/.github/workflows/addRecords.yml @@ -0,0 +1,32 @@ +name: Add DNS records +on: + push: + branches: [ main ] + +jobs: + validation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v34 + with: + files: | + sub-logs/** + reserved/** + - name: Install modules + if: steps.changed-files.outputs.any_changed == 'true' + run: yarn + - name: Add records + if: steps.changed-files.outputs.any_changed == 'true' + id: tests + run: yarn add-records + env: + FILES: ${{ steps.changed-files.outputs.all_changed_files }} + actions_path: ${{ github.workspace }} From ae3398bbea9fe8f9024f8d3acad5390828c0bc9e Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:05:44 -0600 Subject: [PATCH 03/18] Update validation.yml --- .github/workflows/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 23f372a..d843a31 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -16,10 +16,10 @@ jobs: sub-logs/** reserved/** - name: Install modules - if: steps.changed-files-specific.outputs.any_changed == 'true' + if: steps.changed-files.outputs.any_changed == 'true' run: yarn - name: Run tests - if: steps.changed-files-specific.outputs.any_changed == 'true' + if: steps.changed-files.outputs.any_changed == 'true' id: tests run: yarn test env: From d102d169ab1a51cfe66de097858aa8f4a3461879 Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 23:07:23 +0000 Subject: [PATCH 04/18] Add files via upload --- scripts/addRecords.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 scripts/addRecords.js diff --git a/scripts/addRecords.js b/scripts/addRecords.js new file mode 100644 index 0000000..e69de29 From b24ce248b20e8434238ac7973c934324cdb0cb1e Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:10:08 -0600 Subject: [PATCH 05/18] Update addRecords.js --- scripts/addRecords.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/addRecords.js b/scripts/addRecords.js index e69de29..4714bc0 100644 --- a/scripts/addRecords.js +++ b/scripts/addRecords.js @@ -0,0 +1,3 @@ +const fetch = require('node-fetch'); +const getJSON = require('../utils/getJSON.js'); +const data = getJSON(process.env.FILES); From bce758bc855b2d89992a1ce6dab6f9a857060665 Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:10:25 -0600 Subject: [PATCH 06/18] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e04ff2d..ac9fe13 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "jest": "28.1.1" }, "dependencies": { - "node-fetch": "2.6.7", + "node-fetch": "^2.6.7", "jest": "28.1.1", "@actions/core": "1.9.0" } From ba415511251403369da5062d1d6d74b06873f350 Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:32:32 -0600 Subject: [PATCH 07/18] Update addRecords.js --- scripts/addRecords.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/scripts/addRecords.js b/scripts/addRecords.js index 4714bc0..236ea76 100644 --- a/scripts/addRecords.js +++ b/scripts/addRecords.js @@ -1,3 +1,26 @@ const fetch = require('node-fetch'); const getJSON = require('../utils/getJSON.js'); const data = getJSON(process.env.FILES); + +async function addRecord(type, name, value) { + + const response = await fetch(`https://api.is-a-good.dev/api/is-a-good-dev/zones/add?apiKey=${process.env.API_KEY}&type=${type}&name=${name}&content=${value}`); + const data = await response.json(); + return data +} + +(async () => { + try { + const records = Object.keys(data.target) + for (const i in records) { + recordType = records[i] + name = data.target[recordType].name; + value = data.target[recordType].value; + const result = await addRecord(type, name, value); + console.log(result); + } + } catch (e) { + console.log("Error adding records") + console.log(e) + } +})(); From 606f1bd0af37e8988d60fa20771812fb37e4551e Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:33:13 -0600 Subject: [PATCH 08/18] Update addRecords.yml --- .github/workflows/addRecords.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/addRecords.yml b/.github/workflows/addRecords.yml index 064a991..05e3bb8 100644 --- a/.github/workflows/addRecords.yml +++ b/.github/workflows/addRecords.yml @@ -28,5 +28,6 @@ jobs: id: tests run: yarn add-records env: + API_KEY: ${{ secrets.API_KEY }} FILES: ${{ steps.changed-files.outputs.all_changed_files }} actions_path: ${{ github.workspace }} From 7bee298790e5e19e300edf0736d574475398c7fb Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:34:59 -0600 Subject: [PATCH 09/18] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ac9fe13..37b8a2a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "test": "jest --verbose" + "test": "jest --verbose", + "add-records": "node ./scripts/addRecords.js" }, "keywords": [], "author": "Tweak4141", From ba473948f530330028f17ad09291dbad574f5f5b Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:38:23 -0600 Subject: [PATCH 10/18] Create matt2.json --- sub-logs/matt2.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sub-logs/matt2.json diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json new file mode 100644 index 0000000..e248521 --- /dev/null +++ b/sub-logs/matt2.json @@ -0,0 +1,20 @@ +{ + "owner": { + "username": "tweak4141", + "email": "ynan243@gmail.com" + }, + + "target": { + "CNAME": { + "name": "matt2", + "value": "dns.talosbot.xyz" + }, + + "TXT": { + "name": "_talos_verify", + "value": "12345" + } + }, + + "proxied": false +} From a9b4a4d8ec5901b560f2e5a04561c67008e2064e Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:42:29 -0600 Subject: [PATCH 11/18] Update addRecords.js --- scripts/addRecords.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/addRecords.js b/scripts/addRecords.js index 236ea76..334787f 100644 --- a/scripts/addRecords.js +++ b/scripts/addRecords.js @@ -16,7 +16,7 @@ async function addRecord(type, name, value) { recordType = records[i] name = data.target[recordType].name; value = data.target[recordType].value; - const result = await addRecord(type, name, value); + const result = await addRecord(recordType, name, value); console.log(result); } } catch (e) { From 5dee8866301efd07101aee3f7f722bd52945809d Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:43:24 -0600 Subject: [PATCH 12/18] Update addRecords.js --- scripts/addRecords.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/addRecords.js b/scripts/addRecords.js index 334787f..c2c285d 100644 --- a/scripts/addRecords.js +++ b/scripts/addRecords.js @@ -11,6 +11,7 @@ async function addRecord(type, name, value) { (async () => { try { + if (!data) return const records = Object.keys(data.target) for (const i in records) { recordType = records[i] From af35c02a1f836b1330ae53531895648f07c486ab Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:43:41 -0600 Subject: [PATCH 13/18] Delete matt2.json --- sub-logs/matt2.json | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 sub-logs/matt2.json diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json deleted file mode 100644 index e248521..0000000 --- a/sub-logs/matt2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "owner": { - "username": "tweak4141", - "email": "ynan243@gmail.com" - }, - - "target": { - "CNAME": { - "name": "matt2", - "value": "dns.talosbot.xyz" - }, - - "TXT": { - "name": "_talos_verify", - "value": "12345" - } - }, - - "proxied": false -} From 5a9665d0058a2339337c154770fe723dedb1186a Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:44:03 -0600 Subject: [PATCH 14/18] Create matt2.json --- sub-logs/matt2.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sub-logs/matt2.json diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json new file mode 100644 index 0000000..e248521 --- /dev/null +++ b/sub-logs/matt2.json @@ -0,0 +1,20 @@ +{ + "owner": { + "username": "tweak4141", + "email": "ynan243@gmail.com" + }, + + "target": { + "CNAME": { + "name": "matt2", + "value": "dns.talosbot.xyz" + }, + + "TXT": { + "name": "_talos_verify", + "value": "12345" + } + }, + + "proxied": false +} From 607f1236ef3c39061436fc7ec337097207b642db Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:58:36 -0600 Subject: [PATCH 15/18] Delete matt2.json --- sub-logs/matt2.json | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 sub-logs/matt2.json diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json deleted file mode 100644 index e248521..0000000 --- a/sub-logs/matt2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "owner": { - "username": "tweak4141", - "email": "ynan243@gmail.com" - }, - - "target": { - "CNAME": { - "name": "matt2", - "value": "dns.talosbot.xyz" - }, - - "TXT": { - "name": "_talos_verify", - "value": "12345" - } - }, - - "proxied": false -} From ee9a269025192a1aaf500e133a1de1c198e6a892 Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 17:58:48 -0600 Subject: [PATCH 16/18] Create matt2.json --- sub-logs/matt2.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sub-logs/matt2.json diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json new file mode 100644 index 0000000..e248521 --- /dev/null +++ b/sub-logs/matt2.json @@ -0,0 +1,20 @@ +{ + "owner": { + "username": "tweak4141", + "email": "ynan243@gmail.com" + }, + + "target": { + "CNAME": { + "name": "matt2", + "value": "dns.talosbot.xyz" + }, + + "TXT": { + "name": "_talos_verify", + "value": "12345" + } + }, + + "proxied": false +} From ff86484966e3d23a4161ea324f783860ee12d652 Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 18:01:47 -0600 Subject: [PATCH 17/18] Update matt2.json --- sub-logs/matt2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json index e248521..e2a27af 100644 --- a/sub-logs/matt2.json +++ b/sub-logs/matt2.json @@ -12,7 +12,7 @@ "TXT": { "name": "_talos_verify", - "value": "12345" + "value": "123456" } }, From d86b4b04a42709d9df4531e9b0f298e6a7b7b08e Mon Sep 17 00:00:00 2001 From: Tweak Date: Tue, 25 Oct 2022 18:03:27 -0600 Subject: [PATCH 18/18] Delete matt2.json --- sub-logs/matt2.json | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 sub-logs/matt2.json diff --git a/sub-logs/matt2.json b/sub-logs/matt2.json deleted file mode 100644 index e2a27af..0000000 --- a/sub-logs/matt2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "owner": { - "username": "tweak4141", - "email": "ynan243@gmail.com" - }, - - "target": { - "CNAME": { - "name": "matt2", - "value": "dns.talosbot.xyz" - }, - - "TXT": { - "name": "_talos_verify", - "value": "123456" - } - }, - - "proxied": false -}