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

ROX-26360: OCM AuthType Deleted and Replaced #2047

Merged
merged 3 commits into from
Sep 27, 2024

Conversation

aaa5kameric
Copy link
Contributor

@aaa5kameric aaa5kameric commented Sep 25, 2024

Description

OCM AuthType and related configuration deleted from Fleet Manager Client AuthenticatedClientWithOCM---> replaced with AuthenticatedClientWithStaticToken.

And related E2E tests for OCM Authentication Deleted

https://issues.redhat.com/projects/ROX/issues/ROX-26360?filter=myopenissues

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.
  • Add secret to app-interface Vault or Secrets Manager if necessary
  • RDS changes were e2e tested manually
  • Check AWS limits are reasonable for changes provisioning new resources
  • (If applicable) Changes to the dp-terraform Helm values have been reflected in the addon on integration environment

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup
make verify lint binary test test/integration

kovayur
kovayur previously approved these changes Sep 26, 2024
Copy link
Contributor

@kovayur kovayur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not merge before #2048 otherwise it will break the probe service

ocmRefreshToken := os.Getenv(ocmRefreshTokenEnvVar)
if ocmRefreshToken == "" {
panic(fmt.Sprintf("%s not set. Please set OCM token with 'export %s=$(ocm token --refresh)'", ocmRefreshTokenEnvVar, ocmRefreshTokenEnvVar))
func AuthenticatedClientWithStaticToken(ctx context.Context) *fleetmanager.Client {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes sense to remove AuthenticatedClientWithRHOASToken function and use AuthenticatedClientWithStaticToken, they serve the same purpose

@kovayur kovayur dismissed their stale review September 26, 2024 13:57

Probe changes are pending

@openshift-ci openshift-ci bot removed the approved label Sep 26, 2024
Copy link
Contributor

openshift-ci bot commented Sep 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aaa5kameric, kovayur

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kovayur kovayur merged commit f636090 into main Sep 27, 2024
12 checks passed
@kovayur kovayur deleted the ROX-26360-OCM-AuthType-deleted-and-replaced branch September 27, 2024 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants