Skip to content

Set Content-Length when the request body is set instead of via middleware #3513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tongs2000 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Set Content-Length when the request body is set instead of via middleware #3513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a87b431
Stop registering the ComputeContentLength middleware in codegen
Tongs2000 Aug 12, 2026
e3bba75
Regenerated clients
Tongs2000 Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 8 additions & 6 deletions aws/signer/v4/middleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,19 +435,21 @@ func (nonSeeker) Read(p []byte) (n int, err error) {
return 0, io.EOF
}

// semiSeekable is a stream whose seeks succeed until its body has been read,
// then fail, to exercise a rewind failure while computing the payload hash.
type semiSeekable struct {
hasSeeked bool
read bool
}

func (s *semiSeekable) Seek(offset int64, whence int) (int64, error) {
if !s.hasSeeked {
s.hasSeeked = true
return 0, nil
if s.read {
return 0, fmt.Errorf("io seek error")
}
return 0, fmt.Errorf("io seek error")
return 0, nil
}

func (*semiSeekable) Read(p []byte) (n int, err error) {
func (s *semiSeekable) Read(p []byte) (n int, err error) {
s.read = true
return 0, io.EOF
}

Expand Down
18 changes: 2 additions & 16 deletions ...-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@ public List<RuntimeClientPlugin> getClientPlugins() {
.isCommon(true)
.build(),

// Add ContentLengthMiddleware to operation stack
RuntimeClientPlugin.builder()
.operationPredicate((model, service, operation) ->
EventStreamIndex.of(model).getInputInfo(operation).isEmpty())
.registerMiddleware(
MiddlewareRegistrar.builder()
.resolvedFunction(buildPackageSymbol("addComputeContentLength"))
.build()
).build(),

// Add endpoint serialize middleware to operation stack
RuntimeClientPlugin.builder()
.registerMiddleware(MiddlewareRegistrar.builder()
Expand Down Expand Up @@ -274,15 +264,11 @@ public Writable getFuncBody() {

private Writable addMiddleware() {
return goTemplate("""
$D $D $D
$D $D
func addClientRequestID(stack *middleware.Stack) error {
return stack.Build.Add(&awsmiddleware.ClientRequestID{}, middleware.After)
}

func addComputeContentLength(stack *middleware.Stack) error {
return stack.Build.Insert(&smithyhttp.ComputeContentLength{}, "ClientRequestID", middleware.After)
}

func addRawResponseToMetadata(stack *middleware.Stack) error {
return stack.Deserialize.Add(&awsmiddleware.AddRawResponse{}, middleware.Before)
}
Expand All @@ -296,7 +282,7 @@ func addRecordResponseTiming(stack *middleware.Stack, options Options) error {
func addSpanRetryLoop(stack *middleware.Stack, options Options) error {
return stack.Finalize.Insert(&spanRetryLoop{options: options}, "Retry", middleware.Before)
}
""", SmithyGoDependency.SMITHY_MIDDLEWARE, AwsGoDependency.AWS_MIDDLEWARE, SmithyGoDependency.SMITHY_HTTP_TRANSPORT);
""", SmithyGoDependency.SMITHY_MIDDLEWARE, AwsGoDependency.AWS_MIDDLEWARE);
}

private Writable addSigV4XMiddleware() {
Expand Down
4 changes: 0 additions & 4 deletions internal/kitchensinktest/api_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktest/api_op_GetItem.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktest/api_op_PutCompressedData.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktest/api_op_SubscribeEvents.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions internal/kitchensinktest/response_snapshot/ItemNotFound.error.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
400
Content-Type: application/x-amz-json-1.0
X-Amz-Target: AwsJson1KitchenSink.GetItem
X-Amzn-Errortype: ItemNotFound

{}
{"__type":"ItemNotFound"}
1 change: 0 additions & 1 deletion internal/kitchensinktest/snapshot/api_op_GetItem.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ GetItem
OperationSerializer
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktest/snapshot/api_op_PutCompressedData.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ PutCompressedData
RequestCompression
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktest/snapshot/api_op_SubscribeEvents.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ SubscribeEvents
Build stack step
EventStreamBuildMiddleware
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
4 changes: 0 additions & 4 deletions internal/kitchensinktestcbor/api_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestcbor/api_op_CborGetItem.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestcbor/api_op_CborPutCompressedData.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/kitchensinktestcbor/response_snapshot/CborItemNotFound.error.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Accept: application/cbor
Content-Type: application/cbor
Smithy-Protocol: rpc-v2-cbor

¡f__typepCborItemNotFound
¿f__typepCborItemNotFoundÿ
1 change: 0 additions & 1 deletion internal/kitchensinktestcbor/snapshot/api_op_CborGetItem.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ CborGetItem
OperationSerializer
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktestcbor/snapshot/api_op_CborPutCompressedData.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ CborPutCompressedData
RequestCompression
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
4 changes: 0 additions & 4 deletions internal/kitchensinktestcborlegacy/api_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestcborlegacy/api_op_CborGetItem.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestcborlegacy/api_op_CborPutCompressedData.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion internal/kitchensinktestcborlegacy/snapshot/api_op_CborGetItem.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ CborGetItem
OperationSerializer
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktestcborlegacy/snapshot/api_op_CborPutCompressedData.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ CborPutCompressedData
RequestCompression
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
4 changes: 0 additions & 4 deletions internal/kitchensinktestlegacy/api_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestlegacy/api_op_GetItem.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestlegacy/api_op_PutCompressedData.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestlegacy/api_op_SubscribeEvents.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion internal/kitchensinktestlegacy/snapshot/api_op_GetItem.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ GetItem
OperationSerializer
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktestlegacy/snapshot/api_op_PutCompressedData.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ PutCompressedData
RequestCompression
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktestlegacy/snapshot/api_op_SubscribeEvents.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ SubscribeEvents
Build stack step
EventStreamBuildMiddleware
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
4 changes: 0 additions & 4 deletions internal/kitchensinktestrestjson/api_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestrestjson/api_op_GetResource.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestrestjson/api_op_GetStreamingResource.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestrestjson/api_op_PutCompressedData.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions internal/kitchensinktestrestjson/api_op_SubscribeEvents.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions internal/kitchensinktestrestjson/response_snapshot/GetStreamingResource.response.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
200
Content-Type: application/octet-stream

__Body__
2 changes: 1 addition & 1 deletion internal/kitchensinktestrestjson/response_snapshot/ResourceNotFound.error.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
404
X-Amzn-Errortype: ResourceNotFound

{"__type":"ResourceNotFound"}
1 change: 0 additions & 1 deletion internal/kitchensinktestrestjson/snapshot/api_op_GetResource.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ GetResource
OperationSerializer
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktestrestjson/snapshot/api_op_GetStreamingResource.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ GetStreamingResource
OperationSerializer
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
1 change: 0 additions & 1 deletion internal/kitchensinktestrestjson/snapshot/api_op_PutCompressedData.go.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ PutCompressedData
RequestCompression
Build stack step
ClientRequestID
ComputeContentLength
SetCredentialSourceMiddleware
UserAgent
RecursionDetection
Expand Down
Loading
Loading