Skip to content
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.

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

Add Gzip request compression feature #467

Merged
merged 16 commits into from
Dec 6, 2023
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public final class SmithyGoDependency {
public static final GoDependency SMITHY_HTTP_TRANSPORT = smithy("transport/http", "smithyhttp");
public static final GoDependency SMITHY_MIDDLEWARE = smithy("middleware");
public static final GoDependency SMITHY_PRIVATE_PROTOCOL = smithy("private/protocol", "smithyprivateprotocol");
public static final GoDependency SMITHY_REQUEST_COMPRESSION =
smithy("private/requestcompression", "smithyrequestcompression");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix formatting for this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

smithy go doesn't allow single line exceeding 120 chars, that's why there's a separate line

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public static final GoDependency SMITHY_REQUEST_COMPRESSION =
smithy("private/requestcompression", "smithyrequestcompression");
public static final GoDependency SMITHY_REQUEST_COMPRESSION =
smithy("private/requestcompression", "smithyrequestcompression");

public static final GoDependency SMITHY_TIME = smithy("time", "smithytime");
public static final GoDependency SMITHY_HTTP_BINDING = smithy("encoding/httpbinding");
public static final GoDependency SMITHY_JSON = smithy("encoding/json", "smithyjson");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/*
* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/

package software.amazon.smithy.go.codegen.requestcompression;

import java.util.List;
import software.amazon.smithy.codegen.core.SymbolProvider;
import software.amazon.smithy.go.codegen.GoDelegator;
import software.amazon.smithy.go.codegen.GoSettings;
import software.amazon.smithy.go.codegen.GoWriter;
import software.amazon.smithy.go.codegen.SmithyGoDependency;
import software.amazon.smithy.go.codegen.SymbolUtils;
import software.amazon.smithy.go.codegen.integration.ConfigField;
import software.amazon.smithy.go.codegen.integration.GoIntegration;
import software.amazon.smithy.go.codegen.integration.MiddlewareRegistrar;
import software.amazon.smithy.go.codegen.integration.RuntimeClientPlugin;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.knowledge.TopDownIndex;
import software.amazon.smithy.model.shapes.OperationShape;
import software.amazon.smithy.model.shapes.ServiceShape;
import software.amazon.smithy.model.shapes.ToShapeId;
import software.amazon.smithy.model.traits.RequestCompressionTrait;
import software.amazon.smithy.utils.ListUtils;

public final class RequestCompression implements GoIntegration {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit overall: private fields should go below public fields, and private methods should go towards the bottom of the class below all the public methods.

private static final String ADD_REQUEST_COMPRESSION = "addRequestCompression";

private static final String ADD_REQUEST_COMPRESSION_INTERNAL = "AddRequestCompression";

private static final String DISABLE_REQUEST_COMPRESSION = "DisableRequestCompression";

private static final String REQUEST_MIN_COMPRESSION_SIZE_BYTES = "RequestMinCompressSizeBytes";

@Override
public void writeAdditionalFiles(
GoSettings settings,
Model model,
SymbolProvider symbolProvider,
GoDelegator goDelegator
) {
ServiceShape service = settings.getService(model);
if (!isRequestCompressionService(model, service)) {
return;
}

goDelegator.useShapeWriter(service, this::writeMiddlewareHelper);
}


public static boolean isRequestCompressionService(Model model, ServiceShape service) {
TopDownIndex topDownIndex = TopDownIndex.of(model);
for (ToShapeId operation : topDownIndex.getContainedOperations(service)) {
OperationShape operationShape = model.expectShape(operation.toShapeId(), OperationShape.class);
if (operationShape.hasTrait(RequestCompressionTrait.class)) {
return true;
}
}
return false;
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
}

private void writeMiddlewareHelper(GoWriter writer) {
writer.openBlock("func $L(stack *middleware.Stack, options Options) error {", "}",
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
ADD_REQUEST_COMPRESSION, () -> {
writer.write(
"return $T(stack, options.DisableRequestCompression, options.RequestMinCompressSizeBytes)",
SymbolUtils.createValueSymbolBuilder(ADD_REQUEST_COMPRESSION_INTERNAL,
SmithyGoDependency.SMITHY_REQUEST_COMPRESSION).build()
);
});
writer.insertTrailingNewline();
}
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved

@Override
public List<RuntimeClientPlugin> getClientPlugins() {
return ListUtils.of(
RuntimeClientPlugin.builder()
.operationPredicate((model, service, operation) ->
operation.hasTrait(RequestCompressionTrait.class))
.registerMiddleware(MiddlewareRegistrar.builder()
.resolvedFunction(SymbolUtils.createValueSymbolBuilder(ADD_REQUEST_COMPRESSION).build())
.useClientOptions()
.build())
.build(),
RuntimeClientPlugin.builder()
.servicePredicate(RequestCompression::isRequestCompressionService)
.configFields(ListUtils.of(
ConfigField.builder()
.name(DISABLE_REQUEST_COMPRESSION)
.type(SymbolUtils.createValueSymbolBuilder("bool")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GoUniverseTypes.bool?

.putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true)
.build())
.documentation("Determine if request compression is allowed, default to false")
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
.build(),
ConfigField.builder()
.name(REQUEST_MIN_COMPRESSION_SIZE_BYTES)
.type(SymbolUtils.createValueSymbolBuilder("int64")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GoUniverseTypes.Int64?

.putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true)
.build())
.documentation("Inclusive threshold request body size to trigger compression, "
+ "default to 10240 and must be within 0 and 10485760 bytes inclusively")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.documentation("Inclusive threshold request body size to trigger compression, "
+ "default to 10240 and must be within 0 and 10485760 bytes inclusively")
.documentation("The minimum request body size, in bytes, at which compression should occur. The default value is 10 KiB. Values must fall within [0, 1MiB].

.build()
))
.build()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ software.amazon.smithy.go.codegen.integration.Paginators
software.amazon.smithy.go.codegen.integration.Waiters
software.amazon.smithy.go.codegen.integration.ClientLogger
software.amazon.smithy.go.codegen.endpoints.EndpointClientPluginsGenerator
software.amazon.smithy.go.codegen.requestcompression.RequestCompression
105 changes: 105 additions & 0 deletions private/requestcompression/request_compression.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
package requestcompression
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved

import (
"bytes"
"compress/gzip"
"context"
"fmt"
"github.com/aws/smithy-go/middleware"
"github.com/aws/smithy-go/transport/http"
"io"
)

// AddRequestCompression add requestCompression middleware to op stack
func AddRequestCompression(stack *middleware.Stack, DisableRequestCompression bool, RequestMinCompressSizeBytes int64) error {
return stack.Build.Add(&requestCompression{
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
disableRequestCompression: DisableRequestCompression,
requestMinCompressSizeBytes: RequestMinCompressSizeBytes,
}, middleware.After)
}

type requestCompression struct {
disableRequestCompression bool
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
requestMinCompressSizeBytes int64
}

// ID returns the ID of the middleware
func (m requestCompression) ID() string {
return "RequestCompression"
}

// HandleBuild gzip compress the request's stream/body if enabled by config fields
func (m requestCompression) HandleBuild(
ctx context.Context, in middleware.BuildInput, next middleware.BuildHandler,
) (
out middleware.BuildOutput, metadata middleware.Metadata, err error,
) {
if m.disableRequestCompression {
return next.HandleBuild(ctx, in)
}
// still need to check requestMinCompressSizeBytes in case it is out of range after service client config
if m.requestMinCompressSizeBytes < 0 || m.requestMinCompressSizeBytes > 10485760 {
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
return out, metadata, fmt.Errorf("invalid range for min request compression size bytes %d, must be within 0 and 10485760 inclusively", m.requestMinCompressSizeBytes)
}

req, ok := in.Request.(*http.Request)
if !ok {
return out, metadata, fmt.Errorf("unknown request type %T", req)
}

var isCompressed bool
if stream := req.GetStream(); stream != nil {
compressedBytes, err := compress(stream)
if err != nil {
return out, metadata, fmt.Errorf("failed to compress request stream, %v", err)
}

var newReq *http.Request
if newReq, err = req.SetStream(bytes.NewReader(compressedBytes)); err != nil {
return out, metadata, fmt.Errorf("failed to set request stream, %v", err)
}
*req = *newReq
isCompressed = true
} else if req.ContentLength >= m.requestMinCompressSizeBytes {
compressedBytes, err := compress(req.Body)
if err != nil {
return out, metadata, fmt.Errorf("failed to compress request body, %v", err)
}

isCompressed = true
req.Body = io.NopCloser(bytes.NewReader(compressedBytes))
}

if isCompressed {
// Either append to the header if it already exists, else set it
if len(req.Header["Content-Encoding"]) != 0 {
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
req.Header["Content-Encoding"][0] += ", gzip"
} else {
req.Header.Set("Content-Encoding", "gzip")
}
}

return next.HandleBuild(ctx, in)
}

func compress(input io.Reader) ([]byte, error) {
var b bytes.Buffer
w, err := gzip.NewWriterLevel(&b, gzip.BestCompression)
wty-Bryant marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return nil, fmt.Errorf("failed to create gzip writer, %v", err)
}

inBytes, err := io.ReadAll(input)
if err != nil {
return nil, fmt.Errorf("failed read payload to compress, %v", err)
}

if _, err = w.Write(inBytes); err != nil {
return nil, fmt.Errorf("failed to write payload to be compressed, %v", err)
}
if err = w.Close(); err != nil {
return nil, fmt.Errorf("failed to flush payload being compressed, %v", err)
}

return b.Bytes(), nil
}
Loading
Loading