Skip to content

Conversation

dhasani23
Copy link
Contributor

@dhasani23 dhasani23 commented May 9, 2025

Types of changes

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

Description

Execute a JAR client-side to copy the dependencies of the project to the upload ZIP along with some other metadata useful to us for the transformation. Also, enable client-side build by removing the feature flag.

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.

@dhasani23 dhasani23 requested review from a team as code owners May 9, 2025 17:38
@dhasani23 dhasani23 marked this pull request as draft May 9, 2025 17:38
@@ -29,79 +31,20 @@ import java.io.File
import java.nio.file.Files
import java.nio.file.Path

fun runClientSideBuild(targetDir: VirtualFile, logger: Logger, project: Project): Pair<Int?, String> {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this to be below. Basically, deleted the unused functions and moved the HIL-related functions to the very bottom of this file since HIL is likely N/A once this feature is released, so can follow up and delete those later.

@@ -300,11 +301,6 @@ data class CodeModernizerSessionContext(
}

LOG.info { "Source code files size = ${files?.sumOf { it.length.toInt() }}" }

// 5) Initial Maven copy-deps / install build log
Copy link
Contributor Author

@dhasani23 dhasani23 May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unused, no need to include in upload ZIP; update tests accordingly

@dhasani23
Copy link
Contributor Author

dhasani23 commented Jun 11, 2025

Make sure diff.patch gets parsed correctly from IDE when doing a custom upgrade via YAML (ex. snakeyaml to 2.2)

Update: working fine

@dhasani23 dhasani23 force-pushed the csbM3 branch 3 times, most recently from 451c066 to 3f207cb Compare June 19, 2025 23:20
@dhasani23 dhasani23 marked this pull request as ready for review June 20, 2025 03:32
Comment on lines 29 to 33
tasks.prepareSandbox {
from("contrib/QCT-Maven-6-16.jar") {
into("/plugin-amazonq/lib")
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you reuse the block at the end of the file

tasks.withType<PrepareSandboxTask>().configureEach {
[...]
    intoChild(intellijPlatform.projectName.map { "$it/lib" })
        .from(file("contrib/QCT-Maven-6-16.jar"))
}

Co-authored-by: Richard Li <742829+rli@users.noreply.github.com>
@dhasani23 dhasani23 merged commit a993013 into aws:main Jun 23, 2025
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants