Skip to content

Commit

Permalink
Full provider upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
asteel-gsa committed Oct 24, 2024
1 parent 35b49d7 commit 2a6f673
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 19 deletions.
7 changes: 3 additions & 4 deletions terraform/dev/providers-managed.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ terraform {
}

provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
delete_recursive_allowed = false
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
}
7 changes: 4 additions & 3 deletions terraform/meta/bootstrap-env/space.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ data "cloudfoundry_asg" "asgs" {

# Ensure the space exists and is configured as expected
resource "cloudfoundry_space" "space" {
name = var.name
org = data.cloudfoundry_org.org.id
allow_ssh = var.allow_ssh
name = var.name
org = data.cloudfoundry_org.org.id
allow_ssh = var.allow_ssh
delete_recursive_allowed = false
}

resource "cloudfoundry_space_asgs" "space_asgs" {
Expand Down
7 changes: 3 additions & 4 deletions terraform/meta/bootstrap-env/templates/providers.tf-template
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ terraform {
}

provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
delete_recursive_allowed = false
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
}
7 changes: 3 additions & 4 deletions terraform/preview/providers-managed.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ terraform {
}

provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
delete_recursive_allowed = false
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
}
9 changes: 9 additions & 0 deletions terraform/production/production.tf-example
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# The content of this file is managed by Terraform. If you modify it, it may
# be reverted the next time Terraform runs. If you want to make changes, do it
# in ../meta/bootstrap-env/templates.

# Add resources to this module describing what you want in the corresponding
# space in cloud.gov. You should probably just reference a shared module as in the
# example below to keep consistency across spaces, but you can also vary the
# content for each environment as needed.

module "production" {
source = "../shared/modules/env"
cf_space_name = "production"
Expand Down
4 changes: 2 additions & 2 deletions terraform/production/providers-managed.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "~>0.51.3"
version = "~>0.53.1"
}
}

Expand All @@ -26,4 +26,4 @@ provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
}
}
4 changes: 2 additions & 2 deletions terraform/staging/providers-managed.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "~>0.51.3"
version = "~>0.53.1"
}
}

Expand All @@ -26,4 +26,4 @@ provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
}
}
9 changes: 9 additions & 0 deletions terraform/staging/staging.tf-example
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# The content of this file is managed by Terraform. If you modify it, it may
# be reverted the next time Terraform runs. If you want to make changes, do it
# in ../meta/bootstrap-env/templates.

# Add resources to this module describing what you want in the corresponding
# space in cloud.gov. You should probably just reference a shared module as in the
# example below to keep consistency across spaces, but you can also vary the
# content for each environment as needed.

module "staging" {
source = "../shared/modules/env"
cf_space_name = "staging"
Expand Down

0 comments on commit 2a6f673

Please sign in to comment.