Skip to content

Commit

Permalink
Merge branch 'zowe-v1-lts' into updatedWorkFlowslts
Browse files Browse the repository at this point in the history
  • Loading branch information
@zFernand0
zFernand0 authored May 10, 2023
2 parents ba69279 + 8820922 commit 7201e26
Show file tree
Hide file tree
Showing 10 changed files with 328 additions and 447 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the IBM® Db2® Plug-in for Zowe CLI will be documented in this file.

## `4.1.9`

- BugFix: Updated ibm_db dependency for better support with Node.js 18

## `4.1.8`

- BugFix: Updated the version of minimatch
Expand Down
12 changes: 10 additions & 2 deletions __tests__/__system__/cli/call/__snapshots__/cli.db2.call.stored-proc.system.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ exports[`db2 call stored procedure command should display the help 1`] = `
The value of the token to pass to the API.
--cert-file (local file path)
The file path to a certificate file to use for authentication
--cert-key-file (local file path)
The file path to a certificate key file to use for authentication
GLOBAL OPTIONS
--------------
Expand Down Expand Up @@ -129,8 +137,8 @@ exports[`db2 call stored procedure command should display the help 1`] = `
\\"success\\": true,
\\"exitCode\\": 0,
\\"message\\": \\"The help was constructed for command: procedure.\\",
\\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n procedure | proc | sp\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Call a Db2 stored procedure. Specify the stored procedure name and optionally\\\\n provide values.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe db2 call procedure <routine> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n routine\\\\t\\\\t (string)\\\\n\\\\n The name of a Db2 stored procedure\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --parameters | -p (array)\\\\n\\\\n Values to bind to the stored procedure parameters\\\\n\\\\n DB2 CONNECTION OPTIONS\\\\n ----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The Db2 server host name\\\\n\\\\n --port | -P (number)\\\\n\\\\n The Db2 server port number\\\\n\\\\n --user | -u (string)\\\\n\\\\n The Db2 user ID (may be the same as the TSO login)\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n The Db2 password (may be the same as the TSO password)\\\\n\\\\n --database | --db (string)\\\\n\\\\n The name of the database\\\\n\\\\n --sslFile | --ssl (string)\\\\n\\\\n Path to an SSL Certificate file\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --db2-profile | --db2-p (string)\\\\n\\\\n The name of a (db2) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-examples (boolean)\\\\n\\\\n Display examples for all the commands in a group\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Call stored procedure DEMO.SP1:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP1\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for parameter\\\\n indicators:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP2(?, ?)\\\\\\" --parameters \\\\\\"Hello\\\\\\" \\\\\\"world!\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for two output\\\\n parameters. The first output requires a 2-character buffer. The second output is\\\\n a message that will be truncated to the length of the placeholder.:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP3(NULL, ?, ?)\\\\\\" --parameters \\\\\\"00\\\\\\" \\\\\\"message_placeholder_message_placeholder\\\\\\"\\\\n\\\\n\\",
\\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n procedure | proc | sp\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Call a Db2 stored procedure. Specify the stored procedure name and optionally\\\\n provide values.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe db2 call procedure <routine> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n routine\\\\t\\\\t (string)\\\\n\\\\n The name of a Db2 stored procedure\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --parameters | -p (array)\\\\n\\\\n Values to bind to the stored procedure parameters\\\\n\\\\n DB2 CONNECTION OPTIONS\\\\n ----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The Db2 server host name\\\\n\\\\n --port | -P (number)\\\\n\\\\n The Db2 server port number\\\\n\\\\n --user | -u (string)\\\\n\\\\n The Db2 user ID (may be the same as the TSO login)\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n The Db2 password (may be the same as the TSO password)\\\\n\\\\n --database | --db (string)\\\\n\\\\n The name of the database\\\\n\\\\n --sslFile | --ssl (string)\\\\n\\\\n Path to an SSL Certificate file\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --db2-profile | --db2-p (string)\\\\n\\\\n The name of a (db2) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-examples (boolean)\\\\n\\\\n Display examples for all the commands in a group\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Call stored procedure DEMO.SP1:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP1\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for parameter\\\\n indicators:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP2(?, ?)\\\\\\" --parameters \\\\\\"Hello\\\\\\" \\\\\\"world!\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for two output\\\\n parameters. The first output requires a 2-character buffer. The second output is\\\\n a message that will be truncated to the length of the placeholder.:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP3(NULL, ?, ?)\\\\\\" --parameters \\\\\\"00\\\\\\" \\\\\\"message_placeholder_message_placeholder\\\\\\"\\\\n\\\\n\\",
\\"stderr\\": \\"\\",
\\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n procedure | proc | sp\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Call a Db2 stored procedure. Specify the stored procedure name and optionally\\\\n provide values.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe db2 call procedure <routine> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n routine\\\\t\\\\t (string)\\\\n\\\\n The name of a Db2 stored procedure\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --parameters | -p (array)\\\\n\\\\n Values to bind to the stored procedure parameters\\\\n\\\\n DB2 CONNECTION OPTIONS\\\\n ----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The Db2 server host name\\\\n\\\\n --port | -P (number)\\\\n\\\\n The Db2 server port number\\\\n\\\\n --user | -u (string)\\\\n\\\\n The Db2 user ID (may be the same as the TSO login)\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n The Db2 password (may be the same as the TSO password)\\\\n\\\\n --database | --db (string)\\\\n\\\\n The name of the database\\\\n\\\\n --sslFile | --ssl (string)\\\\n\\\\n Path to an SSL Certificate file\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --db2-profile | --db2-p (string)\\\\n\\\\n The name of a (db2) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-examples (boolean)\\\\n\\\\n Display examples for all the commands in a group\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Call stored procedure DEMO.SP1:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP1\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for parameter\\\\n indicators:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP2(?, ?)\\\\\\" --parameters \\\\\\"Hello\\\\\\" \\\\\\"world!\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for two output\\\\n parameters. The first output requires a 2-character buffer. The second output is\\\\n a message that will be truncated to the length of the placeholder.:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP3(NULL, ?, ?)\\\\\\" --parameters \\\\\\"00\\\\\\" \\\\\\"message_placeholder_message_placeholder\\\\\\"\\\\n\\\\n\\"
\\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n procedure | proc | sp\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Call a Db2 stored procedure. Specify the stored procedure name and optionally\\\\n provide values.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe db2 call procedure <routine> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n routine\\\\t\\\\t (string)\\\\n\\\\n The name of a Db2 stored procedure\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --parameters | -p (array)\\\\n\\\\n Values to bind to the stored procedure parameters\\\\n\\\\n DB2 CONNECTION OPTIONS\\\\n ----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The Db2 server host name\\\\n\\\\n --port | -P (number)\\\\n\\\\n The Db2 server port number\\\\n\\\\n --user | -u (string)\\\\n\\\\n The Db2 user ID (may be the same as the TSO login)\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n The Db2 password (may be the same as the TSO password)\\\\n\\\\n --database | --db (string)\\\\n\\\\n The name of the database\\\\n\\\\n --sslFile | --ssl (string)\\\\n\\\\n Path to an SSL Certificate file\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --db2-profile | --db2-p (string)\\\\n\\\\n The name of a (db2) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-examples (boolean)\\\\n\\\\n Display examples for all the commands in a group\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Call stored procedure DEMO.SP1:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP1\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for parameter\\\\n indicators:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP2(?, ?)\\\\\\" --parameters \\\\\\"Hello\\\\\\" \\\\\\"world!\\\\\\"\\\\n\\\\n - Call a stored procedure and pass values for two output\\\\n parameters. The first output requires a 2-character buffer. The second output is\\\\n a message that will be truncated to the length of the placeholder.:\\\\n\\\\n $ zowe db2 call procedure \\\\\\"DEMO.SP3(NULL, ?, ?)\\\\\\" --parameters \\\\\\"00\\\\\\" \\\\\\"message_placeholder_message_placeholder\\\\\\"\\\\n\\\\n\\"
}"
`;
8 changes: 6 additions & 2 deletions __tests__/__system__/cli/call/__snapshots__/cli.db2.call.system.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ exports[`db2 call command should fail with invalid option 1`] = `
"Command Error:
Unknown argument: sp
Command failed due to improper syntax
Command entered: \\"zowe db2 call --sp DEMOUSER.DEMOSP1(1, 2, 3)\\"
Did you mean: db2 call sp?
Command entered: \\"db2 call --sp DEMOUSER.DEMOSP1(1, 2, 3)\\"
Available commands are \\"procedure\\".
Use \\"zowe db2 call --help\\" to view groups, commands, and options.
Error Details:
Expand All @@ -66,7 +68,9 @@ exports[`db2 call command should fail with invalid parameter 1`] = `
"Command Error:
Unknown arguments: routine, DEMOUSER.DEMOSP1
Command failed due to improper syntax
Command entered: \\"zowe db2 call routine DEMOUSER.DEMOSP1\\"
Did you mean: db2 call proc?
Command entered: \\"db2 call routine DEMOUSER.DEMOSP1\\"
Available commands are \\"procedure\\".
Use \\"zowe db2 call --help\\" to view groups, commands, and options.
Error Details:
Expand Down
Loading

0 comments on commit 7201e26

Please sign in to comment.