argocd: use native http client, apply fallback on sync timeout, local ITs instance script #193
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benbroadaway
changed the title
ibodrov
reviewed
Apr 10, 2025
| public static String auth(String baseUrl, TaskParams.BasicAuth auth) throws IOException { | ||
| private BasicAuthHandler() { } | ||
|
|
||
| public static String auth(HttpClient.Builder httpBuilder, String baseUrl, TaskParams.BasicAuth auth) throws IOException { | ||
| Map<String, Object> body = new HashMap<>(); |
There was a problem hiding this comment.
var here? Should var usage be at least method-wide or, better yet, for the entire file (unless it requires casting like in the lastError case below)?
| .build(); | ||
|
|
||
| try { | ||
| // this will redirect, hopefully client is configured to do so |
There was a problem hiding this comment.
Set followRedirects explicitly?
tasks/argocd/src/main/java/com/walmartlabs/concord/plugins/argocd/LdapAuthHandler.java
Outdated
Show resolved
Hide resolved
tasks/argocd/src/main/java/com/walmartlabs/concord/plugins/argocd/NoopTrustManager.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use Java's native
HttpClientinstead of Apache's.Streamline dependencies. Less stuff to manage over time.
Apply
syncTimeoutto entireCallRetryoperation.Previously, the timeout was implicitly applied through the http call made within. This could result in a duration up-to
retryCount * syncTimeout--say, if the operation was interrupted 59 minutes into a 60 minutes timeout, then a retry would be given at least another 60 minute window. ArgoCD's sync call is essentially a single long-runningGETcall. SinceCallRetryis currently only used for that purpose, the reliance on a socket timeout worked "good enough"--assuming the call wasn't interrupted by something other than aSocketTimeout.This PR's change to
CallRetryforces a timeout against the operation as a whole, so if for some odd reason the http's socket timeout doesn't occur, it will still effectively timeout as expected. This further makes the class more reusable for in the future.Apply "fallback" calls after timeout of "main" call in
CallRetryPreviously, if the main call timed out, then that immediately was the end of things. Now, the fallback call(s) are made in the case of a main call timeout.
Local integration tests
Added script and Ansible playbook to bootstrap a local ArgoCD instance for integration testing. See details in README.md