fix(ftp): Generate member name if missing in `putContents` #3313

traeok · 2024-11-13T16:09:57Z

Proposed changes

Resolves #3305

Release Notes

Milestone: 3.0.3

Changelog:

Fixed issue where the MVS API putContents function did not support PDS members when the member was not specified in the data set name. #3305

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):

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

packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts

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

codecov · 2024-11-13T16:19:20Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.99%. Comparing base (f5ca8cc) to head (bab4dcf).
Report is 1 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #3313   +/-   ##
=======================================
  Coverage   92.99%   92.99%           
=======================================
  Files         116      116           
  Lines       12063    12069    +6     
  Branches     2776     2777    +1     
=======================================
+ Hits        11218    11224    +6     
  Misses        843      843           
  Partials        2        2

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

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

github-actions · 2024-11-13T18:09:46Z

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

JillieBeanSim

LGTM! thanks for the quick fix @traeok

zFernand0

LGTM! 😋
Thanks for the quick fix! 🙏

zFernand0 · 2024-11-14T18:41:28Z

packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts

@@ -128,12 +128,26 @@ export class FtpMvsApi extends AbstractFtpApi implements MainframeInteraction.IM
        const result = this.getDefaultResponse();
        const profile = this.checkedProfile();

+        const dsorg = dsAtrribute.apiResponse.items[0]?.dsorg;
+        const isPds = dsorg === "PO" || dsorg === "PO-E";


I'm curious if there are a few other kind of PDS dsorgs that we may not be considering. Also, not sure if FTP does support them (like PO-L I think)

That's a good question - we use this check in most places in the codebase, but I think we should try to cover all of the possible PDS dsorg values moving forward 😅

* 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]>

* DatasetFSprovider fetchDataset() - fix behavior with non-existent datasets 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` for `delete` and `rename` (#3261) * 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]> * Fix: To resolve error message upon switching the authentication methods (#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]> * fix: "Show Config" button in error dialog does not work during initialization (#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]> * fix(ds): Call remoteLookupForResource when entry doesn't exist locally (#3268) Signed-off-by: Trae Yelovich <[email protected]> Signed-off-by: Billie Simmons <[email protected]> Co-authored-by: Billie Simmons <[email protected]> * fix: Only show "No configs detected" prompt if ZE opened (#3281) * 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(v3): Pass `responseTimeout` in z/OSMF MVS and USS API calls (#3292) * 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]> * run package Signed-off-by: Billie Simmons <[email protected]> * chore: remediation commit 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]> * DatasetFSProvider.readFile() makes at most one API call (#3279) * 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]> * Change default credentials manager check and not-found dialog (#3297) * 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]> * fix(3.0.3): Prompt in editor for 401 error, fix profile propagation (#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` (#3313) * 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]> * run prepublish Signed-off-by: Billie Simmons <[email protected]> * Fix infinite loop when fetching USS resources with stat() (#3321) * 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]> * run prepublish Signed-off-by: Billie Simmons <[email protected]> * Fix port of #3321 for 3.0.3 release Signed-off-by: Timothy Johnson <[email protected]> --------- Signed-off-by: Benjamin Santos <[email protected]> Signed-off-by: Trae Yelovich <[email protected]> Signed-off-by: Santhoshi Boyina <[email protected]> Signed-off-by: Billie Simmons <[email protected]> Signed-off-by: Billie Simmons <[email protected]> Signed-off-by: Fernando Rijo Cedeno <[email protected]> Signed-off-by: benjamin-t-santos <[email protected]> Signed-off-by: Peter Haumer <[email protected]> Signed-off-by: Timothy Johnson <[email protected]> Co-authored-by: benjamin-t-santos <[email protected]> Co-authored-by: Trae Yelovich <[email protected]> Co-authored-by: SanthoshiBoyina1 <[email protected]> Co-authored-by: Fernando Rijo Cedeno <[email protected]> Co-authored-by: Peter Haumer <[email protected]> Co-authored-by: Timothy Johnson <[email protected]>

traeok added 2 commits November 13, 2024 11:04

fix(ftp): Generate member name if missing in putContents

7e33975

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

chore: add entry to FTP changelog

07ac1e8

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

pull-request-size bot added the size/L label Nov 13, 2024

github-actions bot assigned traeok Nov 13, 2024

github-advanced-security bot found potential problems Nov 13, 2024

View reviewed changes

packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts Fixed Show fixed Hide fixed

traeok added 2 commits November 13, 2024 11:15

refactor: remove unused isAbsolutePath import

737fa29

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

chore: undo updates to l10n since no strings were changed

099eb12

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

pull-request-size bot added size/S and removed size/L labels Nov 13, 2024

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

ab8772a

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

pull-request-size bot added size/M and removed size/S labels Nov 13, 2024

traeok changed the title ~~Fix/ftp/upload member~~ fix(ftp): Generate member name if missing in putContents Nov 13, 2024

traeok marked this pull request as ready for review November 13, 2024 18:09

Merge branch 'main' into fix/ftp/upload-member

2da9caf

JillieBeanSim requested review from JillieBeanSim, t1m0thyj, zFernand0, awharn, SanthoshiBoyina1 and likhithanimma1 November 14, 2024 14:22

JillieBeanSim approved these changes Nov 14, 2024

View reviewed changes

JillieBeanSim mentioned this pull request Nov 14, 2024

Port fixes from main for 3.0.3 #3301

Merged

19 tasks

zFernand0 approved these changes Nov 14, 2024

View reviewed changes

Merge branch 'main' into fix/ftp/upload-member

bab4dcf

JillieBeanSim merged commit 91d4aaf into main Nov 15, 2024
31 of 32 checks passed

JillieBeanSim deleted the fix/ftp/upload-member branch November 15, 2024 18:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(ftp): Generate member name if missing in `putContents` #3313

fix(ftp): Generate member name if missing in `putContents` #3313

traeok commented Nov 13, 2024 •

edited

Loading

codecov bot commented Nov 13, 2024 •

edited

Loading

github-actions bot commented Nov 13, 2024

JillieBeanSim left a comment

zFernand0 left a comment

zFernand0 Nov 14, 2024

traeok Nov 14, 2024

fix(ftp): Generate member name if missing in putContents #3313

fix(ftp): Generate member name if missing in putContents #3313

Conversation

traeok commented Nov 13, 2024 • edited Loading

Proposed changes

Release Notes

Types of changes

Checklist

codecov bot commented Nov 13, 2024 • edited Loading

Codecov Report

github-actions bot commented Nov 13, 2024

JillieBeanSim left a comment

Choose a reason for hiding this comment

zFernand0 left a comment

Choose a reason for hiding this comment

zFernand0 Nov 14, 2024

Choose a reason for hiding this comment

traeok Nov 14, 2024

Choose a reason for hiding this comment

fix(ftp): Generate member name if missing in `putContents` #3313

fix(ftp): Generate member name if missing in `putContents` #3313

traeok commented Nov 13, 2024 •

edited

Loading

codecov bot commented Nov 13, 2024 •

edited

Loading