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

Merge master into next #2142

Merged
merged 52 commits into from
May 16, 2024
Merged

Merge master into next #2142

merged 52 commits into from
May 16, 2024

Conversation

awharn
Copy link
Member

@awharn awharn commented May 15, 2024

What It Does

Updates Next to contain the following enhancements and bug fixes from Master:

How to Test

Review Checklist
I certify that I have:

Additional Comments

awharn and others added 30 commits October 5, 2023 10:10
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Signed-off-by: Gene Johnston <Eugene.Johnston@broadcom.com>
Reinstate token precedence over password in AbstractRestClient
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
[v2] Fix pre-commit script to support Git worktrees
Fix macOS tgz containing extra `GNUSparseFile.0` directory
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Show strings instead of regexes for allowed values in CLI help
awharn and others added 12 commits May 14, 2024 09:31
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Add encoding to job spool operations
…oding

Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Add encoding to Submit Jobs CLI and APIs (local-file and stdin)
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
Copy link

codecov bot commented May 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.21%. Comparing base (d68e05d) to head (b91ddbd).
Report is 2 commits behind head on next.

Additional details and impacted files
@@           Coverage Diff           @@
##             next    #2142   +/-   ##
=======================================
  Coverage   91.20%   91.21%           
=======================================
  Files         628      628           
  Lines       17877    17888   +11     
  Branches     3750     3689   -61     
=======================================
+ Hits        16305    16316   +11     
  Misses       1571     1571           
  Partials        1        1           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

sonarcloud bot commented May 15, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
6.3% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

Copy link
Member

@zFernand0 zFernand0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The port of al of those PRs LGTM! 😋
left a few questions to see if we would want to make a slight breaking change here 😋

@@ -366,13 +367,14 @@ export class GetJobs {
* @returns {Promise<string>} - promise that resolves to the spool content
* @memberof GetJobs
*/
public static async getSpoolContentById(session: AbstractSession, jobname: string, jobid: string, spoolId: number) {
public static async getSpoolContentById(session: AbstractSession, jobname: string, jobid: string, spoolId: number, encoding?: string) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we move the params to a typed object? (in V3)

Copy link
Member Author

@awharn awharn May 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking that any changes to interfaces and parameters would be a different story, since this was primarily meant to get the two branches reconciled. It might be nice to do that change on this API....

@@ -106,16 +106,23 @@ export class SubmitJobs {
* @returns {Promise<IJob>} - Promise that resolves to an IJob document with details about the submitted job
* @memberof SubmitJobs
*/
public static submitJcl(session: AbstractSession, jcl: string, internalReaderRecfm?: string, internalReaderLrecl?: string) {
public static submitJcl(session: AbstractSession, jcl: string, internalReaderRecfm?: string,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as previous commnet...
Should we move everything after jcl (or include jcl too) into a typed object (with its own interface)?
This can be done in V3, and we can follow the example of submitJobCommon in this file 😋

Copy link
Member Author

@awharn awharn May 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...however, on this API, we already call submitJclCommon. Frankly, I think it would be nice to just get rid of some of these redundant APIs, since they all do relatively similar things. At least for submitJCL, the change would be relatively small, since all we did was print a trace message, then call submitJclCommon with the same parameters.

Copy link
Member

@traeok traeok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @awharn

Copy link
Member

@t1m0thyj t1m0thyj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @awharn!

@awharn awharn merged commit 00dc65e into next May 16, 2024
21 of 23 checks passed
@awharn awharn deleted the merge-master-into-next branch May 16, 2024 17:16
Copy link

Release succeeded for the next branch. 🎉

The following packages have been published:

  • npm: @zowe/secrets-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/imperative@8.0.0-next.202405161750
  • npm: @zowe/cli-test-utils@8.0.0-next.202405161750
  • npm: @zowe/core-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-uss-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/provisioning-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-console-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-files-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-logs-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zosmf-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-workflows-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-jobs-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/zos-tso-for-zowe-sdk@8.0.0-next.202405161750
  • npm: @zowe/cli@8.0.0-next.202405161750

Powered by Octorelease 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

None yet

7 participants