Unverified Commit 27acbc6d authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Upgrade Smithy (#1330) 

* Upgrade to Smithy 1.16.2

* Remove extra test fixed in Smithy 1.16.2

* Upgrade to Smithy 1.16.3

* Remove extra test fixed in Smithy 1.16.3

* Remove failing expectation from server tests

* Upgrade to Smithy 1.17.0

* Upgrade to Smithy 1.18.1

* Upgrade to Smithy 1.19.0

* Upgrade to Smithy 1.21.0

* Update changelog

* Fix Gradle repositories
parent 2931c9e1

CHANGELOG.next.toml

+6 −0
Original line number Diff line number Diff line
@@ -22,3 +22,9 @@ message = "Bump [MSRV](https://github.com/awslabs/aws-sdk-rust#supported-rust-ve 
references = ["smithy-rs#1318"]

meta = { "breaking" = true, "tada" = false, "bug" = false }

author = "Velfi"



[[smithy-rs]]

message = "Upgrade to Smithy 1.21.0"

references = ["smithy-rs#1330"]

meta = { "breaking" = false, "tada" = false, "bug" = false }

author = "jdisanti"

aws/sdk-codegen/build.gradle.kts

+1 −5
Original line number Diff line number Diff line
@@ -108,9 +108,5 @@ publishing { 
            artifact(sourcesJar)

        }

    }

    repositories {

        maven {

            url = uri("$buildDir/repository")

        }

    }

    repositories { maven { url = uri("$buildDir/repository") } }

}

build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */

buildscript {

    repositories {

        mavenCentral()

        google()

    }

buildSrc/build.gradle.kts

+2 −7
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ plugins { 
    jacoco

}

repositories {

    maven("https://plugins.gradle.org/m2")

    mavenCentral()

    google()

}



// Load properties manually to avoid hard coding smithy version
@@ -21,12 +22,6 @@ val props = Properties().apply { 


val smithyVersion = props["smithyVersion"]



buildscript {

    repositories {

        mavenCentral()

    }

}



dependencies {

    api("software.amazon.smithy:smithy-codegen-core:$smithyVersion")

    implementation("software.amazon.smithy:smithy-utils:$smithyVersion")

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt

+5 −2
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ class ServerProtocolTestGenerator( 
                // corresponding Unicode code point. That is the "form feed" 0x0c character. When printing it,

                // it gets written as "\f", which is an invalid Rust escape sequence: https://static.rust-lang.org/doc/master/reference.html#literals

                // So we need to write the corresponding Rust Unicode escape sequence to make the program compile.

                "#{SmithyHttpServer}::body::Body::from(#{Bytes}::from_static(b${body.replace("\u000c", "\\u{000c}").dq()}))"

                "#{SmithyHttpServer}::body::Body::from(#{Bytes}::from_static(${body.replace("\u000c", "\\u{000c}").dq()}.as_bytes()))"

            } else {

                "#{SmithyHttpServer}::body::Body::empty()"

            }
@@ -652,13 +652,13 @@ class ServerProtocolTestGenerator( 
        private val ExpectFail = setOf<FailingTest>(

            // Headers.

            FailingTest(RestJson, "RestJsonHttpWithHeadersButNoPayload", TestType.Request),

            FailingTest(RestJson, "RestJsonInputAndOutputWithQuotedStringHeaders", TestType.Response),



            FailingTest(RestJson, "RestJsonEndpointTrait", TestType.Request),

            FailingTest(RestJson, "RestJsonEndpointTraitWithHostLabel", TestType.Request),

            FailingTest(RestJson, "RestJsonStreamingTraitsRequireLengthWithBlob", TestType.Response),

            FailingTest(RestJson, "RestJsonHttpWithEmptyBlobPayload", TestType.Request),

            FailingTest(RestJson, "RestJsonHttpWithEmptyStructurePayload", TestType.Request),

            FailingTest(RestJson, "RestJsonHttpResponseCodeDefaultsToModeledCode", TestType.Response),



            FailingTest(RestJson, "RestJsonWithBodyExpectsApplicationJsonAccept", TestType.MalformedRequest),

            FailingTest(RestJson, "RestJsonWithPayloadExpectsImpliedAccept", TestType.MalformedRequest),
@@ -708,6 +708,7 @@ class ServerProtocolTestGenerator( 
            FailingTest(RestJson, "RestJsonPathTimestampDefaultRejectsUTCOffsets", TestType.MalformedRequest),

            FailingTest(RestJson, "RestJsonQueryTimestampDefaultRejectsDifferent8601Formats_case13", TestType.MalformedRequest),

            FailingTest(RestJson, "RestJsonMalformedUnionNoFieldsSet", TestType.MalformedRequest),

            FailingTest(RestJson, "RestJsonMalformedSetDuplicateBlobs", TestType.MalformedRequest),



            FailingTest(RestJsonValidation, "RestJsonMalformedEnumList_case0", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedEnumList_case1", TestType.MalformedRequest),
@@ -727,6 +728,7 @@ class ServerProtocolTestGenerator( 
            FailingTest(RestJsonValidation, "RestJsonMalformedLengthMapOverride_case1", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthStringOverride_case0", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthStringOverride_case1", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthStringOverride_case2", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthBlob_case0", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthBlob_case1", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthList_case0", TestType.MalformedRequest),
@@ -741,6 +743,7 @@ class ServerProtocolTestGenerator( 
            FailingTest(RestJsonValidation, "RestJsonMalformedLengthMapValue_case1", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthString_case0", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthString_case1", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedLengthString_case2", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedPatternListOverride_case0", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedPatternListOverride_case1", TestType.MalformedRequest),

            FailingTest(RestJsonValidation, "RestJsonMalformedPatternMapKeyOverride_case0", TestType.MalformedRequest),