feat(amazonq): support SQL conversions #4995

dhasani23 · 2024-10-21T22:56:11Z

Types of changes

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

Description

QCT wants to support converting embedded SQL in Java apps.

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.

github-advanced-security

QDJVMC found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

...oftware/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

...are/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

...mmunity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt

...oftware/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

.../jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

        ) {
-            maybeAdd(ProgressStepId.UPLOADING, message("codemodernizer.toolwindow.progress.uploading"))
-            maybeAdd(ProgressStepId.BUILDING, message("codemodernizer.toolwindow.progress.building"))
+            maybeAddTransformationStep(ProgressStepId.UPLOADING, message("codemodernizer.toolwindow.progress.uploading"))


...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

-            maybeAdd(ProgressStepId.BUILDING, message("codemodernizer.toolwindow.progress.building"))
-            maybeAdd(ProgressStepId.PLANNING, message("codemodernizer.toolwindow.progress.planning"))
-            maybeAdd(ProgressStepId.TRANSFORMING, message("codemodernizer.toolwindow.progress.transforming"))
+            maybeAddTransformationStep(ProgressStepId.UPLOADING, message("codemodernizer.toolwindow.progress.uploading"))


...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

+            maybeAddTransformationStep(ProgressStepId.UPLOADING, message("codemodernizer.toolwindow.progress.uploading"))
+            maybeAddTransformationStep(ProgressStepId.BUILDING, message("codemodernizer.toolwindow.progress.building"))
+            maybeAddTransformationStep(ProgressStepId.PLANNING, message("codemodernizer.toolwindow.progress.planning"))
+            maybeAddTransformationStep(ProgressStepId.TRANSFORMING, message("codemodernizer.toolwindow.progress.transforming"))


...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

+                loadingPanelText = if (transformType == CodeTransformType.SQL_CONVERSION) {
+                    message("codemodernizer.toolwindow.scan_in_progress.transforming")
+                } else {
+                    message("codemodernizer.toolwindow.scan_in_progress.planning")


...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

            TransformationStatus.PLANNED -> {
-                loadingPanelText = message("codemodernizer.toolwindow.scan_in_progress.planning")
+                loadingPanelText = if (transformType == CodeTransformType.SQL_CONVERSION) {
+                    message("codemodernizer.toolwindow.scan_in_progress.transforming")


.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt


+fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult {
+    if (sctFile == null) {
+        return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.missing_sct_file"))


.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

+        val targetDbServer = targets["DbServer"] as Map<*, *>
+        val targetVendor = (targetDbServer["vendor"] as String).trim().uppercase()
+        if (targetVendor != "AURORA_POSTGRESQL" && targetVendor != "RDS_POSTGRESQL") {
+            return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_target_db"))


.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

+        return SqlMetadataValidationResult(true, "", sourceVendor, targetVendor, sourceServerName, schemaNames)
+    } catch (e: Exception) {
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file: $e" }
+        return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_sct"))


.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

dhasani23 · 2024-11-09T02:36:44Z

TODO: add changelog entry

.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

+private val confirmUserSelectionSQLConversionMetadataButton = Button(
+    keepCardAfterClick = true,
+    waitMandatoryFormItems = true,
+    text = message("codemodernizer.chat.message.button.select_sql_metadata"),


.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

 """.trimIndent()

+private fun getUserSQLConversionSelectionFormattedMarkdown(moduleName: String, schema: String) = """
+        ### ${message("codemodernizer.chat.prompt.title.details")}


.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

+        sctMetadata = xmlMapper.readValue<SctMetadata>(sctFile)
+    } catch (e: Exception) {
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered. $e" }
+        return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_sct"))


...rc/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

.../src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt

        private const val METRICS_FILE_NAME = "metrics.json"
        val LOG = getLogger<CodeModernizerArtifact>()
        val MAPPER = jacksonObjectMapper()
+        val XML_MAPPER = XmlMapper().registerKotlinModule().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)


.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

+fun buildSQLMetadataValidationSuccessDetailsChatContent(validationResult: SqlMetadataValidationResult) = CodeTransformChatMessageContent(
+    type = CodeTransformChatMessageType.FinalizedAnswer,
+    message = """
+        ### ${message("codemodernizer.chat.prompt.title.details")}


rli · 2024-11-18T18:20:26Z

...are/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

+    }
+
+    override suspend fun processCodeTransformSelectSQLMetadataAction(message: IncomingCodeTransformMessage.CodeTransformSelectSQLMetadata) {
+        runInEdt {


this is suspend, so you can just do withContext(EDT) {

rli · 2024-11-18T18:20:45Z

...are/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

+            val metadataValidationResult = validateSctMetadata(sctFile)
+
+            if (!metadataValidationResult.valid) {
+                CoroutineScope(EDT).launch {


we are already on EDT, so what is this doing?

using withContext(EDT) means that I no longer need to do this, previously was getting an error, fixed

rli · 2024-11-18T18:21:11Z

...are/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

+            val metadataValidationResult = validateSctMetadata(sctFile)
+
+            if (!metadataValidationResult.valid) {
+                CoroutineScope(EDT).launch {


also this breaks structured concurrency, should be withContext(...)/launch(...) depending on desired behavior

Removed entirely in favor of withContext

rli · 2024-11-18T18:21:54Z

.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

+    try {
+        sctMetadata = XML_MAPPER.readValue<SctMetadata>(sctFile)
+    } catch (e: Exception) {
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered. $e" }


our linter is broken and not catching this for some reason

Suggested change

getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered. $e" }

getLogger<CodeTransformChatController>(e).error { "Error parsing .sct metadata file; invalid XML encountered." }

When I tried this, got errors prompting me to make changes in LogUtils.kt and some other shared/common files, wasn't sure if I should do that, ideally that can be a follow up, for now I changed it to just log the localizedMessage rather than dumping the entire Error object

rli · 2024-11-18T18:22:07Z

.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

+        }
+        return SqlMetadataValidationResult(true, "", sourceVendor, targetVendor, sourceServerName, schemaNames)
+    } catch (e: Exception) {
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file: $e" }


Suggested change

getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file: $e" }

getLogger<CodeTransformChatController>(e).error { "Error parsing .sct metadata file" }

dhasani23 requested review from a team as code owners October 21, 2024 22:56

dhasani23 changed the title ~~feat(amazonq): enable SQL conversions~~ feat(amazonq): support SQL conversions Oct 21, 2024

github-advanced-security bot found potential problems Oct 21, 2024

View reviewed changes

dhasani23 force-pushed the dmsWork branch from 3c0bb6f to c442c19 Compare October 22, 2024 16:53

github-advanced-security bot found potential problems Oct 22, 2024

View reviewed changes

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt Fixed Show fixed Hide fixed

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Oct 23, 2024

View reviewed changes

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt Fixed Show fixed Hide fixed

dhasani23 force-pushed the dmsWork branch from 2b454a2 to d4b3a09 Compare October 23, 2024 23:32

github-advanced-security bot found potential problems Oct 23, 2024

View reviewed changes

...lkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt Fixed Show fixed Hide fixed

dhasani23 force-pushed the dmsWork branch 2 times, most recently from deb935c to d464830 Compare October 24, 2024 01:54

dhasani23 commented Oct 24, 2024

View reviewed changes

...are/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt Outdated Show resolved Hide resolved

carolabadeer reviewed Oct 31, 2024

View reviewed changes

dhasani23 force-pushed the dmsWork branch from d37a89c to df4c125 Compare October 31, 2024 20:41

carolabadeer approved these changes Oct 31, 2024

View reviewed changes

github-advanced-security bot found potential problems Oct 31, 2024

View reviewed changes

dhasani23 force-pushed the dmsWork branch 2 times, most recently from ad1db16 to 1e9ddf8 Compare October 31, 2024 22:30

rli reviewed Nov 1, 2024

View reviewed changes

.../src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt Outdated Show resolved Hide resolved

manodnyab reviewed Nov 5, 2024

View reviewed changes

.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt Show resolved Hide resolved

.../software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt Outdated Show resolved Hide resolved

dhasani23 force-pushed the dmsWork branch from 1e9ddf8 to 38eb37d Compare November 9, 2024 00:22

dhasani23 requested a review from a team as a code owner November 9, 2024 00:22

dhasani23 marked this pull request as draft November 9, 2024 00:25

dhasani23 force-pushed the dmsWork branch from 38eb37d to d8333ae Compare November 9, 2024 02:22

github-advanced-security bot found potential problems Nov 9, 2024

View reviewed changes

dhasani23 force-pushed the dmsWork branch from d8333ae to 2b3c852 Compare November 13, 2024 23:47

part 1 of DMS support

483b5e6

David Hasani added 16 commits November 14, 2024 11:46

skip build/plan steps

dec4c9a

add telemetry

af941d9

skip getPlan for SQL conversions

7a28eac

fix tests

ee9e962

minor cleanups

912bb65

address comments

cb7a371

fix failing tests

56f950e

fix detekt issue

f4dfaf7

address comment

7668190

update tests

46268b5

grep for sql statements

f4749e1

lint issues

ee28967

fix detekt

52f2e7e

fix detekt issue

0295478

address feedback

ef423b9

resolve conflicts

61a3534

dhasani23 requested a review from a team as a code owner November 14, 2024 19:52

github-advanced-security bot found potential problems Nov 14, 2024

View reviewed changes

add changelog entry

299c6ee

github-advanced-security bot found potential problems Nov 15, 2024

View reviewed changes

add legacy jdbc string

da97538

dhasani23 force-pushed the dmsWork branch from 883b643 to da97538 Compare November 16, 2024 01:13

rli reviewed Nov 18, 2024

View reviewed changes

address final 11/18 comments

2858151

dhasani23 force-pushed the dmsWork branch from 49332f9 to 2858151 Compare November 18, 2024 19:08

Merge branch 'main' into dmsWork

79544a9

rli approved these changes Nov 18, 2024

View reviewed changes

rli merged commit 0e94d02 into aws:main Nov 18, 2024
12 of 13 checks passed

	getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered. $e" }
	getLogger<CodeTransformChatController>(e).error { "Error parsing .sct metadata file; invalid XML encountered." }

feat(amazonq): support SQL conversions #4995

feat(amazonq): support SQL conversions #4995

Uh oh!

Conversation

dhasani23 commented Oct 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Description

Checklist

License

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Uh oh!

Uh oh!

Uh oh!

dhasani23 commented Nov 9, 2024

Uh oh!

Check warning

Check warning

Uh oh!

Check warning

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Check warning

rli Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

rli Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

dhasani23 Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

rli Nov 18, 2024 • 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!

dhasani23 Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

rli Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

dhasani23 Nov 18, 2024 • 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!

rli Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

dhasani23 commented Oct 21, 2024 •

edited

Loading

rli Nov 18, 2024 •

edited

Loading

dhasani23 Nov 18, 2024 •

edited

Loading