Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions environment/deployments/data-curation/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
terraform {
backend "gcs" {}
required_providers {
google = "~> 3.1"
google-beta = "~> 3.1"
google = "~> 5.1"
google-beta = "~> 5.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ git_lfs_ro_dev_service_accounts = [
]

# Increase this number to force Terraform to update the production environment.
# Serial: 5
# Serial: 6
24 changes: 23 additions & 1 deletion environment/deployments/data-curation/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,17 @@ module "storage_bucket_5" {
environment = var.environment
application = "giftless"
}
lifecycle_rules = [
{
action = {
type = "Delete"
}
condition = {
matches_prefix = "mobu/git-lfs-test/"
age = 1
}
}
]
}
// RO storage access to Git-LFS bucket
resource "google_storage_bucket_iam_binding" "git-lfs-bucket-ro-iam-binding" {
Expand Down Expand Up @@ -217,6 +228,17 @@ module "storage_bucket_6" {
environment = var.environment
application = "giftless"
}
lifecycle_rules = [
{
action = {
type = "Delete"
}
condition = {
matches_prefix = "mobu/git-lfs-test/"
age = 1
}
}
]
}
// RO storage access to Git-LFS Dev bucket
resource "google_storage_bucket_iam_binding" "git-lfs-bucket-dev-ro-iam-binding" {
Expand Down Expand Up @@ -286,7 +308,7 @@ resource "google_storage_bucket_iam_member" "data_curation_prod_rw_panda_dev" {
role = each.value
member = "serviceAccount:${module.data_curation_prod_accounts.email}"
}
// RW storage access to repo-locations Butler bucket
// RW storage access to repo-locations Butler bucket
resource "google_storage_bucket_iam_member" "data_curation_prod_rw_repo_locations" {
for_each = toset(["roles/storage.objectAdmin", "roles/storage.legacyBucketReader"])
bucket = "butler-us-central1-repo-locations"
Expand Down