Skip to content

Commit

Permalink
feat: Add credential_path field to Object Storage (#372)
Browse files Browse the repository at this point in the history
Signed-off-by: Zyyeric <[email protected]>
  • Loading branch information
Zyyeric authored Aug 19, 2024
1 parent 5ecabe6 commit 63caf54
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 90 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dragonfly-api"
version = "2.0.150"
version = "2.0.151"
authors = ["Gaius <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
157 changes: 79 additions & 78 deletions pkg/apis/common/v2/common.pb.go

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pkg/apis/common/v2/common.pb.validate.go

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

4 changes: 2 additions & 2 deletions pkg/apis/common/v2/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ message ObjectStorage {
string access_key_secret = 4 [(validate.rules).string.min_len = 1];
// Session token that used to access s3 storage service.
optional string session_token = 5 [(validate.rules).string = {min_len: 1, ignore_empty: true}];
// Credential service account that used for the Google Cloud Storage service.
optional string credential = 6 [(validate.rules).string = {min_len: 1, ignore_empty: true}];
// Local path to credential file for Google Cloud Storage service OAuth2 authentication.
optional string credential_path = 6 [(validate.rules).string = {min_len: 1, ignore_empty: true}];
// Predefined ACL that used for the Google Cloud Storage service.
optional string predefined_acl = 7 [(validate.rules).string = {min_len: 1, ignore_empty: true}];
}
Expand Down
4 changes: 2 additions & 2 deletions proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ message ObjectStorage {
string access_key_secret = 4;
// Session token that used to access s3 storage service.
optional string session_token = 5;
// Credential service account that used for the Google Cloud Storage service.
optional string credential = 6;
// Local path to credential file for Google Cloud Storage service OAuth2 authentication.
optional string credential_path = 6;
// Predefined ACL that used for the Google Cloud Storage service.
optional string predefined_acl = 7;
}
Expand Down
4 changes: 2 additions & 2 deletions src/common.v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,9 @@ pub struct ObjectStorage {
/// Session token that used to access s3 storage service.
#[prost(string, optional, tag = "5")]
pub session_token: ::core::option::Option<::prost::alloc::string::String>,
/// Credential service account that used for the Google Cloud Storage service.
/// Local path to credential file for Google Cloud Storage service OAuth2 authentication.
#[prost(string, optional, tag = "6")]
pub credential: ::core::option::Option<::prost::alloc::string::String>,
pub credential_path: ::core::option::Option<::prost::alloc::string::String>,
/// Predefined ACL that used for the Google Cloud Storage service.
#[prost(string, optional, tag = "7")]
pub predefined_acl: ::core::option::Option<::prost::alloc::string::String>,
Expand Down
Binary file modified src/descriptor.bin
Binary file not shown.

0 comments on commit 63caf54

Please sign in to comment.