-
Notifications
You must be signed in to change notification settings - Fork 194
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fully qualify types from models For a long time, we've been fully qualifying depdency types but not model types. This produces code that's fine, but it's always been a confusing inconsistency and it posed problems trying to render Opaque types that specified namespaces (because the namespace was ignored). This removes that inconsistency. * A few more small refactorings * Fix test failures * Wip fluent API * Fluent builders working! * fix handle visibility * Delete unused imports * Lots of refactorings & making the fluent client an optional feature * Cleanup module handling & add support for Cargo features * Fix AWS tests * Remove unused modules customization * Set optional in the Cargo toml * .execute() -> .send() * Fix issues from refactoring out cargo features implementation
- Loading branch information
Showing
7 changed files
with
184 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/FluentClientGenerator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0. | ||
| */ | ||
|
|
||
| package software.amazon.smithy.rustsdk | ||
|
|
||
| import software.amazon.smithy.model.knowledge.TopDownIndex | ||
| import software.amazon.smithy.model.shapes.MemberShape | ||
| import software.amazon.smithy.rust.codegen.rustlang.Attribute | ||
| import software.amazon.smithy.rust.codegen.rustlang.CargoDependency | ||
| import software.amazon.smithy.rust.codegen.rustlang.Feature | ||
| import software.amazon.smithy.rust.codegen.rustlang.RustMetadata | ||
| import software.amazon.smithy.rust.codegen.rustlang.RustModule | ||
| import software.amazon.smithy.rust.codegen.rustlang.RustType | ||
| import software.amazon.smithy.rust.codegen.rustlang.RustWriter | ||
| import software.amazon.smithy.rust.codegen.rustlang.asType | ||
| import software.amazon.smithy.rust.codegen.rustlang.documentShape | ||
| import software.amazon.smithy.rust.codegen.rustlang.render | ||
| import software.amazon.smithy.rust.codegen.rustlang.rust | ||
| import software.amazon.smithy.rust.codegen.rustlang.rustBlock | ||
| import software.amazon.smithy.rust.codegen.rustlang.rustTemplate | ||
| import software.amazon.smithy.rust.codegen.rustlang.stripOuter | ||
| import software.amazon.smithy.rust.codegen.smithy.RustCrate | ||
| import software.amazon.smithy.rust.codegen.smithy.customize.RustCodegenDecorator | ||
| import software.amazon.smithy.rust.codegen.smithy.generators.ProtocolConfig | ||
| import software.amazon.smithy.rust.codegen.smithy.generators.builderSymbol | ||
| import software.amazon.smithy.rust.codegen.smithy.generators.errorSymbol | ||
| import software.amazon.smithy.rust.codegen.smithy.rustType | ||
| import software.amazon.smithy.rust.codegen.util.inputShape | ||
| import software.amazon.smithy.rust.codegen.util.outputShape | ||
| import software.amazon.smithy.rust.codegen.util.toSnakeCase | ||
|
|
||
| class FluentClientDecorator : RustCodegenDecorator { | ||
| override val name: String = "FluentClient" | ||
| override val order: Byte = 0 | ||
|
|
||
| override fun extras(protocolConfig: ProtocolConfig, rustCrate: RustCrate) { | ||
| val module = RustMetadata(additionalAttributes = listOf(Attribute.Cfg.feature("fluent")), public = true) | ||
| rustCrate.withModule(RustModule("fluent", module)) { writer -> | ||
| FluentClientGenerator(protocolConfig).render(writer) | ||
| } | ||
| rustCrate.addFeature(Feature("fluent", true, listOf(protocolConfig.runtimeConfig.awsHyper().name))) | ||
| } | ||
| } | ||
|
|
||
| class FluentClientGenerator(protocolConfig: ProtocolConfig) { | ||
| private val serviceShape = protocolConfig.serviceShape | ||
| private val operations = | ||
| TopDownIndex.of(protocolConfig.model).getContainedOperations(serviceShape).sortedBy { it.id } | ||
| private val symbolProvider = protocolConfig.symbolProvider | ||
| private val model = protocolConfig.model | ||
| private val hyperDep = protocolConfig.runtimeConfig.awsHyper().copy(optional = true) | ||
| private val runtimeConfig = protocolConfig.runtimeConfig | ||
|
|
||
| fun render(writer: RustWriter) { | ||
| writer.rustTemplate( | ||
| """ | ||
| pub(crate) struct Handle { | ||
| client: #{aws_hyper}::Client<#{aws_hyper}::conn::Standard>, | ||
| conf: crate::Config | ||
| } | ||
| pub struct Client { | ||
| handle: std::sync::Arc<Handle> | ||
| } | ||
| """, | ||
| "aws_hyper" to hyperDep.asType() | ||
| ) | ||
| writer.rustBlock("impl Client") { | ||
| rustTemplate( | ||
| """ | ||
| pub fn from_env() -> Self { | ||
| Self::from_conf_conn(crate::Config::builder().build(), #{aws_hyper}::conn::Standard::https()) | ||
| } | ||
| pub fn from_conf_conn(conf: crate::Config, conn: #{aws_hyper}::conn::Standard) -> Self { | ||
| let client = #{aws_hyper}::Client::new(conn); | ||
| Self { handle: std::sync::Arc::new(Handle { conf, client })} | ||
| } | ||
| """, | ||
| "aws_hyper" to hyperDep.asType() | ||
| ) | ||
| operations.forEach { operation -> | ||
| val name = symbolProvider.toSymbol(operation).name | ||
| rust( | ||
| """ | ||
| pub fn ${name.toSnakeCase()}(&self) -> fluent_builders::$name { | ||
| fluent_builders::$name::new(self.handle.clone()) | ||
| }""" | ||
| ) | ||
| } | ||
| } | ||
| writer.withModule("fluent_builders") { | ||
| operations.forEach { operation -> | ||
| val name = symbolProvider.toSymbol(operation).name | ||
| val input = operation.inputShape(model) | ||
| val members: List<MemberShape> = input.allMembers.values.toList() | ||
|
|
||
| rust( | ||
| """ | ||
| pub struct $name { | ||
| handle: std::sync::Arc<super::Handle>, | ||
| inner: #T | ||
| }""", | ||
| input.builderSymbol(symbolProvider) | ||
| ) | ||
|
|
||
| rustBlock("impl $name") { | ||
| rustTemplate( | ||
| """ | ||
| pub(crate) fn new(handle: std::sync::Arc<super::Handle>) -> Self { | ||
| Self { handle, inner: Default::default() } | ||
| } | ||
| pub async fn send(self) -> Result<#{ok}, #{sdk_err}<#{operation_err}>> { | ||
| let op = self.inner.build(&self.handle.conf); | ||
| self.handle.client.call(op).await | ||
| } | ||
| """, | ||
| "ok" to symbolProvider.toSymbol(operation.outputShape(model)), | ||
| "operation_err" to operation.errorSymbol(symbolProvider), | ||
| "sdk_err" to CargoDependency.SmithyHttp(runtimeConfig).asType().copy(name = "result::SdkError") | ||
| ) | ||
| members.forEach { member -> | ||
| val memberName = symbolProvider.toMemberName(member) | ||
| // All fields in the builder are optional | ||
| val memberSymbol = symbolProvider.toSymbol(member) | ||
| val outerType = memberSymbol.rustType() | ||
| val coreType = outerType.stripOuter<RustType.Option>() | ||
| val signature = when (coreType) { | ||
| is RustType.String, | ||
| is RustType.Box -> "(mut self, inp: impl Into<${coreType.render(true)}>) -> Self" | ||
| else -> "(mut self, inp: ${coreType.render(true)}) -> Self" | ||
| } | ||
| documentShape(member, model) | ||
| rustBlock("pub fn $memberName$signature") { | ||
| write("self.inner = self.inner.$memberName(inp);") | ||
| write("self") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters