From 1cb3ee258ce6712a8fd733b03fbeeab9a157f8d1 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Sun, 20 Apr 2025 20:27:02 -0700 Subject: [PATCH 1/3] Add registry entry for flare manifest endpoint --- .../services/amazonq/lsp/artifacts/ArtifactManager.kt | 2 +- .../services/amazonq/lsp/artifacts/ManifestFetcher.kt | 5 +++-- plugins/amazonq/src/main/resources/META-INF/plugin.xml | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt index b74bbde2886..2f25ecc9da1 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt @@ -32,7 +32,7 @@ class ArtifactManager( companion object { private val DEFAULT_VERSION_RANGE = SupportedManifestVersionRange( - startVersion = SemVer("1.0.0", 1, 0, 0), + startVersion = SemVer("0.0.0", 0, 0, 0), endVersion = SemVer("2.0.0", 2, 0, 0) ) private val logger = getLogger() diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt index 74656d5665b..9ec18e255ec 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt @@ -3,6 +3,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts +import com.intellij.openapi.util.registry.Registry import org.jetbrains.annotations.VisibleForTesting import software.aws.toolkits.core.utils.deleteIfExists import software.aws.toolkits.core.utils.error @@ -24,8 +25,8 @@ class ManifestFetcher( companion object { private val logger = getLogger() - private const val DEFAULT_MANIFEST_URL = - "https://aws-toolkit-language-servers.amazonaws.com/remoteWorkspaceContext/0/manifest.json" + private val DEFAULT_MANIFEST_URL = + Registry.get("amazon.q.flare.endpoint").asString() private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot() .resolve("aws") diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml index 3d8f95579e5..9a6c0ea7f20 100644 --- a/plugins/amazonq/src/main/resources/META-INF/plugin.xml +++ b/plugins/amazonq/src/main/resources/META-INF/plugin.xml @@ -92,6 +92,9 @@ restartRequired="true"/> + From ba163e1d8b9cb3ce1fc57a229f2a733df8c4d001 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 20 May 2025 10:55:11 -0700 Subject: [PATCH 2/3] detekt --- .../services/amazonq/lsp/artifacts/ManifestFetcher.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt index d5af37b5a4c..c616a16ddfe 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt @@ -3,11 +3,11 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts -import com.intellij.openapi.util.registry.Registry import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue +import com.intellij.openapi.util.registry.Registry import org.jetbrains.annotations.VisibleForTesting import software.aws.toolkits.core.utils.deleteIfExists import software.aws.toolkits.core.utils.error @@ -31,12 +31,11 @@ class ManifestFetcher( private val DEFAULT_MANIFEST_URL = getManifestEndpoint() - private fun getManifestEndpoint() : String { + private fun getManifestEndpoint(): String { val endpoint = Registry.get("amazon.q.flare.endpoint").asString() return endpoint.ifBlank { "https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json" } } - private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot() .resolve("aws") .resolve("toolkits") From 2d1c1a3b8b7f5f6f8ae70d9d07513e2cf4f27919 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 20 May 2025 10:56:27 -0700 Subject: [PATCH 3/3] version --- .../jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt index 9141bae0769..b1c929e1aee 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt @@ -40,7 +40,7 @@ class ArtifactManager @NonInjectable internal constructor(private val manifestFe companion object { private val DEFAULT_VERSION_RANGE = SupportedManifestVersionRange( - startVersion = SemVer("0.0.0", 0, 0, 0), + startVersion = SemVer("1.0.0", 1, 0, 0), endVersion = SemVer("2.0.0", 2, 0, 0) ) private val logger = getLogger()