From 0d319932ed715dabb4c85f10d2bca536c3de9a56 Mon Sep 17 00:00:00 2001
From: Chase Coalwell <chasecoa@amazon.com>
Date: Fri, 20 Dec 2019 13:19:53 -0800
Subject: [PATCH 1/2] fix: add BucketEndpoint config plugin

---
 .../smithy/aws/typescript/codegen/AddBuiltinPlugins.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java
index af9eae5e2e77..6dd128efd014 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java
+++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java
@@ -118,6 +118,15 @@ && testServiceId(s, "S3"))
                         .operationPredicate((m, s, o) -> o.getId().getName().equals("Predict")
                                             && testServiceId(s, "Machine Learning"))
                         .build(),
+                /**
+                 * BUCKET_ENDPOINT_MIDDLEWARE needs two separate plugins. The first resolves the config in the client.
+                 * The second applies the middleware to bucket endpoint operations.
+                 */
+                RuntimeClientPlugin.builder()
+                        .withConventions(AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE.dependency, "BucketEndpoint",
+                                         HAS_CONFIG)
+                        .servicePredicate((m, s) -> testServiceId(s, "S3"))
+                        .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions(AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE.dependency, "BucketEndpoint",
                                          HAS_MIDDLEWARE)

From 547a4144f444b988100759d7a20d9186b1a9f767 Mon Sep 17 00:00:00 2001
From: Chase Coalwell <chasecoa@amazon.com>
Date: Fri, 20 Dec 2019 13:51:43 -0800
Subject: [PATCH 2/2] fix: package exports

---
 .../src/index.spec.ts                         | 19 +++++++++++++++++++
 .../middleware-bucket-endpoint/src/index.ts   |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 packages/middleware-bucket-endpoint/src/index.spec.ts

diff --git a/packages/middleware-bucket-endpoint/src/index.spec.ts b/packages/middleware-bucket-endpoint/src/index.spec.ts
new file mode 100644
index 000000000000..8951c01ebf2e
--- /dev/null
+++ b/packages/middleware-bucket-endpoint/src/index.spec.ts
@@ -0,0 +1,19 @@
+import {
+  bucketEndpointMiddleware,
+  getBucketEndpointPlugin,
+  resolveBucketEndpointConfig
+} from "./index";
+
+describe("middleware-bucket-endpoint package exports", () => {
+  it("bucketEndpointMiddleware", () => {
+    expect(typeof bucketEndpointMiddleware).toBe("function");
+  });
+
+  it("getBucketEndpointPlugin", () => {
+    expect(typeof getBucketEndpointPlugin).toBe("function");
+  });
+
+  it("resolveBucketEndpointConfig", () => {
+    expect(typeof resolveBucketEndpointConfig).toBe("function");
+  });
+});
diff --git a/packages/middleware-bucket-endpoint/src/index.ts b/packages/middleware-bucket-endpoint/src/index.ts
index f7cebc0e4b73..73841ad6641c 100644
--- a/packages/middleware-bucket-endpoint/src/index.ts
+++ b/packages/middleware-bucket-endpoint/src/index.ts
@@ -1,2 +1,3 @@
 export * from "./bucketEndpointMiddleware";
 export * from "./bucketHostname";
+export * from "./configurations";