Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update credential management flow #2492

Merged
merged 28 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
abc276e
Update credential management flow
rudyflores Oct 3, 2023
9767258
reload after installing
rudyflores Oct 3, 2023
7ba0dbf
add changelog
rudyflores Oct 3, 2023
5e203ed
fix broken unit tests
rudyflores Oct 3, 2023
5cc3d90
add code coverage
rudyflores Oct 3, 2023
9e6b41d
Merge branch 'main' into update-credential-management
rudyflores Oct 9, 2023
99b94b3
Merge branch 'main' into update-credential-management
rudyflores Oct 9, 2023
16c6ae2
Merge branch 'main' into update-credential-management
rudyflores Oct 16, 2023
ca963a1
Merge branch 'main' into update-credential-management
rudyflores Oct 19, 2023
b513104
Merge branch 'main' into update-credential-management
JillieBeanSim Oct 20, 2023
b870d6d
Merge branch 'main' into update-credential-management
rudyflores Oct 20, 2023
d732a3c
change function access back to public
rudyflores Oct 20, 2023
c20d02a
fix broken unit test
rudyflores Oct 20, 2023
71f1370
Merge branch 'main' into update-credential-management
rudyflores Oct 23, 2023
0be6b9b
Merge branch 'main' into update-credential-management
rudyflores Oct 24, 2023
a6f08d9
Merge branch 'main' into update-credential-management
rudyflores Oct 24, 2023
51672dc
refactor condition for checking for custom credential managers
rudyflores Oct 25, 2023
65cb11e
add back headless used for testing
rudyflores Oct 25, 2023
4d6179a
remove extra call and register before for theia = false
JillieBeanSim Oct 25, 2023
1ca3714
fix code smell
JillieBeanSim Oct 25, 2023
ace4dbe
issue where imperative override was set back to default fix
rudyflores Oct 25, 2023
ea9070e
try this
JillieBeanSim Oct 26, 2023
2746849
fix broken unit tests
rudyflores Oct 26, 2023
926e6fe
add missing code coverage
rudyflores Oct 26, 2023
d8e9da4
Merge pull request #2527 from zowe/update-cm-ext
rudyflores Oct 26, 2023
9608789
fix odd string issue
rudyflores Oct 26, 2023
30dceaa
change refresh to reload
rudyflores Oct 26, 2023
23cb591
fix broken test
rudyflores Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/zowe-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
- Introduce a new user interface for managing profiles via right-click action "Manage Profile".
- Added new edit feature on `Edit Attributes` view for changing file tags on USS [#2113](https://github.com/zowe/vscode-extension-for-zowe/issues/2113)
- Added new API {ZE Extender MetaData} to allow extenders to have the metadata of registered extenders to aid in team configuration file creation from a view that isn't Zowe Explorer's. [#2394](https://github.com/zowe/vscode-extension-for-zowe/issues/2394)
- Added ability to install extension from VS Code marketplace if custom credential manager extension is missing after defining it on `imperative.json` [#2381](https://github.com/zowe/vscode-extension-for-zowe/issues/2381)

### Bug fixes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,8 @@ describe("Profiles Unit Tests - Function createNewConnection for v1 Profiles", (
const globalMocks = await createGlobalMocks();
const blockMocks = await createBlockMocks(globalMocks);

jest.spyOn(utils.ProfilesUtils, "getCredentialManagerOverride").mockReturnValueOnce("@zowe/cli");

jest.spyOn(globalMocks.mockProfileInstance, "getSchema").mockReturnValue(blockMocks.testSchemas);
jest.spyOn(globalMocks.mockProfileInstance, "urlInfo").mockReturnValue(globalMocks.mockUrlInfo);
jest.spyOn(globalMocks.mockProfileInstance, "userInfo").mockReturnValue(globalMocks.testProfile.profile.user);
Expand Down Expand Up @@ -377,6 +379,7 @@ describe("Profiles Unit Tests - Function createNewConnection for v1 Profiles", (
it("Tests that createNewConnection returns 'fake' if the port is undefined and portInfo() returns correct port", async () => {
const globalMocks = await createGlobalMocks();
const blockMocks = await createBlockMocks(globalMocks);
jest.spyOn(utils.ProfilesUtils, "getCredentialManagerOverride").mockReturnValueOnce("@zowe/cli");
const customURLInfo = {
valid: true,
protocol: "https",
Expand Down Expand Up @@ -424,6 +427,7 @@ describe("Profiles Unit Tests - Function createNewConnection for v1 Profiles", (
const globalMocks = await createGlobalMocks();
const blockMocks = await createBlockMocks(globalMocks);

jest.spyOn(utils.ProfilesUtils, "getCredentialManagerOverride").mockReturnValueOnce("@zowe/cli");
jest.spyOn(globalMocks.mockProfileInstance, "getSchema").mockReturnValueOnce(blockMocks.testSchemas);
jest.spyOn(globalMocks.mockProfileInstance, "urlInfo").mockReturnValueOnce(globalMocks.mockUrlInfo);
jest.spyOn(globalMocks.mockProfileInstance, "userInfo").mockReturnValueOnce(globalMocks.testProfile.profile.user);
Expand All @@ -447,6 +451,7 @@ describe("Profiles Unit Tests - Function createNewConnection for v1 Profiles", (
const globalMocks = await createGlobalMocks();
const blockMocks = await createBlockMocks(globalMocks);

jest.spyOn(utils.ProfilesUtils, "getCredentialManagerOverride").mockReturnValueOnce("@zowe/cli");
jest.spyOn(globalMocks.mockProfileInstance, "getSchema").mockReturnValueOnce(blockMocks.testSchemas);
jest.spyOn(globalMocks.mockProfileInstance, "urlInfo").mockReturnValueOnce(globalMocks.mockUrlInfo);
jest.spyOn(globalMocks.mockProfileInstance, "userInfo").mockReturnValueOnce(globalMocks.testProfile.profile.user);
Expand Down Expand Up @@ -499,6 +504,7 @@ describe("Profiles Unit Tests - Function createNewConnection for v1 Profiles", (
const globalMocks = await createGlobalMocks();
const blockMocks = await createBlockMocks(globalMocks);

jest.spyOn(utils.ProfilesUtils, "getCredentialManagerOverride").mockReturnValueOnce("@zowe/cli");
jest.spyOn(globalMocks.mockProfileInstance, "getSchema").mockReturnValueOnce(blockMocks.testSchemas);
jest.spyOn(globalMocks.mockProfileInstance, "urlInfo").mockReturnValueOnce(globalMocks.mockUrlInfo);
jest.spyOn(globalMocks.mockProfileInstance, "userInfo").mockReturnValueOnce(globalMocks.testProfile.profile.user);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { DatasetTree } from "../../src/dataset/DatasetTree";
import { USSTree } from "../../src/uss/USSTree";
import { ZoweLogger } from "../../src/utils/LoggerUtils";
import { ZoweSaveQueue } from "../../src/abstract/ZoweSaveQueue";
import { ProfilesUtils } from "../../src/utils/ProfilesUtils";

jest.mock("vscode");
jest.mock("fs");
Expand Down Expand Up @@ -562,6 +563,7 @@ describe("Extension Unit Tests", () => {
describe("Extension Unit Tests - THEIA", () => {
it("Tests that activate() works correctly for Theia", async () => {
const globalMocks = await createGlobalMocks();
jest.spyOn(ProfilesUtils, "getCredentialManagerOverride").mockReturnValueOnce("@zowe/cli");

Object.defineProperty(vscode.env, "appName", { value: "Eclipse Theia" });
Object.defineProperty(vscode.env, "uriScheme", { value: "theia" });
Expand Down
Loading
Loading