Merge branch 'master' into feat-crates-io-replicate-entire-bucket-in-…

…fallback
rust-lang · Aug 21, 2024 · 9d5a0f0 · 9d5a0f0
2 parents 7581526 + 82fa638
commit 9d5a0f0
Show file tree

Hide file tree

Showing 56 changed files with 926 additions and 854 deletions.
diff --git a/terraform/bastion/firewall.tf b/terraform/bastion/firewall.tf
@@ -20,6 +20,7 @@ locals {
     "rylev-ip-2",
     "jdn",
     "guillaumegomez",
+    "marcoieni",
   ]
 }
 

diff --git a/terraform/bors/.terraform.lock.hcl b/terraform/bors/.terraform.lock.hcl
diff --git a/terraform/bors/_terraform.tf b/terraform/bors/_terraform.tf
@@ -6,15 +6,15 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.59"
+      version = "~> 4.20"
     }
     github = {
       source  = "integrations/github"
-      version = "~> 4.14"
+      version = "~> 6.2.3"
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.0.0"
+      version = "~> 3.6.2"
     }
   }
 

diff --git a/terraform/bors/app.tf b/terraform/bors/app.tf
@@ -30,6 +30,8 @@ module "bors" {
     container_port = 80
     domains        = concat([var.domain_name], var.legacy_domain_names)
 
+    prometheus = null
+
     health_check_path     = "/health"
     health_check_interval = 60
     health_check_timeout  = 50

diff --git a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl
diff --git a/terraform/crates-io-heroku-metrics/_terraform.tf b/terraform/crates-io-heroku-metrics/_terraform.tf
@@ -10,7 +10,7 @@ terraform {
     }
     github = {
       source  = "integrations/github"
-      version = "~> 4.14"
+      version = "~> 6.2.3"
     }
   }