feat(auth): reexport token_source && rename internal TokenSource

1. reexport token_source::{TokenSource,TokenSourceProvider} in gcloud_auth::token.

2. rename gcloud::token::token_source::TokenSource to gcloud::token::token_source:: GoogleCloudTokenSource

Author: washanhanzi

foundation/auth/src/idtoken.rs

@@ -6,7 +6,7 @@ use crate::{
     project::{project, Project, SERVICE_ACCOUNT_KEY},
     token_source::{
         compute_identity_source::ComputeIdentitySource, reuse_token_source::ReuseTokenSource,
-        service_account_token_source::OAuth2ServiceAccountTokenSource, TokenSource,
+        service_account_token_source::OAuth2ServiceAccountTokenSource, GoogleCloudTokenSource,
     },
 };
 
@@ -39,15 +39,15 @@ impl IdTokenSourceConfig {
         self
     }
 
-    pub async fn build(self, audience: &str) -> Result<Box<dyn TokenSource>, error::Error> {
+    pub async fn build(self, audience: &str) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
         create_id_token_source(self, audience).await
     }
 }
 
 pub async fn create_id_token_source(
     config: IdTokenSourceConfig,
     audience: &str,
-) -> Result<Box<dyn TokenSource>, error::Error> {
+) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
     if audience.is_empty() {
         return Err(error::Error::ScopeOrAudienceRequired);
     }
@@ -72,7 +72,7 @@ pub(crate) async fn id_token_source_from_credentials(
     custom_claims: &HashMap<String, serde_json::Value>,
     credentials: &CredentialsFile,
     audience: &str,
-) -> Result<Box<dyn TokenSource>, error::Error> {
+) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
     let ts = match credentials.tp.as_str() {
         SERVICE_ACCOUNT_KEY => {
             let mut claims = custom_claims.clone();

foundation/auth/src/project.rs

@@ -9,7 +9,7 @@ use crate::token_source::compute_token_source::ComputeTokenSource;
 use crate::token_source::reuse_token_source::ReuseTokenSource;
 use crate::token_source::service_account_token_source::OAuth2ServiceAccountTokenSource;
 use crate::token_source::service_account_token_source::ServiceAccountTokenSource;
-use crate::token_source::TokenSource;
+use crate::token_source::GoogleCloudTokenSource;
 use crate::{credentials, error};
 
 pub(crate) const SERVICE_ACCOUNT_KEY: &str = "service_account";
@@ -106,7 +106,7 @@ pub async fn project() -> Result<Project, error::Error> {
 pub async fn create_token_source_from_credentials(
     credentials: &CredentialsFile,
     config: &Config<'_>,
-) -> Result<Box<dyn TokenSource>, error::Error> {
+) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
     let ts = credentials_from_json_with_params(credentials, config).await?;
     let token = ts.token().await?;
     Ok(Box::new(ReuseTokenSource::new(ts, token)))
@@ -116,7 +116,7 @@ pub async fn create_token_source_from_credentials(
 pub async fn create_token_source_from_project(
     project: &Project,
     config: Config<'_>,
-) -> Result<Box<dyn TokenSource>, error::Error> {
+) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
     match project {
         Project::FromFile(file) => {
             if config.use_id_token {
@@ -145,15 +145,15 @@ pub async fn create_token_source_from_project(
 /// create_token_source creates the token source
 /// use [DefaultTokenSourceProvider](crate::token::DefaultTokenSourceProvider) or impl [TokenSourceProvider](google_cloud_token::TokenSourceProvider) instead.
 #[deprecated(note = "Use DefaultTokenSourceProvider instead")]
-pub async fn create_token_source(config: Config<'_>) -> Result<Box<dyn TokenSource>, error::Error> {
+pub async fn create_token_source(config: Config<'_>) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
     let project = project().await?;
     create_token_source_from_project(&project, config).await
 }
 
 async fn credentials_from_json_with_params(
     credentials: &CredentialsFile,
     config: &Config<'_>,
-) -> Result<Box<dyn TokenSource>, error::Error> {
+) -> Result<Box<dyn GoogleCloudTokenSource>, error::Error> {
     match credentials.tp.as_str() {
         SERVICE_ACCOUNT_KEY => {
             match config.audience {

foundation/auth/src/token.rs

@@ -3,14 +3,14 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 
-use token_source::{TokenSource, TokenSourceProvider};
+pub use token_source::{TokenSource, TokenSourceProvider};
 
 use crate::credentials::CredentialsFile;
 use crate::error::Error;
 use crate::project::{
     create_token_source_from_credentials, create_token_source_from_project, project, Config, Project,
 };
-use crate::token_source::TokenSource as InternalTokenSource;
+use crate::token_source::GoogleCloudTokenSource as InternalTokenSource;
 
 pub const TOKEN_URL: &str = "https://oauth2.googleapis.com/token";
 

foundation/auth/src/token_source/authorized_user_token_source.rs

@@ -4,7 +4,7 @@ use crate::credentials;
 use crate::error::Error;
 use crate::misc::{UnwrapOrEmpty, EMPTY};
 use crate::token::{Token, TOKEN_URL};
-use crate::token_source::TokenSource;
+use crate::token_source::GoogleCloudTokenSource;
 use crate::token_source::{default_http_client, InternalToken};
 
 #[allow(dead_code)]
@@ -49,7 +49,7 @@ struct RequestBody<'a> {
 }
 
 #[async_trait]
-impl TokenSource for UserAccountTokenSource {
+impl GoogleCloudTokenSource for UserAccountTokenSource {
     async fn token(&self) -> Result<Token, Error> {
         let data = RequestBody {
             client_id: &self.client_id,

foundation/auth/src/token_source/compute_identity_source.rs

@@ -8,7 +8,7 @@ use google_cloud_metadata::{METADATA_FLAVOR_KEY, METADATA_GOOGLE, METADATA_HOST_
 
 use crate::error::Error;
 use crate::token::Token;
-use crate::token_source::{default_http_client, TokenSource};
+use crate::token_source::{default_http_client, GoogleCloudTokenSource};
 
 /// Fetches a JWT token from the metadata server.
 /// using the `identity` endpoint.
@@ -64,7 +64,7 @@ struct ExpClaim {
 }
 
 #[async_trait]
-impl TokenSource for ComputeIdentitySource {
+impl GoogleCloudTokenSource for ComputeIdentitySource {
     async fn token(&self) -> Result<Token, Error> {
         let jwt = self
             .client

foundation/auth/src/token_source/compute_token_source.rs

@@ -6,7 +6,7 @@ use google_cloud_metadata::{METADATA_FLAVOR_KEY, METADATA_GOOGLE, METADATA_HOST_
 use crate::error::Error;
 use crate::token::Token;
 use crate::token_source::InternalToken;
-use crate::token_source::{default_http_client, TokenSource};
+use crate::token_source::{default_http_client, GoogleCloudTokenSource};
 
 #[allow(dead_code)]
 #[derive(Debug)]
@@ -34,7 +34,7 @@ impl ComputeTokenSource {
 }
 
 #[async_trait]
-impl TokenSource for ComputeTokenSource {
+impl GoogleCloudTokenSource for ComputeTokenSource {
     async fn token(&self) -> Result<Token, Error> {
         let it = self
             .client

foundation/auth/src/token_source/impersonate_token_source.rs

@@ -4,11 +4,11 @@ use time::format_description::well_known::Rfc3339;
 
 use crate::error::Error;
 use crate::token::Token;
-use crate::token_source::{default_http_client, TokenSource};
+use crate::token_source::{default_http_client, GoogleCloudTokenSource};
 
 #[derive(Debug)]
 pub struct ImpersonateTokenSource {
-    target: Box<dyn TokenSource>,
+    target: Box<dyn GoogleCloudTokenSource>,
     scopes: Vec<String>,
     delegates: Vec<String>,
     url: String,
@@ -23,7 +23,7 @@ impl ImpersonateTokenSource {
         delegates: Vec<String>,
         scopes: Vec<String>,
         lifetime: Option<i32>,
-        target: Box<dyn TokenSource>,
+        target: Box<dyn GoogleCloudTokenSource>,
     ) -> Self {
         ImpersonateTokenSource {
             target,
@@ -37,7 +37,7 @@ impl ImpersonateTokenSource {
 }
 
 #[async_trait]
-impl TokenSource for ImpersonateTokenSource {
+impl GoogleCloudTokenSource for ImpersonateTokenSource {
     async fn token(&self) -> Result<Token, Error> {
         let body = ImpersonateTokenRequest {
             lifetime: format!("{}s", self.lifetime.unwrap_or(3600)),

foundation/auth/src/token_source/mod.rs

@@ -7,6 +7,7 @@ use serde::Deserialize;
 
 use crate::error::Error;
 use crate::token::Token;
+// pub use token_source::TokenSource;
 
 pub mod authorized_user_token_source;
 pub mod compute_identity_source;
@@ -19,7 +20,7 @@ pub mod service_account_token_source;
 pub mod external_account_source;
 
 #[async_trait]
-pub trait TokenSource: Send + Sync + Debug {
+pub trait GoogleCloudTokenSource: Send + Sync + Debug {
     async fn token(&self) -> Result<Token, Error>;
 }
 
@@ -86,7 +87,7 @@ mod tests {
     use crate::token_source::service_account_token_source::{
         OAuth2ServiceAccountTokenSource, ServiceAccountTokenSource,
     };
-    use crate::token_source::TokenSource;
+    use crate::token_source::GoogleCloudTokenSource;
 
     #[tokio::test]
     async fn test_jwt_token_source() -> Result<(), Error> {

foundation/auth/src/token_source/reuse_token_source.rs

@@ -2,17 +2,17 @@ use async_trait::async_trait;
 
 use crate::error::Error;
 use crate::token::Token;
-use crate::token_source::TokenSource;
+use crate::token_source::GoogleCloudTokenSource;
 
 #[derive(Debug)]
 pub struct ReuseTokenSource {
-    target: Box<dyn TokenSource>,
+    target: Box<dyn GoogleCloudTokenSource>,
     current_token: std::sync::RwLock<Token>,
     guard: tokio::sync::Mutex<()>,
 }
 
 impl ReuseTokenSource {
-    pub(crate) fn new(target: Box<dyn TokenSource>, token: Token) -> ReuseTokenSource {
+    pub(crate) fn new(target: Box<dyn GoogleCloudTokenSource>, token: Token) -> ReuseTokenSource {
         ReuseTokenSource {
             target,
             current_token: std::sync::RwLock::new(token),
@@ -22,7 +22,7 @@ impl ReuseTokenSource {
 }
 
 #[async_trait]
-impl TokenSource for ReuseTokenSource {
+impl GoogleCloudTokenSource for ReuseTokenSource {
     async fn token(&self) -> Result<Token, Error> {
         if let Some(token) = self.r_lock_token() {
             return Ok(token);
@@ -65,14 +65,14 @@ mod test {
     use crate::error::Error;
     use crate::token::Token;
     use crate::token_source::reuse_token_source::ReuseTokenSource;
-    use crate::token_source::TokenSource;
+    use crate::token_source::GoogleCloudTokenSource;
 
     #[derive(Debug)]
     struct EmptyTokenSource {
         pub expiry: OffsetDateTime,
     }
     #[async_trait]
-    impl TokenSource for EmptyTokenSource {
+    impl GoogleCloudTokenSource for EmptyTokenSource {
         async fn token(&self) -> Result<Token, Error> {
             Ok(Token {
                 access_token: "empty".to_string(),

foundation/auth/src/token_source/service_account_token_source.rs

@@ -10,7 +10,7 @@ use crate::credentials;
 use crate::error::{Error, TokenErrorResponse};
 use crate::misc::UnwrapOrEmpty;
 use crate::token::{Token, TOKEN_URL};
-use crate::token_source::{default_http_client, InternalIdToken, InternalToken, TokenSource};
+use crate::token_source::{default_http_client, GoogleCloudTokenSource, InternalIdToken, InternalToken};
 
 #[derive(Clone, Serialize)]
 struct Claims<'a> {
@@ -74,7 +74,7 @@ impl ServiceAccountTokenSource {
 }
 
 #[async_trait]
-impl TokenSource for ServiceAccountTokenSource {
+impl GoogleCloudTokenSource for ServiceAccountTokenSource {
     async fn token(&self) -> Result<Token, Error> {
         let iat = OffsetDateTime::now_utc();
         let exp = iat + time::Duration::hours(1);
@@ -193,7 +193,7 @@ impl OAuth2ServiceAccountTokenSource {
 }
 
 #[async_trait]
-impl TokenSource for OAuth2ServiceAccountTokenSource {
+impl GoogleCloudTokenSource for OAuth2ServiceAccountTokenSource {
     async fn token(&self) -> Result<Token, Error> {
         let iat = OffsetDateTime::now_utc();
         let exp = iat + time::Duration::hours(1);