Page MenuHomePhabricator
Files F3397098

D9507.id32276.diff
No OneTemporary
Actions

D9507.id32276.diff
View Options

diff --git a/services/terraform/dev/main.tf b/services/terraform/dev/main.tf
--- a/services/terraform/dev/main.tf
+++ b/services/terraform/dev/main.tf
@@ -1,3 +1,8 @@
+variable "localstack_endpoint" {
+ type = string
+ default = "http://localhost:4566"
+}
+
locals {
aws_settings = ({
region = "us-east-2"
@@ -9,7 +14,7 @@
skip_requesting_account_id = true
s3_use_path_style = true
- override_endpoint = "http://localhost:4566"
+ override_endpoint = var.localstack_endpoint
})
}
diff --git a/services/terraform/modules/shared/s3.tf b/services/terraform/modules/shared/s3.tf
--- a/services/terraform/modules/shared/s3.tf
+++ b/services/terraform/modules/shared/s3.tf
@@ -6,6 +6,7 @@
}
resource "aws_s3_bucket" "comm_buckets" {
- count = length(var.s3_bucket_names)
- bucket = "${var.s3_bucket_names[count.index]}${var.bucket_name_suffix}"
+ count = length(var.s3_bucket_names)
+ bucket = "${var.s3_bucket_names[count.index]}${var.bucket_name_suffix}"
+ force_destroy = var.is_dev ? true : false
}
diff --git a/services/terraform/modules/shared/secretsmanager.tf b/services/terraform/modules/shared/secretsmanager.tf
--- a/services/terraform/modules/shared/secretsmanager.tf
+++ b/services/terraform/modules/shared/secretsmanager.tf
@@ -1,6 +1,7 @@
resource "aws_secretsmanager_secret" "services_token" {
- name = "servicesToken"
- description = "Service-to-service access token"
+ name = "servicesToken"
+ description = "Service-to-service access token"
+ recovery_window_in_days = var.is_dev ? 0 : 30
}
resource "aws_secretsmanager_secret_version" "services_token" {
secret_id = aws_secretsmanager_secret.services_token.id

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 2, 4:02 PM (21 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2608114
Default Alt Text
D9507.id32276.diff (1 KB)

Event Timeline