Merge branch 'main' into dependabot/npm_and_yarn/example/semver-6.3.1

nhs-england-tools · Nov 30, 2023 · 7d49e16 · 7d49e16
2 parents cd87abf + 2570005
commit 7d49e16
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/example/terraform/.terraform.lock.hcl b/example/terraform/.terraform.lock.hcl
diff --git a/example/terraform/main.tf b/example/terraform/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
   }
 

diff --git a/main.tf b/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
   }
 }

diff --git a/modules/cloudfront-logs/main.tf b/modules/cloudfront-logs/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
 
     archive = {

diff --git a/modules/opennext-assets/main.tf b/modules/opennext-assets/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
   }
 }

diff --git a/modules/opennext-cloudfront/main.tf b/modules/opennext-cloudfront/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
   }
 }

diff --git a/modules/opennext-cloudfront/waf.tf b/modules/opennext-cloudfront/waf.tf
@@ -122,7 +122,7 @@ resource "aws_wafv2_web_acl" "cloudfront_waf" {
 }
 
 resource "aws_wafv2_web_acl_logging_configuration" "waf_logging" {
-  count = var.waf_logging_configuration == null || try(aws_wafv2_web_acl.cloudfront_waf[0], null) == null ? 0 : 1
+  count = var.waf_logging_configuration == null || var.custom_waf != null ? 0 : 1
 
   resource_arn            = aws_wafv2_web_acl.cloudfront_waf[0].arn
   log_destination_configs = var.waf_logging_configuration.log_destination_configs

diff --git a/modules/opennext-lambda/main.tf b/modules/opennext-lambda/main.tf
@@ -4,11 +4,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
     archive = {
       source  = "hashicorp/archive"
-      version = "~> 2.4.0"
+      version = ">= 2.4.0"
     }
   }
 }

diff --git a/modules/opennext-revalidation-queue/main.tf b/modules/opennext-revalidation-queue/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
   }
 }