Rename make_token to idempotency_token_provider

This commit addresses #2762 (comment)
smithy-lang · Jun 16, 2023 · 6a9a580 · 6a9a580
1 parent 6b9faa1
commit 6a9a580
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/aws/sdk/integration-tests/timestreamquery/tests/endpoint_disco.rs b/aws/sdk/integration-tests/timestreamquery/tests/endpoint_disco.rs
@@ -29,7 +29,7 @@ async fn do_endpoint_discovery() {
         .time_source(SharedTimeSource::new(ts.clone()))
         .build();
     let conf = query::config::Builder::from(&config)
-        .make_token("0000-0000-0000")
+        .idempotency_token_provider("0000-0000-0000")
         .build();
     let (client, reloader) = query::Client::from_conf(conf)
         .enable_endpoint_discovery()

diff --git a/...ware/amazon/smithy/rust/codegen/client/smithy/customizations/IdempotencyTokenGenerator.kt b/...ware/amazon/smithy/rust/codegen/client/smithy/customizations/IdempotencyTokenGenerator.kt
@@ -32,7 +32,7 @@ class IdempotencyTokenGenerator(codegenContext: CodegenContext, operationShape:
                 rustTemplate(
                     """
                     if ${section.input}.$memberName.is_none() {
-                        ${section.input}.$memberName = #{Some}(${section.config}.make_token.make_idempotency_token());
+                        ${section.input}.$memberName = #{Some}(${section.config}.idempotency_token_provider.make_idempotency_token());
                     }
                     """,
                     *preludeScope,

diff --git a/...thy/rust/codegen/client/smithy/generators/config/IdempotencyTokenProviderCustomization.kt b/...thy/rust/codegen/client/smithy/generators/config/IdempotencyTokenProviderCustomization.kt
@@ -15,7 +15,7 @@ import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType.Companion.pre
 import software.amazon.smithy.rust.codegen.core.smithy.customize.NamedCustomization
 
 /**
- * Add a `make_token` field to Service config. See below for the resulting generated code.
+ * Add an `idempotency_token_provider` field to Service config.
  */
 class IdempotencyTokenProviderCustomization(codegenContext: ClientCodegenContext) : NamedCustomization<ServiceConfig>() {
     private val runtimeConfig = codegenContext.runtimeConfig
@@ -30,7 +30,7 @@ class IdempotencyTokenProviderCustomization(codegenContext: ClientCodegenContext
         return when (section) {
             is ServiceConfig.ConfigStruct -> writable {
                 if (runtimeMode.defaultToMiddleware) {
-                    rustTemplate("pub (crate) make_token: #{IdempotencyTokenProvider},", *codegenScope)
+                    rustTemplate("pub (crate) idempotency_token_provider: #{IdempotencyTokenProvider},", *codegenScope)
                 }
             }
 
@@ -41,7 +41,7 @@ class IdempotencyTokenProviderCustomization(codegenContext: ClientCodegenContext
                         /// Returns a copy of the idempotency token provider.
                         /// If a random token provider was configured,
                         /// a newly-randomized token provider will be returned.
-                        pub fn make_token(&self) -> #{IdempotencyTokenProvider} {
+                        pub fn idempotency_token_provider(&self) -> #{IdempotencyTokenProvider} {
                             self.inner.load::<#{IdempotencyTokenProvider}>().expect("the idempotency provider should be set").clone()
                         }
                         """,
@@ -53,8 +53,8 @@ class IdempotencyTokenProviderCustomization(codegenContext: ClientCodegenContext
                         /// Returns a copy of the idempotency token provider.
                         /// If a random token provider was configured,
                         /// a newly-randomized token provider will be returned.
-                        pub fn make_token(&self) -> #{IdempotencyTokenProvider} {
-                            self.make_token.clone()
+                        pub fn idempotency_token_provider(&self) -> #{IdempotencyTokenProvider} {
+                            self.idempotency_token_provider.clone()
                         }
                         """,
                         *codegenScope,
@@ -63,21 +63,21 @@ class IdempotencyTokenProviderCustomization(codegenContext: ClientCodegenContext
             }
 
             ServiceConfig.BuilderStruct -> writable {
-                rustTemplate("make_token: #{Option}<#{IdempotencyTokenProvider}>,", *codegenScope)
+                rustTemplate("idempotency_token_provider: #{Option}<#{IdempotencyTokenProvider}>,", *codegenScope)
             }
 
             ServiceConfig.BuilderImpl -> writable {
                 rustTemplate(
                     """
                     /// Sets the idempotency token provider to use for service calls that require tokens.
-                    pub fn make_token(mut self, make_token: impl #{Into}<#{IdempotencyTokenProvider}>) -> Self {
-                        self.set_make_token(#{Some}(make_token.into()));
+                    pub fn idempotency_token_provider(mut self, idempotency_token_provider: impl #{Into}<#{IdempotencyTokenProvider}>) -> Self {
+                        self.set_idempotency_token_provider(#{Some}(idempotency_token_provider.into()));
                         self
                     }
 
                     /// Sets the idempotency token provider to use for service calls that require tokens.
-                    pub fn set_make_token(&mut self, make_token: #{Option}<#{IdempotencyTokenProvider}>) -> &mut Self {
-                        self.make_token = make_token;
+                    pub fn set_idempotency_token_provider(&mut self, idempotency_token_provider: #{Option}<#{IdempotencyTokenProvider}>) -> &mut Self {
+                        self.idempotency_token_provider = idempotency_token_provider;
                         self
                     }
                     """,
@@ -88,19 +88,19 @@ class IdempotencyTokenProviderCustomization(codegenContext: ClientCodegenContext
             ServiceConfig.BuilderBuild -> writable {
                 if (runtimeMode.defaultToOrchestrator) {
                     rustTemplate(
-                        "layer.store_put(self.make_token.unwrap_or_else(#{default_provider}));",
+                        "layer.store_put(self.idempotency_token_provider.unwrap_or_else(#{default_provider}));",
                         *codegenScope,
                     )
                 } else {
                     rustTemplate(
-                        "make_token: self.make_token.unwrap_or_else(#{default_provider}),",
+                        "idempotency_token_provider: self.idempotency_token_provider.unwrap_or_else(#{default_provider}),",
                         *codegenScope,
                     )
                 }
             }
 
             is ServiceConfig.DefaultForTests -> writable {
-                rust("""${section.configBuilderRef}.set_make_token(Some("00000000-0000-4000-8000-000000000000".into()));""")
+                rust("""${section.configBuilderRef}.set_idempotency_token_provider(Some("00000000-0000-4000-8000-000000000000".into()));""")
             }
 
             else -> writable { }