From af5d544ca46740912b272afe0eed3ae3d14739c8 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 15 May 2024 11:19:33 -0500 Subject: [PATCH 1/6] Update api-token. --- .sops.yaml | 4 ++-- testdata/dnsimple-secret.sops.yaml | 21 +++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index fb8556e..33d97c1 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,7 @@ --- creation_rules: - - path_regex: testdata/dnsimple/.*\.sops\.ya?ml + - path_regex: testdata/.*\.sops\.ya?ml encrypted_regex: "^(data|stringData)$" # Cert-Manager-Test age: >- - age10z089ltez8yuerju86k6aqd9vrmecm5gyn6gxmj68em0ztnyj46sd9840z + age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp diff --git a/testdata/dnsimple-secret.sops.yaml b/testdata/dnsimple-secret.sops.yaml index 59949c7..031bbde 100644 --- a/testdata/dnsimple-secret.sops.yaml +++ b/testdata/dnsimple-secret.sops.yaml @@ -4,27 +4,24 @@ metadata: name: dnsimple-api-token namespace: basic-present-record stringData: - #ENC[AES256_GCM,data:s6XpXBkiPEb3n+pqCz7bSJQ=,iv:TlPSJXxh/At1vaDJKdXGSImv8/UqUSPauSfh7z4Z8uU=,tag:bW+URfs7HbgPmVlp4Z+/fw==,type:comment] - #ENC[AES256_GCM,data:J/fjzPD0Rj84GdxOvTopvaEeDLquugLVCezxjiMHhJA5W3k/KbCcycJNOJaj6BKf3L8jJTMAMc6NDMr5Ng==,iv:5bPxLXiDuOlSSPOdztgwedtvxv0odq0+kTODjWPFyX8=,tag:o7EnpU4tHBxy1HaHBAl5bg==,type:comment] - #ENC[AES256_GCM,data:OJnwJTuX2olquBix8IY=,iv:TVGNA76LYAPDcZtkkiKIWIEZ+6w4ga4MGhqyTOO8Tuk=,tag:DoCsETByFWw2P4yqcfKLow==,type:comment] - api-token: ENC[AES256_GCM,data:akxH4nXY3l8UJ90VW0Pk0sfAYeEO+34WJ+y/KaR6lI+Ny93ksfhh5YvDzA==,iv:+30VKChTo3HHedN0Ltf395J3p4JaoPzWYbyRXzmv0Ek=,tag:8KLJYev9BKWLwu0cAkZq6Q==,type:str] + api-token: ENC[AES256_GCM,data:f1s9tQVLIZIYD4pgA1RLUh54oG2ffFF9LUcrUT0GGrmMKUEQuMX3YJJesQ==,iv:3i4Y//FvBNTspXhh//wsXvwca7P+YammbDy8VlCtDVM=,tag:m2+PojxxkJuUTY9ojW6IKg==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: - - recipient: age10z089ltez8yuerju86k6aqd9vrmecm5gyn6gxmj68em0ztnyj46sd9840z + - recipient: age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbWc1anVLelZKa3FKTXVW - eDQ1WGpzZkVFK1FMaGk1MmhPclE3d0h6bkRnCmF4U0dnandmdTRuN085WUpKQTFZ - NHorRW1mVXhtUStUaWh1QTFKZlRaZG8KLS0tIHVmZkg5SnMrWVRCRlRlaTU3bDd2 - d1pyanBkYWk4Q25UL1JwWFlTRTZlWkUKDwfj4bVfu6OSJGP9GePhTQZ5HzjG+0It - ndxQHaRurb28g63JK0KVKlIOzxrZqijlmAaCtdK25WXEV77vS9rqWg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByZWRHNlBRUGdaT2RLL0t6 + MFhXZDQrOThqZC96S2VUeDlhUXdreldLQ2hBCmVtOVdSMFBCamZnUGdUMjQ4K0Nk + MjB1ZytGT1NzRHlGdm9rOElYT2NBblUKLS0tIDdjQm9zbHZPaGtOUGowckVNdkN1 + Q01EdjhPaWcrZWg1QW5OYnVEMGRMcTgK8Pbn8JLKKfIJgFyOvfTkSlHWd4+g8b3r + nEzKfF77Cjne1ppAr4MPdBZO7xIXq0BE3iOhdp5T+uCOGxAyqkadow== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-02T18:25:19Z" - mac: ENC[AES256_GCM,data:GHUNQNN7811QEJ94IPRTopWLxJJMtMx3SQ5bGwMf5AWv6Xd5t7hqgsnzobGWHQv36iWfs2HkhH8muzm0XRHWnMIe1a6gvW2ZfkiEaoldKMYzX2/KjZ9YYsg7RzTAiat/rJlp4iaPJAmP4r6RqqWXe5QMJRorAFSAqhQAYr/oB+g=,iv:AkKILisDDsQZCOTg7hwUDnSOq60sgOOoR4exWUBR8rU=,tag:qomsH2u4ZSeCO5iHa/7Bqg==,type:str] + lastmodified: "2024-05-15T15:49:24Z" + mac: ENC[AES256_GCM,data:cE7z9aAHzx3n1UJU0ZgSIw7Rzp20W/V9WNnZxRmswX4i0WPq58IX1Sg24745V/xh/KrCTQdlQWEBpxlHQ6O/jtK78n+XvNo6JFFZ51FXxjQRWPQPw7HMU5ULOJw90Y8hpZ6mSjMa593ZtLzTumlKt/LcFcMt/XKq2vL0zYuswpM=,iv:XKLHE4xEAHcv4jZPXOC4c6iOOIlKcCTfFgfdorW3nFA=,tag:Qp6eRqHnzWIPWVR8YMD6ng==,type:str] pgp: [] encrypted_regex: ^(data|stringData)$ version: 3.8.1 From 0ea238f22dd5b24ed99e4867e8025341c3bd4d9f Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 15 May 2024 11:19:49 -0500 Subject: [PATCH 2/6] Add test workflow. --- .forgejo/workflows/test.yaml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .forgejo/workflows/test.yaml diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml new file mode 100644 index 0000000..be89afe --- /dev/null +++ b/.forgejo/workflows/test.yaml @@ -0,0 +1,31 @@ +on: + push: + branches: + - main + pull_request: +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Go + run: actions/setup-go@v5 + with: + go-version: '1.22.3' + - name: Output File + run: | + echo " + apiVersion: v1 + kind: Secret + metadata: + name: dnsimple-api-token + namespace: basic-present-record + stringData: + api-token: $API_TOKEN" > testdata/dnsimple/dnsimple-secret.yaml + env: + API_TOKEN: ${{ secrets.API_TOKEN }} + - name: Test + run: make test TEST_ZONE_NAME={{ secrets.TEST_ZONE_NAME }} + - name: Clean up + run: rm -f testdata/dnsimple/dnsimple-secret.yaml \ No newline at end of file From 8b827ab677578780e1fbbeaa8059db8c63248abc Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 15 May 2024 11:21:14 -0500 Subject: [PATCH 3/6] correct setup-go version. --- .forgejo/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index be89afe..22b2e2a 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -10,7 +10,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Setup Go - run: actions/setup-go@v5 + run: actions/setup-go@v3 with: go-version: '1.22.3' - name: Output File From 9f6ee6babc7128ca7054bbe7ec1648c58fac859a Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 15 May 2024 11:22:53 -0500 Subject: [PATCH 4/6] Explicit set --- .forgejo/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index 22b2e2a..df1d21f 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -10,7 +10,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Setup Go - run: actions/setup-go@v3 + run: https://code.forgejo.org/actions/setup-go@v5 with: go-version: '1.22.3' - name: Output File From 18cf0ba364cb56af386b938dd574df8f4c17546d Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 15 May 2024 11:24:40 -0500 Subject: [PATCH 5/6] Uses vs run :| --- .forgejo/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index df1d21f..6a21041 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -10,7 +10,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Setup Go - run: https://code.forgejo.org/actions/setup-go@v5 + uses: https://code.forgejo.org/actions/setup-go@v5 with: go-version: '1.22.3' - name: Output File From 602bbbc93a54e0f8be2e9f85bfdd0219f80f829c Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 15 May 2024 11:28:54 -0500 Subject: [PATCH 6/6] more secrets --- .forgejo/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index 6a21041..7665016 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -26,6 +26,6 @@ jobs: env: API_TOKEN: ${{ secrets.API_TOKEN }} - name: Test - run: make test TEST_ZONE_NAME={{ secrets.TEST_ZONE_NAME }} + run: make test TEST_ZONE_NAME=${{ secrets.TEST_ZONE_NAME }} - name: Clean up run: rm -f testdata/dnsimple/dnsimple-secret.yaml \ No newline at end of file