Add setting content-length middleware into operation stack (aws#634)

Adds the ContentLengthMiddleware to the operation's stack, and updates generated clients and protocol tests to use the content-length check. Depends on: * aws/smithy-go#108 * smithy-lang/smithy#491
skmcgrail · Aug 21, 2020 · 37a8ed7 · 37a8ed7
1 parent 1b93007
commit 37a8ed7
Show file tree

Hide file tree

Showing 204 changed files with 4,115 additions and 3,629 deletions.
diff --git a/...-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java b/...-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import software.amazon.smithy.aws.traits.auth.SigV4Trait;
 import software.amazon.smithy.aws.traits.auth.UnsignedPayloadTrait;
+import software.amazon.smithy.go.codegen.SmithyGoDependency;
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
 import software.amazon.smithy.go.codegen.integration.MiddlewareRegistrar;
@@ -43,6 +44,16 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                         )
                         .build(),
 
+                // Add ContentLengthMiddleware to operation stack
+                RuntimeClientPlugin.builder()
+                        .registerMiddleware(MiddlewareRegistrar.builder()
+                                .resolvedFunction(SymbolUtils.createValueSymbolBuilder(
+                                        "AddContentLengthMiddleware", SmithyGoDependency.SMITHY_HTTP_TRANSPORT)
+                                        .build())
+                                .build()
+                        )
+                        .build(),
+
                 // Add endpoint serialize middleware to operation stack
                 RuntimeClientPlugin.builder()
                         .registerMiddleware(MiddlewareRegistrar.builder()

diff --git a/...-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java b/...-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java
@@ -76,7 +76,6 @@ static void generateHttpProtocolTests(GenerationContext context) {
                             writer.addUseImports(SmithyGoDependency.SMITHY_MIDDLEWARE);
                             writer.openBlock("[]APIOptionFunc{", "},", () -> {
                                 writer.openBlock("func(s *middleware.Stack) error {", "},", () -> {
-                                    writer.write("s.Build.Clear()");
                                     writer.write("s.Finalize.Clear()");
                                     writer.write("return nil");
                                 });

diff --git a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go
diff --git a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes_test.go b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go
diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString_test.go b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go
diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString_test.go b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go
diff --git a/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput_test.go b/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go b/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go
diff --git a/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors_test.go b/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType_test.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits_test.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure_test.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders_test.go b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go