Merge pull request #2039 from zowe/fix/coverity-null-like

fix: Coverity null-like in `updateSchemaAtLayer`
zowe · Feb 8, 2024 · 5667624 · 5667624
2 parents c5a99d8 + 83c5bc7
commit 5667624
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 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
@@ -1416,6 +1416,17 @@ describe("TeamConfig ProfileInfo tests", () => {
                 };
             };
 
+            it("does nothing if there are no layers that match the built layer path", async () => {
+                const profInfo = createNewProfInfo(teamProjDir);
+                await profInfo.readProfilesFromDisk({ homeDir: teamHomeProjDir });
+                (profInfo as any).mProfileSchemaCache = new Map();
+                (profInfo as any).mProfileSchemaCache.set("/some/nonexistent/layer/path:someUnregisteredProfType");
+                const writeFileSync = jest.spyOn(jsonfile, "writeFileSync");
+                writeFileSync.mockReset();
+                (profInfo as any).updateSchemaAtLayer("someUnregisteredProfType", {} as any);
+                expect(writeFileSync).not.toHaveBeenCalled();
+            });
+
             // case 1: schema is the same as the cached one; do not write to disk
             it("does not write schema to disk if it hasn't changed", async () => {
                 const blockMocks = getBlockMocks();

diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/src/ProfileInfo.ts
@@ -1331,6 +1331,9 @@ export class ProfileInfo {
 
         const layerPath = cachedType != null ? cachedType[0].substring(0, cachedType[0].lastIndexOf(":")) : this.getTeamConfig().layerActive().path;
         const layerToUpdate = this.getTeamConfig().mLayers.find((l) => l.path === layerPath);
+        if (layerToUpdate == null) {
+            return;
+        }
         const cacheKey = `${layerPath}:${profileType}`;
 
         const sameSchemaExists = versionChanged ? false :