bundles: consolidate 'Bundle' creation logic

Create a 'NewBundle()' function, which creates a new 'Bundle' instance from
a given repository and timestamp. Replace all manual creation of 'Bundle{}'.

Note that this includes a minor functional change - previously, the base
bundle created by 'CollapseList()' was named 'base-<timestamp>.bundle'; now,
that bundle will be named 'bundle-<timestamp>.bundle', consistent with all
other instances of bundle creation. The name doesn't have any bearing on
bundle server functionality, so the naming convention can be updated without
breaking any existing bundle servers.

Signed-off-by: Victoria Dye <[email protected]>

Author: vdye

internal/bundles/bundles.go

@@ -6,6 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
+	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -33,6 +35,15 @@ type Bundle struct {
 	CreationToken int64
 }
 
+func NewBundle(repo *core.Repository, timestamp int64) Bundle {
+	bundleName := fmt.Sprintf("bundle-%d.bundle", timestamp)
+	return Bundle{
+		URI:           path.Join(".", bundleName),
+		Filename:      filepath.Join(repo.WebDir, bundleName),
+		CreationToken: timestamp,
+	}
+}
+
 type BundleList struct {
 	Version int
 	Mode    string
@@ -80,16 +91,7 @@ func NewBundleProvider(
 }
 
 func (b *bundleProvider) CreateInitialBundle(ctx context.Context, repo *core.Repository) Bundle {
-	timestamp := time.Now().UTC().Unix()
-	bundleName := "bundle-" + fmt.Sprint(timestamp) + ".bundle"
-	bundleFile := repo.WebDir + "/" + bundleName
-	bundle := Bundle{
-		URI:           "./" + bundleName,
-		Filename:      bundleFile,
-		CreationToken: timestamp,
-	}
-
-	return bundle
+	return NewBundle(repo, time.Now().UTC().Unix())
 }
 
 func (b *bundleProvider) createDistinctBundle(repo *core.Repository, list *BundleList) Bundle {
@@ -102,15 +104,7 @@ func (b *bundleProvider) createDistinctBundle(repo *core.Repository, list *Bundl
 		timestamp = maxTimestamp + 1
 	}
 
-	bundleName := "bundle-" + fmt.Sprint(timestamp) + ".bundle"
-	bundleFile := repo.WebDir + "/" + bundleName
-	bundle := Bundle{
-		URI:           "./" + bundleName,
-		Filename:      bundleFile,
-		CreationToken: timestamp,
-	}
-
-	return bundle
+	return NewBundle(repo, timestamp)
 }
 
 func (b *bundleProvider) CreateSingletonList(ctx context.Context, bundle Bundle) *BundleList {
@@ -365,11 +359,7 @@ func (b *bundleProvider) CollapseList(ctx context.Context, repo *core.Repository
 	// branches that were never merged and may have been force-pushed or
 	// deleted.
 
-	bundle := Bundle{
-		CreationToken: maxTimestamp,
-		Filename:      fmt.Sprintf("%s/base-%d.bundle", repo.WebDir, maxTimestamp),
-		URI:           fmt.Sprintf("./base-%d.bundle", maxTimestamp),
-	}
+	bundle := NewBundle(repo, maxTimestamp)
 
 	err := b.gitHelper.CreateBundleFromRefs(ctx, repo.RepoDir, bundle.Filename, refs)
 	if err != nil {