feat(amazonq): Implement aws/credentials/token messages #5410
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
Qodana Community for JVMIt seems all right 👌 No new problems were found according to the checks applied 💡 Qodana analysis was run in the pull request mode: only the changed files were checked Contact Qodana teamContact us at [email protected]
|
rli
reviewed
Feb 26, 2025
Comment on lines
29
to
41
| return CompletableFuture<ResponseMessage>().also { completableFuture -> | ||
| AmazonQLspService.executeIfRunning(project) { server -> | ||
| server.updateTokenCredentials(payload) | ||
| .whenComplete { response, throwable -> | ||
| if (throwable != null) { | ||
| completableFuture.completeExceptionally(throwable) | ||
| } else { | ||
| completableFuture.complete(response) | ||
| } | ||
| } | ||
| } ?: completableFuture.completeExceptionally(IllegalStateException("LSP Server not running")) | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
i think we can reduce the boilerplate to
Suggested change
| return CompletableFuture<ResponseMessage>().also { completableFuture -> | |
| AmazonQLspService.executeIfRunning(project) { server -> | |
| server.updateTokenCredentials(payload) | |
| .whenComplete { response, throwable -> | |
| if (throwable != null) { | |
| completableFuture.completeExceptionally(throwable) | |
| } else { | |
| completableFuture.complete(response) | |
| } | |
| } | |
| } ?: completableFuture.completeExceptionally(IllegalStateException("LSP Server not running")) | |
| } | |
| } | |
| return AmazonQLspService.executeIfRunning(project) { server -> | |
| server.updateTokenCredentials(payload) | |
| } ?: CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")) |
then redefine the execute methods with type generics
suspend fun<T> execute(runnable: suspend (AmazonQLanguageServer) -> T): T {
val lsp = withTimeout(10.seconds) {
val holder = mutex.withLock { instance }.await()
holder.initializer.join()
holder.languageServer
}
return runnable(lsp)
}
fun<T> executeSync(runnable: suspend (AmazonQLanguageServer) -> T): T =
runBlocking(cs.coroutineContext) {
execute(runnable)
}| fun updateTokenCredentials(payload: UpdateCredentialsPayload): CompletableFuture<ResponseMessage> | ||
|
|
||
| @JsonNotification("aws/credentials/token/delete") | ||
| fun deleteTokenCredentials() |
Contributor
There was a problem hiding this comment.
Suggested change
| fun deleteTokenCredentials() | |
| fun deleteTokenCredentials(): CompletableFuture<Void> |
should it also return a future?
Comment on lines
+10
to
+11
| fun updateTokenCredentials(accessToken: String, encrypted: Boolean): CompletableFuture<ResponseMessage> | ||
| fun deleteTokenCredentials(): CompletableFuture<Unit> |
Contributor
There was a problem hiding this comment.
im assuming hooking these up will be a followup?
rli
approved these changes
Feb 26, 2025
leigaol
pushed a commit
to leigaol/aws-toolkit-jetbrains
that referenced
this pull request
Mar 20, 2025
* implement aws/credentials/token messages * detekt * feedback
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Added service handlers for aws/credential messages.
Types of changes
Description
Implemented credential service class to invoke messaging the LSP server for token updates and token deletion.
Checklist
License
I confirm that my contribution is made under the terms of the Apache 2.0 license.