Skip to content

Commit d229edd

Browse files
authored
fix(client-s3): add staticContextParams in endpoint param instructions (#4285)
1 parent 0cba099 commit d229edd

File tree

8 files changed

+2
-221
lines changed

8 files changed

+2
-221
lines changed

clients/client-s3/src/commands/CreateBucketCommand.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ export class CreateBucketCommand extends $Command<
202202

203203
public static getEndpointParameterInstructions(): EndpointParameterInstructions {
204204
return {
205+
DisableAccessPoints: { type: "staticContextParams", value: true },
205206
Bucket: { type: "contextParams", name: "Bucket" },
206207
ForcePathStyle: { type: "clientContextParams", name: "forcePathStyle" },
207208
UseArnRegion: { type: "clientContextParams", name: "useArnRegion" },

clients/client-s3/src/commands/WriteGetObjectResponseCommand.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// smithy-typescript generated code
22
import { EndpointParameterInstructions, getEndpointPlugin } from "@aws-sdk/middleware-endpoint";
3-
import { getWriteGetObjectResponseEndpointPlugin } from "@aws-sdk/middleware-sdk-s3";
43
import { getSerdePlugin } from "@aws-sdk/middleware-serde";
54
import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
65
import { Command as $Command } from "@aws-sdk/smithy-client";
@@ -82,6 +81,7 @@ export class WriteGetObjectResponseCommand extends $Command<
8281

8382
public static getEndpointParameterInstructions(): EndpointParameterInstructions {
8483
return {
84+
UseObjectLambdaEndpoint: { type: "staticContextParams", value: true },
8585
ForcePathStyle: { type: "clientContextParams", name: "forcePathStyle" },
8686
UseArnRegion: { type: "clientContextParams", name: "useArnRegion" },
8787
DisableMultiRegionAccessPoints: { type: "clientContextParams", name: "disableMultiregionAccessPoints" },
@@ -112,7 +112,6 @@ export class WriteGetObjectResponseCommand extends $Command<
112112
this.middlewareStack.use(
113113
getEndpointPlugin(configuration, WriteGetObjectResponseCommand.getEndpointParameterInstructions())
114114
);
115-
this.middlewareStack.use(getWriteGetObjectResponseEndpointPlugin(configuration));
116115

117116
const stack = clientStack.concat(this.middlewareStack);
118117

clients/client-s3/test/S3.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ describe("Endpoints from ARN", () => {
136136
expect(result.request.headers["authorization"]).contains(
137137
`Credential=${credentials.accessKeyId}/${date}/${region}/s3-object-lambda/aws4_request`
138138
);
139-
expect(result.request.headers["transfer-encoding"]).to.equal("chunked");
140139
});
141140
});
142141
});

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddS3Config.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,6 @@ public List<RuntimeClientPlugin> getClientPlugins() {
180180
(m, s, o) -> EXCEPTIONS_OF_200_OPERATIONS.contains(o.getId().getName(s))
181181
&& isS3(s))
182182
.build(),
183-
RuntimeClientPlugin.builder()
184-
.withConventions(AwsDependency.S3_MIDDLEWARE.dependency,
185-
"WriteGetObjectResponseEndpoint", HAS_MIDDLEWARE)
186-
.operationPredicate((m, s, o) -> isS3(s)
187-
&& o.getId().getName(s).equals("WriteGetObjectResponse"))
188-
.build(),
189183
RuntimeClientPlugin.builder()
190184
.withConventions(AwsDependency.ADD_EXPECT_CONTINUE.dependency, "AddExpectContinue",
191185
HAS_MIDDLEWARE)

packages/middleware-sdk-s3/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
},
2121
"license": "Apache-2.0",
2222
"dependencies": {
23-
"@aws-sdk/middleware-bucket-endpoint": "*",
2423
"@aws-sdk/protocol-http": "*",
2524
"@aws-sdk/types": "*",
2625
"@aws-sdk/util-arn-parser": "*",

packages/middleware-sdk-s3/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ export * from "./check-content-length-header";
22
export * from "./configuration";
33
export * from "./throw-200-exceptions";
44
export * from "./validate-bucket-name";
5-
export * from "./write-get-object-response-endpoint";

packages/middleware-sdk-s3/src/write-get-object-response-endpoint.spec.ts

Lines changed: 0 additions & 127 deletions
This file was deleted.

packages/middleware-sdk-s3/src/write-get-object-response-endpoint.ts

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)