Skip to content

Commit 768ec55

Browse files
author
Yuriy Bezsonov
committed
update cfns
1 parent d4057e0 commit 768ec55

6 files changed

Lines changed: 69 additions & 69 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public SpringAIStack(final Construct scope, final String id) {
100100
new InfrastructureEks(this, "InfrastructureEks", infrastructureCore);
101101

102102
// Create EKS cluster for the workshop
103-
var eksCluster = new EksCluster(this, "UnicornStoreEksCluster", "unicorn-store", "1.32",
103+
var eksCluster = new EksCluster(this, "UnicornStoreEksCluster", "unicorn-store", "1.33",
104104
vpc, ideInternalSecurityGroup);
105105
eksCluster.createAccessEntry(ideRole.getRoleArn(), "unicorn-store", "unicornstore-ide-user");
106106

‎infrastructure/cdk/src/main/java/com/unicorn/constructs/EksCluster.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public CfnCluster getCluster() {
164164
return cluster;
165165
}
166166

167-
public CfnAccessEntry createAccessEntry(final String principalArn,
167+
public CfnAccessEntry createAccessEntry(final String principalArn,
168168
final String clusterName, final String roleName) {
169169
var accessEntry = CfnAccessEntry.Builder.create(this, "AccessEntry-" + roleName)
170170
.clusterName(clusterName)
@@ -180,7 +180,7 @@ public CfnAccessEntry createAccessEntry(final String principalArn,
180180
return accessEntry;
181181
}
182182

183-
public void createPodIdentity(final String principalArn, final String clusterName,
183+
public void createPodIdentity(final String principalArn, final String clusterName,
184184
final String namespace, final String serviceAccount) {
185185
var podIdentityAssociation = CfnPodIdentityAssociation.Builder.create(this, "CfnPodIdentityAssociationESO")
186186
.clusterName(clusterName)

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

Lines changed: 15 additions & 15 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-20250716-122018
450+
LogGroupName: ide-bootstrap-log-20250718-081437
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
description: (Optional) Custom bootstrap script to run.
883884
type: String
884-
default: ""
885885
mainSteps:
886886
- inputs:
887887
runCommand:
@@ -1142,7 +1142,17 @@ Resources:
11421142
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11431143
11441144
exit $exit_code
1145-
- installGitea: |
1145+
- splashUrl: ""
1146+
instanceIamRoleArn:
1147+
Fn::GetAtt:
1148+
- VSCodeIdeGiteaIdeRole90308F47
1149+
- Arn
1150+
readmeUrl: ""
1151+
waitConditionHandleUrl:
1152+
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1153+
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1154+
domain: ""
1155+
installGitea: |
11461156
dnf install -y nerdctl cni-plugins
11471157
mkdir -p /gitea/config /gitea/data
11481158
@@ -1379,16 +1389,6 @@ Resources:
13791389
codeServerVersion: 4.101.2
13801390
instanceIamRoleName:
13811391
Ref: VSCodeIdeGiteaIdeRole90308F47
1382-
splashUrl: ""
1383-
instanceIamRoleArn:
1384-
Fn::GetAtt:
1385-
- VSCodeIdeGiteaIdeRole90308F47
1386-
- Arn
1387-
readmeUrl: ""
1388-
waitConditionHandleUrl:
1389-
Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
1390-
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,ms-azuretools.vscode-docker
1391-
domain: ""
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
LogGroupName:
15301532
Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
15311533
SsmDocument:
15321534
Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
1533-
InstanceId:
1534-
Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
15351535
UpdateReplacePolicy: Delete
15361536
DeletionPolicy: Delete
15371537
Outputs:

‎infrastructure/cfn/ide-stack.yaml‎

Lines changed: 5 additions & 5 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-20250716-121954
450+
LogGroupName: ide-bootstrap-log-20250718-081414
451451
RetentionInDays: 7
452452
UpdateReplacePolicy: Retain
453453
DeletionPolicy: Retain
@@ -1125,10 +1125,7 @@ Resources:
11251125
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11261126
11271127
exit $exit_code
1128-
- environmentContentsZip: ""
1129-
terminalOnStartup: "true"
1130-
installGitea: echo bootstrapGitea was not provided
1131-
domain: ""
1128+
- domain: ""
11321129
extensions: ms-kubernetes-tools.vscode-kubernetes-tools,shardulm94.trailing-spaces,ms-azuretools.vscode-docker
11331130
waitConditionHandleUrl:
11341131
Ref: VSCodeIdeIdeBootstrapWaitConditionHandle0A599C82
@@ -1181,6 +1178,9 @@ Resources:
11811178
- Fn::Split:
11821179
- ":"
11831180
- Ref: VSCodeIdeIdePasswordSecret39AD78F3
1181+
environmentContentsZip: ""
1182+
terminalOnStartup: "true"
1183+
installGitea: echo bootstrapGitea was not provided
11841184
name: IdeBootstrapFunction
11851185
action: aws:runShellScript
11861186
DocumentFormat: YAML

‎infrastructure/cfn/spring-ai-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-20250716-122038
465+
LogGroupName: unicornstore-ide-bootstrap-log-20250718-081455
466466
RetentionInDays: 7
467467
UpdateReplacePolicy: Retain
468468
DeletionPolicy: Retain
@@ -877,9 +877,9 @@ Resources:
877877
description: Bootstrap IDE
878878
parameters:
879879
BootstrapScript:
880-
default: ""
881-
description: (Optional) Custom bootstrap script to run.
882880
type: String
881+
description: (Optional) Custom bootstrap script to run.
882+
default: ""
883883
mainSteps:
884884
- inputs:
885885
runCommand:
@@ -1140,19 +1140,28 @@ Resources:
11401140
/opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
11411141
11421142
exit $exit_code
1143-
- splashUrl: ""
1144-
instanceIamRoleArn:
1143+
- instanceIamRoleArn:
11451144
Fn::GetAtt:
11461145
- UnicornStoreIdeIdeRole81A2CEAA
11471146
- Arn
1148-
readmeUrl: ""
1149-
waitConditionHandleUrl:
1150-
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1151-
extensions: vscjava.vscode-java-pack,ms-azuretools.vscode-docker
1152-
domain: ""
1153-
installGitea: echo bootstrapGitea was not provided
1154-
terminalOnStartup: "true"
1155-
environmentContentsZip: ""
1147+
splashUrl: ""
1148+
instanceIamRoleName:
1149+
Ref: UnicornStoreIdeIdeRole81A2CEAA
1150+
codeServerVersion: 4.101.2
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/spring-ai/build-and-push.sh unicorn-spring-ai-agent"
1163+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/spring-ai/build-and-push.sh unicorn-store-spring"
1164+
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
11561165
passwordName:
11571166
Fn::Join:
11581167
- "-"
@@ -1192,23 +1201,14 @@ Resources:
11921201
- Fn::Split:
11931202
- ":"
11941203
- Ref: UnicornStoreIdeIdePasswordSecret514252E2
1195-
customBootstrapScript: |
1196-
date
1197-
1198-
echo '=== Clone Git repository ==='
1199-
sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
1200-
# sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
1201-
1202-
echo '=== Setup IDE ==='
1203-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
1204-
1205-
echo '=== Additional Setup ==='
1206-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/spring-ai/build-and-push.sh unicorn-spring-ai-agent"
1207-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/spring-ai/build-and-push.sh unicorn-store-spring"
1208-
sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
1209-
codeServerVersion: 4.101.2
1210-
instanceIamRoleName:
1211-
Ref: UnicornStoreIdeIdeRole81A2CEAA
1204+
environmentContentsZip: ""
1205+
terminalOnStartup: "true"
1206+
installGitea: echo bootstrapGitea was not provided
1207+
domain: ""
1208+
extensions: vscjava.vscode-java-pack,ms-azuretools.vscode-docker
1209+
waitConditionHandleUrl:
1210+
Ref: UnicornStoreIdeIdeBootstrapWaitConditionHandle3D9B67F1
1211+
readmeUrl: ""
12121212
name: IdeBootstrapFunction
12131213
action: aws:runShellScript
12141214
DocumentFormat: YAML
@@ -1348,10 +1348,10 @@ Resources:
13481348
- Arn
13491349
InstanceId:
13501350
Ref: UnicornStoreIdeIdeEC2Instance5F393FC5
1351-
LogGroupName:
1352-
Ref: UnicornStoreIdeIdeLogGroup7A5EFA50
13531351
SsmDocument:
13541352
Ref: UnicornStoreIdeIdeBootstrapDocumentE330810B
1353+
LogGroupName:
1354+
Ref: UnicornStoreIdeIdeLogGroup7A5EFA50
13551355
UpdateReplacePolicy: Delete
13561356
DeletionPolicy: Delete
13571357
InfrastructureCorepostgresB0D0C6BB:
@@ -1852,9 +1852,6 @@ Resources:
18521852
HostPort: 8080
18531853
Protocol: tcp
18541854
Secrets:
1855-
- Name: SPRING_DATASOURCE_PASSWORD
1856-
ValueFrom:
1857-
Ref: InfrastructureCoredbSecretPassword1EC1CF00
18581855
- Name: SPRING_DATASOURCE_URL
18591856
ValueFrom:
18601857
Fn::Join:
@@ -1867,6 +1864,9 @@ Resources:
18671864
- Ref: AWS::AccountId
18681865
- :parameter/
18691866
- Ref: InfrastructureCoreSsmParameterDBConnectionString2EE427D4
1867+
- Name: SPRING_DATASOURCE_PASSWORD
1868+
ValueFrom:
1869+
Ref: InfrastructureCoredbSecretPassword1EC1CF00
18701870
Cpu: "1024"
18711871
ExecutionRoleArn:
18721872
Fn::GetAtt:
@@ -2180,9 +2180,6 @@ Resources:
21802180
HostPort: 8080
21812181
Protocol: tcp
21822182
Secrets:
2183-
- Name: SPRING_DATASOURCE_PASSWORD
2184-
ValueFrom:
2185-
Ref: InfrastructureCoredbSecretPassword1EC1CF00
21862183
- Name: SPRING_DATASOURCE_URL
21872184
ValueFrom:
21882185
Fn::Join:
@@ -2195,6 +2192,9 @@ Resources:
21952192
- Ref: AWS::AccountId
21962193
- :parameter/
21972194
- Ref: InfrastructureCoreSsmParameterDBConnectionString2EE427D4
2195+
- Name: SPRING_DATASOURCE_PASSWORD
2196+
ValueFrom:
2197+
Ref: InfrastructureCoredbSecretPassword1EC1CF00
21982198
Cpu: "1024"
21992199
ExecutionRoleArn:
22002200
Fn::GetAtt:
@@ -2506,7 +2506,7 @@ Resources:
25062506
Enabled: true
25072507
UpgradePolicy:
25082508
SupportType: STANDARD
2509-
Version: "1.32"
2509+
Version: "1.33"
25102510
UnicornStoreEksClusterAccessEntryunicornstoreideuser92F16088:
25112511
Type: AWS::EKS::AccessEntry
25122512
Properties:
@@ -2787,9 +2787,6 @@ Resources:
27872787
Fn::GetAtt:
27882788
- UnicornStoreDatabaseSetupDatabaseSetupFunction83636DD9
27892789
- Arn
2790-
SqlStatements: |-
2791-
CREATE TABLE IF NOT EXISTS unicorns(id TEXT DEFAULT gen_random_uuid() PRIMARY KEY, name TEXT, age TEXT, size TEXT, type TEXT);
2792-
CREATE EXTENSION IF NOT EXISTS vector;
27932790
SecretName:
27942791
Fn::Join:
27952792
- "-"
@@ -2820,6 +2817,9 @@ Resources:
28202817
- Fn::Split:
28212818
- ":"
28222819
- Ref: InfrastructureCorepostgresB0D0C6BB
2820+
SqlStatements: |-
2821+
CREATE TABLE IF NOT EXISTS unicorns(id TEXT DEFAULT gen_random_uuid() PRIMARY KEY, name TEXT, age TEXT, size TEXT, type TEXT);
2822+
CREATE EXTENSION IF NOT EXISTS vector;
28232823
DependsOn:
28242824
- InfrastructureCoreUnicornStoreDatabaseF56884BA
28252825
- InfrastructureCoreUnicornStoreDatabaseSubnets55C412B8
@@ -3292,12 +3292,12 @@ Resources:
32923292
Description: Build complete
32933293
EventPattern:
32943294
detail:
3295+
project-name:
3296+
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
32953297
build-status:
32963298
- SUCCEEDED
32973299
- FAILED
32983300
- STOPPED
3299-
project-name:
3300-
- Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
33013301
detail-type:
33023302
- CodeBuild Build State Change
33033303
source:
@@ -3331,11 +3331,11 @@ Resources:
33313331
- Arn
33323332
ProjectName:
33333333
Ref: UnicornStoreCodeBuildCodeBuildProjectAF799FF7
3334+
ContentHash: fd70d4491df3a6a44292446f6b364c8a
33343335
CodeBuildIamRoleArn:
33353336
Fn::GetAtt:
33363337
- UnicornStoreCodeBuildCodeBuildRoleB9CE0DE7
33373338
- Arn
3338-
ContentHash: fd70d4491df3a6a44292446f6b364c8a
33393339
DependsOn:
33403340
- UnicornStoreCodeBuildBuildCompleteRuleAllowEventRulespringaistackUnicornStoreCodeBuildReportBuildFunctionA3347B9EB9A35FA4
33413341
- UnicornStoreCodeBuildBuildCompleteRule7E287561

‎infrastructure/cfn/unicornstore-stack.yaml‎

Lines changed: 1 addition & 1 deletion
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-20250716-121929
465+
LogGroupName: unicornstore-ide-bootstrap-log-20250718-081355
466466
RetentionInDays: 7
467467
UpdateReplacePolicy: Retain
468468
DeletionPolicy: Retain

0 commit comments

Comments
 (0)