Merge pull request #61 from g0v-network/update-octodns

Updated octodns to get around a zone_id but that fails sync workflow

Author: patcon

.github/workflows/domain-plan.yml

@@ -1,9 +1,10 @@
 on:
   pull_request_target:
     paths:
-      - '*.domain/*.yaml'
-      - '.github/config-plan-amendment.yml'
-      - '.github/workflows/domain-plan.yml'
+      - "*.domain/*.yaml"
+      - ".github/config-plan-amendment.yml"
+      - ".github/workflows/domain-plan.yml"
+      - "Pipfile*"
 
 defaults:
   run:
@@ -22,44 +23,15 @@ jobs:
       - name: Checkout config files from PR
         id: prhead
         run: |
-          # Set $_sha to the first 7 char of PR head SHA
-          _sha="$(echo "${{ github.event.pull_request.head.sha }}" | cut -c 1-7)"
-          # Fetch PR head commit
-          git fetch origin refs/pull/${{ github.event.pull_request.number }}/head
-          # List changed config files in PR head
-          _files="$(git diff --name-only HEAD $_sha | grep "\.yaml$")"
-          # Separate added/modified files from deleted files
-          _existing_files=""
-          _deleted_files=""
-          for file in $_files; do
-            if git cat-file -e "$_sha:$file" 2>/dev/null; then
-              _existing_files="$_existing_files $file"
-            else
-              _deleted_files="$_deleted_files $file"
-            fi
-          done
-          # Checkout only existing config files from PR head commit
-          if [ -n "$_existing_files" ]; then
-            git checkout "$_sha" -- $_existing_files
-          fi
-          # Remove deleted files from working directory if they exist
-          if [ -n "$_deleted_files" ]; then
-            for file in $_deleted_files; do
-              if [ -f "$file" ]; then
-                echo "Removing deleted file: $file"
-                rm "$file"
-              fi
-            done
-          fi
-          # Set output 'sha' to $_sha
-          echo "::set-output name=sha::${_sha}"
+          chmod +x scripts/checkout-pr-config-files.sh
+          scripts/checkout-pr-config-files.sh "${{ github.event.pull_request.head.sha }}" "${{ github.event.pull_request.number }}"
 
       - name: Force HTML plan output
         run: cat .github/config-plan-amendment.yml >> config.yaml
 
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: "3.8"
 
       - name: Install pipenv
         run: |
@@ -75,20 +47,15 @@ jobs:
       - name: Get plan output
         id: plan
         run: |
-          # Parse plan output into $_plan
-          _plan="$(cat ${GITHUB_WORKSPACE}/octodns-sync.plan)"
-          _plan="${_plan//'%'/'%25'}"
-          _plan="${_plan//$'\n'/'%0A'}"
-          _plan="${_plan//$'\r'/'%0D'}"
-          # Set output 'plan' to $_plan
-          echo "::set-output name=plan::${_plan}"
+          chmod +x scripts/parse-plan-output.sh
+          scripts/parse-plan-output.sh "${GITHUB_WORKSPACE}/octodns-sync.plan"
 
       - name: Find Comment
         uses: peter-evans/find-comment@v1
         id: find-comment
         with:
           issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
+          comment-author: "github-actions[bot]"
           body-includes: Automatically generated by octodns-sync
 
       - name: Add or update PR comment

.github/workflows/domain-sync.yml

@@ -6,11 +6,12 @@ on:
     branches:
       - main
     paths:
-      - '.github/workflows/domain-sync.yml'
-      - '.github/settings.yml'
+      - ".github/workflows/domain-sync.yml"
+      - ".github/settings.yml"
       # Only domain folders ending in dots.
-      - '*.domain/*.yaml'
-      - 'config.yaml'
+      - "*.domain/*.yaml"
+      - "config.yaml"
+      - "Pipfile*"
 
 env:
   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
@@ -20,11 +21,11 @@ jobs:
     name: Publish DNS config from main
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.8'
+          python-version: "3.8"
 
       - name: Install pipenv
         run: |

.github/workflows/sync-repo-settings.yml

@@ -4,15 +4,15 @@ on:
   workflow_dispatch:
   push:
     branches: [main]
-    paths: 
-    - '.github/workflows/sync-repo-settings.yml'
-    - '.github/settings.yml'
-    # Only domain folders ending in dots.
-    - '*.domain/*.yaml'
-    - 'config.yaml'
+    paths:
+      - ".github/workflows/sync-repo-settings.yml"
+      - ".github/settings.yml"
+      # Only domain folders ending in dots.
+      - "*.domain/*.yaml"
+      - "config.yaml"
   schedule:
     # See: https://crontab.guru/#55_2_*_*_*
-    - cron: '55 2 * * *'
+    - cron: "55 2 * * *"
 
 jobs:
   sync-repo-settings:
@@ -26,7 +26,7 @@ jobs:
           # See: https://github.com/apps/repo-settings-sync-g0v-network
           application_id: 194297
           application_private_key: ${{ secrets.APPLICATION_PRIVATE_KEY_BASE64 }}
-        
+
       - uses: actions/checkout@v2
 
       - uses: exivity/actions/sync-defaults@main

Makefile

@@ -4,7 +4,6 @@ setup: ## Prepare your local workspace
 	pipenv install
 
 validate: ## Validate your configuration files
-	@echo Note: This was not functional last time tested. Please ignore errors...
 	$(RUN) octodns-validate --config-file config.yaml
 	@echo Config files successfully validated!
 

Pipfile

@@ -8,7 +8,7 @@ name = "pypi"
 # Will need this untile octdns > 0.9.11 is released.
 # See: https://github.com/g0v-network/domains/issues/20#issue-825088710
 octodns = "*"
-octodns-cloudflare = "*"
+octodns-cloudflare = ">=0.0.5"
 
 [dev-packages]