Merge branch 'main' into update/typesafe-1.4.3

nationalarchives · Oct 27, 2023 · 6179c66 · 6179c66
2 parents 467f3d9 + 1e0557b
commit 6179c66
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,8 +6,8 @@ object Dependencies {
   private val testContainersVersion = "0.41.0"
 
   lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.2.17"
-  lazy val awsSdkDynamoDbV2 = "software.amazon.awssdk" % "dynamodb" % "2.20.110"
-  lazy val awsSdkDynamoDbV1 = "com.amazonaws" % "aws-java-sdk-dynamodb" % "1.12.562"
+  lazy val awsSdkDynamoDbV2 = "software.amazon.awssdk" % "dynamodb" % "2.21.7"
+  lazy val awsSdkDynamoDbV1 = "com.amazonaws" % "aws-java-sdk-dynamodb" % "1.12.573"
   lazy val lambdaJavaCore = "com.amazonaws" % "aws-lambda-java-core" % "1.2.3"
   lazy val lambdaJavaEvents = "com.amazonaws" % "aws-lambda-java-events" % "3.11.3"
   lazy val ocitools = "uk.gov.nationalarchives.oci" % "oci-tools-scala_2.13" % "0.3.0"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.7
diff --git a/terraform/da-terraform-configurations b/terraform/da-terraform-configurations
diff --git a/terraform/da-terraform-modules b/terraform/da-terraform-modules
diff --git a/terraform/root_locals.tf b/terraform/root_locals.tf
@@ -15,6 +15,7 @@ locals {
   reference_generator_function_name    = "${var.project}-reference-generator-${local.hosting_environment}"
   reference_generator_api_gateway_name = "${upper(var.project)}ReferenceGenerator${local.hosting_environment}"
   reference_counter_table_name         = "${var.project}-reference-counter"
+  reference_generator_limit            = module.terraform_config_hosting_project.terraform_config["reference_generator_limit"]
   api_task_role_arn                    = module.terraform_config_hosting_project.terraform_config[local.hosting_environment]["api_task_role_arn"]
   api_execution_role_arn               = module.terraform_config_hosting_project.terraform_config[local.hosting_environment]["api_execution_role_arn"]
 }
diff --git a/terraform/root_main.tf b/terraform/root_main.tf
@@ -43,7 +43,7 @@ module "reference_generator_lambda" {
     REFERENCE_KEY_VALUE = "fileCounter"
     REFERENCE_COUNTER   = "referenceCounter"
     QUERY_PARAM         = "numberofrefs"
-    REFERENCE_LIMIT     = 5000
+    REFERENCE_LIMIT     = local.reference_generator_limit
   }
   runtime         = "java11"
   timeout_seconds = 60
+20 −5		s3/main.tf
+20 −0		s3/templates/default_bucket_policy.json.tpl
+5 −0		s3/variables.tf