Skip to content

Commit

Permalink
Merge branch 'master' into feat/imperative/jwt-token-expiration
Browse files Browse the repository at this point in the history
  • Loading branch information
traeok authored Oct 9, 2024
2 parents 021db76 + a8a90f8 commit 29cde25
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { Config } from "../src/Config";
import { IConfig } from "../src/doc/IConfig";
import { IConfigSecure } from "../src/doc/IConfigSecure";
import { IConfigVault } from "../src/doc/IConfigVault";
import { EventOperator } from "../../events";

const MY_APP = "my_app";

Expand Down Expand Up @@ -52,6 +53,7 @@ describe("Config secure tests", () => {
load: mockSecureLoad,
save: mockSecureSave
};
jest.spyOn(EventOperator, "getZoweProcessor").mockReturnValue({ emitZoweEvent: jest.fn() } as any);
});

it("should set vault if provided for secure load", async () => {
Expand Down
4 changes: 4 additions & 0 deletions packages/secrets/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the Zowe Secrets SDK package will be documented in this file.

## Recent Changes

- BugFix: Updated dependencies for technical currency. [#2289](https://github.com/zowe/zowe-cli/pull/2289)

## `8.0.0`

- MAJOR: v8.0.0 Release
Expand Down
36 changes: 18 additions & 18 deletions packages/secrets/core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions packages/secrets/src/keyring/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 29cde25

Please sign in to comment.