Port fixes from main for 3.0.3 #3301

JillieBeanSim · 2024-11-07T19:06:16Z

Proposed changes

this ports the fixes already merged into main that are listed in the 3.0.3 Release Plan
Will update Lerna and polish Changelogs in the release PR to avoid issues seen with release automation and the port with squash and merge.

waiting on

Release Notes

Milestone:

Changelog:

Types of changes

Bug fix (non-breaking change which fixes an issue)
Enhancement (non-breaking change which adds or improves functionality)
Breaking change (a change that would cause existing functionality to not work as expected)
Documentation (Markdown, README updates)
Other (please specify above in "Proposed changes" section)

Checklist

General

I have read the CONTRIBUTOR GUIDANCE wiki
All PR dependencies have been merged and published (if applicable)
A GIF or screenshot is included in the PR for visual changes
The pre-publish command has been executed:
- v2 and below: yarn workspace vscode-extension-for-zowe vscode:prepublish
- v3: pnpm --filter vscode-extension-for-zowe vscode:prepublish

Code coverage

There is coverage for the code that I have added
I have added new test cases and they are passing
I have manually tested the changes

Deployment

I have added developer documentation (if applicable)
Documentation should be added to Zowe Docs
- If you're an outside contributor, please post in the #zowe-doc Slack channel to coordinate documentation.
- Otherwise, please check with the rest of the squad about any needed documentation before merging.
These changes may need ported to the appropriate branches (list here):

Further comments

…asets and members (#3255) * Fix PDS members in fetchDataset Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * Update DatasetFSProvider.unit.test.ts Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * Update CHANGELOG.md Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * Merge branch 'main' into datasetfsprovider-remote-lookup-fix Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * move changelog update Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * improve logic Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * add ? after checking dsorg Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * do not fetch attributes for members Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> --------- Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com>

* fix: use vscode.workspace.fs to rename URIs Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: update ZE changelog Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * update mocks, remaining use of delete/rename Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com>

…ds (#3275) * To handle missing args in basicAuthClearSecureArray Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To handle missing args in tokenAuthClearSecureArray Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To add unit test case for missing arg's in basicAuthClearSecureArray Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To add unit test case for missing arg's in tokenAuthClearSecureArray Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To run pre-publish command Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To update changelog Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To modify tokenAuthClearSecureArray() function Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> * To add additional test cases for tokenAuthClearSecureArray() Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com> --------- Signed-off-by: Santhoshi Boyina <Santhoshi.Boyina1@ibm.com>

…lization (#3274) * fix: check if profileInfo is nullish during v1 migration Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: update ZE changelog Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests: integration test for broken config Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * add unit test for nullish profileinfo Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * fix transient failures in UpdateCredentials scenario Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * remove extra join import in wdio conf Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * make integration test more reliable Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * move getprofileinfo call into try/catch during profiles init Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * test: open notification center to check for dialog Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * add license header to test; add another null check Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * add typedoc to ProfilesUtils.getProfileInfo Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * setupDefaultCredentialManager: log err msgs, update typedoc Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * test: promptUserWithNoConfigs, nullish profileInfo case Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor typedoc for setupDefaultCredentialManager Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com>

#3268) Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> Signed-off-by: Billie Simmons <BillieJean.Simmons@ibm.com> Co-authored-by: Billie Simmons <BillieJean.Simmons@ibm.com>

* fix: show 'No config detected' prompt once when ZE opened Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: update ZE changelog Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * resolve failing tests Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor: move event into static fn, add coverage Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * update changelog Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * patch coverage for ProfilesUtils.promptUserWithNoConfigs Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * move variable definition Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> Signed-off-by: Billie Simmons <BillieJean.Simmons@ibm.com> Co-authored-by: Billie Simmons <BillieJean.Simmons@ibm.com> Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

* fix: pass responseTimeout to API functions Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor: remove fallback for spreading newOptions Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor: use optional chaining; work on resolving tests Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor: pass profile props to tests, fix types Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests: resolve failing cases in ZE Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: update changelog entry for ZE API Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor: remove fallback for spreading undefined options Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * fix: add missing functions to MvsApi test list Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com>

Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Third-Party DCO Remediation Commit for benjamin-t-santos <115251181+benjamin-t-santos@users.noreply.github.com> On behalf of benjamin-t-santos <115251181+benjamin-t-santos@users.noreply.github.com>, I, Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 8957a64 Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Third-Party DCO Remediation Commit for SanthoshiBoyina1 <142206957+SanthoshiBoyina1@users.noreply.github.com> On behalf of SanthoshiBoyina1 <142206957+SanthoshiBoyina1@users.noreply.github.com>, I, Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 86a82f6 Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com>

github-actions · 2024-11-07T19:47:24Z

📅 Suggested merge-by date: 11/21/2024

* fix(ds): Call remoteLookupForResource when entry doesn't exist locally Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * readFile() uses one MVS API call Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * update unit tests, fix logic of calls Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * fix lint error Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * Update CHANGELOG.md Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> Signed-off-by: benjamin-t-santos <115251181+benjamin-t-santos@users.noreply.github.com> Co-authored-by: Trae Yelovich <trae.yelovich@broadcom.com> Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

codecov · 2024-11-08T17:50:38Z

Codecov Report

Attention: Patch coverage is 96.38554% with 9 lines in your changes missing coverage. Please review.

Project coverage is 93.05%. Comparing base (db0b487) to head (d1326e8).
Report is 4 commits behind head on release/3.0.

Files with missing lines	Patch %	Lines
packages/zowe-explorer/src/utils/AuthUtils.ts	90.62%	3 Missing ⚠️
packages/zowe-explorer/src/utils/ProfilesUtils.ts	93.02%	3 Missing ⚠️
...we-explorer/src/trees/dataset/DatasetFSProvider.ts	96.72%	2 Missing ⚠️
packages/zowe-explorer/src/trees/uss/USSTree.ts	50.00%	1 Missing ⚠️

Additional details and impacted files

@@               Coverage Diff               @@
##           release/3.0    #3301      +/-   ##
===============================================
+ Coverage        93.02%   93.05%   +0.02%     
===============================================
  Files              113      113              
  Lines            11714    11815     +101     
  Branches          2526     2644     +118     
===============================================
+ Hits             10897    10994      +97     
- Misses             815      819       +4     
  Partials             2        2

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

* updates to webpack and package.json for dev mode Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> * Remove endless startup loop when default CM cannot be loaded Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Initial set of test updates Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Merge branch 'main' into change-credentials-manager-check Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Convenience launch to only run currently open test Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Fixed ProfileUtils tests Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Clean up package files Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Updated changelog Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Reworded info message Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> * Added detail to info message Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> * Updated resource files Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> --------- Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Signed-off-by: Peter Haumer <4391934+phaumer@users.noreply.github.com> Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Co-authored-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Co-authored-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

…3318) * fix: profile change propagation, prompt on auth error Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests: profile propagation, tree node cases Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: changelogs Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * test(jobs): add patch coverage Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests: AuthUtils.promptForAuthError Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests: UssFSProvider.fetchFileAtUri Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * fix: reset wasAccessed flag if ImperativeError caught Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests: resolve failing USS tests Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * fix failing jobs test Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com>

* fix(ftp): Generate member name if missing in putContents Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: add entry to FTP changelog Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * refactor: remove unused isAbsolutePath import Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * chore: undo updates to l10n since no strings were changed Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> * tests(ftp): PDS upload case, clean up PS upload test Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> --------- Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> Co-authored-by: Billie Simmons <BillieJean.Simmons@ibm.com> Co-authored-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com>

Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

* remove query when looking up parent Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * remove leftover comment Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> * Update CHANGELOG.md Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> --------- Signed-off-by: Benjamin Santos <benjamin.santos@ibm.com> Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>

t1m0thyj

LGTM, fixed failing tests in d1326e8 - I think conflicts were resolved incorrectly in 8903d1d because #3321 should only modify 2 lines in UssFSProvider.ts.

benjamin-t-santos and others added 8 commits November 7, 2024 13:45

fix(ds): Call remoteLookupForResource when entry doesn't exist locally (

bbcbb1a

#3268) Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com> Signed-off-by: Billie Simmons <BillieJean.Simmons@ibm.com> Co-authored-by: Billie Simmons <BillieJean.Simmons@ibm.com>

run package

ca2f559

Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

JillieBeanSim added this to the v3.0.3 milestone Nov 7, 2024

JillieBeanSim self-assigned this Nov 7, 2024

pull-request-size bot added the size/XL label Nov 7, 2024

JillieBeanSim mentioned this pull request Nov 7, 2024

New Install of 3.0.2 - Extension wouldn't activate #3290

Closed

JillieBeanSim marked this pull request as ready for review November 7, 2024 19:47

pull-request-size bot added size/XXL and removed size/XL labels Nov 8, 2024

phaumer and others added 4 commits November 12, 2024 13:15

run prepublish

c041372

Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

JillieBeanSim requested review from traeok, t1m0thyj, zFernand0, awharn, SanthoshiBoyina1 and likhithanimma1 November 15, 2024 18:38

t1m0thyj previously approved these changes Nov 15, 2024

View reviewed changes

JillieBeanSim dismissed t1m0thyj’s stale review via 8903d1d November 15, 2024 20:02

run prepublish

a18d424

Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com>

JillieBeanSim requested a review from t1m0thyj November 15, 2024 20:04

Fix port of #3321 for 3.0.3 release

d1326e8

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>

t1m0thyj approved these changes Nov 15, 2024

View reviewed changes

zFernand0 approved these changes Nov 16, 2024

View reviewed changes

zFernand0 merged commit e1c39ad into release/3.0 Nov 16, 2024
19 checks passed

zFernand0 deleted the port-fixes-4303 branch November 16, 2024 17:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port fixes from main for 3.0.3 #3301

Port fixes from main for 3.0.3 #3301

JillieBeanSim commented Nov 7, 2024 •

edited

Loading

github-actions bot commented Nov 7, 2024

codecov bot commented Nov 8, 2024 •

edited

Loading

t1m0thyj left a comment

Port fixes from main for 3.0.3 #3301

Port fixes from main for 3.0.3 #3301

Conversation

JillieBeanSim commented Nov 7, 2024 • edited Loading

Proposed changes

Release Notes

Types of changes

Checklist

Further comments

github-actions bot commented Nov 7, 2024

codecov bot commented Nov 8, 2024 • edited Loading

Codecov Report

t1m0thyj left a comment

Choose a reason for hiding this comment

JillieBeanSim commented Nov 7, 2024 •

edited

Loading

codecov bot commented Nov 8, 2024 •

edited

Loading