@mavogel/awscdk-rootmail 0.1.33 → 0.1.35

package/node_modules/@aws-sdk/core/dist-es/submodules/httpAuthSchemes/aws_sdk/NODE_AUTH_SCHEME_PREFERENCE_OPTIONS.js

@@ -6,16 +6,19 @@ export const NODE_AUTH_SCHEME_PREFERENCE_OPTIONS = {
     environmentVariableSelector: (env, options) => {
         if (options?.signingName) {
             const bearerTokenKey = getBearerTokenEnvKey(options.signingName);
-            if (bearerTokenKey in env)
+            if (bearerTokenKey in env) {
                 return ["httpBearerAuth"];
+            }
         }
-        if (!(NODE_AUTH_SCHEME_PREFERENCE_ENV_KEY in env))
+        if (!(NODE_AUTH_SCHEME_PREFERENCE_ENV_KEY in env)) {
             return undefined;
+        }
         return getArrayForCommaSeparatedString(env[NODE_AUTH_SCHEME_PREFERENCE_ENV_KEY]);
     },
     configFileSelector: (profile) => {
-        if (!(NODE_AUTH_SCHEME_PREFERENCE_CONFIG_KEY in profile))
+        if (!(NODE_AUTH_SCHEME_PREFERENCE_CONFIG_KEY in profile)) {
             return undefined;
+        }
         return getArrayForCommaSeparatedString(profile[NODE_AUTH_SCHEME_PREFERENCE_CONFIG_KEY]);
     },
     default: [],

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/index.js

@@ -3,6 +3,7 @@ export { AwsJson1_0Protocol } from "./json/AwsJson1_0Protocol";
 export { AwsJson1_1Protocol } from "./json/AwsJson1_1Protocol";
 export { AwsJsonRpcProtocol } from "./json/AwsJsonRpcProtocol";
 export { AwsRestJsonProtocol } from "./json/AwsRestJsonProtocol";
+export { AwsSmithyRpcV2JsonProtocol } from "./json/AwsSmithyRpcV2JsonProtocol";
 export { JsonCodec, JsonCodec2, JsonShapeDeserializer, JsonShapeDeserializer2, JsonShapeSerializer, JsonShapeSerializer2, loadJsonRpcErrorCode, loadRestJsonErrorCode, parseJsonBody, parseJsonErrorBody, } from "@smithy/core/protocols";
 export { AwsEc2QueryProtocol } from "./query/AwsEc2QueryProtocol";
 export { AwsQueryProtocol } from "./query/AwsQueryProtocol";

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsSmithyRpcV2JsonProtocol.js

@@ -0,0 +1,51 @@
+import { loadSmithyRpcV2JsonErrorCode, SmithyRpcV2JsonProtocol } from "@smithy/core/protocols";
+import { NormalizedSchema } from "@smithy/core/schema";
+import { ProtocolLib } from "../ProtocolLib";
+export class AwsSmithyRpcV2JsonProtocol extends SmithyRpcV2JsonProtocol {
+    awsQueryCompatible;
+    mixin;
+    constructor({ defaultNamespace, errorTypeRegistries, awsQueryCompatible, }) {
+        super({ defaultNamespace, errorTypeRegistries });
+        this.awsQueryCompatible = !!awsQueryCompatible;
+        this.mixin = new ProtocolLib(this.awsQueryCompatible);
+    }
+    async serializeRequest(operationSchema, input, context) {
+        const request = await super.serializeRequest(operationSchema, input, context);
+        if (this.awsQueryCompatible) {
+            request.headers["x-amzn-query-mode"] = "true";
+        }
+        return request;
+    }
+    async handleError(operationSchema, context, response, dataObject, metadata) {
+        if (this.awsQueryCompatible) {
+            this.mixin.setQueryCompatError(dataObject, response);
+        }
+        const errorName = (() => {
+            const compatHeader = response.headers["x-amzn-query-error"];
+            if (compatHeader && this.awsQueryCompatible) {
+                return compatHeader.split(";")[0];
+            }
+            return loadSmithyRpcV2JsonErrorCode(response, dataObject) ?? "Unknown";
+        })();
+        this.mixin.compose(this.compositeErrorRegistry, errorName, this.options.defaultNamespace);
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
+        const ns = NormalizedSchema.of(errorSchema);
+        const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
+        const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
+        const exception = new ErrorCtor({});
+        const output = {};
+        const errorDeserializer = this.getPayloadCodec().createDeserializer();
+        for (const [name, member] of ns.structIterator()) {
+            if (dataObject[name] != null) {
+                output[name] = errorDeserializer.readObject(member, dataObject[name]);
+            }
+        }
+        if (this.awsQueryCompatible) {
+            this.mixin.queryCompatOutput(dataObject, output);
+        }
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
+            $fault: ns.getMergedTraits().error,
+            message,
+        }, output), dataObject);
+    }
+}

package/node_modules/@aws-sdk/core/dist-es/submodules/util/util-arn-parser/arn.js

@@ -1,8 +1,9 @@
 export const validate = (str) => typeof str === "string" && str.indexOf("arn:") === 0 && str.split(":").length >= 6;
 export const parse = (arn) => {
     const segments = arn.split(":");
-    if (segments.length < 6 || segments[0] !== "arn")
+    if (segments.length < 6 || segments[0] !== "arn") {
         throw new Error("Malformed ARN");
+    }
     const [, partition, service, region, accountId, ...resource] = segments;
     return {
         partition,

package/node_modules/@aws-sdk/core/dist-types/submodules/protocols/index.d.ts

@@ -3,6 +3,7 @@ export { AwsJson1_0Protocol } from "./json/AwsJson1_0Protocol";
 export { AwsJson1_1Protocol } from "./json/AwsJson1_1Protocol";
 export { AwsJsonRpcProtocol } from "./json/AwsJsonRpcProtocol";
 export { AwsRestJsonProtocol } from "./json/AwsRestJsonProtocol";
+export { AwsSmithyRpcV2JsonProtocol } from "./json/AwsSmithyRpcV2JsonProtocol";
 export { JsonCodec, JsonCodec2, JsonShapeDeserializer, JsonShapeDeserializer2, JsonShapeSerializer, JsonShapeSerializer2, loadJsonRpcErrorCode, loadRestJsonErrorCode, parseJsonBody, parseJsonErrorBody, } from "@smithy/core/protocols";
 export type { JsonSettings } from "@smithy/core/protocols";
 export { AwsEc2QueryProtocol } from "./query/AwsEc2QueryProtocol";

package/node_modules/@aws-sdk/core/dist-types/submodules/protocols/json/AwsSmithyRpcV2JsonProtocol.d.ts

@@ -0,0 +1,25 @@
+import { SmithyRpcV2JsonProtocol } from "@smithy/core/protocols";
+import type { TypeRegistry } from "@smithy/core/schema";
+import type { EndpointBearer, HandlerExecutionContext, HttpRequest, HttpResponse, OperationSchema, ResponseMetadata, SerdeFunctions } from "@smithy/types";
+/**
+ * Extends the Smithy implementation to add AwsQueryCompatibility support.
+ *
+ * @public
+ */
+export declare class AwsSmithyRpcV2JsonProtocol extends SmithyRpcV2JsonProtocol {
+    private readonly awsQueryCompatible;
+    private readonly mixin;
+    constructor({ defaultNamespace, errorTypeRegistries, awsQueryCompatible, }: {
+        defaultNamespace: string;
+        errorTypeRegistries?: TypeRegistry[];
+        awsQueryCompatible?: boolean;
+    });
+    /**
+     * @override
+     */
+    serializeRequest<Input extends object>(operationSchema: OperationSchema, input: Input, context: HandlerExecutionContext & SerdeFunctions & EndpointBearer): Promise<HttpRequest>;
+    /**
+     * @override
+     */
+    protected handleError(operationSchema: OperationSchema, context: HandlerExecutionContext & SerdeFunctions, response: HttpResponse, dataObject: any, metadata: ResponseMetadata): Promise<never>;
+}

package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/protocols/index.d.ts

@@ -3,6 +3,7 @@ export { AwsJson1_0Protocol } from "./json/AwsJson1_0Protocol";
 export { AwsJson1_1Protocol } from "./json/AwsJson1_1Protocol";
 export { AwsJsonRpcProtocol } from "./json/AwsJsonRpcProtocol";
 export { AwsRestJsonProtocol } from "./json/AwsRestJsonProtocol";
+export { AwsSmithyRpcV2JsonProtocol } from "./json/AwsSmithyRpcV2JsonProtocol";
 export {
   JsonCodec,
   JsonCodec2,

package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/protocols/json/AwsSmithyRpcV2JsonProtocol.d.ts

@@ -0,0 +1,36 @@
+import { SmithyRpcV2JsonProtocol } from "@smithy/core/protocols";
+import { TypeRegistry } from "@smithy/core/schema";
+import {
+  EndpointBearer,
+  HandlerExecutionContext,
+  HttpRequest,
+  HttpResponse,
+  OperationSchema,
+  ResponseMetadata,
+  SerdeFunctions,
+} from "@smithy/types";
+export declare class AwsSmithyRpcV2JsonProtocol extends SmithyRpcV2JsonProtocol {
+  private readonly awsQueryCompatible;
+  private readonly mixin;
+  constructor({
+    defaultNamespace,
+    errorTypeRegistries,
+    awsQueryCompatible,
+  }: {
+    defaultNamespace: string;
+    errorTypeRegistries?: TypeRegistry[];
+    awsQueryCompatible?: boolean;
+  });
+  serializeRequest<Input extends object>(
+    operationSchema: OperationSchema,
+    input: Input,
+    context: HandlerExecutionContext & SerdeFunctions & EndpointBearer,
+  ): Promise<HttpRequest>;
+  protected handleError(
+    operationSchema: OperationSchema,
+    context: HandlerExecutionContext & SerdeFunctions,
+    response: HttpResponse,
+    dataObject: any,
+    metadata: ResponseMetadata,
+  ): Promise<never>;
+}

package/node_modules/@aws-sdk/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/core",
-  "version": "3.978.6",
+  "version": "3.979.0",
   "description": "Core functions & classes shared by multiple AWS SDK clients.",
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages-internal/core",
   "license": "Apache-2.0",
@@ -125,7 +125,7 @@
   },
   "dependencies": {
     "@aws-sdk/types": "^3.975.0",
-    "@aws-sdk/xml-builder": "^3.972.41",
+    "@aws-sdk/xml-builder": "^3.972.42",
     "@aws/lambda-invoke-store": "^0.3.0",
     "@smithy/core": "^3.37.0",
     "@smithy/signature-v4": "^5.7.4",

package/node_modules/@aws-sdk/credential-provider-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-env",
-  "version": "3.972.77",
+  "version": "3.972.79",
   "description": "AWS credential provider that sources credentials from known environment variables",
   "keywords": [
     "aws",
@@ -43,7 +43,7 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
+    "@aws-sdk/core": "^3.979.0",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/types": "^4.19.0",

package/node_modules/@aws-sdk/credential-provider-http/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-http",
-  "version": "3.972.79",
+  "version": "3.972.81",
   "description": "AWS credential provider for containers and HTTP sources",
   "keywords": [
     "aws",
@@ -53,7 +53,7 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
+    "@aws-sdk/core": "^3.979.0",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/fetch-http-handler": "^5.8.0",

package/node_modules/@aws-sdk/credential-provider-ini/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-ini",
-  "version": "3.973.22",
+  "version": "3.973.24",
   "description": "AWS credential provider that sources credentials from ~/.aws/credentials and ~/.aws/config",
   "keywords": [
     "aws",
@@ -45,14 +45,14 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
-    "@aws-sdk/credential-provider-env": "^3.972.77",
-    "@aws-sdk/credential-provider-http": "^3.972.79",
-    "@aws-sdk/credential-provider-login": "^3.972.84",
-    "@aws-sdk/credential-provider-process": "^3.972.77",
-    "@aws-sdk/credential-provider-sso": "^3.973.21",
-    "@aws-sdk/credential-provider-web-identity": "^3.972.83",
-    "@aws-sdk/nested-clients": "^3.997.51",
+    "@aws-sdk/core": "^3.979.0",
+    "@aws-sdk/credential-provider-env": "^3.972.79",
+    "@aws-sdk/credential-provider-http": "^3.972.81",
+    "@aws-sdk/credential-provider-login": "^3.972.86",
+    "@aws-sdk/credential-provider-process": "^3.972.79",
+    "@aws-sdk/credential-provider-sso": "^3.973.23",
+    "@aws-sdk/credential-provider-web-identity": "^3.972.85",
+    "@aws-sdk/nested-clients": "^3.997.53",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/credential-provider-imds": "^4.5.2",

package/node_modules/@aws-sdk/credential-provider-login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-login",
-  "version": "3.972.84",
+  "version": "3.972.86",
   "description": "AWS credential provider that sources credentials from aws login cached tokens",
   "keywords": [
     "aws",
@@ -45,8 +45,8 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
-    "@aws-sdk/nested-clients": "^3.997.51",
+    "@aws-sdk/core": "^3.979.0",
+    "@aws-sdk/nested-clients": "^3.997.53",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/types": "^4.19.0",

package/node_modules/@aws-sdk/credential-provider-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-node",
-  "version": "3.972.89",
+  "version": "3.972.91",
   "description": "AWS credential provider that sources credentials from a Node.JS environment. ",
   "keywords": [
     "aws",
@@ -45,12 +45,12 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/credential-provider-env": "^3.972.77",
-    "@aws-sdk/credential-provider-http": "^3.972.79",
-    "@aws-sdk/credential-provider-ini": "^3.973.22",
-    "@aws-sdk/credential-provider-process": "^3.972.77",
-    "@aws-sdk/credential-provider-sso": "^3.973.21",
-    "@aws-sdk/credential-provider-web-identity": "^3.972.83",
+    "@aws-sdk/credential-provider-env": "^3.972.79",
+    "@aws-sdk/credential-provider-http": "^3.972.81",
+    "@aws-sdk/credential-provider-ini": "^3.973.24",
+    "@aws-sdk/credential-provider-process": "^3.972.79",
+    "@aws-sdk/credential-provider-sso": "^3.973.23",
+    "@aws-sdk/credential-provider-web-identity": "^3.972.85",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/credential-provider-imds": "^4.5.2",

package/node_modules/@aws-sdk/credential-provider-process/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-process",
-  "version": "3.972.77",
+  "version": "3.972.79",
   "description": "AWS credential provider that sources credential_process from ~/.aws/credentials and ~/.aws/config",
   "keywords": [
     "aws",
@@ -43,7 +43,7 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
+    "@aws-sdk/core": "^3.979.0",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/types": "^4.19.0",

package/node_modules/@aws-sdk/credential-provider-sso/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-sso",
-  "version": "3.973.21",
+  "version": "3.973.23",
   "description": "AWS credential provider that exchanges a resolved SSO login token file for temporary AWS credentials",
   "keywords": [
     "aws",
@@ -45,9 +45,9 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
-    "@aws-sdk/nested-clients": "^3.997.51",
-    "@aws-sdk/token-providers": "3.1157.0",
+    "@aws-sdk/core": "^3.979.0",
+    "@aws-sdk/nested-clients": "^3.997.53",
+    "@aws-sdk/token-providers": "3.1160.0",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/types": "^4.19.0",

package/node_modules/@aws-sdk/credential-provider-web-identity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-web-identity",
-  "version": "3.972.83",
+  "version": "3.972.85",
   "description": "AWS credential provider that calls STS assumeRole for temporary AWS credentials",
   "keywords": [
     "aws",
@@ -50,8 +50,8 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.978.6",
-    "@aws-sdk/nested-clients": "^3.997.51",
+    "@aws-sdk/core": "^3.979.0",
+    "@aws-sdk/nested-clients": "^3.997.53",
     "@aws-sdk/types": "^3.975.0",
     "@smithy/core": "^3.37.0",
     "@smithy/types": "^4.19.0",

package/node_modules/@aws-sdk/middleware-sdk-s3/dist-cjs/submodules/s3/index.js

@@ -147,18 +147,22 @@ class S3ExpressIdentityCache {
     delete(key) {
         delete this.data[key];
     }
+    clear() {
+        this.data = {};
+    }
     async purgeExpired() {
         const now = Date.now();
         if (this.lastPurgeTime + S3ExpressIdentityCache.EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS > now) {
             return;
         }
-        for (const key in this.data) {
-            const entry = this.data[key];
+        const data = this.data;
+        for (const key in data) {
+            const entry = data[key];
             if (!entry.isRefreshing) {
                 const credential = await entry.identity;
                 if (credential.expiration) {
-                    if (credential.expiration.getTime() < now) {
-                        delete this.data[key];
+                    if (credential.expiration.getTime() < now && data[key] === entry) {
+                        delete data[key];
                     }
                 }
             }
@@ -185,37 +189,47 @@ class S3ExpressIdentityProviderImpl {
     createSessionFn;
     cache;
     static REFRESH_WINDOW_MS = 60_000;
+    accessKeyId;
+    cacheGeneration = 0;
     constructor(createSessionFn, cache = new S3ExpressIdentityCache()) {
         this.createSessionFn = createSessionFn;
         this.cache = cache;
     }
     async getS3ExpressIdentity(awsIdentity, identityProperties) {
-        const key = identityProperties.Bucket;
+        const bucket = identityProperties.Bucket;
         const { cache } = this;
-        const entry = cache.get(key);
+        if (awsIdentity.accessKeyId !== this.accessKeyId) {
+            this.accessKeyId = awsIdentity.accessKeyId;
+            this.cacheGeneration++;
+            cache.clear();
+        }
+        const cacheGeneration = this.cacheGeneration;
+        const entry = cache.get(bucket);
         if (entry) {
             return entry.identity.then((identity) => {
                 const isExpired = (identity.expiration?.getTime() ?? 0) < Date.now();
                 if (isExpired) {
-                    return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
+                    return cache.set(bucket, new S3ExpressIdentityCacheEntry(this.getIdentity(bucket))).identity;
                 }
                 const isExpiringSoon = (identity.expiration?.getTime() ?? 0) < Date.now() + S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS;
                 if (isExpiringSoon && !entry.isRefreshing) {
                     entry.isRefreshing = true;
-                    this.getIdentity(key).then((id) => {
-                        cache.set(key, new S3ExpressIdentityCacheEntry(Promise.resolve(id)));
+                    this.getIdentity(bucket).then((id) => {
+                        if (cacheGeneration === this.cacheGeneration) {
+                            cache.set(bucket, new S3ExpressIdentityCacheEntry(Promise.resolve(id)));
+                        }
                     });
                 }
                 return identity;
             });
         }
-        return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
+        return cache.set(bucket, new S3ExpressIdentityCacheEntry(this.getIdentity(bucket))).identity;
     }
-    async getIdentity(key) {
+    async getIdentity(bucket) {
         await this.cache.purgeExpired().catch((error) => {
             console.warn("Error while clearing expired entries in S3ExpressIdentityCache: \n" + error);
         });
-        const session = await this.createSessionFn(key);
+        const session = await this.createSessionFn(bucket);
         if (!session.Credentials?.AccessKeyId || !session.Credentials?.SecretAccessKey) {
             throw new Error("s3#createSession response credential missing AccessKeyId or SecretAccessKey.");
         }
@@ -601,10 +615,12 @@ const validateDNSHostLabel = (label, options = { tlsCompatible: true }) => {
 };
 const validateCustomEndpoint = (options) => {
     if (options.isCustomEndpoint) {
-        if (options.dualstackEndpoint)
+        if (options.dualstackEndpoint) {
             throw new Error("Dualstack endpoint is not supported with custom endpoint");
-        if (options.accelerateEndpoint)
+        }
+        if (options.accelerateEndpoint) {
             throw new Error("Accelerate endpoint is not supported with custom endpoint");
+        }
     }
 };
 const getArnResources = (resource) => {
@@ -629,8 +645,9 @@ const getArnResources = (resource) => {
 };
 const validateNoDualstack = (dualstackEndpoint) => { };
 const validateNoFIPS = (useFipsEndpoint) => {
-    if (useFipsEndpoint)
+    if (useFipsEndpoint) {
         throw new Error(`FIPS region is not supported with Outpost.`);
+    }
 };
 const validateMrapAlias = (name) => {
     try {
@@ -967,8 +984,9 @@ const getSsecPlugin = (config) => ({
 });
 function isValidBase64EncodedSSECustomerKey(str, options) {
     const base64Regex = /^(?:[A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
-    if (!base64Regex.test(str))
+    if (!base64Regex.test(str)) {
         return false;
+    }
     try {
         const decodedBytes = options.base64Decoder(str);
         return decodedBytes.length === 32;

package/node_modules/@aws-sdk/middleware-sdk-s3/dist-cjs/submodules/s3-control/index.js

@@ -19,8 +19,9 @@ const CONTEXT_SIGNING_REGION = "signing_region";
 const parseOutpostArnablesMiddleaware = (options) => (next, context) => async (args) => {
     const { input } = args;
     const parameter = input.Name && validate(input.Name) ? "Name" : input.Bucket && validate(input.Bucket) ? "Bucket" : undefined;
-    if (!parameter)
+    if (!parameter) {
         return next(args);
+    }
     const clientRegion = await options.region();
     const useArnRegion = await options.useArnRegion();
     const useFipsEndpoint = await options.useFipsEndpoint();
@@ -60,8 +61,9 @@ const parseOutpostArnablesMiddleaware = (options) => (next, context) => async (a
     if (!input.AccountId) {
         input.AccountId = arn.accountId;
     }
-    if (useArnRegion)
+    if (useArnRegion) {
         context[CONTEXT_ARN_REGION] = arn.region;
+    }
     return next(args);
 };
 const parseOutpostArnablesMiddleawareOptions = {
@@ -176,8 +178,9 @@ const getHostPrefixDeduplicationPlugin = (config) => ({
 
 const redirectFromPostIdMiddleware = (config) => (next, context) => async (args) => {
     const { input, request } = args;
-    if (!HttpRequest.isInstance(request))
+    if (!HttpRequest.isInstance(request)) {
         return next(args);
+    }
     if (input.OutpostId) {
         const { isCustomEndpoint } = config;
         const useFipsEndpoint = await config.useFipsEndpoint();

package/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/submodules/s3/middleware-bucket-endpoint/bucketHostnameUtils.js

@@ -68,10 +68,12 @@ export const validateDNSHostLabel = (label, options = { tlsCompatible: true }) =
 };
 export const validateCustomEndpoint = (options) => {
     if (options.isCustomEndpoint) {
-        if (options.dualstackEndpoint)
+        if (options.dualstackEndpoint) {
             throw new Error("Dualstack endpoint is not supported with custom endpoint");
-        if (options.accelerateEndpoint)
+        }
+        if (options.accelerateEndpoint) {
             throw new Error("Accelerate endpoint is not supported with custom endpoint");
+        }
     }
 };
 export const getArnResources = (resource) => {
@@ -96,8 +98,9 @@ export const getArnResources = (resource) => {
 };
 export const validateNoDualstack = (dualstackEndpoint) => { };
 export const validateNoFIPS = (useFipsEndpoint) => {
-    if (useFipsEndpoint)
+    if (useFipsEndpoint) {
         throw new Error(`FIPS region is not supported with Outpost.`);
+    }
 };
 export const validateMrapAlias = (name) => {
     try {

package/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/submodules/s3/middleware-s3-express/classes/S3ExpressIdentityCache.js

@@ -19,18 +19,22 @@ export class S3ExpressIdentityCache {
     delete(key) {
         delete this.data[key];
     }
+    clear() {
+        this.data = {};
+    }
     async purgeExpired() {
         const now = Date.now();
         if (this.lastPurgeTime + S3ExpressIdentityCache.EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS > now) {
             return;
         }
-        for (const key in this.data) {
-            const entry = this.data[key];
+        const data = this.data;
+        for (const key in data) {
+            const entry = data[key];
             if (!entry.isRefreshing) {
                 const credential = await entry.identity;
                 if (credential.expiration) {
-                    if (credential.expiration.getTime() < now) {
-                        delete this.data[key];
+                    if (credential.expiration.getTime() < now && data[key] === entry) {
+                        delete data[key];
                     }
                 }
             }

package/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/submodules/s3/middleware-s3-express/classes/S3ExpressIdentityProviderImpl.js

@@ -4,37 +4,47 @@ export class S3ExpressIdentityProviderImpl {
     createSessionFn;
     cache;
     static REFRESH_WINDOW_MS = 60_000;
+    accessKeyId;
+    cacheGeneration = 0;
     constructor(createSessionFn, cache = new S3ExpressIdentityCache()) {
         this.createSessionFn = createSessionFn;
         this.cache = cache;
     }
     async getS3ExpressIdentity(awsIdentity, identityProperties) {
-        const key = identityProperties.Bucket;
+        const bucket = identityProperties.Bucket;
         const { cache } = this;
-        const entry = cache.get(key);
+        if (awsIdentity.accessKeyId !== this.accessKeyId) {
+            this.accessKeyId = awsIdentity.accessKeyId;
+            this.cacheGeneration++;
+            cache.clear();
+        }
+        const cacheGeneration = this.cacheGeneration;
+        const entry = cache.get(bucket);
         if (entry) {
             return entry.identity.then((identity) => {
                 const isExpired = (identity.expiration?.getTime() ?? 0) < Date.now();
                 if (isExpired) {
-                    return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
+                    return cache.set(bucket, new S3ExpressIdentityCacheEntry(this.getIdentity(bucket))).identity;
                 }
                 const isExpiringSoon = (identity.expiration?.getTime() ?? 0) < Date.now() + S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS;
                 if (isExpiringSoon && !entry.isRefreshing) {
                     entry.isRefreshing = true;
-                    this.getIdentity(key).then((id) => {
-                        cache.set(key, new S3ExpressIdentityCacheEntry(Promise.resolve(id)));
+                    this.getIdentity(bucket).then((id) => {
+                        if (cacheGeneration === this.cacheGeneration) {
+                            cache.set(bucket, new S3ExpressIdentityCacheEntry(Promise.resolve(id)));
+                        }
                     });
                 }
                 return identity;
             });
         }
-        return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
+        return cache.set(bucket, new S3ExpressIdentityCacheEntry(this.getIdentity(bucket))).identity;
     }
-    async getIdentity(key) {
+    async getIdentity(bucket) {
         await this.cache.purgeExpired().catch((error) => {
             console.warn("Error while clearing expired entries in S3ExpressIdentityCache: \n" + error);
         });
-        const session = await this.createSessionFn(key);
+        const session = await this.createSessionFn(bucket);
         if (!session.Credentials?.AccessKeyId || !session.Credentials?.SecretAccessKey) {
             throw new Error("s3#createSession response credential missing AccessKeyId or SecretAccessKey.");
         }

package/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/submodules/s3/middleware-ssec/middleware-ssec.js

@@ -54,8 +54,9 @@ export const getSsecPlugin = (config) => ({
 });
 export function isValidBase64EncodedSSECustomerKey(str, options) {
     const base64Regex = /^(?:[A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
-    if (!base64Regex.test(str))
+    if (!base64Regex.test(str)) {
         return false;
+    }
     try {
         const decodedBytes = options.base64Decoder(str);
         return decodedBytes.length === 32;