Merge main into feature/agent-refactor#6344
Open
aws-toolkit-automation wants to merge 80 commits intofeature/agent-refactorfrom
Open
Merge main into feature/agent-refactor#6344aws-toolkit-automation wants to merge 80 commits intofeature/agent-refactorfrom
aws-toolkit-automation wants to merge 80 commits intofeature/agent-refactorfrom
Conversation
… run concurrently
…-toolkit-jetbrains into breedloj/coreDeprecation
… for 4.0 release (#6330) * fix(cloudformation): update marketplace docs to highlight cfn lsp and remove Q and CodeWhisperer (#6312) * fix(cloudformation): change cloudformation language server path (#6310) * fix(cloudformation): change cloudformation language server path * cleanup legacy dir * fix(cloudformation): fix platform detection for linux (#6315) * fix(cloudformation): update Node.js resolution to include common path… (#6321) * fix(cloudformation): update Node.js resolution to be more robust for all operating systems and improve node failure prompt * make throw foldable * Update main owner to be aws-toolkits-team (#6325) Changing the owner team * fix(cloudformation): update assertion to be seperator agnostic for windows (#6326) * Updating version to 3.108 * feat(cloudformation): enable CloudFormation Language Server beta via environemnt variable (#6327) * fix(cloudformation): migrate to ProjectActivity (#6329) * fix(toolkit): remove duplicate AwsSettings import in CfnLspServerSupportProvider Cherry-pick conflict resolution introduced a duplicate import. Removed the extra line, keeping the correct toolkitOnly package path (software.aws.toolkit.jetbrains.settings.AwsSettings). --------- Co-authored-by: Zeeshan Ahmed <37942674+Zee2413@users.noreply.github.com> Co-authored-by: amzn-kvk <kavukcut@amazon.com> Co-authored-by: aws-toolkit-automation <>
#6333) * feat(toolkit): Add notification for AWS Core plugin no longer required Add a ProjectActivity that checks if the AWS Core plugin (aws.toolkit.core) is installed and notifies users that it is no longer needed starting with AWS Toolkit 4.0. The notification includes a button to open the Plugins settings page and a dismiss option. * docs: Add changelog entry for AWS Core dependency removal
Add 2026.1 profile with stable SDK and marketplace plugin versions. Full buildPlugin passes for both 2025.3 and 2026.1. Build config: - IdeVersions.kt: add 2026.1 profile (community, ultimate, rider) - BuildScriptUtils.kt: add 2026.1 to kotlinTarget - kotlinResolution: add coroutines 1.10.2-intellij-1 - toolkit-intellij-subplugin: fix IC->IU and collaboration modules checks for stable version format - Rider build.gradle.kts: update for rd-gen 2026.1.3 API changes (hashFolder/sources/classpath removed, SystemInfo replaced) - generateConfigs.py: add 2026.1 run configs - settings.gradle.kts: exclude Gateway for 2026.1 Version-specific source dirs: - S3TreeTableModel (src-251-253 + src-261+): TreeVisitor.Acceptor return type nullability change - PyCharmSdkUtil (src-251-253 + src-261+): PyAddSdkPanel removed - DotNetDebuggerUtils (src-243-253 + src-261+): RiderEnvironment moved to com.jetbrains.rider.environment - CodeCatalystGatewayClientCustomizer (src-253 + src-261+ no-op): rdserver APIs moved to remoteController module - RebuildDevfileRequiredNotification (src-253 + src-261+ no-op): codeWithMe metrics APIs moved to remoteController module Known limitations: - Gateway excluded (Gradle plugin 2.7.1 cannot resolve Gateway SDK) - Two CodeCatalyst remote dev features are no-op in 261
#6337) Commit 292181d removed hashFolder, classpath, and sources from the RdGenExtension config to accommodate rd-gen 2026.1 API changes, but this broke the 2025.3 build and left 2026.1 model generation non- functional. For pre-2026 profiles, restore the extension properties via reflection to avoid script compilation failures when the 2026.1 rd-gen jar is on the buildscript classpath. For 2026.1+, add a compileModelSources task that pre-compiles model sources with an external Kotlin compiler, since rd-gen 2026.1 removed its built-in Kotlin compilation support.
…ter adding try new cfn node (#6338)
…#6355) The 2026.1 test failures (ToolkitTelemetryOTelSpanProcessorTest, AwsClientManagerTest) are caused by a debug metadata version mismatch: kotlin-stdlib 2.2.0 on the test classpath only understands metadata version 1, but IntelliJ 2026.1 bundles Kotlin 2.3.20 which produces metadata version 2. The coroutines debug probes crash when inspecting platform coroutines. Add a per-profile kotlinStdlib version in the settings resolution that matches each IDE's bundled Kotlin version. Update the resolution strategy so that only stdlib-like artifacts (kotlin-stdlib, kotlin-reflect, kotlin-test) on runtime/test configurations use the IDE-bundled version, and only when it is newer than the KGP version (2.2.0). Compiler plugins (kotlin-scripting-*, kotlin-build-tools-*) always stay at the KGP version to avoid internal API mismatches. Profile -> stdlib resolved version: 2025.1 -> 2.2.0 (KGP version, IDE bundles older 2.1.10) 2025.2 -> 2.2.0 (KGP version, IDE bundles older 2.1.20) 2025.3 -> 2.2.20 (upgraded to match IDE) 2026.1 -> 2.3.20 (upgraded to match IDE)
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+15
to
+36
| name: ${{ matrix.os }} | ||
|
|
||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest, macos-latest] | ||
|
|
||
| steps: | ||
| - name: Support longpaths | ||
| if: ${{ matrix.os == 'windows-latest' }} | ||
| run: git config --system core.longpaths true | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'corretto' | ||
| java-version: '21' | ||
| - name: Grant execute permission for gradlew | ||
| run: chmod +x gradlew | ||
| - name: Run CloudFormation LSP Integration Tests | ||
| run: ./gradlew :plugin-toolkit:jetbrains-core:integrationTest --info --full-stacktrace --console plain --tests "software.aws.toolkits.jetbrains.services.cfnlsp.CfnLspIntegrationTest" |
* fix(261): handle CompilerTestUtil and MavenServerManager changes across versions * fix(261): suppress issues for detekt
* fix(cloudformation): handle credentials with empty session token * linting
…ity (#6369) Pin the linter image in `qodana.yaml` to `2025.1` instead of `:latest`, preventing silent breakage when JetBrains publishes new container images. This matches the CLI version bundled in `JetBrains/qodana-action@v2025.1.1`
…ed to s3 (#6367) - enforce s3 upload when templates exceed size limit or contain artifact - backwards compatible change with prior language server versions <=1.6.0
* Updating version to 4.1 * Updating SNAPSHOT version to 4.2-SNAPSHOT The 4.1 release automation's fast-forward merge-back step failed due to main diverging during the release. This happened because of 2 PRs merged during code-freeze (6369, 6367). This manually applies the snapshot version bump that the automation would have committed. --------- Co-authored-by: aws-toolkit-automation <> Co-authored-by: Yurii Vynohradov <yurivyn@amazon.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):