This is an automated email from the ASF dual-hosted git repository.

xuanwo pushed a commit to branch xuanwo/google-file-token-providers
in repository https://gitbox.apache.org/repos/asf/opendal-reqsign.git

commit 97dd64a4d21c48883edcd790a11ba4b06b3dd393
Merge: f32dab1 561a93a
Author: Xuanwo <[email protected]>
AuthorDate: Wed Mar 18 17:40:24 2026 +0800

    Merge remote-tracking branch 'origin/main' into 
xuanwo/google-file-token-providers
    
    # Conflicts:
    #       services/google/src/lib.rs

 .github/workflows/aws_v4.yml                       | 30 ++++----
 .github/workflows/azure_storage.yml                | 30 ++++----
 .github/workflows/google.yml                       | 30 ++++----
 .github/workflows/tencent_cos.yml                  |  2 +-
 Cargo.toml                                         |  1 -
 services/google/Cargo.toml                         |  1 -
 services/google/src/lib.rs                         |  4 +-
 services/google/src/provide_credential/default.rs  | 54 +++++++++++++-
 .../google/src/provide_credential/vm_metadata.rs   | 82 +++++++++++++++++++++-
 services/google/src/sign_request.rs                |  3 +-
 services/oracle/src/lib.rs                         |  6 +-
 services/oracle/src/provide_credential/default.rs  | 50 ++++++++++++-
 services/tencent-cos/src/lib.rs                    |  2 +-
 .../volcengine-tos/src/provide_credential/mod.rs   |  2 +-
 14 files changed, 236 insertions(+), 61 deletions(-)

diff --cc services/google/src/lib.rs
index db75cf8,79785bd..b9d1cae
--- a/services/google/src/lib.rs
+++ b/services/google/src/lib.rs
@@@ -27,6 -27,6 +27,6 @@@ pub use sign_request::RequestSigner
  
  mod provide_credential;
  pub use provide_credential::{
-     DefaultCredentialProvider, FileCredentialProvider, 
StaticCredentialProvider,
-     TokenCredentialProvider, VmMetadataCredentialProvider,
 -    DefaultCredentialProvider, DefaultCredentialProviderBuilder, 
StaticCredentialProvider,
 -    VmMetadataCredentialProvider,
++    DefaultCredentialProvider, DefaultCredentialProviderBuilder, 
FileCredentialProvider,
++    StaticCredentialProvider, TokenCredentialProvider, 
VmMetadataCredentialProvider,
  };

Reply via email to