feat: migrate bucketEndpointMiddleware (#552)

feat: name package feat: migrate and apply middleware feat: remove $ input options feat: remove preformedBucket option
aws · Jan 3, 2020 · f0c3222 · f0c3222
1 parent 0454dd6
commit f0c3222
Show file tree

Hide file tree

Showing 20 changed files with 268 additions and 306 deletions.
diff --git a/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java b/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java
@@ -51,6 +51,12 @@ public class AddBuiltinPlugins implements TypeScriptIntegration {
             "PutBucketReplication"
     );
 
+    private static final Set<String> NON_BUCKET_ENDPOINT_OPERATIONS = SetUtils.of(
+            "CreateBucket",
+            "DeleteBucket",
+            "ListBuckets"
+    );
+
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
         // Note that order is significant because configurations might
@@ -112,6 +118,12 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                         .servicePredicate((m, s) -> testServiceId(s, "Machine Learning"))
                         .operationPredicate((m, s, o) -> o.getId().getName().equals("Predict"))
                         .build(),
+                RuntimeClientPlugin.builder()
+                        .withConventions(AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE.dependency, "BucketEndpoint",
+                                         HAS_MIDDLEWARE)
+                        .servicePredicate((m, s) -> testServiceId(s, "S3"))
+                        .operationPredicate((m, s, o) -> !NON_BUCKET_ENDPOINT_OPERATIONS.contains(o.getId().getName()))
+                        .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions(AwsDependency.BODY_CHECKSUM.dependency, "ApplyMd5BodyChecksum",
                                          HAS_MIDDLEWARE)

diff --git a/...pt-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java b/...pt-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java
@@ -42,6 +42,7 @@ public enum AwsDependency implements SymbolDependencyContainer {
     STREAM_HASHER_NODE(NORMAL_DEPENDENCY, "@aws-sdk/hash-stream-node", "^0.1.0-preview.4"),
     STREAM_HASHER_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/hash-blob-browser", "^0.1.0-preview.4"),
     ROUTE53_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-route53", "^0.1.0-preview.1"),
+    BUCKET_ENDPOINT_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-bucket-endpoint", "^0.1.0-preview.5"),
     BODY_CHECKSUM(NORMAL_DEPENDENCY, "@aws-sdk/middleware-apply-body-checksum", "^0.1.0-preview.5");
 
     public final String packageName;

diff --git a/packages/bucket-endpoint-middleware/README.md b/packages/bucket-endpoint-middleware/README.md
diff --git a/packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.spec.ts b/packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.spec.ts
diff --git a/packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.ts b/packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.ts
diff --git a/...ges/bucket-endpoint-middleware/.gitignore → ...ges/middleware-bucket-endpoint/.gitignore b/...ges/bucket-endpoint-middleware/.gitignore → ...ges/middleware-bucket-endpoint/.gitignore
diff --git a/...ges/bucket-endpoint-middleware/.npmignore → ...ges/middleware-bucket-endpoint/.npmignore b/...ges/bucket-endpoint-middleware/.npmignore → ...ges/middleware-bucket-endpoint/.npmignore
diff --git a/...s/bucket-endpoint-middleware/CHANGELOG.md → ...s/middleware-bucket-endpoint/CHANGELOG.md b/...s/bucket-endpoint-middleware/CHANGELOG.md → ...s/middleware-bucket-endpoint/CHANGELOG.md
diff --git a/packages/bucket-endpoint-middleware/LICENSE → packages/middleware-bucket-endpoint/LICENSE b/packages/bucket-endpoint-middleware/LICENSE → packages/middleware-bucket-endpoint/LICENSE
diff --git a/packages/middleware-bucket-endpoint/README.md b/packages/middleware-bucket-endpoint/README.md
@@ -0,0 +1,4 @@
+# @aws-sdk/middleware-bucket-endpoint
+
+[![NPM version](https://img.shields.io/npm/v/@aws-sdk/middleware-bucket-endpoint/preview.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-bucket-endpoint)
+[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/middleware-bucket-endpoint.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-bucket-endpoint)
diff --git a/...bucket-endpoint-middleware/jest.config.js → ...middleware-bucket-endpoint/jest.config.js b/...bucket-endpoint-middleware/jest.config.js → ...middleware-bucket-endpoint/jest.config.js
diff --git a/...s/bucket-endpoint-middleware/package.json → ...s/middleware-bucket-endpoint/package.json b/...s/bucket-endpoint-middleware/package.json → ...s/middleware-bucket-endpoint/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@aws-sdk/bucket-endpoint-middleware",
-  "version": "0.1.0-preview.7",
+  "name": "@aws-sdk/middleware-bucket-endpoint",
+  "version": "0.1.0-preview.5",
   "scripts": {
     "prepublishOnly": "tsc",
     "pretest": "tsc -p tsconfig.test.json",
@@ -22,4 +22,4 @@
     "jest": "^24.7.1",
     "typescript": "~3.4.0"
   }
-}
+}