From 7f6d8acb8518e844c041443a33a94be7f045ca55 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 5 Nov 2026 15:52:49 -0500 Subject: [PATCH] backend/b2: Support Multi-Bucket Application Keys (#22104) --- build.go | 2 +- changelog/unreleased/issue-5741 | 8 ++++++++ changelog/unreleased/pull-22104 | 7 +++++++ changelog/unreleased/pull-22121 | 5 ----- doc/020_installation.rst | 2 +- go.mod | 6 ++---- go.sum | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 changelog/unreleased/issue-5741 create mode 100644 changelog/unreleased/pull-22104 delete mode 100644 changelog/unreleased/pull-22121 diff --git a/build.go b/build.go index f4f5f5b04..ab45bea8f 100644 --- a/build.go +++ b/build.go @@ -59,7 +59,7 @@ var config = Config{ // see https://github.com/googleapis/google-cloud-go/issues/11448 DefaultBuildTags: []string{"selfupdate", "disable_grpc_modules"}, // specify build tags which are always used Tests: []string{"./..."}, // tests to run - MinVersion: GoVersion{Major: 1, Minor: 26, Patch: 0}, // minimum Go version supported + MinVersion: GoVersion{Major: 1, Minor: 26, Patch: 10}, // minimum Go version supported } // Config configures the build. diff --git a/changelog/unreleased/issue-5741 b/changelog/unreleased/issue-5741 new file mode 100644 index 000000000..9992479c3 --- /dev/null +++ b/changelog/unreleased/issue-5741 @@ -0,0 +1,8 @@ +Enhancement: Support Multi-Bucket Application Keys in the `b2` backend + +The `b2` backend now supports Backblaze B2 Multi-Bucket Application Keys, +including single-bucket keys created through the multi-bucket API (for +example by the Backblaze Terraform provider). + +https://github.com/restic/restic/issues/5741 +https://github.com/restic/restic/pull/22104 diff --git a/changelog/unreleased/pull-22104 b/changelog/unreleased/pull-22104 new file mode 100644 index 000000000..7c3d1a7d9 --- /dev/null +++ b/changelog/unreleased/pull-22104 @@ -0,0 +1,7 @@ +Change: Require Go 1.26.10 or newer + +Restic now requires Go 1.26.10 or newer to build, as the library used to +access the B2 backend requires it. + +https://github.com/restic/restic/pull/22104 +https://github.com/restic/restic/pull/22121 diff --git a/changelog/unreleased/pull-22121 b/changelog/unreleased/pull-22121 deleted file mode 100644 index ef8c01f21..000000000 --- a/changelog/unreleased/pull-22121 +++ /dev/null @@ -1,5 +0,0 @@ -Change: Require Go 1.26 or newer - -Building restic now requires Go 1.26 or newer. - -https://github.com/restic/restic/pull/22121 diff --git a/doc/020_installation.rst b/doc/020_installation.rst index 517e5d54d..05b565e21 100644 --- a/doc/020_installation.rst +++ b/doc/020_installation.rst @@ -305,7 +305,7 @@ From source *********** restic is written in the Go programming language and you need at least -Go version 1.26. Building restic may also work with older versions of Go, +Go version 1.26.10. Building restic may also work with older versions of Go, but that's not supported. See the `Getting started `__ guide of the Go project for instructions how to install Go. diff --git a/go.mod b/go.mod index a3ec162d1..191b04378 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/restic/restic -go 1.26.0 - -toolchain go1.26.9 +go 1.26.10 // keep the old behavior for reparse points on windows until handling reparse points has been improved in restic // https://forum.restic.net/t/windows-junction-backup-with-go1-23-or-later/8940 @@ -13,7 +11,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.1 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.8.1 - github.com/Backblaze/blazer v0.7.2 + github.com/Backblaze/blazer v0.9.0 github.com/Microsoft/go-winio v0.6.2 github.com/ProtonMail/go-crypto v1.5.2 github.com/anacrolix/fuse v0.3.1 diff --git a/go.sum b/go.sum index 519075e8c..f704c77e6 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,8 @@ github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJ github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= github.com/AzureAD/microsoft-authentication-library-for-go v1.8.0 h1:Nljr4q1GRA/5vCrMONS+g4u4LRHNgOXVSh3O43J2CnI= github.com/AzureAD/microsoft-authentication-library-for-go v1.8.0/go.mod h1:Y33QHnf0FfdVewFFISOGe20mkZbxX4H839o955/PoeI= -github.com/Backblaze/blazer v0.7.2 h1:UWNHMLB+Nf+UmbO2qkVvgriODLEMz4kIyr2Hm+DVXQM= -github.com/Backblaze/blazer v0.7.2/go.mod h1:T4y3EYa9IQ5J0PKc/C/J8/CEnSd3qa/lgNw938wZg10= +github.com/Backblaze/blazer v0.9.0 h1:413rZHO8Vnpfjygrfxt8AO56LD6lE4w334MZIpnxdAs= +github.com/Backblaze/blazer v0.9.0/go.mod h1:/JlJELHVlJWBwHknmVqQ92zYyVm0s4EI+Cn3XU6IgCc= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.35.0 h1:bN1gA3of5bXtbnLsRPrwfmbbe7A5UWFlcTHseujLnpc= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.35.0/go.mod h1:Yj5vHEz/aAepZGliRJsA6uvHAVAQyEwajq9ORCHPxzM= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.57.0 h1:jLdiS1vO+XJFyDSWRHBx56r4s/NNtcl5J6KyCcWUX/w=