Merge pull request #355 from nicolas-vivot/feature/externalize-token-source

nicolas-vivot · web-flow · commit d2f37c3e6dc8 · 2025-03-08T10:10:54.000+09:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 resolver = "2"
 members = [
-    "foundation/token",
     "foundation/metadata",
     "foundation/gax",
     "foundation/longrunning",
diff --git a/artifact-registry/Cargo.toml b/artifact-registry/Cargo.toml
@@ -14,7 +14,7 @@ documentation = "https://docs.rs/gcloud-artifact-registry/latest/gcloud_artifact
 doctest = false
 
 [dependencies]
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../foundation/token" }
+token-source = "1.0"
 google-cloud-auth = { package = "gcloud-auth", optional = true, version = "1.0.0", path="../foundation/auth", default-features=false }
 google-cloud-googleapis = { package = "gcloud-googleapis", version="1.0.0", path = "../googleapis", features=["artifact-registry"]}
 google-cloud-gax = { package = "gcloud-gax", version = "1.0.0", path = "../foundation/gax"}
diff --git a/artifact-registry/src/client.rs b/artifact-registry/src/client.rs
@@ -1,6 +1,6 @@
 use crate::grpc::apiv1::artifact_registry_client::Client as ArtifactRegistryGrpcClient;
 use google_cloud_gax::conn::{ConnectionManager, ConnectionOptions, Environment, Error};
-use google_cloud_token::{NopeTokenSourceProvider, TokenSourceProvider};
+use token_source::{NoopTokenSourceProvider, TokenSourceProvider};
 use std::ops::{Deref, DerefMut};
 use std::time::Duration;
 
@@ -53,7 +53,7 @@ impl Default for ClientConfig {
     fn default() -> Self {
         Self {
             artifact_registry_endpoint: ARTIFACT_REGISTRY.to_string(),
-            token_source_provider: Box::new(NopeTokenSourceProvider {}),
+            token_source_provider: Box::new(NoopTokenSourceProvider {}),
             timeout: Some(Duration::from_secs(30)),
             connect_timeout: Some(Duration::from_secs(30)),
         }
diff --git a/bigquery/Cargo.toml b/bigquery/Cargo.toml
@@ -15,7 +15,7 @@ doctest = false
 
 [dependencies]
 async-trait = "0.1"
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../foundation/token" }
+token-source = "1.0"
 google-cloud-googleapis = { package = "gcloud-googleapis", version="1.0.0", path = "../googleapis", features=["bigquery"]}
 google-cloud-gax = { package = "gcloud-gax", version = "1.0.0", path = "../foundation/gax"}
 thiserror = "1.0"
diff --git a/bigquery/src/client.rs b/bigquery/src/client.rs
@@ -5,7 +5,7 @@ use google_cloud_gax::retry::RetrySetting;
 use google_cloud_googleapis::cloud::bigquery::storage::v1::{
     read_session, CreateReadSessionRequest, DataFormat, ReadSession,
 };
-use google_cloud_token::{TokenSource, TokenSourceProvider};
+use token_source::{TokenSource, TokenSourceProvider};
 use std::borrow::Cow;
 use std::collections::VecDeque;
 use std::fmt::Debug;
diff --git a/bigquery/src/http/bigquery_client.rs b/bigquery/src/http/bigquery_client.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use reqwest::Response;
 use reqwest_middleware::{ClientWithMiddleware as Client, RequestBuilder};
 
-use google_cloud_token::TokenSource;
+use token_source::TokenSource;
 
 use crate::http::error::{Error, ErrorWrapper};
 
@@ -102,7 +102,7 @@ pub(crate) mod test {
 
     use google_cloud_auth::project::Config;
     use google_cloud_auth::token::DefaultTokenSourceProvider;
-    use google_cloud_token::TokenSourceProvider;
+    use token_source::TokenSourceProvider;
 
     use crate::http::bigquery_client::{BigqueryClient, SCOPES};
     use crate::http::query;
diff --git a/foundation/auth/Cargo.toml b/foundation/auth/Cargo.toml
@@ -24,7 +24,7 @@ home = "0.5"
 urlencoding = "2.1"
 tokio = { version = "1.32", features = ["fs"] }
 google-cloud-metadata = { package = "gcloud-metadata", version = "1.0.0", path = "../metadata" }
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../token" }
+token-source = "1.0"
 base64 = "0.21"
 time = "0.3"
 
diff --git a/foundation/auth/README.md b/foundation/auth/README.md
@@ -9,7 +9,6 @@ Google Cloud Platform server application authentication library.
 ```toml
 [dependencies]
 google-cloud-auth = { package="gcloud-auth", version="1.0.0" }
-google-cloud-token = { package="gcloud-token", version="1.0.0" }
 ```
 
 ## Quickstart
diff --git a/foundation/auth/src/token.rs b/foundation/auth/src/token.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 
-use google_cloud_token::{TokenSource, TokenSourceProvider};
+use token_source::{TokenSource, TokenSourceProvider};
 
 use crate::credentials::CredentialsFile;
 use crate::error::Error;
diff --git a/foundation/gax/Cargo.toml b/foundation/gax/Cargo.toml
@@ -19,5 +19,5 @@ tonic = { version = "0.12", default-features = false, features = ["prost", "tls-
 thiserror = "1.0"
 tower = { version = "0.4", features = ["filter", "util"] }
 http = "1.1"
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../token" }
+token-source = "1.0"
 tokio-retry2 = "0.5.3"
diff --git a/foundation/gax/src/conn.rs b/foundation/gax/src/conn.rs
@@ -14,7 +14,7 @@ use tower::filter::{AsyncFilter, AsyncFilterLayer, AsyncPredicate};
 use tower::util::Either;
 use tower::{BoxError, ServiceBuilder};
 
-use google_cloud_token::{TokenSource, TokenSourceProvider};
+use token_source::{TokenSource, TokenSourceProvider};
 
 pub type Channel = Either<AsyncFilter<TonicChannel, AsyncAuthInterceptor>, TonicChannel>;
 
diff --git a/foundation/token/Cargo.toml b/foundation/token/Cargo.toml
diff --git a/foundation/token/LICENSE b/foundation/token/LICENSE
diff --git a/foundation/token/README.md b/foundation/token/README.md
diff --git a/foundation/token/src/lib.rs b/foundation/token/src/lib.rs
diff --git a/kms/Cargo.toml b/kms/Cargo.toml
@@ -14,7 +14,7 @@ documentation = "https://docs.rs/gcloud-kms/latest/gcloud_kms/"
 doctest = false
 
 [dependencies]
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../foundation/token" }
+token-source = "1.0"
 google-cloud-auth = { package = "gcloud-auth", optional = true, version = "1.0.0", path="../foundation/auth", default-features=false }
 google-cloud-googleapis = { package = "gcloud-googleapis", version="1.0.0", path = "../googleapis", features=["kms"]}
 google-cloud-gax = { package = "gcloud-gax", version = "1.0.0", path = "../foundation/gax"}
diff --git a/kms/src/client.rs b/kms/src/client.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 pub use google_cloud_auth;
 use google_cloud_gax::conn::{ConnectionOptions, Environment, Error};
 
-use google_cloud_token::{NopeTokenSourceProvider, TokenSourceProvider};
+use token_source::{NoopTokenSourceProvider, TokenSourceProvider};
 
 use crate::grpc::apiv1::conn_pool::{ConnectionManager, KMS, SCOPES};
 use crate::grpc::apiv1::kms_client::Client as KmsGrpcClient;
@@ -51,7 +51,7 @@ impl Default for ClientConfig {
     fn default() -> Self {
         Self {
             endpoint: KMS.to_string(),
-            token_source_provider: Box::new(NopeTokenSourceProvider {}),
+            token_source_provider: Box::new(NoopTokenSourceProvider {}),
             pool_size: Some(1),
             connection_option: ConnectionOptions::default(),
         }
diff --git a/pubsub/Cargo.toml b/pubsub/Cargo.toml
@@ -22,7 +22,7 @@ async-stream = "0.3"
 thiserror = "1.0"
 tokio-util = "0.7"
 
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../foundation/token" }
+token-source = "1.0"
 google-cloud-gax = { package = "gcloud-gax", version = "1.0.0", path = "../foundation/gax" }
 google-cloud-googleapis = { package = "gcloud-googleapis", version = "1.0.0", path = "../googleapis", features = ["pubsub"]}
 
diff --git a/pubsub/src/client.rs b/pubsub/src/client.rs
@@ -6,7 +6,7 @@ use google_cloud_gax::retry::RetrySetting;
 use google_cloud_googleapis::pubsub::v1::{
     DetachSubscriptionRequest, ListSnapshotsRequest, ListSubscriptionsRequest, ListTopicsRequest, Snapshot,
 };
-use google_cloud_token::NopeTokenSourceProvider;
+use token_source::NoopTokenSourceProvider;
 
 use crate::apiv1::conn_pool::{ConnectionManager, PUBSUB};
 use crate::apiv1::publisher_client::PublisherClient;
@@ -37,7 +37,7 @@ impl Default for ClientConfig {
             pool_size: Some(4),
             environment: match emulator {
                 Some(v) => Environment::Emulator(v),
-                None => Environment::GoogleCloud(Box::new(NopeTokenSourceProvider {})),
+                None => Environment::GoogleCloud(Box::new(NoopTokenSourceProvider {})),
             },
             project_id: default_project_id,
             endpoint: PUBSUB.to_string(),
diff --git a/spanner/Cargo.toml b/spanner/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
 tokio-util = "0.7"
 bigdecimal = { version="0.4", features=["serde"] }
 
-google-cloud-token = { package = "gcloud-token", version = "1.0.0", path = "../foundation/token" }
+token-source = "1.0"
 google-cloud-longrunning = { package = "gcloud-longrunning", version = "1.0.0", path = "../foundation/longrunning" }
 google-cloud-gax = { package = "gcloud-gax", version = "1.0.0", path = "../foundation/gax" }
 google-cloud-googleapis = { package = "gcloud-googleapis", version = "1.0.0", path = "../googleapis", features = ["spanner"]}
diff --git a/spanner/src/admin/mod.rs b/spanner/src/admin/mod.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use google_cloud_gax::conn::Environment;
 use google_cloud_gax::grpc::Code;
 use google_cloud_gax::retry::RetrySetting;
-use google_cloud_token::NopeTokenSourceProvider;
+use token_source::NoopTokenSourceProvider;
 
 pub mod client;
 pub mod database;
@@ -25,7 +25,7 @@ impl Default for AdminClientConfig {
         AdminClientConfig {
             environment: match var("SPANNER_EMULATOR_HOST").ok() {
                 Some(v) => Environment::Emulator(v),
-                None => Environment::GoogleCloud(Box::new(NopeTokenSourceProvider {})),
+                None => Environment::GoogleCloud(Box::new(NoopTokenSourceProvider {})),
             },
         }
     }
diff --git a/spanner/src/client.rs b/spanner/src/client.rs
@@ -9,7 +9,7 @@ use google_cloud_gax::conn::{ConnectionOptions, Environment};
 use google_cloud_gax::grpc::{Code, Status};
 use google_cloud_gax::retry::{invoke_fn, TryAs};
 use google_cloud_googleapis::spanner::v1::{commit_request, transaction_options, Mutation, TransactionOptions};
-use google_cloud_token::NopeTokenSourceProvider;
+use token_source::NoopTokenSourceProvider;
 
 use crate::apiv1::conn_pool::{ConnectionManager, SPANNER};
 use crate::retry::TransactionRetrySetting;
@@ -86,7 +86,7 @@ impl Default for ClientConfig {
             endpoint: SPANNER.to_string(),
             environment: match var("SPANNER_EMULATOR_HOST").ok() {
                 Some(v) => Environment::Emulator(v),
-                None => Environment::GoogleCloud(Box::new(NopeTokenSourceProvider {})),
+                None => Environment::GoogleCloud(Box::new(NoopTokenSourceProvider {})),
             },
         };
         config.session_config.min_opened = config.channel_config.num_channels * 4;
diff --git a/storage/Cargo.toml b/storage/Cargo.toml
@@ -18,7 +18,7 @@ anyhow = "1.0"
 base64 = "0.21"
 bytes = "1.5"
 futures-util = "0.3"
-google-cloud-token = {package = "gcloud-token", version = "1.0.0", path = "../foundation/token"}
+token-source = "1.0"
 hex = "0.4"
 once_cell = "1.18"
 percent-encoding = "2.3"
diff --git a/storage/src/client.rs b/storage/src/client.rs
@@ -2,7 +2,7 @@ use std::ops::Deref;
 
 use ring::{rand, signature};
 
-use google_cloud_token::{NopeTokenSourceProvider, TokenSourceProvider};
+use token_source::{NoopTokenSourceProvider, TokenSourceProvider};
 
 use crate::http::service_account_client::ServiceAccountClient;
 use crate::http::storage_client::StorageClient;
@@ -54,7 +54,7 @@ impl Default for ClientConfig {
         Self {
             http: None,
             storage_endpoint: "https://storage.googleapis.com".to_string(),
-            token_source_provider: Some(Box::new(NopeTokenSourceProvider {})),
+            token_source_provider: Some(Box::new(NoopTokenSourceProvider {})),
             service_account_endpoint: "https://iamcredentials.googleapis.com".to_string(),
             default_google_access_id: None,
             default_sign_by: None,
diff --git a/storage/src/http/service_account_client.rs b/storage/src/http/service_account_client.rs
@@ -1,4 +1,4 @@
-use google_cloud_token::TokenSource;
+use token_source::TokenSource;
 use reqwest::Response;
 use std::sync::Arc;
 
@@ -80,7 +80,7 @@ mod test {
 
     use google_cloud_auth::project::Config;
     use google_cloud_auth::token::DefaultTokenSourceProvider;
-    use google_cloud_token::TokenSourceProvider;
+    use token_source::TokenSourceProvider;
 
     use crate::http::service_account_client::ServiceAccountClient;
 
diff --git a/storage/src/http/storage_client.rs b/storage/src/http/storage_client.rs
@@ -5,7 +5,7 @@ use reqwest::header::{HeaderValue, CONTENT_LENGTH, LOCATION};
 use reqwest::{Body, Request};
 use reqwest_middleware::RequestBuilder;
 
-use google_cloud_token::TokenSource;
+use token_source::TokenSource;
 
 use crate::http::bucket_access_controls::delete::DeleteBucketAccessControlRequest;
 use crate::http::bucket_access_controls::get::GetBucketAccessControlRequest;
@@ -1380,7 +1380,7 @@ pub(crate) mod test {
 
     use google_cloud_auth::project::Config;
     use google_cloud_auth::token::DefaultTokenSourceProvider;
-    use google_cloud_token::TokenSourceProvider;
+    use token_source::TokenSourceProvider;
 
     use crate::http::bucket_access_controls::delete::DeleteBucketAccessControlRequest;
     use crate::http::bucket_access_controls::get::GetBucketAccessControlRequest;
