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

Clean up the code when checking z/OSMF [v2] #3971

Merged
merged 3 commits into from
Sep 12, 2024

Conversation

Martin-Zeithaml
Copy link
Contributor

@Martin-Zeithaml Martin-Zeithaml commented Sep 3, 2024

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 #3932

Changes proposed in this PR

  • Error message ZWEL0141E contains a text $(get_user_id) instead of real userID
  • When checking z/OSMF connection, some conditions are checked twice
  • This error message does not make sense z/OSMF is not configured. Using z/OSMF as authentication provider is not supported.
    • If zOSMF is configured
    • If default setting of authentication provider is used

Does this PR introduce a breaking change?

  • No

Testing

Always this setting:

zowe:
  environments:
    ZOSMF_HOST: example.com
    ZOSMF_PORT: 1234

With or without fix, if discovery.enabled=true:
Successfully checked z/OS MF is available on 'https://example.com:1234/zosmf/info'

But when this is set:

components.discovery.enabled=false
components.gateway.apiml.security.auth.provider=zosmf

No fix, confusing error message is printed and the zowe continues:
ERROR: z/OSMF is not configured. Using z/OSMF as authentication provider is not supported.

With fix, error with reason is printed and zowe is terminated:

ERROR: Using z/OSMF as 'components.gateway.apiml.security.auth.provider' is not possible: discovery is disabled. 
ERROR: 2024-09-06 07:21:53 <ZWELS:67504334> martin ERROR (zwe-internal-start-prepare,global_validate) Zosmf validation failed 

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

github-actions bot commented Sep 3, 2024

build 5892 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10683515173

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

github-actions bot commented Sep 3, 2024

build 5893 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10683572940

@Martin-Zeithaml Martin-Zeithaml changed the title zOSMF validate [WIP - Testing] Clean up the code when checking z/OSMF [v2 - WIP] Sep 6, 2024
@Martin-Zeithaml Martin-Zeithaml changed the title Clean up the code when checking z/OSMF [v2 - WIP] Clean up the code when checking z/OSMF [v2] Sep 6, 2024
Copy link

github-actions bot commented Sep 6, 2024

build 5951 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10740004312

Copy link

github-actions bot commented Sep 6, 2024

Test workflow 5321 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/2.18.1-PR-3971/zowe-2.18.1-pr-3971-5951-20240906142500.pax
Running on machine: zzow07
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10740123791

@MarkAckert MarkAckert merged commit f0e3b34 into v2.x/staging Sep 12, 2024
11 checks passed
@MarkAckert MarkAckert deleted the v2.x/bugfix/zosmfValidate branch September 12, 2024 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Review the zOSMF validation logic in zwe internal start prepare
3 participants