From e8b337e56134c32b206f0b7569033e50316cc4d9 Mon Sep 17 00:00:00 2001
From: VJ Patel <vj@vjpatel.me>
Date: Sat, 20 Jan 2024 00:39:49 +0000
Subject: [PATCH] Fix updating versions via GitHub Actions

---
 .github/workflows/update_versions.yaml | 13 +++++++++----
 .gitignore                             |  1 +
 scripts/mirror_terraform_releases.sh   | 24 +++++++++++++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/update_versions.yaml b/.github/workflows/update_versions.yaml
index a17efeb..16e2cae 100644
--- a/.github/workflows/update_versions.yaml
+++ b/.github/workflows/update_versions.yaml
@@ -8,23 +8,28 @@ permissions:
   pull-requests: write
 
 jobs:
-  create-release:
+  update-versions:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Tag
+      - name: Fetch versions
         run: |-
           bazel run //scripts:mirror_terraform_releases > terraform/private/versions_new.bzl
 
       - name: Commit and push update
         run: |-
           mv terraform/private/versions_new.bzl terraform/private/versions.bzl
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+          git checkout -b update-terraform-versions
           git add terraform/private/versions.bzl
           git commit -m "Updated Terraform Versions"
+          git push origin -u update-terraform-versions
 
-      - name: create PR
-        run: gh pr create -B main -H new_versions --title 'Update Terraform Versions' --body 'Created by Github action'
+      - name: Create PR
+        run: >-
+          gh pr create --base main --title 'Update Terraform Versions' --body 'Created by Github action'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index c127628..66ef5a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 bazel-*
 .bazelrc.user
 .DS_Store
+*_new.*
diff --git a/scripts/mirror_terraform_releases.sh b/scripts/mirror_terraform_releases.sh
index 337e765..e05da03 100755
--- a/scripts/mirror_terraform_releases.sh
+++ b/scripts/mirror_terraform_releases.sh
@@ -13,7 +13,7 @@ KEY_ID="72D7468F"
 export GNUPGHOME="$(mktemp -d)"
 chmod 0700 "$GNUPGHOME"
 gpg --import "$hashicorp_pgp_key_file"
-echo -e "5\nquit\n" | gpg --command-fd 0 --expert --edit-key $KEY_ID trust
+echo -e "5\nquit\n" | gpg --command-fd 0 --expert --batch --yes --edit-key $KEY_ID trust
 
 mapfile -t terraform_release_url_dirs < \
     <(
@@ -27,20 +27,30 @@ json="{}"
 
 for terraform_release_url in "${terraform_release_url_dirs[@]}"; do
     version="$(echo "$terraform_release_url" | rev | cut -f2 -d/ | rev)"
-    >&2 echo "processing Terraform $version..."
+    >&2 echo "Processing Terraform $version..."
 
     json="$(echo "$json" | jq --arg version "$version" '.[$version] = {}')"
+    >&2 echo "> Added $version to JSON"
 
     sha256sums_url="${terraform_release_url}terraform_${version}_SHA256SUMS"
-    sha256sums_sig_url="${terraform_release_url}terraform_${version}_SHA256SUMS.sig"
+    sha256sums_sig_url="${terraform_release_url}terraform_${version}_SHA256SUMS.$KEY_ID.sig"
     >&2 curl -sL "${sha256sums_url}" -o "terraform_${version}_SHA256SUMS"
+    >&2 echo "> Downloaded ${sha256sums_url}"
     >&2 curl -sL "${sha256sums_sig_url}" -o "terraform_${version}_SHA256SUMS.sig"
-    if ! gpg --verify "terraform_${version}_SHA256SUMS.sig" "terraform_${version}_SHA256SUMS" 2>&1 | grep "Good signature" > /dev/null; then
-        echo "could not find good signature for terraform_${version}_SHA256SUMS.sig"
+    >&2 echo "> Downloaded ${sha256sums_sig_url}"
+
+    verify_out="$(gpg --verify "terraform_${version}_SHA256SUMS.sig" "terraform_${version}_SHA256SUMS" 2>&1 || true)"
+
+    if ! echo "$verify_out" | grep "Good signature" > /dev/null; then
+        >&2 echo "> Could not find good signature for terraform_${version}_SHA256SUMS.sig:"
+        >&2 echo "$verify_out"
         exit 1
     fi
+    >&2 echo "> Verified terraform_${version}_SHA256SUMS"
+
 
     mapfile -t sha256sum_lines < "terraform_${version}_SHA256SUMS"
+    >&2 echo "> Loaded terraform_${version}_SHA256SUMS"
 
     for sha256sum_line in "${sha256sum_lines[@]}"; do
         sha256sum="$(echo "$sha256sum_line" | cut -f1 -d" ")"
@@ -51,7 +61,11 @@ for terraform_release_url in "${terraform_release_url_dirs[@]}"; do
             --arg platform "$platform" \
             --arg sha256sum "$sha256sum" \
             '.[$version][$platform] = $sha256sum')"
+
+        >&2 echo "> Added .$version.$platform = $sha256sum to JSON"
     done
+    >&2 echo "---"
+
 done
 
 cat <<EOF