Update uses of bb_digest

Author: mortenmj

pkg/fetch/BUILD.bazel

@@ -60,6 +60,7 @@ go_test(
         "@com_github_buildbarn_bb_storage//pkg/blobstore/buffer",
         "@com_github_buildbarn_bb_storage//pkg/digest",
         "@com_github_buildbarn_bb_storage//pkg/testutil",
+        "@com_github_buildbarn_bb_storage//pkg/util",
         "@com_github_golang_mock//gomock",
         "@com_github_stretchr_testify//require",
         "@org_golang_google_genproto_googleapis_rpc//status",

pkg/fetch/authorizing_fetcher_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/buildbarn/bb-remote-asset/internal/mock"
 	"github.com/buildbarn/bb-remote-asset/pkg/fetch"
 	bb_digest "github.com/buildbarn/bb-storage/pkg/digest"
+	"github.com/buildbarn/bb-storage/pkg/util"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
@@ -22,7 +23,7 @@ func TestFetchBlobAuthorization(t *testing.T) {
 	authorizer := mock.NewMockAuthorizer(ctrl)
 	af := fetch.NewAuthorizingFetcher(baseFetcher, authorizer)
 
-	instanceName := bb_digest.MustNewInstanceName("gondor")
+	instanceName := util.Must(bb_digest.NewInstanceName("gondor"))
 	instanceSlice := []bb_digest.InstanceName{instanceName}
 
 	uri := "source.test"
@@ -66,7 +67,7 @@ func TestFetchDirectoryAuthorization(t *testing.T) {
 	authorizer := mock.NewMockAuthorizer(ctrl)
 	af := fetch.NewAuthorizingFetcher(baseFetcher, authorizer)
 
-	instanceName := bb_digest.MustNewInstanceName("gondor")
+	instanceName := util.Must(bb_digest.NewInstanceName("gondor"))
 	instanceSlice := []bb_digest.InstanceName{instanceName}
 
 	uri := "source.test"

pkg/fetch/http_fetcher.go

@@ -212,7 +212,7 @@ func getChecksumSri(qualifiers []*remoteasset.Qualifier) (string, bb_digest.Func
 			// Convert to a proper digest function.
 			// Note: The Instance name doesn't matter here, this function is used only
 			// to give us a convenient API when actually checking the checksum.
-			instance := bb_digest.MustNewInstanceName("")
+			instance := util.Must(bb_digest.NewInstanceName(""))
 			checksumFunction, err := instance.GetDigestFunction(digestFunctionEnum, len(expectedDigest))
 			if err != nil {
 				return "", bb_digest.Function{}, status.Errorf(codes.InvalidArgument, "Failed to get checksum function for checksum.sri: %s", err.Error())

pkg/fetch/http_fetcher_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/buildbarn/bb-remote-asset/pkg/qualifier"
 	"github.com/buildbarn/bb-storage/pkg/digest"
 	"github.com/buildbarn/bb-storage/pkg/testutil"
+	"github.com/buildbarn/bb-storage/pkg/util"
 
 	remoteasset "github.com/bazelbuild/remote-apis/build/bazel/remote/asset/v1"
 	remoteexecution "github.com/bazelbuild/remote-apis/build/bazel/remote/execution/v2"
@@ -119,7 +120,7 @@ func TestHTTPFetcherFetchBlobSuccessSha256tree(t *testing.T) {
 func testHTTPFetcherFetchBlobSuccessWithHasher(t *testing.T, digestFunctionEnum remoteexecution.DigestFunction_Value) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instance := digest.MustNewInstanceName(InstanceName)
+	instance := util.Must(digest.NewInstanceName(InstanceName))
 	digestFunction, err := instance.GetDigestFunction(digestFunctionEnum, 0)
 	require.NoError(t, err)
 	digestGenerator := digestFunction.NewGenerator(int64(len(TestData)))
@@ -177,7 +178,7 @@ func testHTTPFetcherFetchBlobSuccessWithHasher(t *testing.T, digestFunctionEnum
 func TestHTTPFetcherFetchBlob(t *testing.T) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instance := digest.MustNewInstanceName(InstanceName)
+	instance := util.Must(digest.NewInstanceName(InstanceName))
 	digestFunction, err := instance.GetDigestFunction(remoteexecution.DigestFunction_SHA256, 0)
 	require.NoError(t, err)
 	digestGenerator := digestFunction.NewGenerator(int64(len(TestData)))

pkg/storage/BUILD.bazel

@@ -46,6 +46,7 @@ go_test(
         "@bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto",
         "@com_github_buildbarn_bb_storage//pkg/blobstore/buffer",
         "@com_github_buildbarn_bb_storage//pkg/digest",
+        "@com_github_buildbarn_bb_storage//pkg/util",
         "@com_github_golang_mock//gomock",
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//codes",

pkg/storage/action_cache_asset_store_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/buildbarn/bb-remote-asset/pkg/storage"
 	"github.com/buildbarn/bb-storage/pkg/blobstore/buffer"
 	"github.com/buildbarn/bb-storage/pkg/digest"
+	"github.com/buildbarn/bb-storage/pkg/util"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
@@ -34,7 +35,7 @@ func bbDigest(d *remoteexecution.Digest) digest.Digest {
 func TestActionCacheAssetStorePutBlob(t *testing.T) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instanceName := digest.MustNewInstanceName("")
+	instanceName := util.Must(digest.NewInstanceName(""))
 	digestFunction, err := instanceName.GetDigestFunction(remoteexecution.DigestFunction_SHA256, 0)
 	require.NoError(t, err)
 
@@ -499,7 +500,7 @@ func TestActionCacheAssetStoreRoundTripWithSpecialQualifiers(t *testing.T) {
 func TestActionCacheAssetStoreGetBlob(t *testing.T) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instanceName := digest.MustNewInstanceName("")
+	instanceName := util.Must(digest.NewInstanceName(""))
 	digestFunction, err := instanceName.GetDigestFunction(remoteexecution.DigestFunction_SHA256, 0)
 	require.NoError(t, err)
 
@@ -542,7 +543,7 @@ func TestActionCacheAssetStoreGetBlob(t *testing.T) {
 func TestActionCacheAssetStoreGetDirectory(t *testing.T) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instanceName := digest.MustNewInstanceName("")
+	instanceName := util.Must(digest.NewInstanceName(""))
 	digestFunction, err := instanceName.GetDigestFunction(remoteexecution.DigestFunction_SHA256, 0)
 	require.NoError(t, err)
 

pkg/storage/authorizing_asset_store_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/buildbarn/bb-remote-asset/internal/mock"
 	"github.com/buildbarn/bb-remote-asset/pkg/storage"
 	bb_digest "github.com/buildbarn/bb-storage/pkg/digest"
+	"github.com/buildbarn/bb-storage/pkg/util"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
@@ -19,7 +20,7 @@ import (
 func TestAuthorizingBlobAccessGet(t *testing.T) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instanceName := bb_digest.MustNewInstanceName("rohan")
+	instanceName := util.Must(bb_digest.NewInstanceName("rohan"))
 	instanceSlice := []bb_digest.InstanceName{instanceName}
 	digestFunction, err := instanceName.GetDigestFunction(remoteexecution.DigestFunction_SHA256, 0)
 	require.NoError(t, err)
@@ -54,7 +55,7 @@ func TestAuthorizingBlobAccessGet(t *testing.T) {
 func TestAuthorizingBlobAccessPut(t *testing.T) {
 	ctrl, ctx := gomock.WithContext(context.Background(), t)
 
-	instanceName := bb_digest.MustNewInstanceName("rohan")
+	instanceName := util.Must(bb_digest.NewInstanceName("rohan"))
 	instanceSlice := []bb_digest.InstanceName{instanceName}
 	digestFunction, err := instanceName.GetDigestFunction(remoteexecution.DigestFunction_SHA256, 0)
 	require.NoError(t, err)