user config osLoc fix and unit test

Signed-off-by: jace-roell <[email protected]>
zowe · Dec 17, 2024 · 5b85f22 · 5b85f22
1 parent 4386b17
commit 5b85f22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts
@@ -677,7 +677,14 @@ describe("TeamConfig ProfileInfo tests", () => {
                 expect(arg.argValue).toEqual(expectedArgs[idx].argValue);
                 expect(arg.argLoc.locType).toBe(ProfLocType.TEAM_CONFIG);
                 expect(arg.argLoc.jsonLoc).toMatch(/^profiles\.(base_glob|LPAR2_home)\.properties\./);
-                expect(arg.argLoc.osLoc[0]).toEqual(path.normalize(path.join(teamHomeProjDir, `${testAppNm}.config.json`)));
+                expect([
+                    path.normalize(
+                        path.join(teamHomeProjDir, `${testAppNm}.config.json`)
+                    ),
+                    path.normalize(
+                        path.join(teamProjDir, `${testAppNm}.config.json`)
+                    ),
+                ]).toContain(arg.argLoc.osLoc[0]);
             }
         });
 

diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/src/ProfileInfo.ts
@@ -1654,16 +1654,12 @@ export class ProfileInfo {
         };
 
         let filePath: string;
-        if (_isPropInLayer(opts.configProperties) && opts.osLocInfo) {
-            filePath = opts.osLocInfo.path;
-        } else {
             for (const layer of this.mLoadedConfig.mLayers) {
                 // Find the first layer that includes the JSON path
                 if (_isPropInLayer(layer.properties)) {
                     filePath = layer.path;
                     break;
                 }
-            }
         }
 
         return [{