From 373dbd8e5490d03ef8a3a962f2117d0e22e5e75a Mon Sep 17 00:00:00 2001 From: takaidohigasi Date: Mon, 4 Sep 2023 11:30:35 +0900 Subject: [PATCH 1/2] support s3 config profile --- pkg/brpb/brpb.pb.go | 8 ++++++++ proto/brpb.proto | 1 + scripts/proto.lock | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkg/brpb/brpb.pb.go b/pkg/brpb/brpb.pb.go index dd430a106..063a329bb 100644 --- a/pkg/brpb/brpb.pb.go +++ b/pkg/brpb/brpb.pb.go @@ -1792,6 +1792,7 @@ type S3 struct { ObjectLockEnabled bool `protobuf:"varint,14,opt,name=object_lock_enabled,json=objectLockEnabled,proto3" json:"object_lock_enabled,omitempty"` SessionToken string `protobuf:"bytes,15,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"` Provider string `protobuf:"bytes,16,opt,name=provider,proto3" json:"provider,omitempty"` + Profile string `protobuf:"bytes,17,opt,name=profile,json=profile,proto3" json:"profile,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1942,6 +1943,13 @@ func (m *S3) GetProvider() string { return "" } +func (m *S3) GetProfile() string { + if m != nil { + return m.Profile + } + return "" +} + // GCS storage backend saves files into google cloud storage. type GCS struct { Endpoint string `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"` diff --git a/proto/brpb.proto b/proto/brpb.proto index b3823f443..d1387c3ad 100644 --- a/proto/brpb.proto +++ b/proto/brpb.proto @@ -335,6 +335,7 @@ message S3 { bool object_lock_enabled = 14; string session_token = 15; string provider = 16; + string profile = 17; } // GCS storage backend saves files into google cloud storage. diff --git a/scripts/proto.lock b/scripts/proto.lock index 9b356c074..359b2d90c 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -910,6 +910,11 @@ "id": 16, "name": "provider", "type": "string" + }, + { + "id": 17, + "name": "profile", + "type": "string" } ] }, @@ -20053,4 +20058,4 @@ } } ] -} \ No newline at end of file +} From 02f635f542924b8903f5a791ba3783cc211609a4 Mon Sep 17 00:00:00 2001 From: takaidohigasi Date: Wed, 6 Sep 2023 06:44:22 +0900 Subject: [PATCH 2/2] remove newline at the end of file to fix CI error --- scripts/proto.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/proto.lock b/scripts/proto.lock index 9fa90a3b1..5a10b1ea4 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -20150,4 +20150,4 @@ } } ] -} +} \ No newline at end of file