Skip to content

Commit 3874d03

Browse files
author
Yuriy Bezsonov
committed
update idp setup
1 parent 5cc7c44 commit 3874d03

6 files changed

Lines changed: 79 additions & 77 deletions

File tree

‎infrastructure/cdk/src/main/java/com/unicorn/IdeStack.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public IdeStack(final Construct scope, final String id) {
5353
// "amazonwebservices.amazon-q-vscode",
5454
// "vscjava.vscode-java-pack",
5555
"ms-kubernetes-tools.vscode-kubernetes-tools",
56+
"shardulm94.trailing-spaces",
5657
"ms-azuretools.vscode-docker"
5758
));
5859
ideProps.setAppPort(8080);

‎infrastructure/cfn/ide-gitea-stack.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Resources:
447447
VSCodeIdeGiteaIdeLogGroupCD76FEFA:
448448
Type: AWS::Logs::LogGroup
449449
Properties:
450-
LogGroupName: ide-bootstrap-log-20250615-133649
450+
LogGroupName: ide-bootstrap-log-20250619-133401
451451
RetentionInDays: 7
452452
UpdateReplacePolicy: Retain
453453
DeletionPolicy: Retain
@@ -879,9 +879,9 @@ Resources:
879879
description: Bootstrap IDE
880880
parameters:
881881
BootstrapScript:
882+
default: ""
882883
type: String
883884
description: (Optional) Custom bootstrap script to run.
884-
default: ""
885885
mainSteps:
886886
- inputs:
887887
runCommand:
@@ -1142,7 +1142,16 @@ Resources:
11421142
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11431143
11441144
exit $exit_code
1145-
- splashUrl: ""
1145+
- domain: ""
1146+
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1147+
waitConditionHandleUrl:
1148+
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1149+
readmeUrl: ""
1150+
instanceIamRoleArn:
1151+
Fn::GetAtt:
1152+
- VSCodeIdeGiteaIdeRole90308F47
1153+
- Arn
1154+
splashUrl: ""
11461155
instanceIamRoleName:
11471156
Ref: VSCodeIdeGiteaIdeRole90308F47
11481157
codeServerVersion: 4.100.3
@@ -1380,15 +1389,6 @@ Resources:
13801389
EOF
13811390
13821391
source /etc/profile.d/gitea.sh
1383-
domain: ""
1384-
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1385-
waitConditionHandleUrl:
1386-
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1387-
readmeUrl: ""
1388-
instanceIamRoleArn:
1389-
Fn::GetAtt:
1390-
- VSCodeIdeGiteaIdeRole90308F47
1391-
- Arn
13921392
name: IdeBootstrapFunction
13931393
action: aws:runShellScript
13941394
DocumentFormat: YAML
@@ -1526,12 +1526,12 @@ Resources:
15261526
Fn::GetAtt:
15271527
- VSCodeIdeGiteaIdeBootstrapFunction34BA645E
15281528
- Arn
1529+
InstanceId:
1530+
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
15291531
SsmDocument:
15301532
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
15311533
LogGroupName:
15321534
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
1533-
InstanceId:
1534-
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
15351535
UpdateReplacePolicy: Delete
15361536
DeletionPolicy: Delete
15371537
Outputs:

‎infrastructure/cfn/ide-stack.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Resources:
447447
VSCodeIdeIdeLogGroup364F2B78:
448448
Type: AWS::Logs::LogGroup
449449
Properties:
450-
LogGroupName: ide-bootstrap-log-20250615-133633
450+
LogGroupName: ide-bootstrap-log-20250619-133344
451451
RetentionInDays: 7
452452
UpdateReplacePolicy: Retain
453453
DeletionPolicy: Retain
@@ -1127,7 +1127,7 @@ Resources:
11271127
exit $exit_code
11281128
- waitConditionHandleUrl:
11291129
Ref: VSCodeIdeIdeBootstrapWaitConditionHandle0A599C82
1130-
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1130+
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,shardulm94.trailing-spaces,ms-azuretools.vscode-docker
11311131
domain: ""
11321132
installGitea: echo bootstrapGitea was not provided
11331133
terminalOnStartup: "true"

‎infrastructure/cfn/spring-ai-stack.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ Resources:
442442
UnicornStoreIdeIdeLogGroup7A5EFA50:
443443
Type: AWS::Logs::LogGroup
444444
Properties:
445-
LogGroupName: unicornstore-ide-bootstrap-log-20250615-133708
445+
LogGroupName: unicornstore-ide-bootstrap-log-20250619-133421
446446
RetentionInDays: 7
447447
UpdateReplacePolicy: Retain
448448
DeletionPolicy: Retain
@@ -857,9 +857,9 @@ Resources:
857857
description: Bootstrap IDE
858858
parameters:
859859
BootstrapScript:
860-
default: ""
861860
type: String
862861
description: (Optional) Custom bootstrap script to run.
862+
default: ""
863863
mainSteps:
864864
- inputs:
865865
runCommand:
@@ -1120,12 +1120,7 @@ Resources:
11201120
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11211121
11221122
exit $exit_code
1123-
- domain: ""
1124-
extensions: vscjava.vscode-java-pack,ms-azuretools.vscode-docker
1125-
waitConditionHandleUrl:
1126-
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1127-
readmeUrl: ""
1128-
instanceIamRoleArn:
1123+
- instanceIamRoleArn:
11291124
Fn::GetAtt:
11301125
- UnicornStoreIdeIdeRole81A2CEAA
11311126
- Arn
@@ -1187,6 +1182,11 @@ Resources:
11871182
environmentContentsZip: ""
11881183
terminalOnStartup: "true"
11891184
installGitea: echo bootstrapGitea was not provided
1185+
domain: ""
1186+
extensions: vscjava.vscode-java-pack,ms-azuretools.vscode-docker
1187+
waitConditionHandleUrl:
1188+
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1189+
readmeUrl: ""
11901190
name: IdeBootstrapFunction
11911191
action: aws:runShellScript
11921192
DocumentFormat: YAML
@@ -2360,9 +2360,6 @@ Resources:
23602360
Fn::GetAtt:
23612361
- UnicornStoreDatabaseSetupDatabaseSetupFunction83636DD9
23622362
- Arn
2363-
SqlStatements: |-
2364-
CREATE TABLE IF NOT EXISTS unicorns(id TEXT DEFAULT gen_random_uuid() PRIMARY KEY, name TEXT, age TEXT, size TEXT, type TEXT);
2365-
CREATE EXTENSION IF NOT EXISTS vector;
23662363
SecretName:
23672364
Fn::Join:
23682365
- "-"
@@ -2393,6 +2390,9 @@ Resources:
23932390
- Fn::Split:
23942391
- ":"
23952392
- Ref: InfrastructureCorepostgresB0D0C6BB
2393+
SqlStatements: |-
2394+
CREATE TABLE IF NOT EXISTS unicorns(id TEXT DEFAULT gen_random_uuid() PRIMARY KEY, name TEXT, age TEXT, size TEXT, type TEXT);
2395+
CREATE EXTENSION IF NOT EXISTS vector;
23962396
DependsOn:
23972397
- InfrastructureCoreUnicornStoreDatabaseF56884BA
23982398
- InfrastructureCoreUnicornStoreDatabaseSubnets55C412B8
@@ -2454,7 +2454,6 @@ Resources:
24542454
return 'placeholder'
24552455
Environment:
24562456
Variables:
2457-
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
24582457
SPRING_DATASOURCE_PASSWORD:
24592458
Fn::Join:
24602459
- ""
@@ -2471,6 +2470,7 @@ Resources:
24712470
- :5432/unicorns
24722471
SPRING_DATASOURCE_HIKARI_maximumPoolSize: "1"
24732472
AWS_SERVERLESS_JAVA_CONTAINER_INIT_GRACE_TIME: "500"
2473+
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
24742474
FunctionName: unicorn-store-spring
24752475
Handler: com.unicorn.store.StreamLambdaHandler::handleRequest
24762476
MemorySize: 2048
@@ -3239,13 +3239,13 @@ Resources:
32393239
Fn::GetAtt:
32403240
- UnicornStoreCodeBuildStartBuildFunctionB2FE9156
32413241
- Arn
3242+
ProjectName:
3243+
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
3244+
ContentHash: fd70d4491df3a6a44292446f6b364c8a
32423245
CodeBuildIamRoleArn:
32433246
Fn::GetAtt:
32443247
- UnicornStoreCodeBuildCodeBuildRoleB9CE0DE7
32453248
- Arn
3246-
ProjectName:
3247-
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
3248-
ContentHash: fd70d4491df3a6a44292446f6b364c8a
32493249
DependsOn:
32503250
- UnicornStoreCodeBuildBuildCompleteRuleAllowEventRulespringaistackUnicornStoreCodeBuildReportBuildFunctionA3347B9EB9A35FA4
32513251
- UnicornStoreCodeBuildBuildCompleteRule7E287561

‎infrastructure/cfn/unicornstore-stack.yaml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ Resources:
462462
UnicornStoreIdeIdeLogGroup7A5EFA50:
463463
Type: AWS::Logs::LogGroup
464464
Properties:
465-
LogGroupName: unicornstore-ide-bootstrap-log-20250615-133613
465+
LogGroupName: unicornstore-ide-bootstrap-log-20250619-133322
466466
RetentionInDays: 7
467467
UpdateReplacePolicy: Retain
468468
DeletionPolicy: Retain
@@ -877,8 +877,8 @@ Resources:
877877
description: Bootstrap IDE
878878
parameters:
879879
BootstrapScript:
880-
description: (Optional) Custom bootstrap script to run.
881880
type: String
881+
description: (Optional) Custom bootstrap script to run.
882882
default: ""
883883
mainSteps:
884884
- inputs:
@@ -1140,11 +1140,27 @@ Resources:
11401140
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11411141
11421142
exit $exit_code
1143-
- extensions: vscjava.vscode-java-pack,ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1144-
domain: ""
1145-
installGitea: echo bootstrapGitea was not provided
1146-
terminalOnStartup: "true"
1147-
environmentContentsZip: ""
1143+
- instanceIamRoleArn:
1144+
Fn::GetAtt:
1145+
- UnicornStoreIdeIdeRole81A2CEAA
1146+
- Arn
1147+
splashUrl: ""
1148+
instanceIamRoleName:
1149+
Ref: UnicornStoreIdeIdeRole81A2CEAA
1150+
codeServerVersion: 4.100.3
1151+
customBootstrapScript: |
1152+
date
1153+
1154+
echo '=== Clone Git repository ==='
1155+
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1156+
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1157+
1158+
echo '=== Setup IDE ==='
1159+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1160+
1161+
echo '=== Additional Setup ==='
1162+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/app.sh"
1163+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
11481164
passwordName:
11491165
Fn::Join:
11501166
- "-"
@@ -1184,30 +1200,14 @@ Resources:
11841200
- Fn::Split:
11851201
- ":"
11861202
- Ref: UnicornStoreIdeIdePasswordSecret514252E2
1187-
customBootstrapScript: |
1188-
date
1189-
1190-
echo '=== Clone Git repository ==='
1191-
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1192-
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1193-
1194-
echo '=== Setup IDE ==='
1195-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1196-
1197-
echo '=== Additional Setup ==='
1198-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/app.sh"
1199-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
1200-
codeServerVersion: 4.100.3
1201-
instanceIamRoleName:
1202-
Ref: UnicornStoreIdeIdeRole81A2CEAA
1203-
splashUrl: ""
1204-
instanceIamRoleArn:
1205-
Fn::GetAtt:
1206-
- UnicornStoreIdeIdeRole81A2CEAA
1207-
- Arn
1208-
readmeUrl: ""
1203+
environmentContentsZip: ""
1204+
terminalOnStartup: "true"
1205+
installGitea: echo bootstrapGitea was not provided
1206+
domain: ""
1207+
extensions: vscjava.vscode-java-pack,ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
12091208
waitConditionHandleUrl:
12101209
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1210+
readmeUrl: ""
12111211
name: IdeBootstrapFunction
12121212
action: aws:runShellScript
12131213
DocumentFormat: YAML
@@ -1345,12 +1345,12 @@ Resources:
13451345
Fn::GetAtt:
13461346
- UnicornStoreIdeIdeBootstrapFunctionF57074A6
13471347
- Arn
1348-
LogGroupName:
1349-
Ref: UnicornStoreIdeIdeLogGroup7A5EFA50
1350-
SsmDocument:
1351-
Ref: UnicornStoreIdeIdeBootstrapDocumentE330810B
13521348
InstanceId:
13531349
Ref: UnicornStoreIdeIdeEC2Instance5F393FC5
1350+
SsmDocument:
1351+
Ref: UnicornStoreIdeIdeBootstrapDocumentE330810B
1352+
LogGroupName:
1353+
Ref: UnicornStoreIdeIdeLogGroup7A5EFA50
13541354
UpdateReplacePolicy: Delete
13551355
DeletionPolicy: Delete
13561356
InfrastructureCorepostgresB0D0C6BB:
@@ -2296,9 +2296,12 @@ Resources:
22962296
return 'placeholder'
22972297
Environment:
22982298
Variables:
2299-
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
2300-
AWS_SERVERLESS_JAVA_CONTAINER_INIT_GRACE_TIME: "500"
2301-
SPRING_DATASOURCE_HIKARI_maximumPoolSize: "1"
2299+
SPRING_DATASOURCE_PASSWORD:
2300+
Fn::Join:
2301+
- ""
2302+
- - "{{resolve:secretsmanager:"
2303+
- Ref: InfrastructureCorepostgresB0D0C6BB
2304+
- :SecretString:password::}}
23022305
SPRING_DATASOURCE_URL:
23032306
Fn::Join:
23042307
- ""
@@ -2307,12 +2310,9 @@ Resources:
23072310
- InfrastructureCoreUnicornStoreDatabaseF56884BA
23082311
- Endpoint.Address
23092312
- :5432/unicorns
2310-
SPRING_DATASOURCE_PASSWORD:
2311-
Fn::Join:
2312-
- ""
2313-
- - "{{resolve:secretsmanager:"
2314-
- Ref: InfrastructureCorepostgresB0D0C6BB
2315-
- :SecretString:password::}}
2313+
SPRING_DATASOURCE_HIKARI_maximumPoolSize: "1"
2314+
AWS_SERVERLESS_JAVA_CONTAINER_INIT_GRACE_TIME: "500"
2315+
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
23162316
FunctionName: unicorn-store-spring
23172317
Handler: com.unicorn.store.StreamLambdaHandler::handleRequest
23182318
MemorySize: 2048
@@ -3044,12 +3044,12 @@ Resources:
30443044
Description: Build complete
30453045
EventPattern:
30463046
detail:
3047+
project-name:
3048+
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
30473049
build-status:
30483050
- SUCCEEDED
30493051
- FAILED
30503052
- STOPPED
3051-
project-name:
3052-
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
30533053
detail-type:
30543054
- CodeBuild Build State Change
30553055
source:
@@ -3081,9 +3081,9 @@ Resources:
30813081
Fn::GetAtt:
30823082
- UnicornStoreCodeBuildStartBuildFunctionB2FE9156
30833083
- Arn
3084-
ContentHash: fd70d4491df3a6a44292446f6b364c8a
30853084
ProjectName:
30863085
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
3086+
ContentHash: fd70d4491df3a6a44292446f6b364c8a
30873087
CodeBuildIamRoleArn:
30883088
Fn::GetAtt:
30893089
- UnicornStoreCodeBuildCodeBuildRoleB9CE0DE7

‎infrastructure/scripts/setup/idp.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ cd ~/tmp
2424
curl -sSL https://raw.githubusercontent.com/aws-samples/fleet-management-on-amazon-eks-workshop/refs/heads/riv24/hack/.zshrc -o .zshrc
2525
curl -sSL https://raw.githubusercontent.com/aws-samples/fleet-management-on-amazon-eks-workshop/refs/heads/riv24/hack/.p10k.zsh -o .p10k.zsh
2626
curl -sSL https://tinyurl.com/installBox | bash
27-
# echo "exec zsh" >> ~/.bashrc
27+
chsh -s $(which zsh)
28+
echo "exec zsh" >> ~/.bashrc

0 commit comments

Comments
 (0)