trivikr · trivikr · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023
diff --git a/packages/config-resolver/CHANGELOG.md b/packages/config-resolver/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.0.13
+
+### Patch Changes
+
+- Updated dependencies [7b568c39]
+  - @smithy/node-config-provider@2.1.0
+
 ## 2.0.12
 
 ### Patch Changes

diff --git a/packages/config-resolver/package.json b/packages/config-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/config-resolver",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "yarn g:tsc -p tsconfig.cjs.json",

diff --git a/packages/credential-provider-imds/CHANGELOG.md b/packages/credential-provider-imds/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.0.15
+
+### Patch Changes
+
+- Updated dependencies [7b568c39]
+  - @smithy/node-config-provider@2.1.0
+
 ## 2.0.14
 
 ### Patch Changes

diff --git a/packages/credential-provider-imds/package.json b/packages/credential-provider-imds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/credential-provider-imds",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "AWS credential provider that sources credentials from the EC2 instance metadata service and ECS container metadata service",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",

diff --git a/packages/experimental-identity-and-auth/CHANGELOG.md b/packages/experimental-identity-and-auth/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.13
+
+### Patch Changes
+
+- @smithy/middleware-retry@2.0.15
+
 ## 0.0.12
 
 ### Patch Changes

diff --git a/packages/experimental-identity-and-auth/package.json b/packages/experimental-identity-and-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/experimental-identity-and-auth",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "yarn g:tsc -p tsconfig.cjs.json",

diff --git a/packages/middleware-retry/CHANGELOG.md b/packages/middleware-retry/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.0.15
+
+### Patch Changes
+
+- Updated dependencies [7b568c39]
+  - @smithy/node-config-provider@2.1.0
+
 ## 2.0.14
 
 ### Patch Changes

diff --git a/packages/middleware-retry/package.json b/packages/middleware-retry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/middleware-retry",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "yarn g:tsc -p tsconfig.cjs.json",

diff --git a/packages/node-config-provider/CHANGELOG.md b/packages/node-config-provider/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## 2.1.0
+
+### Minor Changes
+
+- 7b568c39: Pass configuration file as second parameter to configSelector
+
+### Patch Changes
+
+- Updated dependencies [aa86b3fe]
+  - @smithy/shared-ini-file-loader@2.1.0
+
 ## 2.0.14
 
 ### Patch Changes

diff --git a/packages/node-config-provider/package.json b/packages/node-config-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/node-config-provider",
-  "version": "2.0.14",
+  "version": "2.1.0",
   "description": "Load config default values from ini config files and environmental variable",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",

diff --git a/packages/node-config-provider/src/fromSharedConfigFiles.ts b/packages/node-config-provider/src/fromSharedConfigFiles.ts
@@ -1,6 +1,6 @@
 import { CredentialsProviderError } from "@smithy/property-provider";
 import { getProfileName, loadSharedConfigFiles, SourceProfileInit } from "@smithy/shared-ini-file-loader";
-import { Profile, Provider } from "@smithy/types";
+import { ParsedIniData, Profile, Provider } from "@smithy/types";
 
 export interface SharedConfigInit extends SourceProfileInit {
   /**
@@ -11,7 +11,7 @@ export interface SharedConfigInit extends SourceProfileInit {
   preferredFile?: "config" | "credentials";
 }
 
-export type GetterFromConfig<T> = (profile: Profile) => T | undefined;
+export type GetterFromConfig<T> = (profile: Profile, configFile?: ParsedIniData) => T | undefined;
 
 /**
  * Get config value from the shared config files with inferred profile name.
@@ -31,7 +31,8 @@ export const fromSharedConfigFiles = <T = string>(
       : { ...profileFromConfig, ...profileFromCredentials };
 
   try {
-    const configValue = configSelector(mergedProfile);
+    const cfgFile = preferredFile === "config" ? configFile : credentialsFile;
+    const configValue = configSelector(mergedProfile, cfgFile);
     if (configValue === undefined) {
       throw new Error();
     }

diff --git a/packages/shared-ini-file-loader/CHANGELOG.md b/packages/shared-ini-file-loader/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.1.0
+
+### Minor Changes
+
+- aa86b3fe: Populate subsection using dot separator in section key when parsing INI files
+
 ## 2.0.13
 
 ### Patch Changes

diff --git a/packages/shared-ini-file-loader/package.json b/packages/shared-ini-file-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/shared-ini-file-loader",
-  "version": "2.0.13",
+  "version": "2.1.0",
   "dependencies": {
     "@smithy/types": "workspace:^",
     "tslib": "^2.5.0"

diff --git a/packages/shared-ini-file-loader/src/parseIni.spec.ts b/packages/shared-ini-file-loader/src/parseIni.spec.ts
@@ -91,20 +91,33 @@ describe(parseIni.name, () => {
     });
 
     it("returns data from main section, and not subsection", () => {
-      const mockMainSettings = { key: "value1" };
-      const mockProfileDataWithSubSettings = { ...mockMainSettings, "sub-settings-name": { key: "subValue1" } };
+      const mockProfileDataWithSubSettings = {
+        key: "value",
+        subSection: { subKey: "subValue" },
+      };
       const mockInput = getMockProfileContent(mockProfileName, mockProfileDataWithSubSettings);
       expect(parseIni(mockInput)).toStrictEqual({
-        [mockProfileName]: mockMainSettings,
+        [mockProfileName]: {
+          key: "value",
+          "subSection.subKey": "subValue",
+        },
       });
 
       const mockProfileName2 = "mock_profile_name_2";
-      const mockMainSettings2 = { key: "value2" };
-      const mockProfileDataWithSubSettings2 = { ...mockMainSettings2, "sub-settings-name": { key: "subValue2" } };
+      const mockProfileDataWithSubSettings2 = {
+        key: "value2",
+        subSection: { subKey: "subValue2" },
+      };
       const mockInput2 = getMockProfileContent(mockProfileName2, mockProfileDataWithSubSettings2);
       expect(parseIni(`${mockInput}${mockInput2}`)).toStrictEqual({
-        [mockProfileName]: mockMainSettings,
-        [mockProfileName2]: mockMainSettings2,
+        [mockProfileName]: {
+          key: "value",
+          "subSection.subKey": "subValue",
+        },
+        [mockProfileName2]: {
+          key: "value2",
+          "subSection.subKey": "subValue2",
+        },
       });
     });
   });

diff --git a/packages/shared-ini-file-loader/src/parseIni.ts b/packages/shared-ini-file-loader/src/parseIni.ts
@@ -26,10 +26,10 @@ export const parseIni = (iniData: string): ParsedIniData => {
         ];
         if (value === "") {
           currentSubSection = name;
-        } else if (currentSubSection === undefined) {
-          // ToDo: populate subsection in future PR, when IniSection is updated to support subsections.
+        } else {
           map[currentSection] = map[currentSection] || {};
-          map[currentSection][name] = value;
+          const key = currentSubSection ? `${currentSubSection}.${name}` : name;
+          map[currentSection][key] = value;
         }
       }
     }

diff --git a/packages/util-defaults-mode-node/CHANGELOG.md b/packages/util-defaults-mode-node/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.0.17
+
+### Patch Changes
+
+- Updated dependencies [7b568c39]
+  - @smithy/node-config-provider@2.1.0
+  - @smithy/config-resolver@2.0.13
+  - @smithy/credential-provider-imds@2.0.15
+
 ## 2.0.16
 
 ### Patch Changes

diff --git a/packages/util-defaults-mode-node/package.json b/packages/util-defaults-mode-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smithy/util-defaults-mode-node",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "yarn g:tsc -p tsconfig.cjs.json",