Build and publish arm64 binary (#254)

* Build and publish arm64 binary

* Add parameter to configure architecture

* Ditch Architecture param

Not needed since each Serverless Application is built for specific arch.

---------

Co-authored-by: Pete Tomasik <senate6268@gmail.com>

Author: scadu

.buildkite/pipeline-sar.yaml

@@ -21,6 +21,7 @@ steps:
       - .buildkite/steps/build-lambda.sh
     artifact_paths:
       - handler.zip
+      - handler-arm64.zip
 
   - label: ":lambda::arrow_right::package: Create SAR Package"
     key: package

.buildkite/pipeline.yaml

@@ -32,6 +32,7 @@ steps:
       - .buildkite/steps/build-lambda.sh
     artifact_paths:
       - handler.zip
+      - handler-arm64.zip
 
   - label: ":s3: Publish to S3 Branch Location"
     key: s3-branch

.buildkite/steps/build-lambda.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -eu
 
-make handler.zip
+# Build both architectures
+make build
 
 if [[ -z "${BUILDKITE_TAG:-}" ]]; then
   VERSION=$(git describe --tags)

.buildkite/steps/github-release.sh

@@ -38,7 +38,7 @@ notes=$(sed -n "/^## \[${escaped_tag}\]/,/^## \[${escaped_last_tag}\]/p" CHANGEL
 echo "$notes"
 
 echo --- :lambda: Downloading lambda from artifacts
-buildkite-agent artifact download handler.zip .
+buildkite-agent artifact download "handler*.zip" .
 
 echo "--- 🚀 Releasing $version"
 if [[ "${GITHUB_RELEASE_ACCESS_TOKEN:-}" == "" ]]; then
@@ -51,4 +51,5 @@ GITHUB_TOKEN="$GITHUB_RELEASE_ACCESS_TOKEN" release_dry_run gh release create \
   --title "$tag" \
   --notes "$notes" \
   "$tag" \
-  handler.zip
+  handler.zip \
+  handler-arm64.zip

.buildkite/steps/publish-package.sh

@@ -6,12 +6,17 @@ source .buildkite/lib/release-dry-run.sh
 
 VERSION=$(buildkite-agent meta-data get version)
 
-buildkite-agent artifact download packaged.yml .
+buildkite-agent artifact download "packaged*.yml" .
 
+# Determine SAR application IDs based on release type
 if [[ -z "${BUILDKITE_TAG:-}" ]]; then
+  # Edge builds
   APP_ID=arn:aws:serverlessrepo:us-east-1:172840064832:applications/buildkite-agent-scaler-edge
+  APP_ID_ARM64=arn:aws:serverlessrepo:us-east-1:172840064832:applications/buildkite-agent-scaler-arm64-edge
 else
+  # Release builds
   APP_ID=arn:aws:serverlessrepo:us-east-1:172840064832:applications/buildkite-agent-scaler
+  APP_ID_ARM64=arn:aws:serverlessrepo:us-east-1:172840064832:applications/buildkite-agent-scaler-arm64
 fi
 
 echo --- ":aws::lambda: Publishing version $VERSION to SAR"
@@ -20,3 +25,10 @@ release_dry_run aws serverlessrepo create-application-version \
   --template-body file://packaged.yml \
   --semantic-version "${VERSION#v}" \
   --source-code-url "https://github.com/buildkite/buildkite-agent-scaler/tree/$(git rev-parse HEAD)/"
+
+echo --- ":aws::lambda: Publishing arm64 version $VERSION to SAR"
+release_dry_run aws serverlessrepo create-application-version \
+  --application-id "$APP_ID_ARM64" \
+  --template-body file://packaged-arm64.yml \
+  --semantic-version "${VERSION#v}" \
+  --source-code-url "https://github.com/buildkite/buildkite-agent-scaler/tree/$(git rev-parse HEAD)/"

.buildkite/steps/sar.sh

@@ -2,12 +2,40 @@
 
 set -euo pipefail
 
-echo --- Download handler.zip
-buildkite-agent artifact download handler.zip .
+echo --- Download handler zips
+buildkite-agent artifact download "handler*.zip" .
 
-echo --- Create template for Serverless Application Repository
-sam package --region us-east-1 --s3-bucket buildkite-serverless-apps-us-east-1 --s3-prefix elastic-ci/agent-scaler --output-template-file packaged.yml
+# Package x86_64 version (default - handler.zip is already x86_64)
+echo "--- Create x86_64 template for Serverless Application Repository"
+sam package \
+  --template-file template.yaml \
+  --region us-east-1 \
+  --s3-bucket buildkite-serverless-apps-us-east-1 \
+  --s3-prefix elastic-ci/agent-scaler \
+  --output-template-file packaged.yml
 buildkite-agent artifact upload packaged.yml
 
-echo --- Print template for Serverless Application Repository
+# Package arm64 version
+echo "--- Create arm64 template for Serverless Application Repository"
+# Temporarily rename files to avoid overwriting handler.zip
+mv handler.zip handler-x86_64-backup.zip
+mv handler-arm64.zip handler.zip
+sam package \
+  --template-file template.yaml \
+  --region us-east-1 \
+  --s3-bucket buildkite-serverless-apps-us-east-1 \
+  --s3-prefix elastic-ci/agent-scaler-arm64 \
+  --output-template-file packaged-arm64.yml
+# Restore original filenames
+mv handler.zip handler-arm64.zip
+mv handler-x86_64-backup.zip handler.zip
+# Update the hardcoded architecture from x86_64 to arm64
+echo "Updating Lambda architecture to arm64..."
+sed -i.bak 's/- x86_64/- arm64/' packaged-arm64.yml && rm packaged-arm64.yml.bak
+buildkite-agent artifact upload packaged-arm64.yml
+
+echo --- Print x86_64 template for Serverless Application Repository
 echo "$(< packaged.yml)"
+
+echo --- Print arm64 template for Serverless Application Repository
+echo "$(< packaged-arm64.yml)"

.buildkite/steps/upload-to-s3.sh

@@ -15,7 +15,11 @@ else
 fi
 
 echo "~~~ :buildkite: Downloading artifacts"
-buildkite-agent artifact download handler.zip .
+buildkite-agent artifact download "handler*.zip" .
 
 echo "~~~ :s3: Uploading lambda to ${BASE_BUCKET}/${BUCKET_PATH}/ in ${AWS_DEFAULT_REGION}"
+# Upload both versions:
+# - handler.zip: x86_64 (default/existing architecture)
+# - handler-arm64.zip: arm64 (new architecture)
 aws s3 cp handler.zip "s3://${BASE_BUCKET}/${BUCKET_PATH}/handler.zip"
+aws s3 cp handler-arm64.zip "s3://${BASE_BUCKET}/${BUCKET_PATH}/handler-arm64.zip"

.gitignore

@@ -1,4 +1,5 @@
 /lambda/handler
 /*.zip
-/packaged.yml
+/bootstrap*
+/packaged*.yml
 buildkite-agent-scaler

Makefile

@@ -1,32 +1,51 @@
-.PHONY: all clean build
+.PHONY: all clean build build-arm64
 
 all: build
 
+build: handler.zip handler-arm64.zip
+
 clean:
-	-rm -f handler.zip bootstrap
+	-rm -f handler.zip handler-arm64.zip bootstrap bootstrap-arm64
 
 export CGO_ENABLED := 0
+export GOOS := linux
 
 ifdef BUILDKITE_BUILD_NUMBER
   LD_FLAGS       := -s -w -X version.Build=$(BUILDKITE_BUILD_NUMBER)
-  BUILDVSC_FLAG  := false
+  BUILDVCS_FLAG  := false
   USER           := 0:0
 else
   LD_FLAGS       := -s -w
-  BUILDVSC_FLAG  := true
+  BUILDVCS_FLAG  := true
   USER           := "$(shell id -u):$(shell id -g)"
 endif
 
-build: handler.zip
+build-arm64: handler-arm64.zip
 
+# handler.zip is x86_64 (default/existing architecture)
 handler.zip: bootstrap
 	zip -9 -v -j $@ "$<"
 
+handler-arm64.zip: bootstrap-arm64
+	@rm -f bootstrap
+	@cp bootstrap-arm64 bootstrap
+	@zip -9 -v -j $@ bootstrap
+	@rm -f bootstrap
+
 bootstrap: lambda/main.go
 	./bin/mise install
-	./bin/mise exec -- go build \
+	GOARCH=amd64 ./bin/mise exec -- go build \
 	    -ldflags="$(LD_FLAGS)" \
 	    -buildvcs="$(BUILDVCS_FLAG)" \
 	    -tags lambda.norpc \
 	    -o bootstrap \
 	    ./lambda
+
+bootstrap-arm64: lambda/main.go
+	./bin/mise install
+	GOARCH=arm64 ./bin/mise exec -- go build \
+	    -ldflags="$(LD_FLAGS)" \
+	    -buildvcs="$(BUILDVCS_FLAG)" \
+	    -tags lambda.norpc \
+	    -o bootstrap-arm64 \
+	    ./lambda

template.yaml

@@ -138,6 +138,7 @@ Parameters:
       - "false"
     Default: "false"
 
+
 Conditions:
   CreateRole:
     !Equals [ !Ref AutoscalingLambdaExecutionRole, '' ]