Skip to content

Commit f0c3222

Browse files
Chase Coalwelltrivikr
Chase Coalwell
authored andcommitted
feat: migrate bucketEndpointMiddleware (#552)
feat: name package feat: migrate and apply middleware feat: remove $ input options feat: remove preformedBucket option
1 parent 0454dd6 commit f0c3222

20 files changed

+268
-306
lines changed

Diff for: codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java

+12
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ public class AddBuiltinPlugins implements TypeScriptIntegration {
5151
"PutBucketReplication"
5252
);
5353

54+
private static final Set<String> NON_BUCKET_ENDPOINT_OPERATIONS = SetUtils.of(
55+
"CreateBucket",
56+
"DeleteBucket",
57+
"ListBuckets"
58+
);
59+
5460
@Override
5561
public List<RuntimeClientPlugin> getClientPlugins() {
5662
// Note that order is significant because configurations might
@@ -112,6 +118,12 @@ public List<RuntimeClientPlugin> getClientPlugins() {
112118
.servicePredicate((m, s) -> testServiceId(s, "Machine Learning"))
113119
.operationPredicate((m, s, o) -> o.getId().getName().equals("Predict"))
114120
.build(),
121+
RuntimeClientPlugin.builder()
122+
.withConventions(AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE.dependency, "BucketEndpoint",
123+
HAS_MIDDLEWARE)
124+
.servicePredicate((m, s) -> testServiceId(s, "S3"))
125+
.operationPredicate((m, s, o) -> !NON_BUCKET_ENDPOINT_OPERATIONS.contains(o.getId().getName()))
126+
.build(),
115127
RuntimeClientPlugin.builder()
116128
.withConventions(AwsDependency.BODY_CHECKSUM.dependency, "ApplyMd5BodyChecksum",
117129
HAS_MIDDLEWARE)

Diff for: codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public enum AwsDependency implements SymbolDependencyContainer {
4242
STREAM_HASHER_NODE(NORMAL_DEPENDENCY, "@aws-sdk/hash-stream-node", "^0.1.0-preview.4"),
4343
STREAM_HASHER_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/hash-blob-browser", "^0.1.0-preview.4"),
4444
ROUTE53_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-route53", "^0.1.0-preview.1"),
45+
BUCKET_ENDPOINT_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-bucket-endpoint", "^0.1.0-preview.5"),
4546
BODY_CHECKSUM(NORMAL_DEPENDENCY, "@aws-sdk/middleware-apply-body-checksum", "^0.1.0-preview.5");
4647

4748
public final String packageName;

Diff for: packages/bucket-endpoint-middleware/README.md

-4
This file was deleted.

Diff for: packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.spec.ts

-222
This file was deleted.

Diff for: packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.ts

-73
This file was deleted.

Diff for: packages/middleware-bucket-endpoint/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# @aws-sdk/middleware-bucket-endpoint
2+
3+
[![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)
4+
[![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 for: packages/bucket-endpoint-middleware/package.json renamed to packages/middleware-bucket-endpoint/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@aws-sdk/bucket-endpoint-middleware",
3-
"version": "0.1.0-preview.7",
2+
"name": "@aws-sdk/middleware-bucket-endpoint",
3+
"version": "0.1.0-preview.5",
44
"scripts": {
55
"prepublishOnly": "tsc",
66
"pretest": "tsc -p tsconfig.test.json",
@@ -22,4 +22,4 @@
2222
"jest": "^24.7.1",
2323
"typescript": "~3.4.0"
2424
}
25-
}
25+
}

0 commit comments

Comments
 (0)