Skip to content

Commit 29a635e

Browse files
authored
Restructure repo layout to clarify feature vertical boundaries (#4132)
1 parent 56fa3c3 commit 29a635e

File tree

2,060 files changed

+517
-205
lines changed

Some content is hidden

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

2,060 files changed

+517
-205
lines changed

.github/CODEOWNERS

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
* @aws/aws-ides-team
22
codewhisperer/ @aws/codewhisperer-team
3-
amazonq/ @aws/aws-mynah
4-
cwc/ @aws/aws-mynah
3+
mynah-ui/ @aws/aws-mynah
54
codemodernizer/ @aws/elastic-gumby

.github/workflows/ssm-integ.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828
run: git config --system core.longpaths true
2929
if: ${{ matrix.os == 'windows-latest' }}
3030
- uses: actions/checkout@v2
31-
- name: Set up JDK 11
31+
- name: Set up JDK 17
3232
uses: actions/setup-java@v1
3333
with:
34-
java-version: 11
34+
java-version: 17
3535
- name: Grant execute permission for gradlew
3636
run: chmod +x gradlew
3737
- name: Build with Gradle
38-
run: ./gradlew :jetbrains-core:integrationTest --info --full-stacktrace --console plain --tests "software.aws.toolkits.jetbrains.services.ssm.SsmPluginTest"
38+
run: ./gradlew :plugin-toolkit:jetbrains-core:integrationTest --info --full-stacktrace --console plain --tests "software.aws.toolkits.jetbrains.services.ssm.SsmPluginTest"

.gitignore

+4-7
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,19 @@ stale_outputs_checked
1717
global.json
1818

1919
# local dev files
20-
unload-PythonCore-*
21-
unload-aws.toolkit-*
20+
unload-*
2221
jetbrains-core/bin/
2322
jetbrains-ultimate/bin/
2423
resources/bin/
24+
jetbrains-rider/**/NuGet.config
25+
RiderSdkPackageVersion.props
26+
*.Generated.cs
2527
core/bin
2628
jetbrains-gateway/bin
2729
jetbrains-rider/bin
2830
sdk-codegen/bin
2931
ui-tests/bin
3032

3133
#CodeWhispererChat
32-
33-
/jetbrains-rider/testData/NuGet.config
34-
/jetbrains-core/ui/package-lock.json
3534
node_modules
36-
package-lock.json
3735
!mynah-ui/package-lock.json
38-
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Core [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.1" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

.run/Run IDE - Rider [2023.2].run.xml renamed to .run/Run AWS Toolkit - Core [2023.2].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Rider [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
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/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.2" />
99
<option name="taskDescriptions">

.run/Run IDE - Rider [2023.3].run.xml renamed to .run/Run AWS Toolkit - Core [2023.3].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Rider [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
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/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.3" />
99
<option name="taskDescriptions">

.run/Run IDE - Core [2023.3].run.xml renamed to .run/Run AWS Toolkit - Gateway [2023.3].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Core [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Gateway [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.3" />
99
<option name="taskDescriptions">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Rider [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.1" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

.run/Run IDE - Core [2023.2].run.xml renamed to .run/Run AWS Toolkit - Rider [2023.2].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Core [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
2+
<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/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.2" />
99
<option name="taskDescriptions">

.run/Run IDE - Ultimate [2023.3].run.xml renamed to .run/Run AWS Toolkit - Rider [2023.3].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Ultimate [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
2+
<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/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.3" />
99
<option name="taskDescriptions">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.1" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

.run/Run IDE - Ultimate [2023.2].run.xml renamed to .run/Run AWS Toolkit - Ultimate [2023.2].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Ultimate [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.2" />
99
<option name="taskDescriptions">

.run/Run IDE - Gateway [2023.3].run.xml renamed to .run/Run AWS Toolkit - Ultimate [2023.3].run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run IDE - Gateway [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-gateway" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PideProfileName=2023.3" />
99
<option name="taskDescriptions">

.run/Run IDE - Core [2023.1].run.xml

-25
This file was deleted.

.run/Run IDE - Rider [2023.1].run.xml

-25
This file was deleted.

.run/Run IDE - Ultimate [2023.1].run.xml

-25
This file was deleted.

0 commit comments

Comments
 (0)