Skip to content

Commit 0c0ce47

Browse files
author
Yuriy Bezsonov
committed
update cfn
1 parent 1361f78 commit 0c0ce47

File tree

6 files changed

+96
-91
lines changed

6 files changed

+96
-91
lines changed

infrastructure/cdk/src/main/java/com/unicorn/constructs/EcsCluster.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ private ApplicationLoadBalancer createLoadBalancer(ISecurityGroup albSecurityGro
114114
.vpc(infrastructureCore.getVpc())
115115
.internetFacing(true)
116116
.securityGroup(albSecurityGroup)
117+
.idleTimeout(Duration.hours(1))
117118
.vpcSubnets(SubnetSelection.builder()
118119
.subnetType(SubnetType.PUBLIC)
119120
.build())

infrastructure/cdk/src/main/java/com/unicorn/constructs/VSCodeIde.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static class VSCodeIdeProps {
8181
private String availabilityZone;
8282
private IMachineImage machineImage = MachineImage.latestAmazonLinux2023();
8383
private InstanceType instanceType = InstanceType.of(InstanceClass.T3, InstanceSize.MEDIUM);
84-
private String codeServerVersion = "4.100.2";
84+
private String codeServerVersion = "4.100.3";
8585
private List<IManagedPolicy> additionalIamPolicies = new ArrayList<>();
8686
private List<ISecurityGroup> additionalSecurityGroups = new ArrayList<>();
8787
private int bootstrapTimeoutMinutes = 30;

infrastructure/cfn/ide-gitea-stack.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Resources:
445445
VSCodeIdeGiteaIdeLogGroupCD76FEFA:
446446
Type: AWS::Logs::LogGroup
447447
Properties:
448-
LogGroupName: ide-bootstrap-log-20250611-151811
448+
LogGroupName: ide-bootstrap-log-20250614-180628
449449
RetentionInDays: 7
450450
UpdateReplacePolicy: Retain
451451
DeletionPolicy: Retain
@@ -877,9 +877,9 @@ Resources:
877877
description: Bootstrap IDE
878878
parameters:
879879
BootstrapScript:
880-
default: ""
881880
type: String
882881
description: (Optional) Custom bootstrap script to run.
882+
default: ""
883883
mainSteps:
884884
- inputs:
885885
runCommand:
@@ -1140,17 +1140,10 @@ Resources:
11401140
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11411141
11421142
exit $exit_code
1143-
- waitConditionHandleUrl:
1144-
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1145-
readmeUrl: ""
1146-
instanceIamRoleArn:
1147-
Fn::GetAtt:
1148-
- VSCodeIdeGiteaIdeRole90308F47
1149-
- Arn
1150-
splashUrl: ""
1143+
- splashUrl: ""
11511144
instanceIamRoleName:
11521145
Ref: VSCodeIdeGiteaIdeRole90308F47
1153-
codeServerVersion: 4.100.2
1146+
codeServerVersion: 4.100.3
11541147
customBootstrapScript: |
11551148
date
11561149
@@ -1387,6 +1380,13 @@ Resources:
13871380
source /etc/profile.d/gitea.sh
13881381
domain: ""
13891382
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1383+
waitConditionHandleUrl:
1384+
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1385+
readmeUrl: ""
1386+
instanceIamRoleArn:
1387+
Fn::GetAtt:
1388+
- VSCodeIdeGiteaIdeRole90308F47
1389+
- Arn
13901390
name: IdeBootstrapFunction
13911391
action: aws:runShellScript
13921392
DocumentFormat: YAML
@@ -1524,12 +1524,12 @@ Resources:
15241524
Fn::GetAtt:
15251525
- VSCodeIdeGiteaIdeBootstrapFunction34BA645E
15261526
- Arn
1527+
LogGroupName:
1528+
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
15271529
InstanceId:
15281530
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
15291531
SsmDocument:
15301532
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
1531-
LogGroupName:
1532-
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
15331533
UpdateReplacePolicy: Delete
15341534
DeletionPolicy: Delete
15351535
Outputs:

infrastructure/cfn/ide-stack.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Resources:
445445
VSCodeIdeIdeLogGroup364F2B78:
446446
Type: AWS::Logs::LogGroup
447447
Properties:
448-
LogGroupName: ide-bootstrap-log-20250611-151751
448+
LogGroupName: ide-bootstrap-log-20250614-180609
449449
RetentionInDays: 7
450450
UpdateReplacePolicy: Retain
451451
DeletionPolicy: Retain
@@ -860,8 +860,8 @@ Resources:
860860
description: Bootstrap IDE
861861
parameters:
862862
BootstrapScript:
863-
description: (Optional) Custom bootstrap script to run.
864863
default: ""
864+
description: (Optional) Custom bootstrap script to run.
865865
type: String
866866
mainSteps:
867867
- inputs:
@@ -1123,7 +1123,22 @@ Resources:
11231123
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11241124
11251125
exit $exit_code
1126-
- passwordName:
1126+
- instanceIamRoleName:
1127+
Ref: VSCodeIdeIdeRole21951A1F
1128+
splashUrl: ""
1129+
instanceIamRoleArn:
1130+
Fn::GetAtt:
1131+
- VSCodeIdeIdeRole21951A1F
1132+
- Arn
1133+
readmeUrl: ""
1134+
waitConditionHandleUrl:
1135+
Ref: VSCodeIdeIdeBootstrapWaitConditionHandle0A599C82
1136+
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1137+
domain: ""
1138+
installGitea: echo bootstrapGitea was not provided
1139+
terminalOnStartup: "true"
1140+
environmentContentsZip: ""
1141+
passwordName:
11271142
Fn::Join:
11281143
- "-"
11291144
- - Fn::Select:
@@ -1153,22 +1168,6 @@ Resources:
11531168
- Fn::Split:
11541169
- ":"
11551170
- Ref: VSCodeIdeIdePasswordSecret39AD78F3
1156-
environmentContentsZip: ""
1157-
terminalOnStartup: "true"
1158-
installGitea: echo bootstrapGitea was not provided
1159-
domain: ""
1160-
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1161-
waitConditionHandleUrl:
1162-
Ref: VSCodeIdeIdeBootstrapWaitConditionHandle0A599C82
1163-
readmeUrl: ""
1164-
instanceIamRoleArn:
1165-
Fn::GetAtt:
1166-
- VSCodeIdeIdeRole21951A1F
1167-
- Arn
1168-
splashUrl: ""
1169-
instanceIamRoleName:
1170-
Ref: VSCodeIdeIdeRole21951A1F
1171-
codeServerVersion: 4.100.2
11721171
customBootstrapScript: |
11731172
date
11741173
@@ -1179,6 +1178,7 @@ Resources:
11791178
echo '=== Setup IDE ==='
11801179
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
11811180
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/idp.sh"
1181+
codeServerVersion: 4.100.3
11821182
name: IdeBootstrapFunction
11831183
action: aws:runShellScript
11841184
DocumentFormat: YAML
@@ -1316,10 +1316,10 @@ Resources:
13161316
Fn::GetAtt:
13171317
- VSCodeIdeIdeBootstrapFunctionADFBCE22
13181318
- Arn
1319-
InstanceId:
1320-
Ref: VSCodeIdeIdeEC2Instance846AE373
13211319
SsmDocument:
13221320
Ref: VSCodeIdeIdeBootstrapDocument8DDB05AD
1321+
InstanceId:
1322+
Ref: VSCodeIdeIdeEC2Instance846AE373
13231323
LogGroupName:
13241324
Ref: VSCodeIdeIdeLogGroup364F2B78
13251325
UpdateReplacePolicy: Delete

0 commit comments

Comments
 (0)