Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.26.0
require (
github.com/cockroachdb/errors v1.14.0
github.com/google/uuid v1.6.0
github.com/longhorn/backupstore v0.0.0-20260722010828-e5f4ddc47e4d
github.com/longhorn/backupstore v0.0.0-20260820115123-12a1fc975d8f
github.com/longhorn/go-common-libs v0.0.0-20260730002911-add09e6eb92c
github.com/longhorn/go-spdk-helper v0.9.1-0.20260814082531-318b4a23bb34
github.com/longhorn/longhorn-engine v1.13.0-dev-20260712.0.20260722045630-fbcdec882798
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/longhorn/backupstore v0.0.0-20260722010828-e5f4ddc47e4d h1:5uXSMAcpNnE2WSLh/LVPhyd0Aff2pBQOurAMnpxcVRY=
github.com/longhorn/backupstore v0.0.0-20260722010828-e5f4ddc47e4d/go.mod h1:Vb1kh30oG5znu8vpr/imYLzf6gq23mietPXrHtxSwVw=
github.com/longhorn/backupstore v0.0.0-20260820115123-12a1fc975d8f h1:c6oB9+9/xf6ZW0LWgTfHAsU4tCB7ezpAJjYM8/Cnczc=
github.com/longhorn/backupstore v0.0.0-20260820115123-12a1fc975d8f/go.mod h1:Vb1kh30oG5znu8vpr/imYLzf6gq23mietPXrHtxSwVw=
github.com/longhorn/go-common-libs v0.0.0-20260730002911-add09e6eb92c h1:WR2BAcTwBRv2fKxd+z066GWQj2Ioq+m5pPpjK2fvxwk=
github.com/longhorn/go-common-libs v0.0.0-20260730002911-add09e6eb92c/go.mod h1:pjOR2fdQA0dNp3is1xfA+Ni2PjPDP+JuOoSEjdL2cfQ=
github.com/longhorn/go-iscsi-helper v0.0.0-20260625081921-94479d1d3cf4 h1:i4yKScA3sFjO9wJUMqlIQ0JjpQhhGd14jziljO3Og34=
Expand Down
1 change: 1 addition & 0 deletions pkg/proxy/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ func TestSetEnv_AcceptsAllowlistedCredentials(t *testing.T) {
"AWS_ENDPOINTS",
"AWS_CERT",
"VIRTUAL_HOSTED_STYLE",
"AWS_SIGN_ACCEPT_ENCODING",
"CIFS_USERNAME",
"CIFS_PASSWORD",
"AZBLOB_ACCOUNT_NAME",
Expand Down
4 changes: 4 additions & 0 deletions pkg/proxy/env_allowlist.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ var backupEnvAllowlist = map[string]struct{}{
btypes.AWSCert: {},
btypes.VirtualHostedStyle: {},

// Selects whether Accept-Encoding is part of the SigV4 signature. It is a
// signing option, not a credential, and carries no secret.
btypes.AWSSignAcceptEncoding: {},

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't compile when I opened this. backupstore#316 merged as 12a1fc975d8f, so I bumped and re-vendored in 210d947.

make validate and the test stage both pass in the container, pkg/proxy included. Diff is go.mod, go.sum, vendor/modules.txt and the three backupstore files.


// CIFS
btypes.CIFSUsername: {},
btypes.CIFSPassword: {},
Expand Down
62 changes: 56 additions & 6 deletions vendor/github.com/longhorn/backupstore/s3/s3_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/longhorn/backupstore/types/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/longhorn/backupstore/util/credential.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ github.com/kr/pretty
# github.com/kr/text v0.2.0
## explicit
github.com/kr/text
# github.com/longhorn/backupstore v0.0.0-20260722010828-e5f4ddc47e4d
# github.com/longhorn/backupstore v0.0.0-20260820115123-12a1fc975d8f
## explicit; go 1.25.10
github.com/longhorn/backupstore
github.com/longhorn/backupstore/azblob
Expand Down