fix region on bucket

dev-go/lib/bedrock/telemetry.go

@@ -26,8 +26,11 @@ func init() {
 }
 
 func loggerReplaceErrs(groups []string, pre slog.Attr) slog.Attr {
+	if !(pre.Key == "err" || pre.Key == "error") {
+		return pre
+	}
 	err, isErr := pre.Value.Any().(terrors.Error)
-	if (pre.Key != "err" && pre.Key != "error") || !isErr {
+	if !isErr {
 		return pre
 	}
 	params := make([]slog.Attr, len(err.Params))

dev-go/lib/objectstore/client.go

@@ -41,6 +41,7 @@ func credentialsProvider() aws.CredentialsProvider {
 func B2Client() (*s3.Client, error) {
 	config := aws.Config{
 		BaseEndpoint: aws.String("https://s3.us-east-005.backblazeb2.com"),
+		Region:       "us-east-005",
 		Credentials:  credentialsProvider(),
 	}
 	client := s3.NewFromConfig(config)

dev-go/services/s-rpc-vault/handler.go

@@ -1,6 +1,7 @@
 package module
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -9,9 +10,7 @@ import (
 	pb "github.com/cottand/selfhosted/dev-go/lib/proto/s-rpc-vault"
 	vault "github.com/hashicorp/vault/api"
 	"github.com/monzo/terrors"
-	"golang.org/x/sync/errgroup"
 	"google.golang.org/protobuf/types/known/emptypb"
-	"io"
 	"time"
 )
 
@@ -45,27 +44,21 @@ func (h *ProtoHandler) Snapshot(ctx context.Context, _ *emptypb.Empty) (*emptypb
 	if err != nil {
 		return nil, err
 	}
-	pr, pw := io.Pipe()
 	ctx, cancel := context.WithDeadline(ctx, time.Now().Add(1*time.Minute))
+	defer cancel()
 	key := fmt.Sprintf("vault/snapshot/%s-%v.snap", time.Now().Format(time.DateOnly), time.Now().UnixMilli())
-	wg, wctx := errgroup.WithContext(ctx)
-	wg.Go(func() error {
-		_, err2 := b2.PutObject(wctx, &s3.PutObjectInput{
-			Bucket: aws.String("services-bu"),
-			Body:   pr,
-			Key:    aws.String(key),
-		})
-		if err2 != nil {
-			return err2
-		}
-		return nil
-	})
-	wg.Go(func() error {
-		return h.vaultClient.Sys().RaftSnapshotWithContext(wctx, pw)
+	buffer := bytes.NewBuffer(nil)
+	err = h.vaultClient.Sys().RaftSnapshotWithContext(ctx, buffer)
+	if err != nil {
+		return nil, terrors.Augment(err, "failed to snapshot raft snapshot", nil)
+	}
+	cLength := int64(buffer.Len())
+	_, err = b2.PutObject(ctx, &s3.PutObjectInput{
+		Bucket:        aws.String("services-bu"),
+		Body:          buffer,
+		ContentLength: &cLength,
+		Key:           aws.String(key),
 	})
-
-	err = wg.Wait()
-	cancel()
 	if err != nil {
 		return nil, terrors.Augment(err, "failed to upload snapshot", nil)
 	}

dev-go/services/s-web-github-webhook/handler.go

@@ -44,23 +44,23 @@ func (s *scaffold) handlePush(writer http.ResponseWriter, request *http.Request)
 	fullBody := new(bytes.Buffer)
 	_, err := fullBody.ReadFrom(request.Body)
 	if err != nil {
-		slog.Warn("failed to read request into memory", "err", terrors.Propagate(err).Error())
+		slog.WarnContext(ctx, "failed to read request into memory", "err", terrors.Propagate(err))
 	}
 	ghSecret, err := ghWebhookSecret(ctx)
 	if err != nil {
-		slog.Warn("failed to reach Vault to fetch the gh secret - cannot validate event, skipping!", "err", err.Error())
+		slog.WarnContext(ctx, "failed to reach Vault to fetch the gh secret - cannot validate event, skipping!", "err", err)
 		return
 	}
 	ghHmac256 := request.Header.Get("X-Hub-Signature-256")
 	err = validateWebhookHmac(ctx, []byte{}, ghSecret, ghHmac256)
 	if err != nil {
-		slog.Info("skipping invalid push event", "err", err)
+		slog.InfoContext(ctx, "skipping invalid push event", "err", err)
 		return
 	}
-	slog.Info("event validation OK ✅")
+	slog.InfoContext(ctx, "event validation OK ✅")
 	event := WorkflowJobEvent{}
 	if err := json.Unmarshal(fullBody.Bytes(), &event); err != nil {
-		slog.WarnContext(ctx, "could not parse push event", "err", err.Error())
+		slog.WarnContext(ctx, "could not parse push event", "err", err)
 		return
 	}
 	go func() {