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

Update cf provider & remove deprecated option #36

Merged
merged 3 commits into from
May 8, 2024
Merged

Update cf provider & remove deprecated option #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a79c7cf
Update minimum cloudfoundry provider version
rahearn May 8, 2024
1ab1b66
Remove deprecated recursive_delete option
rahearn May 8, 2024
23fd68a
Run terraform fmt
rahearn May 8, 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
4 changes: 2 additions & 2 deletions cg_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.1"
}
}
}
}
2 changes: 1 addition & 1 deletion clamav/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.1"
}
}
}
11 changes: 5 additions & 6 deletions database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ data "cloudfoundry_service" "rds" {
}

resource "cloudfoundry_service_instance" "rds" {
name = var.name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.rds.service_plans[var.rds_plan_name]
recursive_delete = var.recursive_delete
tags = var.tags
json_params = var.json_params
name = var.name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.rds.service_plans[var.rds_plan_name]
tags = var.tags
json_params = var.json_params
}
3 changes: 1 addition & 2 deletions database/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = ">=0.15"
version = ">=0.53.1"
}
}
}

10 changes: 2 additions & 8 deletions database/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ variable "name" {
description = "Name of the database service instance"
}

variable "recursive_delete" {
type = bool
description = "when true, deletes service bindings attached to the resource (not recommended for production)"
default = false
}

variable "rds_plan_name" {
type = string
description = "service plan to use"
Expand All @@ -33,7 +27,7 @@ variable "tags" {

variable "json_params" {
description = "A JSON string of arbitrary parameters"
type = string
default = null
type = string
default = null
# See options at https://cloud.gov/docs/services/relational-database/#setting-optional-parameters-1
}
11 changes: 5 additions & 6 deletions domain/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ data "cloudfoundry_service" "external_domain" {
}

resource "cloudfoundry_service_instance" "external_domain_instance" {
name = local.service_name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.external_domain.service_plans[var.cdn_plan_name]
recursive_delete = var.recursive_delete
json_params = "{\"domains\": \"${local.endpoint}\"}"
tags = var.tags
name = local.service_name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.external_domain.service_plans[var.cdn_plan_name]
json_params = "{\"domains\": \"${local.endpoint}\"}"
tags = var.tags
}
2 changes: 1 addition & 1 deletion domain/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.1"
}
}
}
6 changes: 0 additions & 6 deletions domain/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ variable "app_name_or_id" {
description = "base application name to be accessed at this domain name"
}

variable "recursive_delete" {
type = bool
description = "when true, deletes service bindings attached to the resource (not recommended for production)"
default = false
}

variable "name" {
type = string
description = "name of the service instance"
Expand Down
11 changes: 5 additions & 6 deletions redis/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ data "cloudfoundry_service" "redis" {
}

resource "cloudfoundry_service_instance" "redis" {
name = var.name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.redis.service_plans[var.redis_plan_name]
recursive_delete = var.recursive_delete
tags = var.tags
json_params = var.json_params
name = var.name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.redis.service_plans[var.redis_plan_name]
tags = var.tags
json_params = var.json_params
}
2 changes: 1 addition & 1 deletion redis/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.1"
}
}
}
6 changes: 0 additions & 6 deletions redis/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ variable "name" {
description = "name for the redis service instance"
}

variable "recursive_delete" {
type = bool
description = "when true, deletes service bindings attached to the resource (not recommended for production)"
default = false
}

variable "redis_plan_name" {
type = string
description = "name of the service plan name to create"
Expand Down
11 changes: 5 additions & 6 deletions s3/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ data "cloudfoundry_service" "s3" {
}

resource "cloudfoundry_service_instance" "bucket" {
name = var.name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.s3.service_plans[var.s3_plan_name]
recursive_delete = var.recursive_delete
tags = var.tags
json_params = var.json_params
name = var.name
space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.s3.service_plans[var.s3_plan_name]
tags = var.tags
json_params = var.json_params
}
3 changes: 1 addition & 2 deletions s3/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ terraform {
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = ">=0.15"
version = ">=0.53.1"
}
}
}

6 changes: 0 additions & 6 deletions s3/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ variable "cf_space_name" {
description = "cloud.gov space name (staging or prod)"
}

variable "recursive_delete" {
type = bool
description = "when true, deletes service bindings attached to the resource (not recommended for production)"
default = false
}

variable "name" {
type = string
description = "name of the cloud.gov service instance"
Expand Down
Loading