Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
Browse files Browse the repository at this point in the history
Signed-off-by: Gene Johnston <[email protected]>
  • Loading branch information
gejohnston committed Nov 9, 2021
2 parents 3e288b0 + 792594e commit ac5af39
Show file tree
Hide file tree
Showing 19 changed files with 636 additions and 614 deletions.
4 changes: 2 additions & 2 deletions __tests__/__packages__/cli-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli-test-utils",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Test utilities package for Zowe CLI plug-ins",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@types/node": "^14.14.37",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/imperative": "5.0.0-next.202111032034",
"eslint": "^7.32.0",
"rimraf": "^3.0.2",
"typescript": "^4.2.3"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"command": {
"publish": {
"ignoreChanges": [
Expand Down
1,095 changes: 547 additions & 548 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"prepare": "husky install"
},
"dependencies": {
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/imperative": "5.0.0-next.202111032034",
"@zowe/perf-timing": "1.0.7"
},
"devDependencies": {
Expand Down
20 changes: 16 additions & 4 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ All notable changes to the Zowe CLI package will be documented in this file.
- Eliminate the display of escape characters when colors are displayed while running in daemon mode. [#938](https://github.com/zowe/zowe-cli/issues/938). Currently accomplished by not displaying colors in daemon mode.
- Command-line arguments that contain spaces no longer require extra quotes or escapes. [#978](https://github.com/zowe/zowe-cli/issues/978)

## `7.0.0-next.202111041425`

- Enhancement: Added `autoStore` property to config JSON files which defaults to true. When this property is enabled and the CLI prompts you to enter connection info, the values you enter will be saved to disk (or credential vault if they are secure) for future use. [zowe/zowe-cli#923](https://github.com/zowe/zowe-cli/issues/923)

## `7.0.0-next.202110211759`

- Enhancement: Display the set of changes made by the 'zowe config auto-init' command.
Expand Down Expand Up @@ -60,22 +64,30 @@ All notable changes to the Zowe CLI package will be documented in this file.
- Deprecated: The "profiles" command group for managing global profiles in "~/.zowe/profiles". Use the new "config" command group instead.
- **Breaking**: Removed "config" command group for managing app settings in "~/.zowe/imperative/settings.json". If app settings already exist they are still loaded for backwards compatibility.

## `6.36.1`

- BugFix: Fixed an issue where plugin install and uninstall did not work with NPM version 8. [#683](https://github.com/zowe/imperative/issues/683)

## `6.36.0`

- Enhancement: Added the command tree JSON object to the `zowe --available-commands` command's data object, returned when `--response-format-json` is specified.

## `6.35.0`

- Enhancement: Removed the misleading `workflow-name` option for the `zowe zos-workflows list definition-file-details` help example. [#659](https://github.com/zowe/zowe-cli/issues/659)
- Enhancement: Exposed new option `modifyVersion` for the `zowe zos-jobs delete job` and `zowe zos-jobs cancel job` commands. [#1092](https://github.com/zowe/zowe-cli/issues/1092)

## `6.34.1`

- BugFix: Reverts hiding the cert-key-file path so users can see what path was specified and check if the file exists
- BugFix: Reverts hiding the cert-key-file path so users can see what path was specified and check if the file exists.

## `6.34.0`

- Enhancement: Add support for PEM certificate based authentication
- Enhancement: Add support for PEM certificate based authentication.

## `6.33.4`

- BugFix: Updated dependencies to resolve problems with the ansi-regex package
- BugFix: Updated dependencies to resolve problems with the ansi-regex package.

## `6.33.3`

Expand All @@ -89,7 +101,7 @@ All notable changes to the Zowe CLI package will be documented in this file.

- Enhancement: Exposed new option `start` for the `zowe zos-files list data-set` command. [#495](https://github.com/zowe/zowe-cli/issues/495)
- Enhancement: Updated Imperative to add the following features:
- Enhancement: Improved command suggestions for mistyped commands, add aliases to command suggestions
- Enhancement: Improved command suggestions for mistyped commands, add aliases to command suggestions.
- Enhancement: The `plugins validate` command will return an error code when plugins have errors if the new `--fail-on-error` option is specified. Also adds `--fail-on-warning` option to return with an error code when plugins have warnings. [#463](https://github.com/zowe/imperative/issues/463)
- BugFix: Fixed regression where characters are not correctly escaped in web help causing extra slashes ("\") to appear. [#644](https://github.com/zowe/imperative/issues/644)
- Renamed the zos-files `--responseTimeout` option to `--response-timeout` in help docs for consistency. [#803](https://github.com/zowe/zowe-cli/issues/803)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`start address-space handler tests should be able respond with error message, if required z/OSMF parameters were not passed 1`] = `"Timed out waiting for host name."`;
exports[`start address-space handler tests should be able respond with error message, if required z/OSMF parameters were not passed 1`] = `"Timed out waiting for hostname."`;

exports[`start address-space handler tests should be able to start address-space 1`] = `
Object {
Expand Down
24 changes: 12 additions & 12 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -55,25 +55,25 @@
"typedocSpecifySrc": "typedoc --options ./typedoc.json"
},
"dependencies": {
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"@zowe/perf-timing": "1.0.7",
"@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202111041425",
"get-stdin": "7.0.0",
"lodash": "4.17.21",
"minimatch": "3.0.4"
},
"devDependencies": {
"@types/lodash": "^4.14.175",
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"comment-json": "^4.1.0",
"eslint": "^7.32.0",
"js-yaml": "^3.13.1",
Expand Down
4 changes: 4 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## `7.0.0-next.202111041425`

- Enhancement: Updated `Services.convertApimlProfileInfoToProfileConfig` method to include the `autoStore` property in config it creates

## `6.34.0`

- Enhancement: Add support for PEM certificate based authentication
Expand Down
18 changes: 12 additions & 6 deletions packages/core/__tests__/apiml/__unit__/Services.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@ describe("APIML Services unit tests", () => {
it("should handle null or undefined profileInfoList", () => {
const expectedJson = `{
"profiles": {},
"defaults": {}
"defaults": {},
"autoStore": true
}`;
let actualJson = JSONC.stringify(Services.convertApimlProfileInfoToProfileConfig(null), null, ConfigConstants.INDENT);
expect(actualJson).toEqual(expectedJson);
Expand Down Expand Up @@ -417,7 +418,8 @@ describe("APIML Services unit tests", () => {
},
"defaults": {
"type0": "test0"
}
},
"autoStore": true
}`;
expect(actualJson).toEqual(expectedJson);
});
Expand Down Expand Up @@ -450,7 +452,8 @@ describe("APIML Services unit tests", () => {
},
"defaults": {
"type1": "test1"
}
},
"autoStore": true
}`;
expect(actualJson).toEqual(expectedJson);
});
Expand Down Expand Up @@ -502,7 +505,8 @@ describe("APIML Services unit tests", () => {
},
"defaults": {
"type1": "test1"
}
},
"autoStore": true
}`;
expect(actualJson).toEqual(expectedJson);
});
Expand Down Expand Up @@ -549,7 +553,8 @@ describe("APIML Services unit tests", () => {
// Uncomment one of the lines below to set a different default.
//"type2": "test2.2"
"type2": "test2.1"
}
},
"autoStore": true
}`;
expect(actualJson).toEqual(expectedJson);
});
Expand Down Expand Up @@ -645,7 +650,8 @@ describe("APIML Services unit tests", () => {
// Uncomment one of the lines below to set a different default.
//"type4": "test4.2"
"type4": "test4.1"
}
},
"autoStore": true
}`;
expect(actualJson).toEqual(expectedJson);
});
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/core-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Core libraries shared by Zowe SDK packages",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -49,8 +49,8 @@
},
"devDependencies": {
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"chalk": "^4.1.0",
"eslint": "^7.32.0",
"madge": "^4.0.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/apiml/Services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ export class Services {

const configResult: IConfig = {
profiles: configProfile.profiles,
defaults: configDefaults
defaults: configDefaults,
autoStore: true
};
return configResult;
}
Expand Down
8 changes: 4 additions & 4 deletions packages/provisioning/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/provisioning-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe SDK to interact with the z/OS provisioning APIs",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -49,9 +49,9 @@
"devDependencies": {
"@types/js-yaml": "^3.12.5",
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"eslint": "^7.32.0",
"madge": "^4.0.1",
"rimraf": "^2.6.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/workflows/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zos-workflows-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe SDK to interact with the z/OS workflows APIs",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -44,13 +44,13 @@
"typedocSpecifySrc": "typedoc --options ./typedoc.json"
},
"dependencies": {
"@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202110211759"
"@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202111041425"
},
"devDependencies": {
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"eslint": "^7.32.0",
"madge": "^4.0.1",
"rimraf": "^2.6.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/zosconsole/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zos-console-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe SDK to interact with the z/OS console",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -45,9 +45,9 @@
},
"devDependencies": {
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"eslint": "^7.32.0",
"madge": "^4.0.1",
"rimraf": "^2.6.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/zosfiles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zos-files-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe SDK to interact with files and data sets on z/OS",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -49,10 +49,10 @@
},
"devDependencies": {
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202111041425",
"eslint": "^7.32.0",
"madge": "^4.0.1",
"rimraf": "^2.6.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/zosjobs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zos-jobs-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe SDK to interact with jobs on z/OS",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -45,13 +45,13 @@
"typedocSpecifySrc": "typedoc --options ./typedoc.json"
},
"dependencies": {
"@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202110211759"
"@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202111041425"
},
"devDependencies": {
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"eslint": "^7.32.0",
"madge": "^4.0.1",
"rimraf": "^2.6.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/zosmf/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zosmf-for-zowe-sdk",
"version": "7.0.0-next.202110211759",
"version": "7.0.0-next.202111041425",
"description": "Zowe SDK to interact with the z/OS Management Facility",
"author": "Broadcom",
"license": "EPL-2.0",
Expand Down Expand Up @@ -44,9 +44,9 @@
},
"devDependencies": {
"@types/node": "^12.12.24",
"@zowe/cli-test-utils": "7.0.0-next.202110211759",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202110211759",
"@zowe/imperative": "5.0.0-next.202110201735",
"@zowe/cli-test-utils": "7.0.0-next.202111041425",
"@zowe/core-for-zowe-sdk": "7.0.0-next.202111041425",
"@zowe/imperative": "5.0.0-next.202111032034",
"eslint": "^7.32.0",
"madge": "^4.0.1",
"rimraf": "^2.6.3",
Expand Down
Loading

0 comments on commit ac5af39

Please sign in to comment.