From 114dfd3b68e198655f2d5ee1c86fedf1ab902777 Mon Sep 17 00:00:00 2001 From: David Hasani Date: Mon, 16 Dec 2024 19:30:13 -0800 Subject: [PATCH 1/3] fix(amazonq): allow postgresql as target DB --- .../bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json | 4 ++++ .../codemodernizer/model/CodeModernizerSessionContext.kt | 1 + .../services/codemodernizer/utils/CodeTransformFileUtils.kt | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json diff --git a/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json b/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json new file mode 100644 index 00000000000..56fbd6b70b5 --- /dev/null +++ b/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json @@ -0,0 +1,4 @@ +{ + "type" : "bugfix", + "description" : "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions" +} \ No newline at end of file diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt index bd75a61c4fc..1474d18d7db 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt @@ -59,6 +59,7 @@ const val INVALID_SUFFIX_REPOSITORIES = "repositories" const val ORACLE_DB = "ORACLE" const val AURORA_DB = "AURORA_POSTGRESQL" const val RDS_DB = "RDS_POSTGRESQL" +const val POSTGRESQL_DB = "POSTGRESQL" data class CodeModernizerSessionContext( val project: Project, var configurationFile: VirtualFile? = null, // used to ZIP module diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt index bba84915c2b..aa0a952c3fb 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt @@ -28,6 +28,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni import software.aws.toolkits.jetbrains.services.codemodernizer.model.DependencyUpdatesReport import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_CONFIGURATION_FILE_NAME import software.aws.toolkits.jetbrains.services.codemodernizer.model.ORACLE_DB +import software.aws.toolkits.jetbrains.services.codemodernizer.model.POSTGRESQL_DB import software.aws.toolkits.jetbrains.services.codemodernizer.model.RDS_DB import software.aws.toolkits.jetbrains.services.codemodernizer.model.SctMetadata import software.aws.toolkits.jetbrains.services.codemodernizer.model.SqlMetadataValidationResult @@ -167,7 +168,7 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult { val targetDbServer = projectModel.entities.targets.dbServer val targetVendor = targetDbServer.vendor.trim().uppercase() - if (targetVendor != AURORA_DB && targetVendor != RDS_DB) { + if (targetVendor != AURORA_DB && targetVendor != RDS_DB && targetVendor != POSTGRESQL_DB) { return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_target_db")) } From 19ae8187b416865438c04abd494cac96ba710ff0 Mon Sep 17 00:00:00 2001 From: David Hasani Date: Tue, 17 Dec 2024 04:19:29 -0800 Subject: [PATCH 2/3] fix typo --- .../codemodernizer/model/CodeModernizerSessionContext.kt | 3 +-- .../services/codemodernizer/utils/CodeTransformFileUtils.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt index 1474d18d7db..b3c0fc9fc4d 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt @@ -58,8 +58,7 @@ const val INVALID_SUFFIX_SHA = "sha1" const val INVALID_SUFFIX_REPOSITORIES = "repositories" const val ORACLE_DB = "ORACLE" const val AURORA_DB = "AURORA_POSTGRESQL" -const val RDS_DB = "RDS_POSTGRESQL" -const val POSTGRESQL_DB = "POSTGRESQL" +const val RDS_DB = "POSTGRESQL" data class CodeModernizerSessionContext( val project: Project, var configurationFile: VirtualFile? = null, // used to ZIP module diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt index aa0a952c3fb..bba84915c2b 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt @@ -28,7 +28,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni import software.aws.toolkits.jetbrains.services.codemodernizer.model.DependencyUpdatesReport import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_CONFIGURATION_FILE_NAME import software.aws.toolkits.jetbrains.services.codemodernizer.model.ORACLE_DB -import software.aws.toolkits.jetbrains.services.codemodernizer.model.POSTGRESQL_DB import software.aws.toolkits.jetbrains.services.codemodernizer.model.RDS_DB import software.aws.toolkits.jetbrains.services.codemodernizer.model.SctMetadata import software.aws.toolkits.jetbrains.services.codemodernizer.model.SqlMetadataValidationResult @@ -168,7 +167,7 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult { val targetDbServer = projectModel.entities.targets.dbServer val targetVendor = targetDbServer.vendor.trim().uppercase() - if (targetVendor != AURORA_DB && targetVendor != RDS_DB && targetVendor != POSTGRESQL_DB) { + if (targetVendor != AURORA_DB && targetVendor != RDS_DB) { return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_target_db")) } From 4b4e395889eecc35fe341afba1ea3c829a7cb813 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:29:15 -0800 Subject: [PATCH 3/3] Update .changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json Co-authored-by: Richard Li <742829+rli@users.noreply.github.com> --- .../bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json b/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json index 56fbd6b70b5..f59e5fb7281 100644 --- a/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json +++ b/.changes/next-release/bugfix-8ccd7b78-550a-42c5-ab9c-151977ff6e96.json @@ -1,4 +1,4 @@ { "type" : "bugfix", - "description" : "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions" + "description" : "Amazon Q Code Transformation: allow PostgreSQL as target DB for SQL conversions" } \ No newline at end of file