File tree Expand file tree Collapse file tree 3 files changed +59
-13
lines changed
AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands
codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen Expand file tree Collapse file tree 3 files changed +59
-13
lines changed Original file line number Diff line number Diff line change @@ -81,16 +81,16 @@ struct PrepareRelease {
8181 try FileManager . default. changeWorkingDirectory ( repoPath)
8282
8383 let previousVersion = try getPreviousVersion ( )
84- // guard try repoHasChanges(previousVersion) else {
85- // /// If repo has no changes, create an empty release-manifest.json file.
86- // /// Empty manifest file makes GitHubReleasePublisher be no-op.
87- // /// The manifest file is required regardless of whether there should
88- // /// be a release or not.
89- // try createEmptyReleaseManifest()
90- // /// Return without creating new commit or tag in local repos.
91- // /// This makes GitPublisher be no-op.
92- // return
93- // }
84+ guard try repoHasChanges ( previousVersion) else {
85+ /// If repo has no changes, create an empty release-manifest.json file.
86+ /// Empty manifest file makes GitHubReleasePublisher be no-op.
87+ /// The manifest file is required regardless of whether there should
88+ /// be a release or not.
89+ try createEmptyReleaseManifest ( )
90+ /// Return without creating new commit or tag in local repos.
91+ /// This makes GitPublisher be no-op.
92+ return
93+ }
9494 let newVersion = try createNewVersion ( previousVersion)
9595
9696 try stageFiles ( )
Original file line number Diff line number Diff line change @@ -13,11 +13,11 @@ class AWSSmokeTestGenerator(
1313 // Filter out tests by name or tag at codegen time.
1414 // Each element must have the prefix "<service-name>:" before the test name or tag name.
1515 // E.g., "AWSS3:GetObjectTest" or "AWSS3:BucketTests"
16- override val testIdsToIgnore = setOf<String >(
16+ override val smokeTestIdsToIgnore = setOf<String >(
1717 // Add smoke test name to ignore here:
1818 // E.g., "AWSACM:GetCertificateFailure",
1919 )
20- override val testTagsToIgnore = setOf<String >(
20+ override val smokeTestTagsToIgnore = setOf<String >(
2121 // Add smoke test tag to ignore here:
2222 // E.g., "AWSACM:TagToIgnore",
2323 )
@@ -27,7 +27,7 @@ class AWSSmokeTestGenerator(
2727 }
2828
2929 override fun getClientName (): String {
30- return ctx.service.getTrait(ServiceTrait ::class .java).get().sdkId.toUpperCamelCase() + " Client"
30+ return ctx.service.getTrait(ServiceTrait ::class .java).get().sdkId.toUpperCamelCase().removeSuffix( " Service " ) + " Client"
3131 }
3232
3333 override fun renderCustomFilePrivateVariables (writer : SwiftWriter ) {
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+
3+ # This is a convenience script for developers for running every smoke test under SmokeTests/.
4+ # The script must be run from aws-sdk-swift/, the directory containing SmokeTests/.
5+
6+ # cd into test module dir
7+ cd SmokeTests/ || { echo " ERROR: Failed to change directory to SmokeTests." ; exit 1; }
8+
9+ # Build and discard output for clean log
10+ echo " INFO: Building SmokeTests module..."
11+ swift build > /dev/null 2>&1
12+
13+ # Header print helpers
14+ print_header () {
15+ print_spacer
16+ local header=$1
17+ echo " ##### $header #####"
18+ print_spacer
19+ }
20+
21+ print_spacer () {
22+ echo " "
23+ }
24+
25+ # Build and run each and every test runner; save result to results array
26+ print_header " TEST RUNS"
27+ results=()
28+ for runnerName in ./* ; do
29+ if [ -d " $runnerName " ]; then
30+ swift run " ${runnerName# ./ } "
31+ if [ $? -eq 0 ]; then
32+ # Record success
33+ results+=(" SUCCESS: ${runnerName# ./ } " )
34+ else
35+ # record failure
36+ results+=(" FAILURE: ${runnerName# ./ } " )
37+ fi
38+ print_spacer
39+ fi
40+ done
41+
42+ # Print result summary
43+ print_header " TEST RESULT SUMMARY"
44+ for result in " ${results[@]} " ; do
45+ echo " $result "
46+ done
You can’t perform that action at this time.
0 commit comments