fix: java version

Siva Ramani · Siva Ramani · commit 07ed041f9925 · 2025-07-13T17:59:31.000-05:00
diff --git a/README.md b/README.md
@@ -100,7 +100,7 @@ Deploy the AWS Infrastructure using Terraform
 Below sample AWS CLI Invoke command inserts sample data for the application logs
 
 ```
-aws lambda invoke --function-name clicklogger-dev-ingestion-lambda —cli-binary-format raw-in-base64-out —payload '{"requestid":"OAP-guid-001","contextid":"OAP-ctxt-001","callerid":"OrderingApplication","component":"login","action":"load","type":"webpage"}' out
+aws lambda invoke --function-name clicklogger-dev-ingestion-lambda --cli-binary-format raw-in-base64-out --payload '{"requestid":"OAP-guid-001","contextid":"OAP-ctxt-001","callerid":"OrderingApplication","component":"login","action":"load","type":"webpage"}' out
 ```
 
 Validate the Deployments
@@ -120,10 +120,26 @@ Validate the Deployments
   * Start a new StepFunctions execution to trigger the workflow with the sample input below. Enter the date value equal to the date when sample data was ingested to S3 with the ingest lambda.
   ```
   {
-    "InputDate": "2023-02-08"
+    "InputDate": "2025-07-13"
   }
   ```
-  * Once the AWS Step Function is successful, navigate to Amazon S3 > <your-region>-clicklogger-dev-loggregator-output-<your-Account-Number> to see the output files.
+  * You can run the same using AWS CLI like below.
+  ```
+    aws stepfunctions start-execution \
+      --state-machine-arn "arn:aws:states:us-east-1:$(aws sts get-caller-identity --query Account --output text):stateMachine:clicklogger-dev-state-machine" \
+      --name "test-execution-$(date +%s)" \
+      --input '{"InputDate": "2025-07-13"}'
+
+  ```
+  * Once the AWS Step Function is successful, you can view the output files using AWS CLI:
+  ```
+  # List all output files
+  aws s3 ls s3://us-east-1-clicklogger-dev-loggregator-output-$(aws sts get-caller-identity --query Account --output text)/ --recursive
+  
+  # View the output file content
+  aws s3 cp s3://us-east-1-clicklogger-dev-loggregator-output-$(aws sts get-caller-identity --query Account --output text)/2025/07/13/response.md -
+  ```
+  * Or navigate to Amazon S3 > us-east-1-clicklogger-dev-loggregator-output-<your-Account-Number> to see the output files.
   * These will be partitioned by year/month/date/response.md. A sample is shown below
  
 ![Alt text](assets/s3_output_response_file.png?raw=true "Title")
diff --git a/exec.sh b/exec.sh
@@ -12,9 +12,9 @@ cd $APP_DIR/source/clicklogger
 mvn clean package
 echo 'Building Source EMR Jar'
 cd $APP_DIR/source/loggregator
-# Make sure to have JAVA8 in your PATH
-sbt reload
-sbt compile
+# Build Scala JAR with Java 11 (Minimum)
+sbt clean 
+sbt compile 
 sbt package
 
 echo 'Deploying Terraform Resources'
diff --git a/source/loggregator/build.sbt b/source/loggregator/build.sbt
@@ -3,7 +3,7 @@ name := "loggregator"
 version := "0.1"
 
 
-scalaVersion := "2.12.1"
+scalaVersion := "2.12.17"
 
 lazy val root = (project in file(".")).
   settings(
diff --git a/source/loggregator/project/build.properties b/source/loggregator/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.3.12
+sbt.version = 1.8.2
diff --git a/source/loggregator/project/plugins.sbt b/source/loggregator/project/plugins.sbt
@@ -1,4 +1,4 @@
-resolvers += Resolver.url("sbt-plugin-releases-scala-sbt", url("http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/"))
+resolvers += Resolver.url("sbt-plugin-releases-scala-sbt", url("https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/"))
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.3")
diff --git a/terraform/templates/firehose.tf b/terraform/templates/firehose.tf
@@ -11,8 +11,8 @@ resource "aws_kinesis_firehose_delivery_stream" "click_logger_firehose_delivery_
   extended_s3_configuration {
     role_arn           = aws_iam_role.click_logger_stream_consumer_firehose_role.arn
     bucket_arn         = aws_s3_bucket.click_logger_firehose_delivery_s3_bucket.arn
-    buffer_size        = 64
-    buffer_interval    = 60
+    buffering_size     = 64
+    buffering_interval = 60
     cloudwatch_logging_options {
       enabled = true
       log_group_name = aws_cloudwatch_log_group.click_logger_firehose_delivery_stream_log_group.name
@@ -46,7 +46,7 @@ resource "aws_kinesis_firehose_delivery_stream" "click_logger_firehose_delivery_
         database_name = aws_glue_catalog_database.aws_glue_click_logger_database.name
         role_arn = aws_iam_role.click_logger_stream_consumer_firehose_role.arn
         table_name = aws_glue_catalog_table.aws_glue_click_logger_catalog_table.name
-        region = data.aws_region.current.name
+        region = data.aws_region.current.id
       }
     }
   
diff --git a/terraform/templates/lambda.tf b/terraform/templates/lambda.tf
@@ -8,7 +8,7 @@ resource "aws_lambda_function" "lambda_clicklogger_ingest" {
   function_name = "${var.app_prefix}-${var.stage_name}-ingestion-lambda"
   role          = aws_iam_role.click_logger_lambda_role.arn
   handler       = "com.clicklogs.Handlers.ClickLoggerHandler::handleRequest"
-  runtime       = "java8"
+  runtime       = "java11"
   memory_size   = 2048
   timeout       = 300
 
@@ -20,7 +20,7 @@ resource "aws_lambda_function" "lambda_clicklogger_ingest" {
   environment {
     variables = {
       STREAM_NAME = aws_kinesis_firehose_delivery_stream.click_logger_firehose_delivery_stream.name
-      REGION      = data.aws_region.current.name
+      REGION      = data.aws_region.current.id
     }
   }
 
@@ -36,7 +36,7 @@ resource "aws_lambda_function" "lambda_clicklogger_emr_job_status" {
   function_name = "${var.app_prefix}-${var.stage_name}-emr-job-status-lambda"
   role          = aws_iam_role.click_logger_emr_lambda_role.arn
   handler       = "com.clicklogs.Handlers.ClickLoggerEMRJobHandler::handleRequest"
-  runtime       = "java8"
+  runtime       = "java11"
   memory_size   = 2048
   timeout       = 600
 
@@ -47,7 +47,7 @@ resource "aws_lambda_function" "lambda_clicklogger_emr_job_status" {
     variables = {
       APPLICATION_ID     = aws_emrserverless_application.click_log_loggregator_emr_serverless.id
       LOGS_OUTPUT_PATH   = "s3://${aws_s3_bucket.click_log_loggregator_emr_serverless_logs_s3_bucket.id}"
-      REGION             = data.aws_region.current.name
+      REGION             = data.aws_region.current.id
       EMR_GET_SLEEP_TIME = 5000
     }
   }
diff --git a/terraform/templates/s3.tf b/terraform/templates/s3.tf
@@ -3,7 +3,7 @@
 ### SPDX-License-Identifier: MIT-0
 
 resource "aws_s3_bucket" "click_log_loggregator_source_s3_bucket" {
-  bucket = "${data.aws_region.current.name}-${var.app_prefix}-${var.stage_name}-loggregator-source-${data.aws_caller_identity.current.account_id}"
+  bucket = "${data.aws_region.current.id}-${var.app_prefix}-${var.stage_name}-loggregator-source-${data.aws_caller_identity.current.account_id}"
 
   tags = {
     Name        = "Loggregator Source S3 Delivery bucket"
@@ -22,7 +22,7 @@ resource "aws_s3_object" "click_log_loggregator_source_s3_bucket_object" {
 
 
 resource "aws_s3_bucket" "click_log_loggregator_output_s3_bucket" {
-  bucket = "${data.aws_region.current.name}-${var.app_prefix}-${var.stage_name}-loggregator-output-${data.aws_caller_identity.current.account_id}"
+  bucket = "${data.aws_region.current.id}-${var.app_prefix}-${var.stage_name}-loggregator-output-${data.aws_caller_identity.current.account_id}"
 
   tags = {
     Name        = "Loggregator Output S3 Delivery bucket"
@@ -31,7 +31,7 @@ resource "aws_s3_bucket" "click_log_loggregator_output_s3_bucket" {
 }
 
 resource "aws_s3_bucket" "click_log_loggregator_emr_serverless_logs_s3_bucket" {
-  bucket = "${data.aws_region.current.name}-${var.app_prefix}-${var.stage_name}-emr-logs-${data.aws_caller_identity.current.account_id}"
+  bucket = "${data.aws_region.current.id}-${var.app_prefix}-${var.stage_name}-emr-logs-${data.aws_caller_identity.current.account_id}"
 
   tags = {
     Name        = "Loggregator EMR Logs S3 Delivery bucket"
@@ -41,7 +41,7 @@ resource "aws_s3_bucket" "click_log_loggregator_emr_serverless_logs_s3_bucket" {
 
 
 resource "aws_s3_bucket" "click_logger_firehose_delivery_s3_bucket" {
-  bucket = "${data.aws_region.current.name}-${var.app_prefix}-${var.stage_name}-firehose-delivery-${data.aws_caller_identity.current.account_id}"
+  bucket = "${data.aws_region.current.id}-${var.app_prefix}-${var.stage_name}-firehose-delivery-${data.aws_caller_identity.current.account_id}"
 
   tags = {
     Name        = "Firehose S3 Delivery bucket"
@@ -50,7 +50,7 @@ resource "aws_s3_bucket" "click_logger_firehose_delivery_s3_bucket" {
 }
 
 resource "aws_s3_bucket" "click_logger_emr_studio_bucket" {
-  bucket = "${data.aws_region.current.name}-${var.app_prefix}-${var.stage_name}-emr-studio-${data.aws_caller_identity.current.account_id}"
+  bucket = "${data.aws_region.current.id}-${var.app_prefix}-${var.stage_name}-emr-studio-${data.aws_caller_identity.current.account_id}"
 
   tags = {
     Name        = "EMR studio bucket"
diff --git a/terraform/templates/vpc.tf b/terraform/templates/vpc.tf
@@ -47,7 +47,7 @@ resource "aws_route_table_association" "click_logger_emr_route_table_association
 }
 
 resource "aws_eip" "click_logger_emr_ip" {
-  vpc = true
+  domain = "vpc"
 
   tags = {
     Name = "${var.app_prefix}-${var.stage_name}-elastic-ip"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version = 1.3.12`
	`1`	`+sbt.version = 1.8.2`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ resource "aws_route_table_association" "click_logger_emr_route_table_association`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`resource "aws_eip" "click_logger_emr_ip" {`
`50`		`- vpc = true`
	`50`	`+ domain = "vpc"`
`51`	`51`
`52`	`52`	`tags = {`
`53`	`53`	`Name = "${var.app_prefix}-${var.stage_name}-elastic-ip"`