Skip to content

Commit 9ee6585

Browse files
rlirli
authored
Merge pull request #4406 from aws/feature/q-extension
Merge `feature/q-extension` to `main`
2 parents d2ed924 + 62471a3 commit 9ee6585

File tree

389 files changed

+15139
-6517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+15139
-6517
lines changed

‎.changes/next-release/feature-6a7485b3-57cb-430d-8ff5-4caaa0392b1c.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Amazon Q: Security scans can now run on all files in the project"
4+
}

‎.changes/next-release/feature-7bef8821-56c1-49ca-b21a-e8cbed4b5a06.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Amazon Q: Send security issue to chat for explanation and fix"
4+
}

‎.changes/next-release/feature-cba19a44-e155-406a-8c10-74626214a815.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Amazon Q Code Transformation: include details about expected changes in transformation plan"
4+
}

‎.changes/next-release/feature-e764fbd7-c6b5-4435-8d3d-a7d54f856355.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Amazon Q: Security scans can now run automatically when file changes are made"
4+
}

‎.github/workflows/prerelease.yml‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,6 @@ on:
1111

1212

1313
jobs:
14-
generate_artifact_toolkit:
15-
strategy:
16-
matrix:
17-
supported_versions: [ '2023.3', '2023.2', '2024.1' ]
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: actions/checkout@v4
21-
with:
22-
fetch-depth: 0
23-
- name: remove unwanted dependencies
24-
run: |
25-
sudo rm -rf /usr/share/dotnet
26-
sudo rm -rf /opt/ghc
27-
sudo rm -rf "/usr/local/share/boost"
28-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
29-
- uses: actions/setup-java@v4
30-
with:
31-
distribution: 'corretto'
32-
java-version: '17'
33-
- uses: actions/setup-dotnet@v4
34-
with:
35-
dotnet-version: '6.x'
36-
- name: Generate artifact
37-
run: |
38-
./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-toolkit:intellij:buildPlugin
39-
- name: Upload artifact
40-
uses: actions/upload-artifact@v4
41-
with:
42-
name: plugin-toolkit-${{ matrix.supported_versions }}
43-
path: ./plugins/toolkit/intellij/build/distributions/*.zip
44-
retention-days: 1
4514
generate_artifact_toolkit_standalone:
4615
strategy:
4716
matrix:
@@ -177,7 +146,7 @@ jobs:
177146
echo 'EOF' >> $GITHUB_OUTPUT
178147
179148
publish:
180-
needs: [ generate_artifact_toolkit, generate_artifact_toolkit_standalone, generate_artifact_core, generate_artifact_q, generate_changelog ]
149+
needs: [ generate_artifact_toolkit_standalone, generate_artifact_core, generate_artifact_q, generate_changelog ]
181150
env:
182151
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
183152
GH_REPO: ${{ github.repository }}
@@ -201,16 +170,13 @@ jobs:
201170
- name: Publish to GitHub Releases
202171
run: |
203172
envsubst < "$GITHUB_WORKSPACE/.github/workflows/prerelease_notes.md" > "$RUNNER_TEMP/prerelease_notes.md"
204-
gh release create "$TAG_NAME" --prerelease --notes-file "$RUNNER_TEMP/prerelease_notes.md" --title "$SUBJECT" --target $GITHUB_SHA plugin-toolkit-*/*.zip
173+
gh release create "$TAG_NAME" --prerelease --notes-file "$RUNNER_TEMP/prerelease_notes.md" --title "$SUBJECT" --target $GITHUB_SHA plugin-standalone-*/*.zip
205174
- name: Publish core
206175
run: |
207176
gh release upload "$TAG_NAME" plugin-core-*/*.zip
208177
- name: Publish Q
209178
run: |
210179
gh release upload "$TAG_NAME" plugin-amazonq-*/*.zip
211-
- name: Publish Toolkit Standalone
212-
run: |
213-
gh release upload "$TAG_NAME" plugin-standalone-*/*.zip
214180
- name: Publish XML manifest
215181
run: |
216182
gh release view "$TAG_NAME" --repo aws/aws-toolkit-jetbrains --json assets | python3 "$GITHUB_WORKSPACE/.github/workflows/generateUpdatesXml.py" - > updatePlugins.xml

‎.run/Run AWS Toolkit - Core [2023.2].run.xml‎ renamed to ‎.run/Run AWS Toolkit - Community [2023.2].run.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run AWS Toolkit - Core [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Community [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2023.2" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Core [2023.3].run.xml‎ renamed to ‎.run/Run AWS Toolkit - Community [2023.3].run.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run AWS Toolkit - Core [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Community [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2023.3" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Core [2024.1].run.xml‎ renamed to ‎.run/Run AWS Toolkit - Community [2024.1].run.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run AWS Toolkit - Core [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Community [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2024.1" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Rider [2023.2].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Rider [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2023.2" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Rider [2023.3].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Rider [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2023.3" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

0 commit comments

Comments
 (0)