feat(amazonq): add q config to lsp/configuration #5520

samgst-amazon · 2025-03-28T16:53:48Z

Add q config section per: https://github.com/aws/language-servers/blob/780be3fdb92917e58524472ea5967f405f802db5/server/aws-lsp-codewhisperer/src/language-server/codeWhispererServer.ts#L629

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

Description

Checklist

My code follows the code style of this project
I have added tests to cover my changes
A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

samgst-amazon · 2025-03-28T17:02:51Z

...ns-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspConstants.kt

+    const val LSP_Q_CONFIGURATION_KEY = "aws.q"
+    const val LSP_OPT_OUT_TELEMETRY_CONFIGURATION_KEY = "optOutTelemetry"
+    const val LSP_ENABLE_TELEMETRY_EVENTS_CONFIGURATION_KEY = "enableTelemetryEventsToDestination"
+    const val LSP_CUSTOMIZATION_CONFIGURATION_KEY = "customization";


Was not sure what value this was tracking -- on the server side I see
if (qConfig) { fallbackCodeWhispererService.customizationArn = textUtils.undefinedIfEmpty(qConfig.customization) codePercentageTracker.customizationArn = textUtils.undefinedIfEmpty(qConfig.customization)

Does this mean the customization value we are sending should just be this:

aws-toolkit-jetbrains/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

Line 170 in a4f5c07

override fun activeCustomization(project: Project): CodeWhispererCustomization? {

?

samgst-amazon · 2025-03-28T17:05:13Z

...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspConfiguration.kt

+    @SerializedName(AmazonQLspConstants.LSP_OPT_OUT_TELEMETRY_CONFIGURATION_KEY)
+    val optOutTelemetry: Boolean? = null,
+
+    @SerializedName(AmazonQLspConstants.LSP_ENABLE_TELEMETRY_EVENTS_CONFIGURATION_KEY)


The flag enableTelemetryEventsToDestination is set to true temporarily. It's value will be determined through destination configuration post all events migration to STE. It'll be replaced by qConfig['enableTelemetryEventsToDestination'] === true

This is not currently being used but will be in future migrations. not exactly sure what it should be pointing to in current codebase

github-actions · 2025-03-28T17:37:06Z

Qodana Community for JVM

28 new problems were found

Inspection name	Severity	Problems
`Usage of redundant or deprecated syntax or deprecated symbols`	🔶 Warning	21
`Extension class should be final and non-public`	🔶 Warning	1
`Serializable object must implement 'readResolve'`	🔶 Warning	1
`Boolean literal argument without parameter name`	◽️ Notice	2
`Const property naming convention`	◽️ Notice	2
`Variable declaration could be moved inside 'when'`	◽️ Notice	1

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at [email protected]

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

samgst-amazon · 2025-03-28T23:19:42Z

/retryBuilds

.../toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt

Conflicts: plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

...ws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

...ty/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CustomizationConstants.kt

+import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
+
+object CustomizationConstants {
+    private const val noAccessToCustomizationMessage = "Your account is not authorized to use CodeWhisperer Enterprise."


...ty/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CustomizationConstants.kt

+
+object CustomizationConstants {
+    private const val noAccessToCustomizationMessage = "Your account is not authorized to use CodeWhisperer Enterprise."
+    private const val invalidCustomizationMessage = "You are not authorized to access"


...ty/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CustomizationConstants.kt

.../toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt

...software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

manodnyab · 2025-04-24T18:49:39Z

.../toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt

+                    rowComment(
+                        message(
+                            "codewhisperer.custom.dialog.option.customization.description.no_customization",
+                            "https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/customizations.html"


Should this be a const or do we expect this value to be updated?

honestly it should probably just be in the localization bundle

add support for q config section

b0c1cdf

samgst-amazon requested review from a team as code owners March 28, 2025 16:53

samgst-amazon changed the base branch from main to feature/q-lsp March 28, 2025 16:54

samgst-amazon commented Mar 28, 2025

View reviewed changes

samgst-amazon added 2 commits March 28, 2025 10:07

customization field

ba3cb74

detekt

50e2f3d

Merge branch 'feature/q-lsp' into samgst/q-lsp-q-config-settings

bb57f74

samgst-amazon added 2 commits March 31, 2025 15:27

Merge branch 'feature/q-lsp' into samgst/q-lsp-q-config-settings

d9ee16c

Merge branch 'feature/q-lsp' into samgst/q-lsp-q-config-settings

5af7915

rli deleted the branch feature/q-lsp-chat April 18, 2025 19:44

rli closed this Apr 18, 2025

rli reopened this Apr 18, 2025

rli changed the base branch from feature/q-lsp to main April 18, 2025 19:47

Merge branch 'main' into samgst/q-lsp-q-config-settings

8eafb45

rli approved these changes Apr 18, 2025

View reviewed changes

samgst-amazon and others added 5 commits April 18, 2025 14:51

Merge branch 'main' into samgst/q-lsp-q-config-settings

f069bd3

add customization

47821ca

fix arn fetching

36e79f9

Merge branch 'main' into samgst/q-lsp-q-config-settings

a5599a7

local indexing

0afdf3e

rli changed the base branch from main to feature/q-lsp-chat April 22, 2025 17:57

github-advanced-security bot found potential problems Apr 22, 2025

View reviewed changes

.../toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Apr 23, 2025

View reviewed changes

rli added 2 commits April 23, 2025 16:16

tst

ad65042

tst

38d4084

rli added 2 commits April 23, 2025 17:13

tst

564d74b

lint

ce128ab

github-advanced-security bot found potential problems Apr 24, 2025

View reviewed changes

rli added 3 commits April 23, 2025 18:57

tst

fade5db

lint

78ac285

propogate settings

085c9b0

github-advanced-security bot found potential problems Apr 24, 2025

View reviewed changes

...software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt Fixed Show fixed Hide fixed

...software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt Fixed Show fixed Hide fixed

rli added 2 commits April 24, 2025 11:13

tst

39e0c06

shadowing

00ef3a0

manodnyab approved these changes Apr 24, 2025

View reviewed changes

rli merged commit 09b851f into feature/q-lsp-chat Apr 24, 2025
13 of 16 checks passed

rli deleted the samgst/q-lsp-q-config-settings branch April 24, 2025 19:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(amazonq): add q config to lsp/configuration #5520

feat(amazonq): add q config to lsp/configuration #5520

Uh oh!

samgst-amazon commented Mar 28, 2025

Uh oh!

samgst-amazon Mar 28, 2025

Uh oh!

samgst-amazon Mar 28, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Mar 28, 2025 •

edited

Loading

Uh oh!

samgst-amazon commented Mar 28, 2025

Uh oh!

Uh oh!

Uh oh!

Check notice

Check notice

Uh oh!

Check warning

Uh oh!

Uh oh!

manodnyab Apr 24, 2025

Uh oh!

rli Apr 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

feat(amazonq): add q config to lsp/configuration #5520

feat(amazonq): add q config to lsp/configuration #5520

Uh oh!

Conversation

samgst-amazon commented Mar 28, 2025

Types of changes

Description

Checklist

License

Uh oh!

samgst-amazon Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

samgst-amazon Mar 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Qodana Community for JVM

Uh oh!

samgst-amazon commented Mar 28, 2025

Uh oh!

Uh oh!

Uh oh!

Check notice

Check notice

Uh oh!

Check warning

Uh oh!

Uh oh!

manodnyab Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

rli Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

samgst-amazon Mar 28, 2025 •

edited

Loading

github-actions bot commented Mar 28, 2025 •

edited

Loading