@aws-sdk/middleware-user-agent 3.664.0 → 3.667.0

package/dist-cjs/index.js

@@ -65,6 +65,39 @@ __name(resolveUserAgentConfig, "resolveUserAgentConfig");
 var import_util_endpoints = require("@aws-sdk/util-endpoints");
 var import_protocol_http = require("@smithy/protocol-http");
 
+// src/check-features.ts
+var import_core2 = require("@aws-sdk/core");
+async function checkFeatures(context, config, args) {
+  var _a, _b;
+  const request = args.request;
+  if (typeof config.accountIdEndpointMode === "function") {
+    switch (await ((_a = config.accountIdEndpointMode) == null ? void 0 : _a.call(config))) {
+      case "disabled":
+        (0, import_core2.setFeature)(context, "ACCOUNT_ID_MODE_DISABLED", "Q");
+        break;
+      case "preferred":
+        (0, import_core2.setFeature)(context, "ACCOUNT_ID_MODE_PREFERRED", "P");
+        break;
+      case "required":
+        (0, import_core2.setFeature)(context, "ACCOUNT_ID_MODE_REQUIRED", "R");
+        break;
+    }
+  }
+  if (typeof config.credentials === "function") {
+    try {
+      const credentials = await ((_b = config.credentials) == null ? void 0 : _b.call(config));
+      if (credentials.accountId) {
+        (0, import_core2.setFeature)(context, "RESOLVED_ACCOUNT_ID", "T");
+      }
+      for (const [key, value] of Object.entries(credentials.$source ?? {})) {
+        (0, import_core2.setFeature)(context, key, value);
+      }
+    } catch (e) {
+    }
+  }
+}
+__name(checkFeatures, "checkFeatures");
+
 // src/constants.ts
 var USER_AGENT = "user-agent";
 var X_AMZ_USER_AGENT = "x-amz-user-agent";
@@ -104,6 +137,7 @@ var userAgentMiddleware = /* @__PURE__ */ __name((options) => (next, context) =>
   const { headers } = request;
   const userAgent = ((_a = context == null ? void 0 : context.userAgent) == null ? void 0 : _a.map(escapeUserAgent)) || [];
   const defaultUserAgent = (await options.defaultUserAgentProvider()).map(escapeUserAgent);
+  await checkFeatures(context, options, args);
   const awsContext = context;
   defaultUserAgent.push(
     `m/${encodeFeatures(

package/dist-es/check-features.js

@@ -0,0 +1,30 @@
+import { setFeature } from "@aws-sdk/core";
+export async function checkFeatures(context, config, args) {
+    const request = args.request;
+    if (typeof config.accountIdEndpointMode === "function") {
+        switch (await config.accountIdEndpointMode?.()) {
+            case "disabled":
+                setFeature(context, "ACCOUNT_ID_MODE_DISABLED", "Q");
+                break;
+            case "preferred":
+                setFeature(context, "ACCOUNT_ID_MODE_PREFERRED", "P");
+                break;
+            case "required":
+                setFeature(context, "ACCOUNT_ID_MODE_REQUIRED", "R");
+                break;
+        }
+    }
+    if (typeof config.credentials === "function") {
+        try {
+            const credentials = await config.credentials?.();
+            if (credentials.accountId) {
+                setFeature(context, "RESOLVED_ACCOUNT_ID", "T");
+            }
+            for (const [key, value] of Object.entries(credentials.$source ?? {})) {
+                setFeature(context, key, value);
+            }
+        }
+        catch (e) {
+        }
+    }
+}

package/dist-es/user-agent-middleware.js

@@ -1,5 +1,6 @@
 import { getUserAgentPrefix } from "@aws-sdk/util-endpoints";
 import { HttpRequest } from "@smithy/protocol-http";
+import { checkFeatures } from "./check-features";
 import { SPACE, UA_ESCAPE_CHAR, UA_NAME_ESCAPE_REGEX, UA_NAME_SEPARATOR, UA_VALUE_ESCAPE_REGEX, USER_AGENT, X_AMZ_USER_AGENT, } from "./constants";
 import { encodeFeatures } from "./encode-features";
 export const userAgentMiddleware = (options) => (next, context) => async (args) => {
@@ -10,6 +11,7 @@ export const userAgentMiddleware = (options) => (next, context) => async (args)
     const { headers } = request;
     const userAgent = context?.userAgent?.map(escapeUserAgent) || [];
     const defaultUserAgent = (await options.defaultUserAgentProvider()).map(escapeUserAgent);
+    await checkFeatures(context, options, args);
     const awsContext = context;
     defaultUserAgent.push(`m/${encodeFeatures(Object.assign({}, context.__smithy_context?.features, awsContext.__aws_sdk_context?.features))}`);
     const customUserAgent = options?.customUserAgent?.map(escapeUserAgent) || [];

package/dist-types/check-features.d.ts

@@ -0,0 +1,17 @@
+import type { AccountIdEndpointMode } from "@aws-sdk/core/account-id-endpoint";
+import type { AwsHandlerExecutionContext } from "@aws-sdk/types";
+import type { AwsCredentialIdentityProvider, BuildHandlerArguments, Provider } from "@smithy/types";
+/**
+ * @internal
+ */
+type PreviouslyResolved = Partial<{
+    credentials?: AwsCredentialIdentityProvider;
+    accountIdEndpointMode?: Provider<AccountIdEndpointMode>;
+}>;
+/**
+ * @internal
+ * Check for features that don't have a middleware activation site but
+ * may be detected on the context, client config, or request.
+ */
+export declare function checkFeatures(context: AwsHandlerExecutionContext, config: PreviouslyResolved, args: BuildHandlerArguments<any>): Promise<void>;
+export {};

package/dist-types/ts3.4/check-features.d.ts

@@ -0,0 +1,17 @@
+import { AccountIdEndpointMode } from "@aws-sdk/core/account-id-endpoint";
+import { AwsHandlerExecutionContext } from "@aws-sdk/types";
+import {
+  AwsCredentialIdentityProvider,
+  BuildHandlerArguments,
+  Provider,
+} from "@smithy/types";
+type PreviouslyResolved = Partial<{
+  credentials?: AwsCredentialIdentityProvider;
+  accountIdEndpointMode?: Provider<AccountIdEndpointMode>;
+}>;
+export declare function checkFeatures(
+  context: AwsHandlerExecutionContext,
+  config: PreviouslyResolved,
+  args: BuildHandlerArguments<any>
+): Promise<void>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-user-agent",
-  "version": "3.664.0",
+  "version": "3.667.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline middleware-user-agent",
@@ -22,9 +22,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "3.664.0",
-    "@aws-sdk/util-endpoints": "3.664.0",
-    "@smithy/core": "^2.4.7",
+    "@aws-sdk/core": "3.667.0",
+    "@aws-sdk/types": "3.667.0",
+    "@aws-sdk/util-endpoints": "3.667.0",
+    "@smithy/core": "^2.4.8",
     "@smithy/protocol-http": "^4.1.4",
     "@smithy/types": "^3.5.0",
     "tslib": "^2.6.2"