Merge master into next #2142

awharn · 2024-05-15T20:10:39Z

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:

tested my changes
added/updated automated tests
updated the changelog
followed the contribution guidelines

Additional Comments

Signed-off-by: Andrew W. Harn <[email protected]>

…ewlines

Signed-off-by: Fernando Rijo Cedeno <[email protected]>

Create dco.yml

Signed-off-by: Gene Johnston <[email protected]>

Reinstate token precedence over password in AbstractRestClient

Signed-off-by: zowe-robot <[email protected]>

Signed-off-by: Timothy Johnson <[email protected]>

[v2] Fix pre-commit script to support Git worktrees

Fix macOS tgz containing extra `GNUSparseFile.0` directory

Signed-off-by: zowe-robot <[email protected]>

Signed-off-by: Timothy Johnson <[email protected]>

…ewlines

Signed-off-by: Andrew W. Harn <[email protected]>

Show strings instead of regexes for allowed values in CLI help

Signed-off-by: Andrew W. Harn <[email protected]>

Add encoding to job spool operations

…oding Signed-off-by: Andrew W. Harn <[email protected]>

Add encoding to Submit Jobs CLI and APIs (local-file and stdin)

Signed-off-by: zowe-robot <[email protected]>

Signed-off-by: Andrew W. Harn <[email protected]>

codecov · 2024-05-15T20:24:16Z

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.

sonarqubecloud · 2024-05-15T20:42:54Z

Quality Gate failed

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

See analysis details on SonarCloud

zFernand0

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 😋

zFernand0 · 2024-05-16T13:52:27Z

packages/zosjobs/src/GetJobs.ts

@@ -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) {


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

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....

zFernand0 · 2024-05-16T13:53:55Z

packages/zosjobs/src/SubmitJobs.ts

@@ -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,


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 😋

...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.

traeok

LGTM, thanks @awharn

t1m0thyj

LGTM, thanks @awharn!

github-actions · 2024-05-16T17:53:14Z

Release succeeded for the next branch. 🎉

The following packages have been published:

npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]
npm: @zowe/[email protected]

_{Powered by Octorelease 🚀}

awharn and others added 30 commits October 5, 2023 10:10

Add API changes & tests

4fc2680

Signed-off-by: Andrew W. Harn <[email protected]>

Additional changes

73f31f8

Signed-off-by: Andrew W. Harn <[email protected]>

Update tests

9aac6c5

Signed-off-by: Andrew W. Harn <[email protected]>

Merge remote-tracking branch 'origin/master' into fix-encodings-and-n…

afc4c8e

…ewlines

Create dco.yml

9fa3116

Signed-off-by: Fernando Rijo Cedeno <[email protected]>

Merge pull request #2117 from zowe/add-dco-yml

be499e0

Create dco.yml

Reinstate token precedence over password in AbstractRestClient.

52949a7

Signed-off-by: Gene Johnston <[email protected]>

Replace credOrder parm to constructor with authTypeOrder in ISession

a38fabf

Signed-off-by: Gene Johnston <[email protected]>

Use ||= operator for credsAreSet

252ebfa

Signed-off-by: Gene Johnston <[email protected]>

Fix tests to reflect changes in AbstractRestClient

69edc44

Signed-off-by: Gene Johnston <[email protected]>

Reflect changes in AbstractRestClient in tests

2fb0af4

Signed-off-by: Gene Johnston <[email protected]>

Add new tests for new setXXXAuth( ) functions

9243721

Signed-off-by: Gene Johnston <[email protected]>

Add instructions for adding PFX certs

e33e0a8

Signed-off-by: Gene Johnston <[email protected]>

Add changelog entry

bb9b314

Signed-off-by: Gene Johnston <[email protected]>

Merge pull request #2119 from zowe/cred-order-v2

8a9c0b3

Reinstate token precedence over password in AbstractRestClient

Bump version to 7.24.1 [ci skip]

0a961e2

Signed-off-by: zowe-robot <[email protected]>

Fix macOS tgz containing extra GNUSparseFile.0 directory

86d0bfd

Signed-off-by: Timothy Johnson <[email protected]>

Try to fix daemon build on M1 runners

e32363b

Signed-off-by: Timothy Johnson <[email protected]>

Fix pre-commit script to support Git worktrees

18cf124

Signed-off-by: Timothy Johnson <[email protected]>

Update Cargo.lock for technical currency

17ba056

Signed-off-by: Timothy Johnson <[email protected]>

Update wording of changelog entry

9ec5f9c

Signed-off-by: Timothy Johnson <[email protected]>

Merge pull request #2127 from zowe/fix/git-hook-worktrees

65d4aa9

[v2] Fix pre-commit script to support Git worktrees

Merge branch 'master' into fix/macos-daemon-tgz

b2ed039

Merge pull request #2126 from zowe/fix/macos-daemon-tgz

113e5eb

Fix macOS tgz containing extra `GNUSparseFile.0` directory

Bump version to 7.24.2 [ci skip]

59a4b1e

Signed-off-by: zowe-robot <[email protected]>

Show strings instead of regexes for allowed values in CLI help

11c8edc

Signed-off-by: Timothy Johnson <[email protected]>

Fix secure properties not listed outside the active config layer

d4ac11d

Signed-off-by: Timothy Johnson <[email protected]>

Merge remote-tracking branch 'origin/master' into fix-encodings-and-n…

a464932

…ewlines

Make some changes

9d32ad8

Signed-off-by: Andrew W. Harn <[email protected]>

Merge pull request #2133 from zowe/fix/command-help-regexes

c62e69c

Show strings instead of regexes for allowed values in CLI help

awharn and others added 12 commits May 14, 2024 09:31

Add changelogs

b6d5d5f

Signed-off-by: Andrew W. Harn <[email protected]>

Fix unit test

22efd8b

Signed-off-by: Andrew W. Harn <[email protected]>

Update interface

36d1386

Signed-off-by: Andrew W. Harn <[email protected]>

Update changelog

578e2a3

Signed-off-by: Andrew W. Harn <[email protected]>

Make requested changes

7ac79a6

Signed-off-by: Andrew W. Harn <[email protected]>

Make requested changes

44839b2

Signed-off-by: Andrew W. Harn <[email protected]>

Merge pull request #1822 from zowe/fix-encodings-and-newlines

137cc73

Add encoding to job spool operations

Merge remote-tracking branch 'origin/master' into add-submit-jobs-enc…

7ee1b35

…oding Signed-off-by: Andrew W. Harn <[email protected]>

Merge pull request #2139 from zowe/add-submit-jobs-encoding

eb92768

Add encoding to Submit Jobs CLI and APIs (local-file and stdin)

Bump version to 7.25.0 [ci skip]

d206684

Signed-off-by: zowe-robot <[email protected]>

Merge remote-tracking branch 'origin/master' into merge-master-into-next

580ba8a

Signed-off-by: Andrew W. Harn <[email protected]>

Fix tests

b91ddbd

Signed-off-by: Andrew W. Harn <[email protected]>

awharn requested review from t1m0thyj, gejohnston, zFernand0, traeok and ATorrise May 15, 2024 20:10

github-actions bot assigned awharn May 15, 2024

awharn added the no-changelog label May 15, 2024

zFernand0 approved these changes May 16, 2024

View reviewed changes

ATorrise approved these changes May 16, 2024

View reviewed changes

traeok approved these changes May 16, 2024

View reviewed changes

t1m0thyj approved these changes May 16, 2024

View reviewed changes

awharn merged commit 00dc65e into next May 16, 2024
21 of 23 checks passed

awharn deleted the merge-master-into-next branch May 16, 2024 17:16

awharn mentioned this pull request May 16, 2024

Refactor Jobs APIs in V3 #2145

Open

github-actions bot added the released label May 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master into next #2142

Merge master into next #2142

awharn commented May 15, 2024 •

edited

Loading

codecov bot commented May 15, 2024 •

edited

Loading

sonarqubecloud bot commented May 15, 2024

zFernand0 left a comment

zFernand0 May 16, 2024

awharn May 16, 2024 •

edited

Loading

zFernand0 May 16, 2024

awharn May 16, 2024 •

edited

Loading

traeok left a comment

t1m0thyj left a comment

github-actions bot commented May 16, 2024

Merge master into next #2142

Merge master into next #2142

Conversation

awharn commented May 15, 2024 • edited Loading

codecov bot commented May 15, 2024 • edited Loading

Codecov Report

sonarqubecloud bot commented May 15, 2024

Quality Gate failed

zFernand0 left a comment

Choose a reason for hiding this comment

zFernand0 May 16, 2024

Choose a reason for hiding this comment

awharn May 16, 2024 • edited Loading

Choose a reason for hiding this comment

zFernand0 May 16, 2024

Choose a reason for hiding this comment

awharn May 16, 2024 • edited Loading

Choose a reason for hiding this comment

traeok left a comment

Choose a reason for hiding this comment

t1m0thyj left a comment

Choose a reason for hiding this comment

github-actions bot commented May 16, 2024

awharn commented May 15, 2024 •

edited

Loading

codecov bot commented May 15, 2024 •

edited

Loading

awharn May 16, 2024 •

edited

Loading

awharn May 16, 2024 •

edited

Loading