Merge pull request #291 from borg-land/fast-marker-patch

Publish the marker inside the fast folder

object/gcs.go

@@ -212,14 +212,14 @@ func (g *GCS) GetReleasePath(
 //
 //	gs://<bucket>/<gcsRoot>
 func (g *GCS) GetMarkerPath(
-	bucket, gcsRoot string,
+	bucket, gcsRoot string, fast bool,
 ) (string, error) {
 	gcsPath, err := g.getPath(
 		bucket,
 		gcsRoot,
 		"",
 		"marker",
-		false,
+		fast,
 	)
 	if err != nil {
 		return "", fmt.Errorf("normalize GCS path: %w", err)
@@ -258,6 +258,9 @@ func (g *GCS) getPath(
 			gcsPathParts = append(gcsPathParts, version)
 		}
 	case "marker":
+		if fast {
+			gcsPathParts = append(gcsPathParts, "fast")
+		}
 	default:
 		return "", errors.New("a GCS path type must be specified")
 	}

object/gcs_test.go

@@ -110,24 +110,40 @@ func TestGetMarkerPath(t *testing.T) {
 		bucket, gcsRoot string
 		expected        string
 		shouldError     bool
+		fast            bool
 	}{
 		{ // default CI build
 			bucket:      "k8s-release-dev",
 			gcsRoot:     "ci",
 			expected:    "gs://k8s-release-dev/ci",
 			shouldError: false,
+			fast:        false,
+		},
+		{ // default fast CI build
+			bucket:      "k8s-release-dev",
+			gcsRoot:     "ci",
+			expected:    "gs://k8s-release-dev/ci/fast",
+			shouldError: false,
+			fast:        true,
+		},
+		{ // current problematic behaviour
+			bucket:      "k8s-release-dev",
+			gcsRoot:     "ci",
+			expected:    "gs://k8s-release-dev/ci",
+			shouldError: true,
+			fast:        true,
 		},
 	} {
 		actual, err := testGCS.GetMarkerPath(
 			tc.bucket,
 			tc.gcsRoot,
+			tc.fast,
 		)
 
-		require.Equal(t, tc.expected, actual)
-
 		if tc.shouldError {
-			require.NotNil(t, err)
+			require.NotEqual(t, tc.expected, actual)
 		} else {
+			require.Equal(t, tc.expected, actual)
 			require.Nil(t, err)
 		}
 	}

object/store.go

@@ -43,7 +43,7 @@ type Store interface {
 
 	// TODO: Overly specific. We should only care these methods during a release.
 	GetReleasePath(bucket, gcsRoot, version string, fast bool) (string, error)
-	GetMarkerPath(bucket, gcsRoot string) (string, error)
+	GetMarkerPath(bucket, gcsRoot string, fast bool) (string, error)
 }
 
 type OptFn func(Store)