Skip to content

Commit f730c9a

Browse files
Merge branch 'main' into zhessler/request-compression
2 parents 5a9a26b + 68933b7 commit f730c9a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ Project Layout
3030
* `aws`: AWS specific codegen & Rust code (signing, endpoints, customizations, etc.)
3131
Common commands:
3232
* `./gradlew :aws:sdk:assemble`: Generate (but do not test / compile etc.) a fresh SDK into `sdk/build/aws-sdk`
33-
* `./gradlew :aws:sdk:test`: Generate & run all tests for a fresh SDK
33+
* `./gradlew :aws:sdk:sdkTest`: Generate & run all tests for a fresh SDK. (Note that these tests require Go to be
34+
installed for FIP support to compile properly)
3435
* `./gradlew :aws:sdk:{cargoCheck, cargoTest, cargoDocs, cargoClippy}`: Generate & run specified cargo command.
3536
* `codegen-core`: Common code generation logic useful for clients and servers
3637
* `codegen-client`: Whitelabel Smithy client code generation
@@ -123,7 +124,7 @@ to generate more or less AWS service clients.
123124
# Generate an SDK, but do not attempt to compile / run tests. Useful for inspecting generated code
124125
./gradlew :aws:sdk:assemble
125126
# Run all the tests
126-
./gradlew :aws:sdk:test
127+
./gradlew :aws:sdk:sdkTest
127128
# Validate that the generated code compiles
128129
./gradlew :aws:sdk:cargoCheck
129130
# Validate that the generated code passes Clippy

aws/sdk/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,12 @@ tasks["assemble"].apply {
445445
project.registerCargoCommandsTasks(outputDir.asFile, defaultRustDocFlags)
446446
project.registerGenerateCargoConfigTomlTask(outputDir.asFile)
447447

448-
tasks["test"].dependsOn("assemble")
449-
tasks["test"].finalizedBy(Cargo.CLIPPY.toString, Cargo.TEST.toString, Cargo.DOCS.toString)
448+
//The task name "test" is already registered by one of our plugins
449+
tasks.register("sdkTest") {
450+
description = "Run Cargo clippy/test/docs against the generated SDK."
451+
dependsOn("assemble")
452+
finalizedBy(Cargo.CLIPPY.toString, Cargo.TEST.toString, Cargo.DOCS.toString)
453+
}
450454

451455
tasks.register<Delete>("deleteSdk") {
452456
delete(

0 commit comments

Comments
 (0)