chore(aws-protocoltests-restxml-s3): disable experimentalIdentityAndAuth

Author: trivikr

private/aws-protocoltests-restxml-s3/package.json

@@ -28,6 +28,7 @@
     "@aws-sdk/middleware-logger": "*",
     "@aws-sdk/middleware-recursion-detection": "*",
     "@aws-sdk/middleware-sdk-s3": "*",
+    "@aws-sdk/middleware-signing": "*",
     "@aws-sdk/middleware-user-agent": "*",
     "@aws-sdk/region-config-resolver": "*",
     "@aws-sdk/signature-v4-multi-region": "*",
@@ -41,7 +42,6 @@
     "@smithy/hash-node": "^3.0.3",
     "@smithy/invalid-dependency": "^3.0.3",
     "@smithy/middleware-content-length": "^3.0.3",
-    "@smithy/middleware-endpoint": "^3.0.4",
     "@smithy/middleware-retry": "^3.0.7",
     "@smithy/middleware-serde": "^3.0.3",
     "@smithy/middleware-stack": "^3.0.3",
@@ -57,7 +57,6 @@
     "@smithy/util-body-length-node": "^3.0.0",
     "@smithy/util-defaults-mode-browser": "^3.0.7",
     "@smithy/util-defaults-mode-node": "^3.0.7",
-    "@smithy/util-middleware": "^3.0.3",
     "@smithy/util-retry": "^3.0.3",
     "@smithy/util-utf8": "^3.0.0",
     "tslib": "^2.6.2",

private/aws-protocoltests-restxml-s3/src/S3Client.ts

@@ -14,12 +14,19 @@ import {
 import { getLoggerPlugin } from "@aws-sdk/middleware-logger";
 import { getRecursionDetectionPlugin } from "@aws-sdk/middleware-recursion-detection";
 import { getRegionRedirectMiddlewarePlugin, getValidateBucketNamePlugin } from "@aws-sdk/middleware-sdk-s3";
+import {
+  AwsAuthInputConfig,
+  AwsAuthResolvedConfig,
+  getAwsAuthPlugin,
+  resolveAwsAuthConfig,
+} from "@aws-sdk/middleware-signing";
 import {
   getUserAgentPlugin,
   resolveUserAgentConfig,
   UserAgentInputConfig,
   UserAgentResolvedConfig,
 } from "@aws-sdk/middleware-user-agent";
+import { Credentials as __Credentials } from "@aws-sdk/types";
 import {
   EndpointsInputConfig,
   EndpointsResolvedConfig,
@@ -28,7 +35,6 @@ import {
   resolveEndpointsConfig,
   resolveRegionConfig,
 } from "@smithy/config-resolver";
-import { DefaultIdentityProviderConfig, getHttpAuthSchemePlugin, getHttpSigningPlugin } from "@smithy/core";
 import { getContentLengthPlugin } from "@smithy/middleware-content-length";
 import { getRetryPlugin, resolveRetryConfig, RetryInputConfig, RetryResolvedConfig } from "@smithy/middleware-retry";
 import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
@@ -39,7 +45,6 @@ import {
   SmithyResolvedConfiguration as __SmithyResolvedConfiguration,
 } from "@smithy/smithy-client";
 import {
-  AwsCredentialIdentityProvider,
   BodyLengthCalculator as __BodyLengthCalculator,
   CheckOptionalClientConfig as __CheckOptionalClientConfig,
   ChecksumConstructor as __ChecksumConstructor,
@@ -56,12 +61,6 @@ import {
   UserAgent as __UserAgent,
 } from "@smithy/types";
 
-import {
-  defaultS3HttpAuthSchemeParametersProvider,
-  HttpAuthSchemeInputConfig,
-  HttpAuthSchemeResolvedConfig,
-  resolveHttpAuthSchemeConfig,
-} from "./auth/httpAuthSchemeProvider";
 import {
   DeleteObjectTaggingCommandInput,
   DeleteObjectTaggingCommandOutput,
@@ -183,6 +182,12 @@ export interface ClientDefaults extends Partial<__SmithyConfiguration<__HttpHand
    */
   region?: string | __Provider<string>;
 
+  /**
+   * Default credentials provider; Not available in browser runtime.
+   * @internal
+   */
+  credentialDefaultProvider?: (input: any) => __Provider<__Credentials>;
+
   /**
    * Fetch related hostname, signing name or signing region with given region.
    * @internal
@@ -204,13 +209,6 @@ export interface ClientDefaults extends Partial<__SmithyConfiguration<__HttpHand
    */
   defaultUserAgentProvider?: Provider<__UserAgent>;
 
-  /**
-   * Default credentials provider; Not available in browser runtime.
-   * @deprecated
-   * @internal
-   */
-  credentialDefaultProvider?: (input: any) => AwsCredentialIdentityProvider;
-
   /**
    * Value for how many times a request will be made at most in case of retry.
    */
@@ -248,9 +246,9 @@ export type S3ClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOpti
   EndpointsInputConfig &
   RetryInputConfig &
   HostHeaderInputConfig &
+  AwsAuthInputConfig &
   BucketEndpointInputConfig &
-  UserAgentInputConfig &
-  HttpAuthSchemeInputConfig;
+  UserAgentInputConfig;
 /**
  * @public
  *
@@ -268,9 +266,9 @@ export type S3ClientResolvedConfigType = __SmithyResolvedConfiguration<__HttpHan
   EndpointsResolvedConfig &
   RetryResolvedConfig &
   HostHeaderResolvedConfig &
+  AwsAuthResolvedConfig &
   BucketEndpointResolvedConfig &
-  UserAgentResolvedConfig &
-  HttpAuthSchemeResolvedConfig;
+  UserAgentResolvedConfig;
 /**
  * @public
  *
@@ -298,9 +296,9 @@ export class S3Client extends __Client<
     const _config_2 = resolveEndpointsConfig(_config_1);
     const _config_3 = resolveRetryConfig(_config_2);
     const _config_4 = resolveHostHeaderConfig(_config_3);
-    const _config_5 = resolveBucketEndpointConfig(_config_4);
-    const _config_6 = resolveUserAgentConfig(_config_5);
-    const _config_7 = resolveHttpAuthSchemeConfig(_config_6);
+    const _config_5 = resolveAwsAuthConfig(_config_4);
+    const _config_6 = resolveBucketEndpointConfig(_config_5);
+    const _config_7 = resolveUserAgentConfig(_config_6);
     const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
     super(_config_8);
     this.config = _config_8;
@@ -309,17 +307,11 @@ export class S3Client extends __Client<
     this.middlewareStack.use(getHostHeaderPlugin(this.config));
     this.middlewareStack.use(getLoggerPlugin(this.config));
     this.middlewareStack.use(getRecursionDetectionPlugin(this.config));
+    this.middlewareStack.use(getAwsAuthPlugin(this.config));
     this.middlewareStack.use(getValidateBucketNamePlugin(this.config));
     this.middlewareStack.use(getAddExpectContinuePlugin(this.config));
     this.middlewareStack.use(getRegionRedirectMiddlewarePlugin(this.config));
     this.middlewareStack.use(getUserAgentPlugin(this.config));
-    this.middlewareStack.use(
-      getHttpAuthSchemePlugin(this.config, {
-        httpAuthSchemeParametersProvider: this.getDefaultHttpAuthSchemeParametersProvider(),
-        identityProviderConfigProvider: this.getIdentityProviderConfigProvider(),
-      })
-    );
-    this.middlewareStack.use(getHttpSigningPlugin(this.config));
   }
 
   /**
@@ -330,14 +322,4 @@ export class S3Client extends __Client<
   destroy(): void {
     super.destroy();
   }
-  private getDefaultHttpAuthSchemeParametersProvider() {
-    return defaultS3HttpAuthSchemeParametersProvider;
-  }
-  private getIdentityProviderConfigProvider() {
-    return async (config: S3ClientResolvedConfig) =>
-      new DefaultIdentityProviderConfig({
-        "aws.auth#sigv4": config.credentials,
-        "aws.auth#sigv4a": config.credentials,
-      });
-  }
 }