Merge pull request #3607 from buildkite/fix-double-slashed-custom-bucket-artifacts

PS-1470 Fix issue where artifacts uploaded to custom s3 buckets would have a double slash prefix

Author: moskyb

.buildkite/steps/e2e-tests.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [[ -z "${BUILDKITE_TRIGGERED_FROM_BUILD_ID}" ]] ; then
+if [[ -z "${BUILDKITE_TRIGGERED_FROM_BUILD_ID:-}" ]] ; then
 	# For now, e2e test the agent that's currently running
-	export CI_E2E_TESTS_AGENT_PATH="$(which buildkite-agent)"
+	CI_E2E_TESTS_AGENT_PATH="$(which buildkite-agent)"
+	export CI_E2E_TESTS_AGENT_PATH
 else
 	# Download the artifact from the triggering build
 	ARTIFACT="pkg/buildkite-agent-$(go env GOOS)-$(go env GOARCH)"

internal/artifact/s3_uploader.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"path"
 	"slices"
 	"strings"
 	"time"
@@ -83,11 +84,10 @@ func (u *S3Uploader) URL(artifact *api.Artifact) string {
 		baseUrl = os.Getenv("BUILDKITE_S3_ACCESS_URL")
 	}
 
-	url, _ := url.Parse(baseUrl)
+	uri, _ := url.Parse(baseUrl)
+	uri.Path = path.Join(uri.Path, u.artifactPath(artifact))
 
-	url.Path += u.artifactPath(artifact)
-
-	return url.String()
+	return uri.String()
 }
 
 func (u *S3Uploader) CreateWork(artifact *api.Artifact) ([]workUnit, error) {

internal/e2e/artifact_test.go

@@ -0,0 +1,21 @@
+//go:build e2e
+
+package e2e
+
+import (
+	"testing"
+)
+
+// Test that an agent can upload and download an artifact across different steps in the same build
+func TestArtifactUploadDownload(t *testing.T) {
+	ctx := t.Context()
+
+	tc := newTestCase(t, "artifact_upload_download.yaml")
+
+	tc.startAgent()
+	build := tc.triggerBuild()
+	state := tc.waitForBuild(ctx, build)
+	if got, want := state, "passed"; got != want {
+		t.Errorf("Build state = %q, want %q", got, want)
+	}
+}

internal/e2e/fixtures/artifact_upload_download.yaml

@@ -0,0 +1,11 @@
+agents:
+  queue: {{ .queue }}
+steps:
+  - key: upload
+    commands:
+      - echo "hello world" > artifact.txt
+      - buildkite-agent artifact upload artifact.txt
+  - key: download
+    depends_on: upload
+    commands:
+      - buildkite-agent artifact download artifact.txt . && if [[ $(cat artifact.txt) == "hello world" ]]; then exit 0; else exit 1; fi