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 [v3] #3956

Merged
merged 6 commits into from
Sep 12, 2024

Conversation

Martin-Zeithaml
Copy link
Contributor

@Martin-Zeithaml Martin-Zeithaml commented Aug 28, 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.

  • Feature

Relevant issues

Fixes #3932

Changes proposed in this PR

When checking z/OSMF connection, some messages might be confusing. See testing.

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.zaas.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.zaas.apiml.security.auth.provider' is not possible: discovery is disabled.
ERROR: 2024-08-28 09:38:37 <ZWELS:33950026> martin ERROR (zwe-internal-start-prepare,global_validate) Zosmf validation failed

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

github-actions bot commented Aug 28, 2024

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

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

github-actions bot commented Aug 28, 2024

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

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

github-actions bot commented Aug 28, 2024

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

Copy link

github-actions bot commented Aug 28, 2024

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

Copy link

github-actions bot commented Aug 28, 2024

Test workflow 5221 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.0.0-PR-3956/zowe-3.0.0-pr-3956-5810-20240828081719.pax
Running on machine: zzow08
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10592881447

Copy link

github-actions bot commented Aug 28, 2024

Test workflow 5222 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.0.0-PR-3956/zowe-3.0.0-pr-3956-5811-20240828082252.pax
Running on machine: zzow06
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10592966828

Copy link

github-actions bot commented Aug 28, 2024

Test workflow 5223 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.0.0-PR-3956/zowe-3.0.0-pr-3956-5813-20240828082334.pax
Running on machine: zzow06
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10592978506

Copy link

github-actions bot commented Aug 28, 2024

Test workflow 5224 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.0.0-PR-3956/zowe-3.0.0-pr-3956-5814-20240828082550.pax
Running on machine: zzow08
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10593015603

@Martin-Zeithaml Martin-Zeithaml changed the title Clean up the code when checking z/OSFM [WIP] Clean up the code when checking z/OSFM Aug 28, 2024
@MarkAckert
Copy link
Member

Should we port this to v2 as well?

@Martin-Zeithaml
Copy link
Contributor Author

Martin-Zeithaml commented Aug 28, 2024

Should we port this to v2 as well?

I called this an enhancement so we don't have to do it for v2 😄
But it should be ported to v2 as well.

@Martin-Zeithaml Martin-Zeithaml changed the title Clean up the code when checking z/OSFM Clean up the code when checking z/OSMF Sep 5, 2024
@Martin-Zeithaml Martin-Zeithaml changed the title Clean up the code when checking z/OSMF Clean up the code when checking z/OSMF [v3] Sep 6, 2024
Copy link

github-actions bot commented Sep 6, 2024

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

Copy link

github-actions bot commented Sep 6, 2024

Test workflow 5320 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.0.0-PR-3956/zowe-3.0.0-pr-3956-5950-20240906142405.pax
Running on machine: zzow08
Result: FAILURE
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/10740107002

@MarkAckert MarkAckert added the Build: None Used in CI label Sep 12, 2024
@MarkAckert MarkAckert merged commit 076207b into v3.x/staging Sep 12, 2024
7 checks passed
@MarkAckert MarkAckert deleted the v3.x/bugfix/zosmfValidate branch September 12, 2024 18:51
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.

3 participants