update tests

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt

@@ -50,7 +50,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isValidCode
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.pollTransformationStatusAndPlan
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.toTransformationLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession
-import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import java.io.File
 import java.io.FileInputStream
@@ -270,8 +269,7 @@ class CodeModernizerSession(
         } finally {
             telemetry.uploadProject(payloadSize, startTime, true, telemetryErrorMessage)
             if (payload != null) {
-                // TO-DO: revert
-                // deleteUploadArtifact(payload)
+                deleteUploadArtifact(payload)
             }
         }
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -239,7 +239,7 @@ fun buildObjectiveChosenChatContent(objective: String) = CodeTransformChatMessag
 )
 
 fun buildCheckingValidProjectChatContent() = CodeTransformChatMessageContent(
-    message = message("codemodernizer.chat.message.validation.check_eligible_projects"),
+    message = message("codemodernizer.chat.message.validation.check_eligible_modules"),
     type = CodeTransformChatMessageType.PendingAnswer,
 )
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -150,9 +150,9 @@ class CodeTransformChatController(
         // Publish a metric when transform is first initiated from chat prompt.
         telemetry.initiateTransform()
 
-        val isSqlTransformReady = true // feature flag for SQL conversions
+        val anyModuleContainsOracleSQL = true // TODO: implement, and make sure to say "Checking for eligible modules..." here too
 
-        if (isSqlTransformReady) {
+        if (anyModuleContainsOracleSQL) {
             this.getUserObjective(message.tabId)
         } else {
             this.handleLanguageUpgrade()
@@ -310,7 +310,7 @@ class CodeTransformChatController(
     override suspend fun processCodeTransformSelectSQLMetadataAction(message: IncomingCodeTransformMessage.CodeTransformSelectSQLMetadata) {
         runInEdt {
             val descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor()
-                .withDescription("Upload metadata file")
+                .withDescription("Select metadata file")
                 .withFileFilter { it.extension == "zip" }
 
             val selectedZipFile = FileChooser.chooseFile(descriptor, null, null) ?: return@runInEdt

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

@@ -26,7 +26,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeMo
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactPomFolder
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilDependenciesRootDir
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilUploadZip
-import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import java.io.File
 import java.io.IOException
@@ -57,6 +56,8 @@ const val DS_STORE_FILE_NAME = ".DS_Store"
 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"
 data class CodeModernizerSessionContext(
     val project: Project,
     var configurationFile: VirtualFile? = null, // used to ZIP module

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

@@ -26,12 +26,14 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_POM
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_POM_VERSION_PLACEHOLDER
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_UPLOAD_ZIP_NAME
 import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatController
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.AURORA_DB
 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.RDS_DB
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.SctMetadata
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.SqlMetadataValidationResult
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.content
-import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import java.io.File
 import java.io.FileOutputStream
@@ -154,23 +156,23 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult {
     try {
         sctMetadata = xmlMapper.readValue<SctMetadata>(sctFile)
     } catch (e: Exception) {
-        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered." }
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered. $e" }
         return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_sct"))
     }
 
     try {
         val projectModel = sctMetadata.instances.projectModel
         val sourceDbServer = projectModel.entities.sources.dbServer
         val sourceVendor = sourceDbServer.vendor.trim().uppercase()
-        if (sourceVendor != "ORACLE") {
+        if (sourceVendor != ORACLE_DB) {
             return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_source_db"))
         }
 
         val sourceServerName = sourceDbServer.name.trim()
 
         val targetDbServer = projectModel.entities.targets.dbServer
         val targetVendor = targetDbServer.vendor.trim().uppercase()
-        if (targetVendor != "AURORA_POSTGRESQL" && targetVendor != "RDS_POSTGRESQL") {
+        if (targetVendor != AURORA_DB && targetVendor != RDS_DB) {
             return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_target_db"))
         }
 
@@ -183,8 +185,7 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult {
                 }
             }
         }
-        notifyStickyInfo("successfully parsed .sct file", "$sourceVendor, $targetVendor, $sourceServerName, $schemaNames")
-        return SqlMetadataValidationResult(true, "", sourceVendor, targetVendor, sourceServerName!!, schemaNames)
+        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"))

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerUtilsTest.kt

@@ -250,7 +250,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
                 </DbServer>
                 </sources>
                 <targets>
-                <DbServer vendor="aurora_postgresql" />
+                <DbServer vendor="aurora_postgresql" name="sample.aurora.amazonaws.com" />
                 </targets>
             </entities>
             <relations>
@@ -309,7 +309,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
                 </DbServer>
                 </sources>
                 <targets>
-                <DbServer vendor="aurora_postgresql" />
+                <DbServer vendor="aurora_postgresql" name="sample.aurora.amazonaws.com" />
                 </targets>
             </entities>
             <relations>
@@ -364,7 +364,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
                 </DbServer>
                 </sources>
                 <targets>
-                <DbServer vendor="aurora_postgresql-invalid" />
+                <DbServer vendor="aurora_postgresql-invalid" name="sample.aurora.amazonaws.com" />
                 </targets>
             </entities>
             <relations>

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -119,7 +119,7 @@ object CodeWhispererConstants {
     }
 
     object Config {
-        const val CODEWHISPERER_ENDPOINT = "https://rts.gamma-us-east-1.codewhisperer.ai.aws.dev/" // PROD
+        const val CODEWHISPERER_ENDPOINT = "https://codewhisperer.us-east-1.amazonaws.com/" // PROD
         const val CODEWHISPERER_IDPOOL_ID = "us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9"
         val Sigv4ClientRegion = Region.US_EAST_1
         val BearerClientRegion = Region.US_EAST_1

plugins/amazonq/mynah-ui/src/mynah-ui/ui/tabs/generator.ts

@@ -30,9 +30,6 @@ export class TabDataGenerator {
         ['featuredev', 'Describe your task or issue in detail'],
     ])
 
-    // feature flag for SQL transformations
-    private isSQLTransformReady: boolean = true
-
     private tabWelcomeMessage: Map<TabType, string> = new Map([
         [
             'unknown',
@@ -55,16 +52,8 @@ I can generate code to implement new functionality across your workspace. To get
 What would you like to work on?`,
         ],
         [
-            'codetransform', this.isSQLTransformReady ?
-            `Welcome to Code Transformation!
-
-I can help you upgrade your Java 8 and 11 codebases to Java 17 ("language upgrade") & 
-I can also convert embedded SQL from Oracle to PostgreSQL ("SQL conversion"). What would you like to do?
-` :
-            `Welcome to Code Transformation!
-
-I can help you upgrade your Java 8 and 11 codebases to Java 17.
-`,
+            'codetransform',
+            `Welcome to Code Transformation!`,
         ],
     ])
 

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -632,7 +632,7 @@ codemodernizer.chat.message.upload_failed_http_error=Sorry, I couldn''t upload y
 codemodernizer.chat.message.upload_failed_other=Sorry, I was unable to upload your project due to an unexpected failure. {0}
 codemodernizer.chat.message.upload_failed_ssl_error=Sorry, I was unable to upload your project. This might have been caused by your IDE not trusting the certificate of your HTTP proxy. Ensure all certificates for your proxy client have been configured in your IDE, and then retry transformation.
 codemodernizer.chat.message.upload_failed_url_expired=Sorry, I couldn't upload your project to begin the transformation. The Amazon S3 pre-signed URL used to upload your code expired after 30 minutes. This might have been caused by delays introduced by intermediate services in your network infrastructure.\n\nCheck your network configuration for services that might be causing delays. If the issue persists, you might need to allow list the following Amazon S3 bucket: 'amazonq-code-transformation-us-east-1-c6160f047e0.s3.amazonaws.com'.
-codemodernizer.chat.message.validation.check_eligible_projects=Checking for eligible projects...
+codemodernizer.chat.message.validation.check_eligible_modules=Checking for eligible modules...
 codemodernizer.chat.message.validation.check_passed=I can upgrade your Java module. To start the transformation, I need some information from you. Choose the module you want to upgrade and the target code version to upgrade to. Then, choose **Confirm**.\n\nIf you do not see the module you want to transform, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and language level. In the Modules tab, set the correct module JDK and language level.
 codemodernizer.chat.message.validation.error.invalid_sct=It looks like the .sct file you provided isn't valid. Make sure that you've uploaded the .zip file you retrieved from your schema conversion in AWS DMS.
 codemodernizer.chat.message.validation.error.invalid_source_db=I can only convert SQL for migrations from an Oracle source database. The provided .sct file indicates another source database for this migration.