Skip to content

Commit

Permalink
Merge pull request #143 from zowe/update-next
Browse files Browse the repository at this point in the history
Update next
  • Loading branch information
zFernand0 authored Sep 20, 2024
2 parents 76697f3 + 588d909 commit 7017b2a
Show file tree
Hide file tree
Showing 27 changed files with 118 additions and 74 deletions.
24 changes: 6 additions & 18 deletions .github/release.config.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
module.exports = {
branches: [
{
name: "main",
channel: "latest",
level: "minor",
// This will be moved down once Zowe V3 is announced
// Remember to also update aliasTags below
name: "zowe-v2-lts",
level: "patch",
devDependencies: {
"@zowe/imperative": "zowe-v2-lts",
"@zowe/zowe-explorer-api": ["zowe-v2-lts", "@zowe:registry=https://registry.npmjs.org/"],
}
},
{
name: "zowe-v1-lts",
channel: "zowe-v1-lts",
level: "patch",
devDependencies: {
"@zowe/imperative": "zowe-v1-lts",
"@zowe/zowe-explorer-api": ["zowe-v1-lts", "@zowe:registry=https://registry.npmjs.org/"],
}
},
{
name: "next",
name: "main",
channel: "next",
level: "none",
prerelease: true,
devDependencies: {
"@zowe/imperative": "next",
"@zowe/imperative": "zowe-v3-lts",
"@zowe/zowe-explorer-api": ["next", "@zowe:registry=https://registry.npmjs.org/"],
}
}
Expand Down Expand Up @@ -59,8 +51,6 @@ module.exports = {
aliasTags: {
"latest": ["zowe-v2-lts"],
"next": ["zowe-v3-lts"],
// TODO: Remove the two lines above when merging to the `main` branch
// "latest": ["zowe-v3-lts"],
},
npmPublish: true,
tarballDir: "dist",
Expand All @@ -70,8 +60,6 @@ module.exports = {
aliasTags: {
"latest": ["zowe-v2-lts"],
"next": ["zowe-v3-lts"],
// TODO: Remove the two lines above when merging to the `main` branch
// "latest": ["zowe-v3-lts"],
},
npmPublish: true,
tarballDir: "dist",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
node-version: lts/*

- name: Check Vulnerabilities
run: npm audit --workspaces --production --audit-level=moderate
run: npm audit --workspaces --production --audit-level=moderate
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The following information is critical to working with the code, running/writing/
| Conventions and best practices for creating packages and plug-ins for Zowe CLI | [Package and Plug-in Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/PackagesAndPluginGuidelines.md)|
| Guidelines for running tests on Zowe CLI | [Testing Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/TESTING.md) |
| Guidelines for running tests on the plug-ins that you build for Zowe CLI | [Plug-in Testing Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/PluginTESTINGGuidelines.md) |
| Documentation that describes the features of the Imperative CLI Framework | [About Imperative CLI Framework](https://github.com/zowe/imperative/wiki) |
| Documentation that describes the features of the Imperative CLI Framework | [About Imperative CLI Framework](https://github.com/zowe/zowe-cli/wiki) |
Versioning conventions for Zowe CLI and Plug-ins| [Versioning Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/MaintainerVersioning.md) |

## Contribution Guidelines Specific to the CICS Plug-in
Expand Down
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
###############################################################################
# Example properties file for the SCS Credential Manager plug-in for Zowe CLI #
# Example properties file for the CICS plug-in for Zowe CLI #
# Copy this to custom_properties.yaml in the same directory #
# and modify to fill in your customized connection and test details #
#-----------------------------------------------------------------------------#
# Find and replace the following: #
# #
# my-user-name - This is your TSO user ID #
# my-user-name - This is your TSO user ID #
# my-password - This is your TSO password #
# zosmf-host - The host name for the LPAR with z/OSMF #
# zosmf-port - The z/OSMF port #
# my-cics-host - This is the hostname for the CICS CMCI server #
# my-cics-port - this is the port for the CICS CMCI server #
# my-csd-group - this is the CSD group to which new resources will be #
# defined #
# my-region-name - name of the CICS region #
###############################################################################

#-------------------------------------------------------------------------#
# Connection details/credentials for z/OSMF #
#-------------------------------------------------------------------------#
zosmf:
user: &user zosmf-user
password: &pass zosmf-password
host: &host zosmf-host
port: &port 443
rejectUnauthorized: &ru false
# see zowe profiles create cics --help for more info
cics:
user: *user
password: *pass
host: *host
port: 1234
rejectUnauthorized: *ru
user: my-user-name
password: my-password
host: my-cics-host
port: my-cics-port
protocol: https
rejectUnauthorized: false
cmci:
regionName: region-name
csdGroup: CSDGROUP
csdGroup: my-csd-group
regionName: my-region-name
urimap:
certificate: null

# certificate can be left blank, like the line below
certificate:
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS add-to-list csdGroup command should be able to display the help 1`
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS define program command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ exports[`CICS define transaction command should be able to display the help 1`]
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,10 @@ exports[`CICS define urimap-client command should be able to display the help 1`
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ exports[`CICS define urimap-pipeline command should be able to display the help
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ exports[`CICS define urimap-server command should be able to display the help 1`
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ exports[`CICS define web service command should be able to display the help 1`]
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS delete program command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS delete transaction command should be able to display the help 1`]
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ exports[`CICS delete urimap command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ exports[`CICS delete web service command should be able to display the help 1`]
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ exports[`CICS disable urimap command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ exports[`CICS discard program command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ exports[`CICS discard transaction command should be able to display the help 1`]
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ exports[`CICS discard urimap command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ exports[`CICS enable urimap command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ exports[`cics get resource should display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS install program command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS install transaction command should be able to display the help 1`]
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ exports[`CICS install urimap command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ exports[`CICS refresh program command should be able to display the help 1`] = `
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ exports[`CICS remove-from-list csdGroup command should be able to display the he
--cert-file (local file path)
The file path to a certificate file to use for authentication
The file path to a certificate file to use for authentication.
Note: The CLI does not support certificate files that require a password. For
more information, search Troubleshooting PEM Certificates in Zowe Docs.
--cert-key-file (local file path)
Expand Down
Loading

0 comments on commit 7017b2a

Please sign in to comment.