Treat special chars and more #3728

Martin-Zeithaml · 2024-02-06T14:29:45Z

Please check if your PR fulfills the following requirements. This is simply a reminder of what we are going to look for before merging your PR. If you don't know all of this information when you create this PR, don't worry. You can edit this template as you're working on it.

DCO signoffs have been added to all commits, including this PR

PR type

What type of changes does your PR introduce to Zowe? Put an x in the box that applies to this PR. If you're unsure about any of them, don't hesitate to ask.

Bugfix

Relevant issues

Fixes #3648

Changes proposed in this PR

New string functions to escape special chars
Configmgr stripMemberName can handle special chars now
Various zos-dataset functions can handle dollar sign
tsoCommand will finally work due to proper syntax
TypeScript only

Bonus (for free)

apf command will work!
Message ZWEL0134E will be displayed correctly!
changeTag is changing the tag!
- Why going back to shell? See the problem

Does this PR introduce a breaking change?

No

Does this PR do something the person installing Zowe should know about?

Better experience.

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-06T14:31:10Z

PAX build 4471 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7801270835

github-actions · 2024-02-06T14:38:18Z

Test workflow 3898 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4471-20240206143517.pax
Running on machine: zzow07
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7801355161

github-actions · 2024-02-06T15:02:11Z

Test workflow 3899 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4471-20240206143517.pax
Running on machine: zzow06
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7801656709

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-06T15:10:40Z

PAX build 4472 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7801802888

github-actions · 2024-02-06T15:18:09Z

Test workflow 3900 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4472-20240206151501.pax
Running on machine: zzow08
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7801900825

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-06T15:32:24Z

PAX build 4473 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7802120849

github-actions · 2024-02-06T15:39:23Z

Test workflow 3902 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4473-20240206153624.pax
Running on machine: zzow07
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7802204447

github-actions · 2024-02-06T16:20:53Z

PAX build 4475 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7802783437

github-actions · 2024-02-06T16:28:47Z

Test workflow 3903 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4475-20240206162553.pax
Running on machine: zzow07
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7802873590

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-07T07:57:52Z

PAX build 4481 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7811594803

github-actions · 2024-02-07T08:07:12Z

Test workflow 3910 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4481-20240207080408.pax
Running on machine: zzow08
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7811677218

github-actions · 2024-02-07T15:35:16Z

PAX build 4483 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7817248319

github-actions · 2024-02-07T15:42:18Z

Test workflow 3913 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4483-20240207153920.pax
Running on machine: zzow06
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7817330966

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-08T08:49:38Z

PAX build 4490 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7827018822

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-09T15:43:35Z

PAX build 4503 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7846279653

github-actions · 2024-02-09T15:52:09Z

Test workflow 3931 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4503-20240209154927.pax
Running on machine: zzow07
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7846364735

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-12T10:30:08Z

PAX build 4516 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7870376208

github-actions · 2024-02-12T10:36:56Z

Test workflow 3944 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4516-20240212103412.pax
Running on machine: zzow07
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7870452997

1000TurquoisePogs · 2024-02-14T20:51:06Z

bin/libs/string.ts

+export function escapeDollar(str: string): string | undefined {
+  if (str === null || str === undefined)
+    return undefined;
+  return str.replace(/[$]/g, '\\$&');


can you explain what the ampersand '&' does here?
I'm not familiar with it and a quick search didnt tell me why it is here.

Explanation here.

$& = inserts the matched substring.

It is better to show on the second replacement:
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');: any character from [] found, replace by backslash and that character.

The first replace is just for one char, but the replacement is in general form. It can be changed to str.replace(/[$]/g, '\\$'); if it makes the code better to read. This or that, it will work the same.

okay now i understand. i thought $& was a shell thing, i didn't realize it was a javascript thing.

github-actions · 2024-02-14T21:37:19Z

PAX build 4542 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7907698485

github-actions · 2024-02-14T21:46:58Z

Test workflow 3972 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4542-20240214214241.pax
Running on machine: zzow06
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7907763162

Signed-off-by: Martin Zeithaml <[email protected]>

github-actions · 2024-02-15T15:10:29Z

PAX build 4551 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7918038495

Martin-Zeithaml · 2024-02-15T15:13:04Z

This commit is changing the behavior of copyMvsToUss to strictly use input parameters as text. I think, this was original intention. If we want to be able to use/expand variables, it should be done in another function with name or parameters suggesting that the special chars will be exapanded.

github-actions · 2024-02-15T15:17:46Z

Test workflow 3981 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4551-20240215151504.pax
Running on machine: zzow07
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7918134713

MarkAckert · 2024-02-07T19:14:24Z

bin/libs/zos-fs.ts

@@ -109,7 +109,7 @@ export function ensureFileEncoding(file: string, expectedSample: string, expecte
      }
    }
    common.printTrace(`- Remove encoding tag of ${file}.`);
-    zos.changeTag(file, 0);


Will this cause any change in zwe performance?

github-actions · 2024-02-15T21:08:53Z

PAX build 4552 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7922300849

github-actions · 2024-02-15T21:16:32Z

Test workflow 3982 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.15.0-PR-3728/zowe-2.15.0-pr-3728-4552-20240215211327.pax
Running on machine: zzow08
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/7922369831

Treat special chars

d8b2652

Signed-off-by: Martin Zeithaml <[email protected]>

zowe-robot had a problem deploying to marist-zzow07 February 6, 2024 14:36 — with GitHub Actions Failure

Martin-Zeithaml changed the title ~~Treat special chars~~ Treat special chars [DO NOT MERGE] Feb 6, 2024

zowe-robot temporarily deployed to marist-zzow06 February 6, 2024 14:59 — with GitHub Actions Inactive

Too many slashes

4bec72e

Signed-off-by: Martin Zeithaml <[email protected]>

zowe-robot had a problem deploying to marist-zzow08 February 6, 2024 15:16 — with GitHub Actions Failure

Minor fixes

686cd79

Signed-off-by: Martin Zeithaml <[email protected]>

zowe-robot had a problem deploying to marist-zzow07 February 6, 2024 15:37 — with GitHub Actions Failure

Merge branch 'v2.x/staging' into v2.x/bugfix/Dollar

74b26d8

zowe-robot had a problem deploying to marist-zzow07 February 6, 2024 16:26 — with GitHub Actions Failure

Switch ChangeTag to sh

af0e6a0

Signed-off-by: Martin Zeithaml <[email protected]>

Martin-Zeithaml changed the title ~~Treat special chars [DO NOT MERGE]~~ Treat special chars and more Feb 7, 2024

zowe-robot had a problem deploying to marist-zzow08 February 7, 2024 08:05 — with GitHub Actions Failure

Merge branch 'v2.x/staging' into v2.x/bugfix/Dollar

9e382c7

zowe-robot had a problem deploying to marist-zzow06 February 7, 2024 15:40 — with GitHub Actions Failure

Regex update

dc66beb

Signed-off-by: Martin Zeithaml <[email protected]>

Support '$' and '-' in ds name

f77aba5

Signed-off-by: Martin Zeithaml <[email protected]>

zowe-robot temporarily deployed to marist-zzow07 February 9, 2024 15:50 — with GitHub Actions Inactive

Escape prefix

406e1bc

Signed-off-by: Martin Zeithaml <[email protected]>

zowe-robot temporarily deployed to marist-zzow07 February 12, 2024 10:35 — with GitHub Actions Inactive

Martin-Zeithaml changed the title ~~Treat special chars and more [WIP]~~ Treat special chars and more Feb 12, 2024

1000TurquoisePogs self-requested a review February 14, 2024 16:28

1000TurquoisePogs reviewed Feb 14, 2024

View reviewed changes

Merge branch 'v2.x/staging' into v2.x/bugfix/Dollar

6f67af4

zowe-robot temporarily deployed to marist-zzow06 February 14, 2024 21:43 — with GitHub Actions Inactive

Martin-Zeithaml mentioned this pull request Feb 15, 2024

Migrate 'zwe init' actions to templated JCL #3718

Open

Martin-Zeithaml changed the title ~~Treat special chars and more~~ Treat special chars and more [DO NOT MERGE] Feb 15, 2024

Escape dataset in copyMvsToUss

e237272

Signed-off-by: Martin Zeithaml <[email protected]>

Martin-Zeithaml changed the title ~~Treat special chars and more [DO NOT MERGE]~~ Treat special chars and more Feb 15, 2024

zowe-robot temporarily deployed to marist-zzow07 February 15, 2024 15:16 — with GitHub Actions Inactive

Merge branch 'v2.x/staging' into v2.x/bugfix/Dollar

274a307

MarkAckert approved these changes Feb 15, 2024

View reviewed changes

zowe-robot temporarily deployed to marist-zzow08 February 15, 2024 21:14 — with GitHub Actions Inactive

MarkAckert merged commit f4f61a7 into v2.x/staging Feb 20, 2024
9 checks passed

MarkAckert deleted the v2.x/bugfix/Dollar branch February 20, 2024 17:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Treat special chars and more #3728

Treat special chars and more #3728

Martin-Zeithaml commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 8, 2024 •

edited

Loading

github-actions bot commented Feb 9, 2024 •

edited

Loading

github-actions bot commented Feb 9, 2024 •

edited

Loading

github-actions bot commented Feb 12, 2024 •

edited

Loading

github-actions bot commented Feb 12, 2024 •

edited

Loading

1000TurquoisePogs Feb 14, 2024

Martin-Zeithaml Feb 15, 2024

1000TurquoisePogs Feb 15, 2024

github-actions bot commented Feb 14, 2024 •

edited

Loading

github-actions bot commented Feb 14, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

Martin-Zeithaml commented Feb 15, 2024

github-actions bot commented Feb 15, 2024 •

edited

Loading

MarkAckert Feb 7, 2024

github-actions bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

Treat special chars and more #3728

Treat special chars and more #3728

Conversation

Martin-Zeithaml commented Feb 6, 2024 • edited Loading

PR type

Relevant issues

Changes proposed in this PR

Bonus (for free)

Does this PR introduce a breaking change?

Does this PR do something the person installing Zowe should know about?

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 6, 2024 • edited Loading

github-actions bot commented Feb 7, 2024 • edited Loading

github-actions bot commented Feb 7, 2024 • edited Loading

github-actions bot commented Feb 7, 2024 • edited Loading

github-actions bot commented Feb 7, 2024 • edited Loading

github-actions bot commented Feb 8, 2024 • edited Loading

github-actions bot commented Feb 9, 2024 • edited Loading

github-actions bot commented Feb 9, 2024 • edited Loading

github-actions bot commented Feb 12, 2024 • edited Loading

github-actions bot commented Feb 12, 2024 • edited Loading

1000TurquoisePogs Feb 14, 2024

Choose a reason for hiding this comment

Martin-Zeithaml Feb 15, 2024

Choose a reason for hiding this comment

1000TurquoisePogs Feb 15, 2024

Choose a reason for hiding this comment

github-actions bot commented Feb 14, 2024 • edited Loading

github-actions bot commented Feb 14, 2024 • edited Loading

github-actions bot commented Feb 15, 2024 • edited Loading

Martin-Zeithaml commented Feb 15, 2024

github-actions bot commented Feb 15, 2024 • edited Loading

MarkAckert Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot commented Feb 15, 2024 • edited Loading

github-actions bot commented Feb 15, 2024 • edited Loading

Martin-Zeithaml commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 6, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 8, 2024 •

edited

Loading

github-actions bot commented Feb 9, 2024 •

edited

Loading

github-actions bot commented Feb 9, 2024 •

edited

Loading

github-actions bot commented Feb 12, 2024 •

edited

Loading

github-actions bot commented Feb 12, 2024 •

edited

Loading

github-actions bot commented Feb 14, 2024 •

edited

Loading

github-actions bot commented Feb 14, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading

github-actions bot commented Feb 15, 2024 •

edited

Loading