Skip to content

Commit ee65faf

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

5 files changed

Lines changed: 92 additions & 84 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ public EcsCluster(final Construct scope, final String id, final InfrastructureCo
7373
private Repository createEcrRepository() {
7474
return Repository.Builder.create(this, appName + "-EcrRepository")
7575
.repositoryName(appName)
76+
.imageScanOnPush(false)
7677
.removalPolicy(RemovalPolicy.DESTROY)
78+
.emptyOnDelete(true) // This will force delete all images when repository is deleted
7779
.build();
7880
}
7981

infrastructure/cfn/ide-gitea-stack.yaml

Lines changed: 3 additions & 3 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-20250614-180628
448+
LogGroupName: ide-bootstrap-log-20250614-193054
449449
RetentionInDays: 7
450450
UpdateReplacePolicy: Retain
451451
DeletionPolicy: Retain
@@ -1524,12 +1524,12 @@ Resources:
15241524
Fn::GetAtt:
15251525
- VSCodeIdeGiteaIdeBootstrapFunction34BA645E
15261526
- Arn
1527+
SsmDocument:
1528+
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
15271529
LogGroupName:
15281530
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
15291531
InstanceId:
15301532
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
1531-
SsmDocument:
1532-
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
15331533
UpdateReplacePolicy: Delete
15341534
DeletionPolicy: Delete
15351535
Outputs:

infrastructure/cfn/ide-stack.yaml

Lines changed: 7 additions & 7 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-20250614-180609
448+
LogGroupName: ide-bootstrap-log-20250614-193037
449449
RetentionInDays: 7
450450
UpdateReplacePolicy: Retain
451451
DeletionPolicy: Retain
@@ -1123,10 +1123,7 @@ Resources:
11231123
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11241124
11251125
exit $exit_code
1126-
- instanceIamRoleName:
1127-
Ref: VSCodeIdeIdeRole21951A1F
1128-
splashUrl: ""
1129-
instanceIamRoleArn:
1126+
- instanceIamRoleArn:
11301127
Fn::GetAtt:
11311128
- VSCodeIdeIdeRole21951A1F
11321129
- Arn
@@ -1179,6 +1176,9 @@ Resources:
11791176
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
11801177
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/idp.sh"
11811178
codeServerVersion: 4.100.3
1179+
instanceIamRoleName:
1180+
Ref: VSCodeIdeIdeRole21951A1F
1181+
splashUrl: ""
11821182
name: IdeBootstrapFunction
11831183
action: aws:runShellScript
11841184
DocumentFormat: YAML
@@ -1316,12 +1316,12 @@ Resources:
13161316
Fn::GetAtt:
13171317
- VSCodeIdeIdeBootstrapFunctionADFBCE22
13181318
- Arn
1319+
LogGroupName:
1320+
Ref: VSCodeIdeIdeLogGroup364F2B78
13191321
SsmDocument:
13201322
Ref: VSCodeIdeIdeBootstrapDocument8DDB05AD
13211323
InstanceId:
13221324
Ref: VSCodeIdeIdeEC2Instance846AE373
1323-
LogGroupName:
1324-
Ref: VSCodeIdeIdeLogGroup364F2B78
13251325
UpdateReplacePolicy: Delete
13261326
DeletionPolicy: Delete
13271327
Outputs:

infrastructure/cfn/spring-ai-stack.yaml

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ Resources:
440440
UnicornStoreIdeIdeLogGroup7A5EFA50:
441441
Type: AWS::Logs::LogGroup
442442
Properties:
443-
LogGroupName: unicornstore-ide-bootstrap-log-20250614-180643
443+
LogGroupName: unicornstore-ide-bootstrap-log-20250614-193115
444444
RetentionInDays: 7
445445
UpdateReplacePolicy: Retain
446446
DeletionPolicy: Retain
@@ -855,9 +855,9 @@ Resources:
855855
description: Bootstrap IDE
856856
parameters:
857857
BootstrapScript:
858+
description: (Optional) Custom bootstrap script to run.
858859
default: ""
859860
type: String
860-
description: (Optional) Custom bootstrap script to run.
861861
mainSteps:
862862
- inputs:
863863
runCommand:
@@ -1118,17 +1118,7 @@ Resources:
11181118
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11191119
11201120
exit $exit_code
1121-
- waitConditionHandleUrl:
1122-
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1123-
readmeUrl: ""
1124-
instanceIamRoleArn:
1125-
Fn::GetAtt:
1126-
- UnicornStoreIdeIdeRole81A2CEAA
1127-
- Arn
1128-
splashUrl: ""
1129-
instanceIamRoleName:
1130-
Ref: UnicornStoreIdeIdeRole81A2CEAA
1131-
codeServerVersion: 4.100.3
1121+
- codeServerVersion: 4.100.3
11321122
customBootstrapScript: |
11331123
date
11341124
@@ -1185,6 +1175,16 @@ Resources:
11851175
installGitea: echo bootstrapGitea was not provided
11861176
domain: ""
11871177
extensions: vscjava.vscode-java-pack,ms-azuretools.vscode-docker
1178+
waitConditionHandleUrl:
1179+
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1180+
readmeUrl: ""
1181+
instanceIamRoleArn:
1182+
Fn::GetAtt:
1183+
- UnicornStoreIdeIdeRole81A2CEAA
1184+
- Arn
1185+
splashUrl: ""
1186+
instanceIamRoleName:
1187+
Ref: UnicornStoreIdeIdeRole81A2CEAA
11881188
name: IdeBootstrapFunction
11891189
action: aws:runShellScript
11901190
DocumentFormat: YAML
@@ -1506,6 +1506,9 @@ Resources:
15061506
UnicornAgentEcsClusterunicornspringaiagentEcrRepository0F61DB80:
15071507
Type: AWS::ECR::Repository
15081508
Properties:
1509+
EmptyOnDelete: true
1510+
ImageScanningConfiguration:
1511+
ScanOnPush: false
15091512
RepositoryName: unicorn-spring-ai-agent
15101513
UpdateReplacePolicy: Delete
15111514
DeletionPolicy: Delete
@@ -1831,6 +1834,9 @@ Resources:
18311834
UnicornStoreEcsClusterunicornstorespringEcrRepository677E0768:
18321835
Type: AWS::ECR::Repository
18331836
Properties:
1837+
EmptyOnDelete: true
1838+
ImageScanningConfiguration:
1839+
ScanOnPush: false
18341840
RepositoryName: unicorn-store-spring
18351841
UpdateReplacePolicy: Delete
18361842
DeletionPolicy: Delete
@@ -2446,12 +2452,6 @@ Resources:
24462452
return 'placeholder'
24472453
Environment:
24482454
Variables:
2449-
SPRING_DATASOURCE_PASSWORD:
2450-
Fn::Join:
2451-
- ""
2452-
- - "{{resolve:secretsmanager:"
2453-
- Ref: InfrastructureCorepostgresB0D0C6BB
2454-
- :SecretString:password::}}
24552455
SPRING_DATASOURCE_URL:
24562456
Fn::Join:
24572457
- ""
@@ -2463,6 +2463,12 @@ Resources:
24632463
SPRING_DATASOURCE_HIKARI_maximumPoolSize: "1"
24642464
AWS_SERVERLESS_JAVA_CONTAINER_INIT_GRACE_TIME: "500"
24652465
JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1
2466+
SPRING_DATASOURCE_PASSWORD:
2467+
Fn::Join:
2468+
- ""
2469+
- - "{{resolve:secretsmanager:"
2470+
- Ref: InfrastructureCorepostgresB0D0C6BB
2471+
- :SecretString:password::}}
24662472
FunctionName: unicorn-store-spring
24672473
Handler: com.unicorn.store.StreamLambdaHandler::handleRequest
24682474
MemorySize: 2048
@@ -3194,12 +3200,12 @@ Resources:
31943200
Description: Build complete
31953201
EventPattern:
31963202
detail:
3197-
project-name:
3198-
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
31993203
build-status:
32003204
- SUCCEEDED
32013205
- FAILED
32023206
- STOPPED
3207+
project-name:
3208+
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
32033209
detail-type:
32043210
- CodeBuild Build State Change
32053211
source:
@@ -3231,13 +3237,13 @@ Resources:
32313237
Fn::GetAtt:
32323238
- UnicornStoreCodeBuildStartBuildFunctionB2FE9156
32333239
- Arn
3240+
ContentHash: fd70d4491df3a6a44292446f6b364c8a
32343241
CodeBuildIamRoleArn:
32353242
Fn::GetAtt:
32363243
- UnicornStoreCodeBuildCodeBuildRoleB9CE0DE7
32373244
- Arn
32383245
ProjectName:
32393246
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
3240-
ContentHash: fd70d4491df3a6a44292446f6b364c8a
32413247
DependsOn:
32423248
- UnicornStoreCodeBuildBuildCompleteRuleAllowEventRulespringaistackUnicornStoreCodeBuildReportBuildFunctionA3347B9EB9A35FA4
32433249
- UnicornStoreCodeBuildBuildCompleteRule7E287561

0 commit comments

Comments
 (0)