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

Port fixes from main for 3.0.3 #3301

Merged
merged 17 commits into from
Nov 16, 2024
Merged

Port fixes from main for 3.0.3 #3301

merged 17 commits into from
Nov 16, 2024

Conversation

JillieBeanSim
Copy link
Contributor

@JillieBeanSim JillieBeanSim commented Nov 7, 2024

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

benjamin-t-santos and others added 8 commits November 7, 2024 13:45
…asets and members (#3255)

* Fix PDS members in fetchDataset

Signed-off-by: Benjamin Santos <[email protected]>

* Update DatasetFSProvider.unit.test.ts

Signed-off-by: Benjamin Santos <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Benjamin Santos <[email protected]>

* Merge branch 'main' into datasetfsprovider-remote-lookup-fix

Signed-off-by: Benjamin Santos <[email protected]>

* move changelog update

Signed-off-by: Benjamin Santos <[email protected]>

* improve logic

Signed-off-by: Benjamin Santos <[email protected]>

* add ? after checking dsorg

Signed-off-by: Benjamin Santos <[email protected]>

* do not fetch attributes for members

Signed-off-by: Benjamin Santos <[email protected]>

---------

Signed-off-by: Benjamin Santos <[email protected]>
* fix: use vscode.workspace.fs to rename URIs

Signed-off-by: Trae Yelovich <[email protected]>

* chore: update ZE changelog

Signed-off-by: Trae Yelovich <[email protected]>

* update mocks, remaining use of delete/rename

Signed-off-by: Trae Yelovich <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
…ds (#3275)

* To handle missing args in basicAuthClearSecureArray

Signed-off-by: Santhoshi Boyina <[email protected]>

* To handle missing args in tokenAuthClearSecureArray

Signed-off-by: Santhoshi Boyina <[email protected]>

* To add unit test case for missing arg's in basicAuthClearSecureArray

Signed-off-by: Santhoshi Boyina <[email protected]>

* To add unit test case for missing arg's in tokenAuthClearSecureArray

Signed-off-by: Santhoshi Boyina <[email protected]>

* To run pre-publish command

Signed-off-by: Santhoshi Boyina <[email protected]>

* To update changelog

Signed-off-by: Santhoshi Boyina <[email protected]>

* To modify tokenAuthClearSecureArray() function

Signed-off-by: Santhoshi Boyina <[email protected]>

* To add additional test cases for tokenAuthClearSecureArray()

Signed-off-by: Santhoshi Boyina <[email protected]>

---------

Signed-off-by: Santhoshi Boyina <[email protected]>
…lization (#3274)

* fix: check if profileInfo is nullish during v1 migration

Signed-off-by: Trae Yelovich <[email protected]>

* chore: update ZE changelog

Signed-off-by: Trae Yelovich <[email protected]>

* tests: integration test for broken config

Signed-off-by: Trae Yelovich <[email protected]>

* add unit test for nullish profileinfo

Signed-off-by: Trae Yelovich <[email protected]>

* fix transient failures in UpdateCredentials scenario

Signed-off-by: Trae Yelovich <[email protected]>

* remove extra join import in wdio conf

Signed-off-by: Trae Yelovich <[email protected]>

* make integration test more reliable

Signed-off-by: Trae Yelovich <[email protected]>

* move getprofileinfo call into try/catch during profiles init

Signed-off-by: Trae Yelovich <[email protected]>

* test: open notification center to check for dialog

Signed-off-by: Trae Yelovich <[email protected]>

* add license header to test; add another null check

Signed-off-by: Trae Yelovich <[email protected]>

* add typedoc to ProfilesUtils.getProfileInfo

Signed-off-by: Trae Yelovich <[email protected]>

* setupDefaultCredentialManager: log err msgs, update typedoc

Signed-off-by: Trae Yelovich <[email protected]>

* test: promptUserWithNoConfigs, nullish profileInfo case

Signed-off-by: Trae Yelovich <[email protected]>

* refactor typedoc for setupDefaultCredentialManager

Signed-off-by: Trae Yelovich <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
#3268)

Signed-off-by: Trae Yelovich <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
Co-authored-by: Billie Simmons <[email protected]>
* fix: show 'No config detected' prompt once when ZE opened

Signed-off-by: Trae Yelovich <[email protected]>

* chore: update ZE changelog

Signed-off-by: Trae Yelovich <[email protected]>

* resolve failing tests

Signed-off-by: Trae Yelovich <[email protected]>

* refactor: move event into static fn, add coverage

Signed-off-by: Trae Yelovich <[email protected]>

* update changelog

Signed-off-by: Trae Yelovich <[email protected]>

* patch coverage for ProfilesUtils.promptUserWithNoConfigs

Signed-off-by: Trae Yelovich <[email protected]>

* move variable definition

Signed-off-by: Trae Yelovich <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
Co-authored-by: Billie Simmons <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
* fix: pass responseTimeout to API functions

Signed-off-by: Trae Yelovich <[email protected]>

* refactor: remove fallback for spreading newOptions

Signed-off-by: Trae Yelovich <[email protected]>

* refactor: use optional chaining; work on resolving tests

Signed-off-by: Trae Yelovich <[email protected]>

* refactor: pass profile props to tests, fix types

Signed-off-by: Trae Yelovich <[email protected]>

* tests: resolve failing cases in ZE

Signed-off-by: Trae Yelovich <[email protected]>

* chore: update changelog entry for ZE API

Signed-off-by: Trae Yelovich <[email protected]>

* refactor: remove fallback for spreading undefined options

Signed-off-by: Trae Yelovich <[email protected]>

* fix: add missing functions to MvsApi test list

Signed-off-by: Trae Yelovich <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
Signed-off-by: Fernando Rijo Cedeno <[email protected]>

Third-Party DCO Remediation Commit for benjamin-t-santos <[email protected]>

On behalf of benjamin-t-santos <[email protected]>, I, Fernando Rijo Cedeno <[email protected]>, hereby add my Signed-off-by to this commit: 8957a64

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

Third-Party DCO Remediation Commit for SanthoshiBoyina1 <[email protected]>

On behalf of SanthoshiBoyina1 <[email protected]>, I, Fernando Rijo Cedeno <[email protected]>, hereby add my Signed-off-by to this commit: 86a82f6

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

Signed-off-by: Fernando Rijo Cedeno <[email protected]>
@JillieBeanSim JillieBeanSim marked this pull request as ready for review November 7, 2024 19:47
Copy link

github-actions bot commented Nov 7, 2024

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

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

Signed-off-by: Trae Yelovich <[email protected]>

* readFile() uses one MVS API call

Signed-off-by: Benjamin Santos <[email protected]>

* update unit tests, fix logic of calls

Signed-off-by: Benjamin Santos <[email protected]>

* fix lint error

Signed-off-by: Benjamin Santos <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Benjamin Santos <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
Signed-off-by: Benjamin Santos <[email protected]>
Signed-off-by: benjamin-t-santos <[email protected]>
Co-authored-by: Trae Yelovich <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
Copy link

codecov bot commented Nov 8, 2024

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.

phaumer and others added 4 commits November 12, 2024 13:15
* updates to webpack and package.json for dev mode

Signed-off-by: Billie Simmons <[email protected]>

* Remove endless startup loop when default CM cannot be loaded

Signed-off-by: Peter Haumer <[email protected]>

* Initial set of test updates

Signed-off-by: Peter Haumer <[email protected]>

* Merge branch 'main' into change-credentials-manager-check

Signed-off-by: Peter Haumer <[email protected]>

* Convenience launch to only run currently open test

Signed-off-by: Peter Haumer <[email protected]>

* Fixed ProfileUtils tests

Signed-off-by: Peter Haumer <[email protected]>

* Clean up package files

Signed-off-by: Peter Haumer <[email protected]>

* Updated changelog

Signed-off-by: Peter Haumer <[email protected]>

* Reworded info message

Signed-off-by: Peter Haumer <[email protected]>

* Update CHANGELOG.md

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

* Added detail to info message

Signed-off-by: Peter Haumer <[email protected]>

* Updated resource files

Signed-off-by: Peter Haumer <[email protected]>

---------

Signed-off-by: Billie Simmons <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Fernando Rijo Cedeno <[email protected]>
Co-authored-by: Billie Simmons <[email protected]>
Co-authored-by: Fernando Rijo Cedeno <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
…3318)

* fix: profile change propagation, prompt on auth error

Signed-off-by: Trae Yelovich <[email protected]>

* tests: profile propagation, tree node cases

Signed-off-by: Trae Yelovich <[email protected]>

* chore: changelogs

Signed-off-by: Trae Yelovich <[email protected]>

* test(jobs): add patch coverage

Signed-off-by: Trae Yelovich <[email protected]>

* tests: AuthUtils.promptForAuthError

Signed-off-by: Trae Yelovich <[email protected]>

* tests: UssFSProvider.fetchFileAtUri

Signed-off-by: Trae Yelovich <[email protected]>

* fix: reset wasAccessed flag if ImperativeError caught

Signed-off-by: Trae Yelovich <[email protected]>

* tests: resolve failing USS tests

Signed-off-by: Trae Yelovich <[email protected]>

* fix failing jobs test

Signed-off-by: Trae Yelovich <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
* fix(ftp): Generate member name if missing in putContents

Signed-off-by: Trae Yelovich <[email protected]>

* chore: add entry to FTP changelog

Signed-off-by: Trae Yelovich <[email protected]>

* refactor: remove unused isAbsolutePath import

Signed-off-by: Trae Yelovich <[email protected]>

* chore: undo updates to l10n since no strings were changed

Signed-off-by: Trae Yelovich <[email protected]>

* tests(ftp): PDS upload case, clean up PS upload test

Signed-off-by: Trae Yelovich <[email protected]>

---------

Signed-off-by: Trae Yelovich <[email protected]>
Co-authored-by: Billie Simmons <[email protected]>
Co-authored-by: Fernando Rijo Cedeno <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
t1m0thyj
t1m0thyj previously approved these changes Nov 15, 2024
* remove query when looking up parent

Signed-off-by: Benjamin Santos <[email protected]>

* remove leftover comment

Signed-off-by: Benjamin Santos <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Benjamin Santos <[email protected]>

---------

Signed-off-by: Benjamin Santos <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
Signed-off-by: Billie Simmons <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
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, fixed failing tests in d1326e8 - I think conflicts were resolved incorrectly in 8903d1d because #3321 should only modify 2 lines in UssFSProvider.ts.

@zFernand0 zFernand0 merged commit e1c39ad into release/3.0 Nov 16, 2024
19 checks passed
@zFernand0 zFernand0 deleted the port-fixes-4303 branch November 16, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

7 participants