darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

try with two providers

Browse Source
This commit is contained in:
Kenneth Kehl
2025-10-16 12:28:30 -07:00
parent d9f9bb68df
commit c1bc07e85d
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
terraform/development/main.tf
View File

@@ -5,25 +5,30 @@ locals {
} }
data "cloudfoundry_space" "dev" { data "cloudfoundry_space" "dev" {
org_name = local.cf_org_name org = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
name = local.cf_space_name name = local.cf_space_name
} }
module "logo_upload_bucket" { module "logo_upload_bucket" {
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0" source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
cf_space_id = local.cf_space_name
name = "${var.username}-logo-upload-bucket" cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${var.username}-logo-upload-bucket"
} }
resource "cloudfoundry_service_key" "logo_key" { resource "cloudfoundry_service_key" "logo_key" {
provider = cloudfoundry-community.legacy
name = local.key_name name = local.key_name
service_instance = module.logo_upload_bucket.bucket_id service_instance = module.logo_upload_bucket.bucket_id
} }
data "cloudfoundry_service_instance" "csv_bucket" { data "cloudfoundry_service_instance" "csv_bucket" {
name_or_id = "${var.username}-csv-upload-bucket" name = "${var.username}-csv-upload-bucket"
space = data.cloudfoundry_space.dev.id space = data.cloudfoundry_space.dev.id
} }
resource "cloudfoundry_service_key" "csv_key" { resource "cloudfoundry_service_key" "csv_key" {
provider = cloudfoundry-community.legacy
name = local.key_name name = local.key_name
service_instance = data.cloudfoundry_service_instance.csv_bucket.id service_instance = data.cloudfoundry_service_instance.csv_bucket.id
} }

15
terraform/development/providers.tf
View File

@@ -5,12 +5,27 @@ terraform {
source = "cloudfoundry/cloudfoundry" source = "cloudfoundry/cloudfoundry"
version = "1.9.0" version = "1.9.0"
} }
cloudfoundry-community = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.53.1"
}
} }
} }
provider "cloudfoundry" { provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov" api_url = "https://api.fr.cloud.gov"
user = var.cf_user user = var.cf_user
password = var.cf_password password = var.cf_password
# app_logs_max = 30 # app_logs_max = 30
} }
provider "cloudfoundry-community" {
alias = "legacy"
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}

5
terraform/staging/main.tf
View File

@@ -13,7 +13,7 @@ resource "null_resource" "prevent_destroy" {
} }
module "redis-v70" { module "redis-v70" {
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0" source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
cf_space_id = local.cf_space_name cf_space_id = local.cf_space_name
name = "${local.app_name}-redis-v70-${local.env}" name = "${local.app_name}-redis-v70-${local.env}"
@@ -26,7 +26,8 @@ module "redis-v70" {
} }
module "logo_upload_bucket" { module "logo_upload_bucket" {
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0" provider = cloudfoundry-community.legacy
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
cf_space_id = local.cf_space_name cf_space_id = local.cf_space_name
name = "${local.app_name}-logo-upload-bucket-${local.env}" name = "${local.app_name}-logo-upload-bucket-${local.env}"

12
terraform/staging/providers.tf
View File

@@ -5,6 +5,10 @@ terraform {
source = "cloudfoundry/cloudfoundry" source = "cloudfoundry/cloudfoundry"
version = "1.9.0" version = "1.9.0"
} }
cloudfoundry-community = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.53.1"
}
} }
backend "s3" { backend "s3" {
@@ -22,3 +26,11 @@ provider "cloudfoundry" {
password = var.cf_password password = var.cf_password
# app_logs_max = 30 # app_logs_max = 30
} }
provider "cloudfoundry-community" {
alias = "legacy"
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}