fix terraform provider releases

Author: ndbroadbent

.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
           echo "Timed out waiting for CI to complete."
           exit 1
 
-  release:
+  goreleaser:
     runs-on: ubuntu-latest
     needs: wait_ci
     steps:
@@ -68,33 +68,18 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-      - name: Import GPG private key (for checksum signing)
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        run: |
-          if [ -z "${GPG_PRIVATE_KEY:-}" ]; then
-            echo "No GPG_PRIVATE_KEY secret set; skipping key import."
-            exit 0
-          fi
-          mkdir -p ~/.gnupg
-          chmod 700 ~/.gnupg
-          echo "Importing GPG key"
-          echo "$GPG_PRIVATE_KEY" | gpg --batch --import
-          if [ -n "${GPG_PASSPHRASE:-}" ]; then
-            echo 'pinentry-mode loopback' >> ~/.gnupg/gpg.conf
-            echo 'allow-loopback-pinentry' >> ~/.gnupg/gpg-agent.conf
-            gpg-connect-agent reloadagent /bye
-          fi
-          gpg --list-secret-keys --keyid-format LONG || true
-      - name: Build
-        run: go build ./...
-      - name: GoReleaser
+          go-version-file: 'go.mod'
+          cache: true
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+      - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GPG_TTY: ${{ runner.env.SSH_AUTH_SOCK }}
+          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

.goreleaser.yaml

@@ -1,29 +1,56 @@
+version: 2
 project_name: terraform-provider-logstruct
 before:
   hooks:
     - go mod tidy
 builds:
   - id: provider
     main: ./main.go
-    # Binary inside the ZIP must be versioned for Terraform Registry ingestion
-    binary: terraform-provider-logstruct_v{{ .Version }}
     env:
       - CGO_ENABLED=0
-    goos: [linux, darwin, windows]
-    goarch: [amd64, arm64]
-    flags: ["-trimpath"]
+    mod_timestamp: '{{ .CommitTimestamp }}'
+    flags:
+      - -trimpath
     ldflags:
-      - -s -w -X main.version={{.Version}}
+      - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
+    goos:
+      - freebsd
+      - windows
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - '386'
+      - arm
+      - arm64
+    ignore:
+      - goos: darwin
+        goarch: '386'
+    # Binary inside ZIP must be versioned: terraform-provider-<name>_v<version>
+    binary: '{{ .ProjectName }}_v{{ .Version }}'
 archives:
-  - id: archive
-    name_template: '{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}'
-    builds: [provider]
-    format: zip
+  - format: zip
+    name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
 checksum:
-  name_template: '{{ .ProjectName }}_v{{ .Version }}_SHA256SUMS'
+  extra_files:
+    - glob: 'terraform-registry-manifest.json'
+      name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
+  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+  algorithm: sha256
 signs:
   - artifacts: checksum
+    args:
+      - "--batch"
+      - "--local-user"
+      - "{{ .Env.GPG_FINGERPRINT }}"
+      - "--output"
+      - "${signature}"
+      - "--detach-sign"
+      - "${artifact}"
 release:
-  draft: false
-  prerelease: auto
-  name_template: 'v{{ .Version }}'
+  extra_files:
+    - glob: 'terraform-registry-manifest.json'
+      name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
+  # draft: true # uncomment if you want to inspect before publishing
+changelog:
+  disable: true

terraform-registry-manifest.json

@@ -0,0 +1,7 @@
+{
+  "version": 1,
+  "metadata": {
+    "protocol_versions": ["6.0"]
+  }
+}
+