sspc

Author: leigaol

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

@@ -673,7 +673,6 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         // 5. customization
         val customizationArn = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn
 
-        // TODO: use workspaceID from LSP
         var workspaceId: String? = null
         try {
             val workspacesInfos = getWorkspaceIds(project).get().workspaces
@@ -693,7 +692,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
             fileContext, supplementalContext, connection, latencyContext, customizationArn, workspaceId)
     }
 
-    fun getWorkspaceIds(project: Project): CompletableFuture<LspServerConfigurations> {
+    private fun getWorkspaceIds(project: Project): CompletableFuture<LspServerConfigurations> {
         val payload = GetConfigurationFromServerParams(
             section = "aws.q.workspaceContext"
         )

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt

@@ -32,8 +32,8 @@ class ArtifactManager(
 
     companion object {
         private val DEFAULT_VERSION_RANGE = SupportedManifestVersionRange(
-            startVersion = SemVer("0.1.0", 0, 1, 0),
-            endVersion = SemVer("0.2.0", 0, 2, 0)
+            startVersion = SemVer("3.0.0", 3, 0, 0),
+            endVersion = SemVer("4.0.0", 4, 0, 0)
         )
         private val logger = getLogger<ArtifactManager>()
     }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt

@@ -25,7 +25,7 @@ class ManifestFetcher(
         private val logger = getLogger<ManifestFetcher>()
 
         private const val DEFAULT_MANIFEST_URL =
-            "https://aws-language-servers-gamma.amazonaws.com/remoteWorkspaceContext/0/manifest.json"
+            "https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json"
 
         private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot()
             .resolve("aws")

plugins/amazonq/src/main/resources/META-INF/plugin.xml

@@ -85,7 +85,7 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <registryKey key="amazon.q.endpoint" description="Endpoint to use for Amazon Q"
-                     defaultValue="https://rts.gamma-us-west-2.codewhisperer.ai.aws.dev/" restartRequired="true"/>
+                     defaultValue="https://codewhisperer.us-east-1.amazonaws.com/" restartRequired="true"/>
         <registryKey key="inline.completion.rem.dev.use.rhizome" description="Defined by IntelliJ. Used for Amazon Q to display suggestions on remote."
                      defaultValue="false" restartRequired="true"/>
     </extensions>

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sono/SonoConstants.kt

@@ -13,16 +13,16 @@ const val IDENTITY_CENTER_ROLE_ACCESS_SCOPE = "sso:account:access"
 
 @Deprecated("pending removal, merge into Q_SCOPES")
 val CODEWHISPERER_SCOPES = listOf(
-    "codewhisperer_internal:completions",
-    "codewhisperer_internal:analysis",
+    "codewhisperer:completions",
+    "codewhisperer:analysis",
 )
 
 val Q_SCOPES = listOf(
-    "codewhisperer_internal:conversations",
-    "codewhisperer_internal:transformations",
-    "codewhisperer_internal:taskassist",
-    "codewhisperer_internal:completions",
-    "codewhisperer_internal:analysis",
+    "codewhisperer:conversations",
+    "codewhisperer:transformations",
+    "codewhisperer:taskassist",
+    "codewhisperer:completions",
+    "codewhisperer:analysis",
 )
 
 val CODECATALYST_SCOPES = listOf(