From 6128b639e871c2d257cd556deaa913f823e71239 Mon Sep 17 00:00:00 2001 From: siddsriv Date: Fri, 13 Dec 2024 15:57:40 +0000 Subject: [PATCH 1/4] chore(util-user-agent-node): appId config file name correction --- packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts index 95255eafffba..1547d9a4de23 100644 --- a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts +++ b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts @@ -1,6 +1,5 @@ -import { LoadedConfigSelectors } from "@smithy/node-config-provider"; import { DEFAULT_UA_APP_ID } from "@aws-sdk/middleware-user-agent"; - +import { LoadedConfigSelectors } from "@smithy/node-config-provider"; /** * @internal @@ -10,7 +9,7 @@ export const UA_APP_ID_ENV_NAME = "AWS_SDK_UA_APP_ID"; /** * @internal */ -export const UA_APP_ID_INI_NAME = "sdk-ua-app-id"; +export const UA_APP_ID_INI_NAME = "sdk_ua_app_id"; /** * @internal From 6df2e2287f139e8c84706d13ae94a53a616a5c51 Mon Sep 17 00:00:00 2001 From: siddsriv Date: Fri, 13 Dec 2024 16:31:44 +0000 Subject: [PATCH 2/4] chore(util-user-agent-node): add deprecated name --- .../util-user-agent-node/src/nodeAppIdConfigOptions.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts index 1547d9a4de23..79e7d4e4d0e2 100644 --- a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts +++ b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts @@ -11,11 +11,16 @@ export const UA_APP_ID_ENV_NAME = "AWS_SDK_UA_APP_ID"; */ export const UA_APP_ID_INI_NAME = "sdk_ua_app_id"; +/** + * @internal + */ +export const UA_APP_ID_INI_NAME_DEPRECATED = "sdk-ua-app-id"; + /** * @internal */ export const NODE_APP_ID_CONFIG_OPTIONS: LoadedConfigSelectors = { environmentVariableSelector: (env) => env[UA_APP_ID_ENV_NAME], - configFileSelector: (profile) => profile[UA_APP_ID_INI_NAME], + configFileSelector: (profile) => profile[UA_APP_ID_INI_NAME] ?? profile[UA_APP_ID_INI_NAME_DEPRECATED], default: DEFAULT_UA_APP_ID, }; From 5526ace85fe264840316bf78405f5730310ec6f6 Mon Sep 17 00:00:00 2001 From: siddsriv Date: Fri, 13 Dec 2024 16:35:28 +0000 Subject: [PATCH 3/4] chore(util-user-agent-node): deprecated annotation --- packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts index 79e7d4e4d0e2..3f75cf978599 100644 --- a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts +++ b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts @@ -12,7 +12,7 @@ export const UA_APP_ID_ENV_NAME = "AWS_SDK_UA_APP_ID"; export const UA_APP_ID_INI_NAME = "sdk_ua_app_id"; /** - * @internal + * @deprecated */ export const UA_APP_ID_INI_NAME_DEPRECATED = "sdk-ua-app-id"; From ea7b7c9091a52ead2f2ca9b321530d30d5a8b8f7 Mon Sep 17 00:00:00 2001 From: siddsriv Date: Fri, 13 Dec 2024 16:41:56 +0000 Subject: [PATCH 4/4] chore(util-user-agent-node): remove export --- packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts index 3f75cf978599..bf570d2151a5 100644 --- a/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts +++ b/packages/util-user-agent-node/src/nodeAppIdConfigOptions.ts @@ -14,7 +14,7 @@ export const UA_APP_ID_INI_NAME = "sdk_ua_app_id"; /** * @deprecated */ -export const UA_APP_ID_INI_NAME_DEPRECATED = "sdk-ua-app-id"; +const UA_APP_ID_INI_NAME_DEPRECATED = "sdk-ua-app-id"; /** * @internal