Skip to content

Commit 5829ee8

Browse files
author
Yuriy Bezsonov
committed
update vscode and cfn stacks
1 parent 8ed725b commit 5829ee8

4 files changed

Lines changed: 73 additions & 97 deletions

File tree

‎infrastructure/cdk/src/main/resources/bootstrapDocument.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ PASSWORD_SECRET_VALUE=$(aws secretsmanager get-secret-value --secret-id "${passw
77
88
export IDE_PASSWORD=$(echo "$PASSWORD_SECRET_VALUE" | jq -r '.password')
99
10-
yum install httpd-tools -y
11-
export IDE_PASSWORD_HASH=$(htpasswd -bnBC 10 "" $IDE_PASSWORD | tr -d ':\n')
12-
export IDE_PASSWORD_KEY=$(openssl rand -base64 48 | tr -d "=+/" | head -c 32 | base64)
13-
1410
echo "Setting profile variables..."
1511
1612
# Set some useful variables
@@ -39,8 +35,6 @@ export EC2_URL="$EC2_URL"
3935
export IDE_DOMAIN="$IDE_DOMAIN"
4036
export IDE_URL="https://$IDE_DOMAIN"
4137
export IDE_PASSWORD="$IDE_PASSWORD"
42-
export IDE_PASSWORD_HASH="$IDE_PASSWORD_HASH"
43-
export IDE_PASSWORD_KEY="$IDE_PASSWORD_KEY"
4438
4539
alias code="code-server"
4640
EOF

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ Resources:
422422
VSCodeIdeGiteaIdeLogGroupCD76FEFA:
423423
Type: AWS::Logs::LogGroup
424424
Properties:
425-
LogGroupName: ide-bootstrap-log-20250517-202159
425+
LogGroupName: ide-bootstrap-log-20250518-065512
426426
RetentionInDays: 7
427427
UpdateReplacePolicy: Retain
428428
DeletionPolicy: Retain
@@ -871,10 +871,6 @@ Resources:
871871
872872
export IDE_PASSWORD=$(echo "$PASSWORD_SECRET_VALUE" | jq -r '.password')
873873
874-
yum install httpd-tools -y
875-
export IDE_PASSWORD_HASH=$(htpasswd -bnBC 10 "" $IDE_PASSWORD | tr -d ':\n')
876-
export IDE_PASSWORD_KEY=$(openssl rand -base64 48 | tr -d "=+/" | head -c 32 | base64)
877-
878874
echo "Setting profile variables..."
879875
880876
# Set some useful variables
@@ -903,8 +899,6 @@ Resources:
903899
export IDE_DOMAIN="$IDE_DOMAIN"
904900
export IDE_URL="https://$IDE_DOMAIN"
905901
export IDE_PASSWORD="$IDE_PASSWORD"
906-
export IDE_PASSWORD_HASH="$IDE_PASSWORD_HASH"
907-
export IDE_PASSWORD_KEY="$IDE_PASSWORD_KEY"
908902
909903
alias code="code-server"
910904
EOF
@@ -1118,14 +1112,7 @@ Resources:
11181112
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11191113
11201114
exit $exit_code
1121-
- instanceIamRoleName:
1122-
Ref: VSCodeIdeGiteaIdeRole90308F47
1123-
splashUrl: ""
1124-
instanceIamRoleArn:
1125-
Fn::GetAtt:
1126-
- VSCodeIdeGiteaIdeRole90308F47
1127-
- Arn
1128-
readmeUrl: ""
1115+
- readmeUrl: ""
11291116
waitConditionHandleUrl:
11301117
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
11311118
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
@@ -1365,6 +1352,13 @@ Resources:
13651352
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
13661353
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/idp.sh"
13671354
codeServerVersion: 4.100.2
1355+
instanceIamRoleName:
1356+
Ref: VSCodeIdeGiteaIdeRole90308F47
1357+
splashUrl: ""
1358+
instanceIamRoleArn:
1359+
Fn::GetAtt:
1360+
- VSCodeIdeGiteaIdeRole90308F47
1361+
- Arn
13681362
name: IdeBootstrapFunction
13691363
action: aws:runShellScript
13701364
DocumentFormat: YAML
@@ -1502,12 +1496,12 @@ Resources:
15021496
Fn::GetAtt:
15031497
- VSCodeIdeGiteaIdeBootstrapFunction34BA645E
15041498
- Arn
1499+
LogGroupName:
1500+
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
15051501
SsmDocument:
15061502
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
15071503
InstanceId:
15081504
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
1509-
LogGroupName:
1510-
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
15111505
UpdateReplacePolicy: Delete
15121506
DeletionPolicy: Delete
15131507
Outputs:

‎infrastructure/cfn/ide-stack.yaml‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ Resources:
422422
VSCodeIdeGiteaIdeLogGroupCD76FEFA:
423423
Type: AWS::Logs::LogGroup
424424
Properties:
425-
LogGroupName: ide-bootstrap-log-20250517-202220
425+
LogGroupName: ide-bootstrap-log-20250518-065443
426426
RetentionInDays: 7
427427
UpdateReplacePolicy: Retain
428428
DeletionPolicy: Retain
@@ -837,9 +837,9 @@ Resources:
837837
description: Bootstrap IDE
838838
parameters:
839839
BootstrapScript:
840+
description: (Optional) Custom bootstrap script to run.
840841
default: ""
841842
type: String
842-
description: (Optional) Custom bootstrap script to run.
843843
mainSteps:
844844
- inputs:
845845
runCommand:
@@ -854,10 +854,6 @@ Resources:
854854
855855
export IDE_PASSWORD=$(echo "$PASSWORD_SECRET_VALUE" | jq -r '.password')
856856
857-
yum install httpd-tools -y
858-
export IDE_PASSWORD_HASH=$(htpasswd -bnBC 10 "" $IDE_PASSWORD | tr -d ':\n')
859-
export IDE_PASSWORD_KEY=$(openssl rand -base64 48 | tr -d "=+/" | head -c 32 | base64)
860-
861857
echo "Setting profile variables..."
862858
863859
# Set some useful variables
@@ -886,8 +882,6 @@ Resources:
886882
export IDE_DOMAIN="$IDE_DOMAIN"
887883
export IDE_URL="https://$IDE_DOMAIN"
888884
export IDE_PASSWORD="$IDE_PASSWORD"
889-
export IDE_PASSWORD_HASH="$IDE_PASSWORD_HASH"
890-
export IDE_PASSWORD_KEY="$IDE_PASSWORD_KEY"
891885
892886
alias code="code-server"
893887
EOF
@@ -1101,20 +1095,7 @@ Resources:
11011095
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11021096
11031097
exit $exit_code
1104-
- installGitea: echo bootstrapGitea was not provided
1105-
domain: ""
1106-
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1107-
waitConditionHandleUrl:
1108-
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1109-
readmeUrl: ""
1110-
instanceIamRoleArn:
1111-
Fn::GetAtt:
1112-
- VSCodeIdeGiteaIdeRole90308F47
1113-
- Arn
1114-
splashUrl: ""
1115-
instanceIamRoleName:
1116-
Ref: VSCodeIdeGiteaIdeRole90308F47
1117-
codeServerVersion: 4.100.2
1098+
- codeServerVersion: 4.100.2
11181099
customBootstrapScript: |
11191100
date
11201101
@@ -1157,6 +1138,19 @@ Resources:
11571138
- Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
11581139
environmentContentsZip: ""
11591140
terminalOnStartup: "true"
1141+
installGitea: echo bootstrapGitea was not provided
1142+
domain: ""
1143+
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1144+
waitConditionHandleUrl:
1145+
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1146+
readmeUrl: ""
1147+
instanceIamRoleArn:
1148+
Fn::GetAtt:
1149+
- VSCodeIdeGiteaIdeRole90308F47
1150+
- Arn
1151+
splashUrl: ""
1152+
instanceIamRoleName:
1153+
Ref: VSCodeIdeGiteaIdeRole90308F47
11601154
name: IdeBootstrapFunction
11611155
action: aws:runShellScript
11621156
DocumentFormat: YAML

‎infrastructure/cfn/unicornstore-stack.yaml‎

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ Resources:
437437
UnicornStoreIdeIdeLogGroup7A5EFA50:
438438
Type: AWS::Logs::LogGroup
439439
Properties:
440-
LogGroupName: unicornstore-ide-bootstrap-log-20250517-202132
440+
LogGroupName: unicornstore-ide-bootstrap-log-20250518-065536
441441
RetentionInDays: 7
442442
UpdateReplacePolicy: Retain
443443
DeletionPolicy: Retain
@@ -852,8 +852,8 @@ Resources:
852852
description: Bootstrap IDE
853853
parameters:
854854
BootstrapScript:
855-
type: String
856855
description: (Optional) Custom bootstrap script to run.
856+
type: String
857857
default: ""
858858
mainSteps:
859859
- inputs:
@@ -869,10 +869,6 @@ Resources:
869869
870870
export IDE_PASSWORD=$(echo "$PASSWORD_SECRET_VALUE" | jq -r '.password')
871871
872-
yum install httpd-tools -y
873-
export IDE_PASSWORD_HASH=$(htpasswd -bnBC 10 "" $IDE_PASSWORD | tr -d ':\n')
874-
export IDE_PASSWORD_KEY=$(openssl rand -base64 48 | tr -d "=+/" | head -c 32 | base64)
875-
876872
echo "Setting profile variables..."
877873
878874
# Set some useful variables
@@ -901,8 +897,6 @@ Resources:
901897
export IDE_DOMAIN="$IDE_DOMAIN"
902898
export IDE_URL="https://$IDE_DOMAIN"
903899
export IDE_PASSWORD="$IDE_PASSWORD"
904-
export IDE_PASSWORD_HASH="$IDE_PASSWORD_HASH"
905-
export IDE_PASSWORD_KEY="$IDE_PASSWORD_KEY"
906900
907901
alias code="code-server"
908902
EOF
@@ -1116,27 +1110,13 @@ Resources:
11161110
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11171111
11181112
exit $exit_code
1119-
- instanceIamRoleArn:
1120-
Fn::GetAtt:
1121-
- UnicornStoreIdeIdeRole81A2CEAA
1122-
- Arn
1123-
splashUrl: ""
1124-
instanceIamRoleName:
1125-
Ref: UnicornStoreIdeIdeRole81A2CEAA
1126-
codeServerVersion: 4.100.2
1127-
customBootstrapScript: |
1128-
date
1129-
1130-
echo '=== Clone Git repository ==='
1131-
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1132-
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1133-
1134-
echo '=== Setup IDE ==='
1135-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1136-
1137-
echo '=== Additional Setup ==='
1138-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/app.sh"
1139-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
1113+
- waitConditionHandleUrl:
1114+
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1115+
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1116+
domain: ""
1117+
installGitea: echo bootstrapGitea was not provided
1118+
terminalOnStartup: "true"
1119+
environmentContentsZip: ""
11401120
passwordName:
11411121
Fn::Join:
11421122
- "-"
@@ -1176,13 +1156,27 @@ Resources:
11761156
- Fn::Split:
11771157
- ":"
11781158
- Ref: UnicornStoreIdeIdePasswordSecret514252E2
1179-
environmentContentsZip: ""
1180-
terminalOnStartup: "true"
1181-
installGitea: echo bootstrapGitea was not provided
1182-
domain: ""
1183-
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1184-
waitConditionHandleUrl:
1185-
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1159+
customBootstrapScript: |
1160+
date
1161+
1162+
echo '=== Clone Git repository ==='
1163+
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1164+
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1165+
1166+
echo '=== Setup IDE ==='
1167+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1168+
1169+
echo '=== Additional Setup ==='
1170+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/app.sh"
1171+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
1172+
codeServerVersion: 4.100.2
1173+
instanceIamRoleName:
1174+
Ref: UnicornStoreIdeIdeRole81A2CEAA
1175+
splashUrl: ""
1176+
instanceIamRoleArn:
1177+
Fn::GetAtt:
1178+
- UnicornStoreIdeIdeRole81A2CEAA
1179+
- Arn
11861180
readmeUrl: ""
11871181
name: IdeBootstrapFunction
11881182
action: aws:runShellScript
@@ -1321,12 +1315,12 @@ Resources:
13211315
Fn::GetAtt:
13221316
- UnicornStoreIdeIdeBootstrapFunctionF57074A6
13231317
- Arn
1324-
InstanceId:
1325-
Ref: UnicornStoreIdeIdeEC2Instance5F393FC5
1326-
SsmDocument:
1327-
Ref: UnicornStoreIdeIdeBootstrapDocumentE330810B
13281318
LogGroupName:
13291319
Ref: UnicornStoreIdeIdeLogGroup7A5EFA50
1320+
SsmDocument:
1321+
Ref: UnicornStoreIdeIdeBootstrapDocumentE330810B
1322+
InstanceId:
1323+
Ref: UnicornStoreIdeIdeEC2Instance5F393FC5
13301324
UpdateReplacePolicy: Delete
13311325
DeletionPolicy: Delete
13321326
InfrastructureCorepostgresB0D0C6BB:
@@ -2270,12 +2264,9 @@ Resources:
22702264
return 'placeholder'
22712265
Environment:
22722266
Variables:
2273-
SPRING_DATASOURCE_PASSWORD:
2274-
Fn::Join:
2275-
- ""
2276-
- - "{{resolve:secretsmanager:"
2277-
- Ref: InfrastructureCorepostgresB0D0C6BB
2278-
- :SecretString:password::}}
2267+
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
2268+
AWS_SERVERLESS_JAVA_CONTAINER_INIT_GRACE_TIME: "500"
2269+
SPRING_DATASOURCE_HIKARI_maximumPoolSize: "1"
22792270
SPRING_DATASOURCE_URL:
22802271
Fn::Join:
22812272
- ""
@@ -2284,9 +2275,12 @@ Resources:
22842275
- InfrastructureCoreUnicornStoreDatabaseF56884BA
22852276
- Endpoint.Address
22862277
- :5432/unicorns
2287-
SPRING_DATASOURCE_HIKARI_maximumPoolSize: "1"
2288-
AWS_SERVERLESS_JAVA_CONTAINER_INIT_GRACE_TIME: "500"
2289-
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
2278+
SPRING_DATASOURCE_PASSWORD:
2279+
Fn::Join:
2280+
- ""
2281+
- - "{{resolve:secretsmanager:"
2282+
- Ref: InfrastructureCorepostgresB0D0C6BB
2283+
- :SecretString:password::}}
22902284
FunctionName: unicorn-store-spring
22912285
Handler: com.unicorn.store.StreamLambdaHandler::handleRequest
22922286
MemorySize: 2048
@@ -3018,12 +3012,12 @@ Resources:
30183012
Description: Build complete
30193013
EventPattern:
30203014
detail:
3021-
project-name:
3022-
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
30233015
build-status:
30243016
- SUCCEEDED
30253017
- FAILED
30263018
- STOPPED
3019+
project-name:
3020+
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
30273021
detail-type:
30283022
- CodeBuild Build State Change
30293023
source:
@@ -3055,9 +3049,9 @@ Resources:
30553049
Fn::GetAtt:
30563050
- UnicornStoreCodeBuildStartBuildFunctionB2FE9156
30573051
- Arn
3052+
ContentHash: fd70d4491df3a6a44292446f6b364c8a
30583053
ProjectName:
30593054
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
3060-
ContentHash: fd70d4491df3a6a44292446f6b364c8a
30613055
CodeBuildIamRoleArn:
30623056
Fn::GetAtt:
30633057
- UnicornStoreCodeBuildCodeBuildRoleB9CE0DE7

0 commit comments

Comments
 (0)