WIP: refactoring

Author: Yuriy Bezsonov

infrastructure/cdk/src/main/java/com/unicorn/IdeStack.java

@@ -23,7 +23,7 @@ public class IdeStack extends Stack {
         date
 
         echo '=== Clone Git repository ==='bash
-        sudo -H -u ec2-user  -c "git clone https://github.com/smoell/java-on-aws ~/java-on-aws/"
+        sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
         # sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
 
         echo '=== Setup IDE ==='

infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreStack.java

@@ -86,30 +86,11 @@ public UnicornStoreStack(final Construct scope, final String id) {
         var ideRole = ideProps.getRole();
         var ideInternalSecurityGroup = ide.getIdeInternalSecurityGroup();
 
-        // Create S3 bucket for thread dumps
-        AnalysisBucketConstruct analysisBucket = new AnalysisBucketConstruct(
-                this,
-                "ThreadDumpBucket",
-                AnalysisBucketProps.builder()
-                        .bucketPrefix("unicorn-analysis")
-                        .versioningEnabled(true)
-                        .retentionDays(90)
-                        .noncurrentVersionRetentionDays(30)
-                        .removalPolicy(RemovalPolicy.DESTROY)
-                        .build()
-        );
-
         // Create EKS cluster for the workshop
         var eksCluster = new EksCluster(this, "UnicornStoreEksCluster", "unicorn-store", "1.33",
                 vpc, ideInternalSecurityGroup);
         eksCluster.createAccessEntry(ideRole.getRoleArn(), "unicorn-store", "unicornstore-ide-user");
 
-        // Create Lambda function to create thread dump
-        InfrastructureLambdaBedrock lambdaBedrock = new InfrastructureLambdaBedrock(this, "InfrastructureLambdaBedrock", this.getRegion(), analysisBucket.getBucket(), eksCluster, vpc);
-
-        // Create Prometheus und Grafana infrastructure
-        MonitoringConstruct monitoring = new MonitoringConstruct(this, "Monitoring", vpc, eksCluster.getCluster(), lambdaBedrock.getThreadDumpFunction());        // Create Grafana dashboards
-
         // Create Core infrastructure
         var infrastructureCore = new InfrastructureCore(this, "InfrastructureCore", vpc);
         // var accountId = Stack.of(this).getAccount();
@@ -118,12 +99,16 @@ public UnicornStoreStack(final Construct scope, final String id) {
         new InfrastructureContainers(this, "InfrastructureContainers", infrastructureCore);
         new InfrastructureEks(this, "InfrastructureEks", infrastructureCore);
 
+        // Create Lambda function to create thread dump (after InfrastructureEks)
+        InfrastructureLambdaBedrock lambdaBedrock = new InfrastructureLambdaBedrock(this, "InfrastructureLambdaBedrock", this.getRegion(), infrastructureCore.getWorkshopBucket(), eksCluster, vpc);
+
+        // Create Prometheus and Grafana infrastructure. Create Grafana dashboards (after InfrastructureEks)
+        MonitoringConstruct monitoring = new MonitoringConstruct(this, "Monitoring", vpc, eksCluster.getCluster(), lambdaBedrock.getThreadDumpFunction());
+
         // Execute Database setup
         var databaseSetup = new DatabaseSetup(this, "UnicornStoreDatabaseSetup", infrastructureCore);
         databaseSetup.getNode().addDependency(infrastructureCore.getDatabase());
 
-        String bucketName = analysisBucket.getBucket().getBucketName();
-
         // Create UnicornStoreSpringLambda
         new UnicornStoreSpringLambda(this, "UnicornStoreSpringLambda", infrastructureCore);
 

infrastructure/cdk/src/main/java/com/unicorn/core/AnalysisBucketConstruct.java

@@ -9,10 +9,7 @@
 import software.amazon.awscdk.services.ec2.ISecurityGroup;
 import software.amazon.awscdk.services.ec2.SecurityGroupProps;
 import software.amazon.awscdk.services.events.EventBus;
-import software.amazon.awscdk.services.iam.ArnPrincipal;
-import software.amazon.awscdk.services.iam.Effect;
 import software.amazon.awscdk.services.iam.ManagedPolicy;
-import software.amazon.awscdk.services.iam.PolicyStatement;
 import software.amazon.awscdk.services.iam.Role;
 import software.amazon.awscdk.services.iam.ServicePrincipal;
 import software.amazon.awscdk.services.rds.AuroraPostgresClusterEngineProps;
@@ -44,8 +41,8 @@ public class InfrastructureCore extends Construct {
     private final ISecurityGroup applicationSecurityGroup;
     private final StringParameter paramDBConnectionString;
     private final Secret secretPassword;
-    private final StringParameter paramBucketName;
-    private final Bucket lambdaCodeBucket;
+    private final StringParameter parameterWorkshopBucketName;
+    private final Bucket workshopBucket;
 
     public InfrastructureCore(final Construct scope, final String id, final IVpc vpc) {
         super(scope, id);
@@ -64,34 +61,34 @@ public InfrastructureCore(final Construct scope, final String id, final IVpc vpc
 
         paramDBConnectionString = createParamDBConnectionString();
         secretPassword = createSecretPassword();
-        lambdaCodeBucket = createLambdaCodeBucket();
-        paramBucketName = createParamBucketName();
+        workshopBucket = createWorkshopBucket();
+        parameterWorkshopBucketName = createParameterWorkshopBucketName();
         createRolesLambdaBedrock();
     }
 
-    private Bucket createLambdaCodeBucket() {
-        var lambdaCodeBucket = Bucket.Builder
-            .create(this, "LambdaCodeBucket")
+    private Bucket createWorkshopBucket() {
+        var workshopBucket = Bucket.Builder
+            .create(this, "WorkshopBucket")
             .blockPublicAccess(BlockPublicAccess.BLOCK_ALL)
             .enforceSsl(true)
             .removalPolicy(RemovalPolicy.DESTROY)
             .build();
-        return lambdaCodeBucket;
+        return workshopBucket;
     }
 
 
-    private StringParameter createParamBucketName() {
-        return StringParameter.Builder.create(this, "SsmParameterUnicornStoreBucketName")
+    private StringParameter createParameterWorkshopBucketName() {
+        return StringParameter.Builder.create(this, "SsmParameterWorkshopBucketName")
             .allowedPattern(".*")
-            .description("Lambda code bucket name")
+            .description("Workshop bucket name")
             .parameterName("unicornstore-lambda-bucket-name")
-            .stringValue(lambdaCodeBucket.getBucketName())
+            .stringValue(workshopBucket.getBucketName())
             .tier(ParameterTier.STANDARD)
             .build();
     }
 
     public StringParameter getParamBucketName() {
-        return paramBucketName;
+        return parameterWorkshopBucketName;
     }
 
     private void createRolesLambdaBedrock() {
@@ -224,4 +221,8 @@ public DatabaseSecret getDatabaseSecret(){
     public DatabaseCluster getDatabase() {
         return database;
     }
+
+    public Bucket getWorkshopBucket() {
+        return workshopBucket;
+    }
 }