From 00f209d99b6b76df43672a1b67a942010b42accd Mon Sep 17 00:00:00 2001
From: max furman <mx.furman@gmail.com>
Date: Tue, 23 Jul 2024 11:02:40 -0700
Subject: [PATCH] [ci] remove duplicate s3 unversioned builds in favor of
 name_templates

---
 .goreleaser.yml | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 4e3162a0a..f7a543a6f 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -47,18 +47,6 @@ builds:
       - windows_amd64
       - freebsd_amd64
     binary: 'step_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
-  -
-    # This build is for S3 unversioned binaries that follow our naming convention there.
-    << : *BUILD
-    id: s3-unversioned
-    targets:
-      - darwin_amd64
-      - darwin_arm64
-      - linux_amd64
-      - linux_arm64
-      - windows_amd64
-      - freebsd_amd64
-    binary: 'step_latest_{{ .Os }}_{{ .Arch }}'
   -
     # This build is specifically for nFPM targets (.deb and .rpm files).
     # It's exactly the same as the default build above, except:
@@ -260,28 +248,35 @@ release:
   #  - glob: ./glob/foo/to/bar/file/foobar/override_from_previous
 
 blobs:
-  - provider: s3
+  - &S3_VERSIONED
+    provider: s3
     disable: 'false'
     ids:
       - s3-versioned
     bucket: '{{ .Env.AWS_S3_BUCKET }}'
-    region: us-east-1
+    region: '{{ .Env.AWS_REGION }}'
     directory: '/'
     acl: public-read
     extra_files:
       - glob: ./dist/s3-versioned_*/**
     extra_files_only: true
 
-  - provider: s3
+  -
+    << : *S3_VERSIONED
     disable: '{{ if .Prerelease }}true{{ else }}false{{ end }}'
-    ids:
-      - s3-unversioned
-    bucket: '{{ .Env.AWS_S3_BUCKET }}'
-    region: us-east-1
-    directory: '/'
-    acl: public-read
     extra_files:
-      - glob: ./dist/s3-unversioned_*/**
+      - glob: ./dist/s3-versioned_*/*_darwin_amd64
+        name_template: step_latest_darwin_amd64
+      - glob: ./dist/s3-versioned_*/*_darwin_arm64
+        name_template: step_latest_darwin_arm64
+      - glob: ./dist/s3-versioned_*/*_linux_amd64
+        name_template: step_latest_linux_amd64
+      - glob: ./dist/s3-versioned_*/*_linux_arm64
+        name_template: step_latest_linux_arm64
+      - glob: ./dist/s3-versioned_*/*_windows_amd64.exe
+        name_template: step_latest_windows_amd64.exe
+      - glob: ./dist/s3-versioned_*/*_freebsd_amd64
+        name_template: step_latest_freebsd_amd64
     extra_files_only: true
 
 winget: