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

chore: merging user service with connection manager #6225

Merged
merged 9 commits into from
Jan 2, 2025

Conversation

iamayushm
Copy link
Contributor

@iamayushm iamayushm commented Dec 27, 2024

Description

  1. Earlier we use to pass token in getConnection() function in "github.com/devtron-labs/devtron/client/argocdServer/connection" from outside, now we will be reading token inside getConnection func from outside.

  2. For achieving point 1, argocdUserService is merged with argocdConnectionManager

  3. All usages for setting argoCD token in context is removed

  4. For resolving some circular imports, one method is refactored into clusterReadService, all it's usages are changed and some things are moved into bean.

Future refactoring scope:-

  1. passing authConfig as argument to getConnection function
  2. caching connection object
  3. passing config() in getConnection function from outside

Checklist:

  • The title of the PR states what changed and the related issues number (used for the release note).
  • Does this PR requires documentation updates?
  • I've updated documentation as required by this PR.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have tested it for all user roles.
  • I have added all the required unit/api test cases.

Does this PR introduce a user-facing change?


client/argocdServer/application/Application.go Outdated Show resolved Hide resolved
pkg/gitops/GitOpsConfigService.go Outdated Show resolved Hide resolved
@iamayushm iamayushm changed the title merging user service with connection manager chore: merging user service with connection manager Jan 2, 2025
Copy link

github-actions bot commented Jan 2, 2025

The migration files have successfully passed the criteria!!

@iamayushm iamayushm merged commit 69097b9 into develop Jan 2, 2025
7 of 8 checks passed
@iamayushm iamayushm deleted the argocd-refactoring branch January 2, 2025 07:47
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