remove random src folder full of json files #1519

JillieBeanSim · 2021-10-06T15:42:56Z

we somehow have a random src folder in the next branch that is all json files from the localization that looks like it's from running prettier in this commit 7b96ce2

Types of changes

What types of changes does your code introduce to Zowe Explorer?
Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Updates to Documentation or Tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

Reminder

After a PR is merged into the master branch, create a PR from master to the next branch resolving any conflicts.

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

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

JillieBeanSim · 2021-10-06T15:59:50Z

we may want to check that all 1.18.1 items are brought in as well since we noticed that the @zowe/cli dependency that was added to the ZE API package.json was missing

lauren-li · 2021-10-06T20:29:07Z

we may want to check that all 1.18.1 items are brought in as well since we noticed that the @zowe/cli dependency that was added to the ZE API package.json was missing

It looks like all the 1.18.1 items are in this PR branch. The only thing I saw that was different was the deployment.yml, which I believe is intentionally different between master and next.

lauren-li

This PR looks good to me! Thanks @JillieBeanSim for removing the extra folder and adding the Zowe CLI dependency back in to the Zowe Explorer API.

JillieBeanSim · 2021-10-07T12:18:06Z

we may want to check that all 1.18.1 items are brought in as well since we noticed that the @zowe/cli dependency that was added to the ZE API package.json was missing

It looks like all the 1.18.1 items are in this PR branch. The only thing I saw that was different was the deployment.yml, which I believe is intentionally different between master and next.

@lauren-li The deployment.yml should be the same, I will take a look at it

UPDATE: I just did a compare of this branch and master branch and no differences found in deployment.yml. We do have difference between the branches on zowe-explorer-ci.yml & zowe-explorer-ftp-ci.yml but that is only the node versions since node 10 isn't supported on the next branch.

JillieBeanSim · 2021-10-07T12:19:38Z

packages/zowe-explorer/i18n/sample/src/Profiles.i18n.json

@@ -37,8 +37,7 @@
  "promptCredentials.updateConfigCreds.infoMessage": "Credentials for future use with profile {0} will need to be updated in the Zowe config file or by using the command 'zowe config secure'.",
  "promptCredentials.saveCredentials.button": "Save Credentials",
  "promptCredentials.doNotSave.button": "Do Not Save",
-  "promptCredentials.saveCredentials.infoMessage": "Save entered credentials for future use with profile: {0}?\nSaving credentials will update the local yaml file.",
-  "promptCredentials.saveCredentials.cancelled": "Operation Cancelled",
+  "promptCredentials.saveCredentials.infoMessage": "Save entered credentials for future use with profile: {0}? Saving credentials will update the local yaml file.",


not sure why this changed either, will look at that too

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

JillieBeanSim · 2021-10-07T12:57:05Z

how do we fix an audit with a critical severity of Lodash if no patch? GHSA-8p5q-j9m2-g8wr

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

JillieBeanSim · 2021-10-07T13:16:38Z

resolving ssh2 npm audit seems to break everything, removing that resolution until we figure this out. This is a dependency of @zowe/cli, do they have a version with the fix that we can update to?

lauren-li · 2021-10-07T13:28:33Z

we may want to check that all 1.18.1 items are brought in as well since we noticed that the @zowe/cli dependency that was added to the ZE API package.json was missing

It looks like all the 1.18.1 items are in this PR branch. The only thing I saw that was different was the deployment.yml, which I believe is intentionally different between master and next.

@lauren-li The deployment.yml should be the same, I will take a look at it

UPDATE: I just did a compare of this branch and master branch and no differences found in deployment.yml. We do have difference between the branches on zowe-explorer-ci.yml & zowe-explorer-ftp-ci.yml but that is only the node versions since node 10 isn't supported on the next branch.

@JillieBeanSim Apologies, I double-checked, and I had been comparing the deployment.yml changes made in PR #1442 for the 1.18.1 release against next when I wrote my earlier comment. Thanks for the correction!

t1m0thyj · 2021-10-07T20:25:58Z

resolving ssh2 npm audit seems to break everything, removing that resolution until we figure this out. This is a dependency of @zowe/cli, do they have a version with the fix that we can update to?

@zowe/cli@zowe-v1-lts has been updated to fix the ssh2 vulnerability. You may still encounter this error coming from the "cpu-features" package. It is an optional dependency making use of native binaries that was added to recent versions of ssh2.

We have decided to exclude "cpu-features" from the CLI TGZ on zowe.org because it must be built on each user's system at install time. Perhaps you'll also want to exclude "cpu-features" in your webpack config.

lauren-li · 2021-10-07T20:27:48Z

resolving ssh2 npm audit seems to break everything, removing that resolution until we figure this out. This is a dependency of @zowe/cli, do they have a version with the fix that we can update to?

I have created PR #1521, which updates the Zowe CLI version to 7.0.0-next.202109281609. As the ssh2 audit issues were resolved in Zowe CLI version 7.0.0-next.202109141650, PR #1521 should take care of this for Zowe Explorer's next branch. (Thanks @JillieBeanSim for your research on this!)

lauren-li

This looks good to me! I do not see any regressions as a result of this PR. Per @crawr and @VitGottwald's update, the lodash audit issue might be revoked in the near future (and Zowe Explorer does not use the template function of lodash, so we are not affected anyway).

The ssh2 audit issue can be handled in a separate PR (such as #1521) before the next vNext release.

Thanks @JillieBeanSim for cleaning up the folders (and taking care of some dependency issues)!

lauren-li · 2021-10-08T01:28:27Z

packages/zowe-explorer/src/Profiles.ts

@@ -894,7 +894,7 @@ export class Profiles extends ProfilesCache {
                    const doNotSaveButton = localize("promptCredentials.doNotSave.button", "Do Not Save");
                    const infoMsg = localize(
                        "promptCredentials.saveCredentials.infoMessage",
-                        "Save entered credentials for future use with profile: {0}? Saving credentials will update the local yaml file.",
+                        "Save entered credentials for future use with profile: {0}?\nSaving credentials will update the local yaml file.",


The \n here doesn't seem to create a newline for me in the pop-up message. I do see that this is in master branch, so I think it's okay to go into next, but I was curious if others can see its effect.

crawr

LGTM. Thanks for cleaning this up in preparation for the release

remove random src folder full of json files

c047cd0

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

JillieBeanSim self-assigned this Oct 6, 2021

JillieBeanSim added this to the vNext 0.2 milestone Oct 6, 2021

add back @zowe/cli dependency to package.json in ZE API

22d58b4

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

JillieBeanSim requested review from crawr, jellypuno and lauren-li October 6, 2021 16:02

Merge branch 'next' into next-fix

d2ce608

lauren-li previously approved these changes Oct 6, 2021

View reviewed changes

JillieBeanSim commented Oct 7, 2021

View reviewed changes

add back end of line char

6388a5c

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

JillieBeanSim dismissed lauren-li’s stale review via 6388a5c October 7, 2021 12:37

JillieBeanSim added 2 commits October 7, 2021 09:06

fix audit issues except Lodash, no patch yet

d5e671d

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

remove ssh2 npm audit resolution

64a8fff

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

lauren-li approved these changes Oct 8, 2021

View reviewed changes

crawr approved these changes Oct 8, 2021

View reviewed changes

JillieBeanSim mentioned this pull request Oct 8, 2021

Update Zowe CLI dependency to 7.0.0-next.202109281609 #1521

Merged

16 tasks

crawr merged commit 5252a48 into next Oct 11, 2021

JillieBeanSim deleted the next-fix branch October 22, 2021 15:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove random src folder full of json files #1519

remove random src folder full of json files #1519

JillieBeanSim commented Oct 6, 2021

JillieBeanSim commented Oct 6, 2021

lauren-li commented Oct 6, 2021

lauren-li left a comment

JillieBeanSim commented Oct 7, 2021 •

edited

JillieBeanSim Oct 7, 2021

JillieBeanSim commented Oct 7, 2021 •

edited

JillieBeanSim commented Oct 7, 2021 •

edited

lauren-li commented Oct 7, 2021

t1m0thyj commented Oct 7, 2021 •

edited

lauren-li commented Oct 7, 2021

lauren-li left a comment •

edited

lauren-li Oct 8, 2021

crawr left a comment

remove random src folder full of json files #1519

remove random src folder full of json files #1519

Conversation

JillieBeanSim commented Oct 6, 2021

Types of changes

Checklist

Reminder

Further comments

JillieBeanSim commented Oct 6, 2021

lauren-li commented Oct 6, 2021

lauren-li left a comment

Choose a reason for hiding this comment

JillieBeanSim commented Oct 7, 2021 • edited

JillieBeanSim Oct 7, 2021

Choose a reason for hiding this comment

JillieBeanSim commented Oct 7, 2021 • edited

JillieBeanSim commented Oct 7, 2021 • edited

lauren-li commented Oct 7, 2021

t1m0thyj commented Oct 7, 2021 • edited

lauren-li commented Oct 7, 2021

lauren-li left a comment • edited

Choose a reason for hiding this comment

lauren-li Oct 8, 2021

Choose a reason for hiding this comment

crawr left a comment

Choose a reason for hiding this comment

JillieBeanSim commented Oct 7, 2021 •

edited

JillieBeanSim commented Oct 7, 2021 •

edited

JillieBeanSim commented Oct 7, 2021 •

edited

t1m0thyj commented Oct 7, 2021 •

edited

lauren-li left a comment •

edited