Skip to content

Commit

Permalink
Merge branch 'next' into removeDeprecatedCore
Browse files Browse the repository at this point in the history
Signed-off-by: Amber Torrise <[email protected]>
  • Loading branch information
ATorrise authored Jan 22, 2024
2 parents 15b7244 + 7847dfb commit 45cd1d7
Show file tree
Hide file tree
Showing 249 changed files with 5,878 additions and 6,993 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/update-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Update GitHub Project

on:
issues:
types: [labeled]
pull_request_target:
types: [opened, reopened, converted_to_draft, ready_for_review]

env:
PROJECT_NUMBER: 21
ISSUE_STATUSES: '{"priority-high": "High Priority", "priority-medium": "Medium Priority", "priority-low": "Low Priority", "Epic": "Epics"}'
PR_STATUS_DRAFT: 'In Progress'
PR_STATUS_READY: 'Review/QA'

jobs:
update-project:
name: Move project item
runs-on: ubuntu-latest
steps:
- uses: zowe-actions/shared-actions/project-move-item@main
if: ${{ github.event.issue && fromJSON(env.ISSUE_STATUSES)[github.event.label.name] }}
with:
item-status: ${{ fromJSON(env.ISSUE_STATUSES)[github.event.label.name] }}
project-number: ${{ env.PROJECT_NUMBER }}
project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }}

- uses: zowe-actions/shared-actions/project-move-item@main
if: ${{ github.event.pull_request }}
with:
assign-author: true
item-status: ${{ github.event.action == 'ready_for_review' && env.PR_STATUS_READY || env.PR_STATUS_DRAFT }}
project-number: ${{ env.PROJECT_NUMBER }}
project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }}
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ Versioning conventions for Zowe CLI and Plug-ins| [Versioning Guidelines](./docs
## **Building Zowe CLI From Source**
Zowe CLI requires NPM version 8 and Cargo version 1.72.0 (or newer) to build from source. Before proceeding, check your NPM version with `npm --version` and if it's older than 8.x, update with `npm install -g npm`. To check your version of Cargo, run `cargo --version`. Cargo can be installed using rustup: [https://rustup.rs/](https://rustup.rs/). To update Cargo, run the `rustup update` command.

For developers using Linux, the following packages are required to build Zowe CLI from source:

- Debian/Ubuntu:
- `sudo apt install build-essential libsecret-1-dev`
- Red Hat-based:
- `sudo dnf group install "Development Tools"`
- `sudo dnf install libsecret-devel`
- Arch Linux:
- `sudo pacman -S base-devel libsecret`

The first time that you download Zowe CLI from the GitHub repository, issue the following command to install the required Zowe CLI dependencies and several development tools:

```
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,45 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 1`] = `
"Command Preparation Failed:
Unable to load the secure field \\"username\\" associated with the profile \\"profile-name-changed\\" of type \\"username-password\\".
Error Details:
Unable to load credentials.
Could not find an entry in the credential vault for the following:
Service = example_with_profiles
Account = username-password_profile-name-changed_username
Possible Causes:
This could have been caused by any manual removal of credentials from your vault.
Resolutions:
Recreate the credentials in the vault for the particular service in the vault.
To recreate credentials, issue a 'profiles create' sub-command with the --ow flag.
"
`;

exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 2`] = `
"Your default profile named profile-name of type username-password was successfully deleted.
Because you deleted it, the default profile for type username-password has been cleared.
To set a new default profile, run \\"zowe profiles set-default username-password <profileName>\\".
"
`;
exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 1`] = `
"
Warning: The command 'profiles update' is deprecated.
Recommended replacement: The 'config set' command
"
`;
exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 2`] = `
"Your default profile named profile-name of type username-password was successfully deleted.
Because you deleted it, the default profile for type username-password has been cleared.
To set a new default profile, run \\"zowe profiles set-default username-password <profileName>\\".
"
`;
exports[`Imperative Secure Tests imperative-test-cli config profiles should list profiles 1`] = `
"secured
base
Expand Down
164 changes: 0 additions & 164 deletions __tests__/__integration__/imperative.integration.subtest.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/* eslint-disable max-len */

describe("Imperative Secure Tests", () => {
require("./imperative.integration.subtest");
require("./../../packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest");
require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/PluginManagementFacility.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/init/cli.imperative-test-cli.config.init.integration.subtest");
Expand All @@ -23,7 +22,6 @@ describe("Imperative Secure Tests", () => {
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/profiles/cli.imperative-test-cli.config.profiles.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/secure/cli.imperative-test-cli.config.secure.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/set/cli.imperative-test-cli.config.set.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/cli.imperative-test-cli.profiles.create.secured-profile.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/test/cli.imperative-test-cli.test.config-auto-store.integration.subtest");
require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/test/cli.imperative-test-cli.test.config-override.integration.subtest");
});
Expand Down
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": "8.0.0-next.202401041721",
"version": "8.0.0-next.202401191954",
"description": "Test utilities package for Zowe CLI plug-ins",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@types/js-yaml": "^4.0.0",
"@types/uuid": "^8.3.0",
"@zowe/imperative": "8.0.0-next.202401041721"
"@zowe/imperative": "8.0.0-next.202401191954"
},
"peerDependencies": {
"@zowe/imperative": "^8.0.0-next"
Expand Down
12 changes: 12 additions & 0 deletions __tests__/__scripts__/exitOnFailure.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

# function to exit if we encounter a bad return code
exitOnFailure () {
failureMsg=${1:?"First parm (failureMsg) is required."}
actualExitCode=${2:?"Second parm (actualExitCode) is required."}
goodExitCode=${3:-0}
if [ $actualExitCode != $goodExitCode ]; then
echo `basename $0`": $failureMsg" 1>&2
exit $actualExitCode
fi
}
7 changes: 5 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const sharedConfig = {
"testRegex": "__tests__.*\\.(spec|test)\\.ts$",
"moduleFileExtensions": [
"ts",
"js"
"js",
"json"
],
"testEnvironment": "node",
"testPathIgnorePatterns": [
Expand Down Expand Up @@ -149,5 +150,7 @@ module.exports = {
"!**/node_modules/**",
"!**/lib/**"
],
"maxWorkers": "67%", // You may need to specify maxWorkers if you run out of RAM
// You may need to specify maxWorkers if you run out of RAM
// GHA should use 75% due to high ram, low core count, end user systems ~67%
"maxWorkers": process.env.GITHUB_ACTIONS != null ? "75%" : "67%",
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "8.0.0-next.202401041721",
"version": "8.0.0-next.202401191954",
"command": {
"publish": {
"ignoreChanges": [
Expand Down
Loading

0 comments on commit 45cd1d7

Please sign in to comment.