Remove maven metadata from uploaded dependencies (#4231)

* Remove Maven metadata from uploaded dependencies.

---------

Co-authored-by: Leonardo Araneda Freccero <[email protected]>

Author: arangatang

.changes/next-release/bugfix-ee74fabd-d45c-4ba6-88d3-adecf651b6ed.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Code Transformation - Omit Maven metadata files when uploading dependencies to fix certain build failures in backend."
+}

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

@@ -37,14 +37,16 @@ const val BUILD_LOG_PATH = "build-logs.txt"
 const val MAVEN_CONFIGURATION_FILE_NAME = "pom.xml"
 const val MAVEN_DEFAULT_BUILD_DIRECTORY_NAME = "target"
 const val IDEA_DIRECTORY_NAME = ".idea"
-
+const val INVALID_SUFFIX_SHA = "sha1"
+const val INVALID_SUFFIX_REPOSITORIES = "repositories"
 data class CodeModernizerSessionContext(
     val project: Project,
     val configurationFile: VirtualFile,
     val sourceJavaVersion: JavaSdkVersion,
     val targetJavaVersion: JavaSdkVersion,
 ) {
     private val mapper = jacksonObjectMapper()
+    private val ignoredDependencyFileExtensions = setOf(INVALID_SUFFIX_SHA, INVALID_SUFFIX_REPOSITORIES)
 
     fun File.isMavenTargetFolder(): Boolean {
         val hasPomSibling = this.resolveSibling(MAVEN_CONFIGURATION_FILE_NAME).exists()
@@ -164,16 +166,18 @@ data class CodeModernizerSessionContext(
         }
     }
 
-    private fun iterateThroughDependencies(depDirectory: File): MutableList<File> {
+    private fun Path.isIgnoredDependency() = this.toFile().extension in ignoredDependencyFileExtensions
+
+    fun iterateThroughDependencies(depDirectory: File): MutableList<File> {
         val dependencyfiles = mutableListOf<File>()
         Files.walkFileTree(
             depDirectory.toPath(),
             setOf(FileVisitOption.FOLLOW_LINKS),
             Int.MAX_VALUE,
             object : SimpleFileVisitor<Path>() {
-                override fun visitFile(file: Path?, attrs: BasicFileAttributes?): FileVisitResult {
-                    if (file != null) {
-                        dependencyfiles.add(file.toFile())
+                override fun visitFile(path: Path, attrs: BasicFileAttributes?): FileVisitResult {
+                    if (!path.isIgnoredDependency()) {
+                        dependencyfiles.add(path.toFile())
                     }
                     return FileVisitResult.CONTINUE
                 }

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

@@ -14,15 +14,19 @@ import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.testFramework.common.ThreadLeakTracker
 import com.intellij.testFramework.runInEdtAndGet
 import com.intellij.testFramework.runInEdtAndWait
+import com.intellij.testFramework.utils.io.createFile
 import kotlinx.coroutines.runBlocking
 import org.apache.commons.codec.digest.DigestUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.fail
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TemporaryFolder
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.spy
@@ -54,7 +58,6 @@ import java.io.FileInputStream
 import java.util.Base64
 import java.util.zip.ZipFile
 import kotlin.io.path.Path
-import kotlin.test.assertNotNull
 
 class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBase(HeavyJavaCodeInsightTestFixtureRule()) {
     fun addFilesToProjectModule(vararg path: String) {
@@ -66,6 +69,10 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
     @JvmField
     val wireMock = WireMockRule(WireMockConfiguration.wireMockConfig().dynamicPort())
 
+    @Rule
+    @JvmField
+    val tempFolder = TemporaryFolder()
+
     @Before
     override fun setup() {
         super.setup()
@@ -338,6 +345,44 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
         }
     }
 
+    @Test
+    fun `CodeModernizerSession can create zip and excludes maven metadata from dependencies folder`() {
+        // get project.projectFile because project.projectFile can not be null
+        val context = CodeModernizerSessionContext(project, emptyPomFile, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
+        val m2Folders = listOf(
+            "com/groupid1/artifactid1/version1",
+            "com/groupid1/artifactid1/version2",
+            "com/groupid1/artifactid2/version1",
+            "com/groupid2/artifactid1/version1",
+            "com/groupid2/artifactid1/version2",
+        )
+        // List of files that exist in m2 artifact directory
+        val filesToAdd = listOf(
+            "_remote.repositories",
+            "test-0.0.1-20240315.145420-18.pom",
+            "test-0.0.1-20240315.145420-18.pom.sha1",
+            "test-0.0.1-SNAPSHOT.pom",
+            "maven-metadata-test-repo.xml",
+            "maven-metadata-test-repo.xml.sha1",
+            "resolver-status.properties",
+        )
+        val expectedFilesAfterClean = listOf(
+            "test-0.0.1-20240315.145420-18.pom",
+            "test-0.0.1-SNAPSHOT.pom",
+            "maven-metadata-test-repo.xml",
+            "resolver-status.properties",
+        )
+
+        m2Folders.forEach {
+            val newFolder = tempFolder.newFolder(*it.split("/").toTypedArray())
+            filesToAdd.forEach { file -> newFolder.toPath().resolve(file).createFile() }
+        }
+
+        val dependenciesToUpload = context.iterateThroughDependencies(tempFolder.root)
+        assertEquals(m2Folders.size * expectedFilesAfterClean.size, dependenciesToUpload.size)
+        assertTrue(dependenciesToUpload.all { it.name in expectedFilesAfterClean })
+    }
+
     @Test
     fun `CodeModernizer can create modernization job`() {
         doReturn(ZipCreationResult.Succeeded(File("./tst-resources/codemodernizer/test.txt")))