darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 02:11:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #770 from GSA/fix-infrastructure-checks

Browse Source 
Fix Terraform commands and actions
This commit is contained in:
Carlo Costino
2024-01-30 15:04:32 -05:00
committed by GitHub
parent 0149228a39 123b19d835
commit 87cf541561
17 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
terraform/README.md
View File

@@ -88,6 +88,8 @@ The below steps rely on you first configuring access to the Terraform state in s
terraform plan terraform plan
``` ```
If the `terraform init` command fails, you may need to run `terraform init -upgrade` to make sure new module versions are picked up.
1. Apply changes with `terraform apply`. 1. Apply changes with `terraform apply`.
1. Remove the space deployer service instance if it doesn't need to be used again, such as when manually running terraform once. 1. Remove the space deployer service instance if it doesn't need to be used again, such as when manually running terraform once.

2
terraform/bootstrap/main.tf
View File

@@ -3,7 +3,7 @@ locals {
} }
module "s3" { module "s3" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.3.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
cf_org_name = "gsa-tts-benefits-studio" cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-management" cf_space_name = "notify-management"

2
terraform/bootstrap/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5" version = "0.53.0"
} }
} }
} }

6
terraform/demo/main.tf
View File

@@ -7,7 +7,7 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name

3
terraform/demo/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5" version = "0.53.0"
} }
} }
@@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.demo" key = "api.tfstate.demo"
encrypt = "true" encrypt = "true"
region = "us-gov-west-1" region = "us-gov-west-1"
profile = "notify-terraform-backend"
} }
} }

2
terraform/development/main.tf
View File

@@ -6,7 +6,7 @@ locals {
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name

2
terraform/development/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.50.7" version = "0.53.0"
} }
} }
} }

2
terraform/development/reset.sh
View File

@@ -51,7 +51,7 @@ if [[ ! -s "secrets.auto.tfvars" ]]; then
fi fi
echo "Importing terraform state for $username" echo "Importing terraform state for $username"
terraform init terraform init -upgrade
key_name=$username-api-dev-key key_name=$username-api-dev-key

8
terraform/production/main.tf
View File

@@ -7,7 +7,7 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -78,7 +78,7 @@ module "sns_sms" {
# `cf create-domain gsa-tts-benefits-studio api.notify.gov` # `cf create-domain gsa-tts-benefits-studio api.notify.gov`
########################################################################### ###########################################################################
# module "domain" { # module "domain" {
# source = "github.com/18f/terraform-cloudgov//domain?ref=v0.2.0" # source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.1"
# #
# cf_org_name = local.cf_org_name # cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name # cf_space_name = local.cf_space_name

3
terraform/production/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5" version = "0.53.0"
} }
} }
@@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.prod" key = "api.tfstate.prod"
encrypt = "true" encrypt = "true"
region = "us-gov-west-1" region = "us-gov-west-1"
profile = "notify-terraform-backend"
} }
} }

6
terraform/sandbox/main.tf
View File

@@ -7,7 +7,7 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name

3
terraform/sandbox/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5" version = "0.53.0"
} }
} }
@@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.sandbox" key = "api.tfstate.sandbox"
encrypt = "true" encrypt = "true"
region = "us-gov-west-1" region = "us-gov-west-1"
profile = "notify-terraform-backend"
} }
} }

2
terraform/shared/egress_space/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15" version = "0.53.0"
} }
} }
} }

2
terraform/shared/ses/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15" version = "0.53.0"
} }
} }
} }

2
terraform/shared/sns/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15" version = "0.53.0"
} }
} }
} }

6
terraform/staging/main.tf
View File

@@ -7,7 +7,7 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name

3
terraform/staging/providers.tf
View File

@@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5" version = "0.53.0"
} }
} }
@@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.stage" key = "api.tfstate.stage"
encrypt = "true" encrypt = "true"
region = "us-gov-west-1" region = "us-gov-west-1"
profile = "notify-terraform-backend"
} }
} }