Skip to content

Commit b384e3a

Browse files
author
Yuriy Bezsonov
committed
update cfn stacks
1 parent e629fb8 commit b384e3a

3 files changed

Lines changed: 43 additions & 43 deletions

File tree

infrastructure/cfn/ide-gitea-stack.yaml

Lines changed: 8 additions & 8 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-20250518-065512
425+
LogGroupName: ide-bootstrap-log-20250524-084013
426426
RetentionInDays: 7
427427
UpdateReplacePolicy: Retain
428428
DeletionPolicy: Retain
@@ -854,9 +854,9 @@ Resources:
854854
description: Bootstrap IDE
855855
parameters:
856856
BootstrapScript:
857-
default: ""
858857
description: (Optional) Custom bootstrap script to run.
859858
type: String
859+
default: ""
860860
mainSteps:
861861
- inputs:
862862
runCommand:
@@ -1112,12 +1112,7 @@ Resources:
11121112
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11131113
11141114
exit $exit_code
1115-
- readmeUrl: ""
1116-
waitConditionHandleUrl:
1117-
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1118-
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1119-
domain: ""
1120-
installGitea: |
1115+
- installGitea: |
11211116
dnf install -y nerdctl cni-plugins
11221117
mkdir -p /gitea/config /gitea/data
11231118
@@ -1359,6 +1354,11 @@ Resources:
13591354
Fn::GetAtt:
13601355
- VSCodeIdeGiteaIdeRole90308F47
13611356
- Arn
1357+
readmeUrl: ""
1358+
waitConditionHandleUrl:
1359+
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1360+
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1361+
domain: ""
13621362
name: IdeBootstrapFunction
13631363
action: aws:runShellScript
13641364
DocumentFormat: YAML

infrastructure/cfn/ide-stack.yaml

Lines changed: 28 additions & 28 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-20250518-065443
425+
LogGroupName: ide-bootstrap-log-20250524-084110
426426
RetentionInDays: 7
427427
UpdateReplacePolicy: Retain
428428
DeletionPolicy: Retain
@@ -837,8 +837,8 @@ Resources:
837837
description: Bootstrap IDE
838838
parameters:
839839
BootstrapScript:
840-
description: (Optional) Custom bootstrap script to run.
841840
default: ""
841+
description: (Optional) Custom bootstrap script to run.
842842
type: String
843843
mainSteps:
844844
- inputs:
@@ -1095,17 +1095,18 @@ Resources:
10951095
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
10961096
10971097
exit $exit_code
1098-
- codeServerVersion: 4.100.2
1099-
customBootstrapScript: |
1100-
date
1101-
1102-
echo '=== Clone Git repository ==='
1103-
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1104-
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1105-
1106-
echo '=== Setup IDE ==='
1107-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1108-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/idp.sh"
1098+
- instanceIamRoleArn:
1099+
Fn::GetAtt:
1100+
- VSCodeIdeGiteaIdeRole90308F47
1101+
- Arn
1102+
readmeUrl: ""
1103+
waitConditionHandleUrl:
1104+
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1105+
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
1106+
domain: ""
1107+
installGitea: echo bootstrapGitea was not provided
1108+
terminalOnStartup: "true"
1109+
environmentContentsZip: ""
11091110
passwordName:
11101111
Fn::Join:
11111112
- "-"
@@ -1136,21 +1137,20 @@ Resources:
11361137
- Fn::Split:
11371138
- ":"
11381139
- Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
1139-
environmentContentsZip: ""
1140-
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: ""
1140+
customBootstrapScript: |
1141+
date
1142+
1143+
echo '=== Clone Git repository ==='
1144+
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1145+
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1146+
1147+
echo '=== Setup IDE ==='
1148+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1149+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/idp.sh"
1150+
codeServerVersion: 4.100.2
11521151
instanceIamRoleName:
11531152
Ref: VSCodeIdeGiteaIdeRole90308F47
1153+
splashUrl: ""
11541154
name: IdeBootstrapFunction
11551155
action: aws:runShellScript
11561156
DocumentFormat: YAML
@@ -1290,10 +1290,10 @@ Resources:
12901290
- Arn
12911291
InstanceId:
12921292
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
1293-
SsmDocument:
1294-
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
12951293
LogGroupName:
12961294
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
1295+
SsmDocument:
1296+
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
12971297
UpdateReplacePolicy: Delete
12981298
DeletionPolicy: Delete
12991299
Outputs:

infrastructure/cfn/unicornstore-stack.yaml

Lines changed: 7 additions & 7 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-20250518-065536
440+
LogGroupName: unicornstore-ide-bootstrap-log-20250524-083907
441441
RetentionInDays: 7
442442
UpdateReplacePolicy: Retain
443443
DeletionPolicy: Retain
@@ -852,9 +852,9 @@ Resources:
852852
description: Bootstrap IDE
853853
parameters:
854854
BootstrapScript:
855+
default: ""
855856
description: (Optional) Custom bootstrap script to run.
856857
type: String
857-
default: ""
858858
mainSteps:
859859
- inputs:
860860
runCommand:
@@ -1110,7 +1110,8 @@ Resources:
11101110
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11111111
11121112
exit $exit_code
1113-
- waitConditionHandleUrl:
1113+
- readmeUrl: ""
1114+
waitConditionHandleUrl:
11141115
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
11151116
extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
11161117
domain: ""
@@ -1177,7 +1178,6 @@ Resources:
11771178
Fn::GetAtt:
11781179
- UnicornStoreIdeIdeRole81A2CEAA
11791180
- Arn
1180-
readmeUrl: ""
11811181
name: IdeBootstrapFunction
11821182
action: aws:runShellScript
11831183
DocumentFormat: YAML
@@ -3049,13 +3049,13 @@ Resources:
30493049
Fn::GetAtt:
30503050
- UnicornStoreCodeBuildStartBuildFunctionB2FE9156
30513051
- Arn
3052-
ContentHash: fd70d4491df3a6a44292446f6b364c8a
3053-
ProjectName:
3054-
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
30553052
CodeBuildIamRoleArn:
30563053
Fn::GetAtt:
30573054
- UnicornStoreCodeBuildCodeBuildRoleB9CE0DE7
30583055
- Arn
3056+
ContentHash: fd70d4491df3a6a44292446f6b364c8a
3057+
ProjectName:
3058+
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
30593059
DependsOn:
30603060
- UnicornStoreCodeBuildBuildCompleteRuleAllowEventRuleunicornstorestackUnicornStoreCodeBuildReportBuildFunction6189FCDE5C03542B
30613061
- UnicornStoreCodeBuildBuildCompleteRule7E287561

0 commit comments

Comments
 (0)