Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Production deploy 1/30/24 #772

Merged
merged 7 commits into from
Jan 30, 2024
Merged

Production deploy 1/30/24 #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9ca597
Bump aiohttp from 3.9.0 to 3.9.2
dependabot[bot] Jan 30, 2024
8c03d14
Update Cloud Foundry Terraform module
ccostino Jan 30, 2024
033f439
Updated 18F/terraform-cloudgov to v0.7.1
ccostino Jan 30, 2024
b63130c
Remove profile attribute from environment providers
ccostino Jan 30, 2024
123b19d
Remove the profile attribute entirely
ccostino Jan 30, 2024
0149228
Merge pull request #769 from GSA/dependabot/pip/aiohttp-3.9.2
ccostino Jan 30, 2024
87cf541
Merge pull request #770 from GSA/fix-infrastructure-checks
ccostino Jan 30, 2024
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
171 changes: 93 additions & 78 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions terraform/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ The below steps rely on you first configuring access to the Terraform state in s
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. Remove the space deployer service instance if it doesn't need to be used again, such as when manually running terraform once.
Expand Down
2 changes: 1 addition & 1 deletion terraform/bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ locals {
}

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_space_name = "notify-management"
Expand Down
2 changes: 1 addition & 1 deletion terraform/bootstrap/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5"
version = "0.53.0"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions terraform/demo/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
}

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_space_name = local.cf_space_name
Expand All @@ -17,7 +17,7 @@ module "database" {
}

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_space_name = local.cf_space_name
Expand All @@ -27,7 +27,7 @@ module "redis" {
}

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_space_name = local.cf_space_name
Expand Down
3 changes: 1 addition & 2 deletions terraform/demo/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5"
version = "0.53.0"
}
}

Expand All @@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.demo"
encrypt = "true"
region = "us-gov-west-1"
profile = "notify-terraform-backend"
}
}

Expand Down
2 changes: 1 addition & 1 deletion terraform/development/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ locals {
}

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_space_name = local.cf_space_name
Expand Down
2 changes: 1 addition & 1 deletion terraform/development/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.50.7"
version = "0.53.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/development/reset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if [[ ! -s "secrets.auto.tfvars" ]]; then
fi

echo "Importing terraform state for $username"
terraform init
terraform init -upgrade

key_name=$username-api-dev-key

Expand Down
8 changes: 4 additions & 4 deletions terraform/production/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
}

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_space_name = local.cf_space_name
Expand All @@ -17,7 +17,7 @@ module "database" {
}

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_space_name = local.cf_space_name
Expand All @@ -27,7 +27,7 @@ module "redis" {
}

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_space_name = local.cf_space_name
Expand Down Expand Up @@ -78,7 +78,7 @@ module "sns_sms" {
# `cf create-domain gsa-tts-benefits-studio api.notify.gov`
###########################################################################
# 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_space_name = local.cf_space_name
Expand Down
3 changes: 1 addition & 2 deletions terraform/production/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5"
version = "0.53.0"
}
}

Expand All @@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.prod"
encrypt = "true"
region = "us-gov-west-1"
profile = "notify-terraform-backend"
}
}

Expand Down
6 changes: 3 additions & 3 deletions terraform/sandbox/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
}

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_space_name = local.cf_space_name
Expand All @@ -17,7 +17,7 @@ module "database" {
}

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_space_name = local.cf_space_name
Expand All @@ -27,7 +27,7 @@ module "redis" {
}

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_space_name = local.cf_space_name
Expand Down
3 changes: 1 addition & 2 deletions terraform/sandbox/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5"
version = "0.53.0"
}
}

Expand All @@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.sandbox"
encrypt = "true"
region = "us-gov-west-1"
profile = "notify-terraform-backend"
}
}

Expand Down
2 changes: 1 addition & 1 deletion terraform/shared/egress_space/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15"
version = "0.53.0"
}
}
}
2 changes: 1 addition & 1 deletion terraform/shared/ses/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15"
version = "0.53.0"
}
}
}
2 changes: 1 addition & 1 deletion terraform/shared/sns/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15"
version = "0.53.0"
}
}
}
6 changes: 3 additions & 3 deletions terraform/staging/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
}

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_space_name = local.cf_space_name
Expand All @@ -17,7 +17,7 @@ module "database" {
}

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_space_name = local.cf_space_name
Expand All @@ -27,7 +27,7 @@ module "redis" {
}

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_space_name = local.cf_space_name
Expand Down
3 changes: 1 addition & 2 deletions terraform/staging/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5"
version = "0.53.0"
}
}

Expand All @@ -12,7 +12,6 @@ terraform {
key = "api.tfstate.stage"
encrypt = "true"
region = "us-gov-west-1"
profile = "notify-terraform-backend"
}
}

Expand Down
Loading