diff --git a/cg_space/providers.tf b/cg_space/providers.tf index 51316c3..aa59fd5 100644 --- a/cg_space/providers.tf +++ b/cg_space/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = ">=0.15" + version = ">=0.53.1" } } -} \ No newline at end of file +} diff --git a/clamav/providers.tf b/clamav/providers.tf index b811743..aa59fd5 100644 --- a/clamav/providers.tf +++ b/clamav/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = ">=0.15" + version = ">=0.53.1" } } } diff --git a/database/main.tf b/database/main.tf index d71bd18..6a65d6e 100644 --- a/database/main.tf +++ b/database/main.tf @@ -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 } diff --git a/database/providers.tf b/database/providers.tf index 26848f3..aa59fd5 100644 --- a/database/providers.tf +++ b/database/providers.tf @@ -3,8 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = ">=0.15" + version = ">=0.53.1" } } } - diff --git a/database/variables.tf b/database/variables.tf index ba827c0..a9f67eb 100644 --- a/database/variables.tf +++ b/database/variables.tf @@ -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" @@ -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 } diff --git a/domain/main.tf b/domain/main.tf index 541e8d1..04b8e2c 100644 --- a/domain/main.tf +++ b/domain/main.tf @@ -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 } diff --git a/domain/providers.tf b/domain/providers.tf index b811743..aa59fd5 100644 --- a/domain/providers.tf +++ b/domain/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = ">=0.15" + version = ">=0.53.1" } } } diff --git a/domain/variables.tf b/domain/variables.tf index e4eb344..ae3866e 100644 --- a/domain/variables.tf +++ b/domain/variables.tf @@ -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" diff --git a/redis/main.tf b/redis/main.tf index 291ed0f..e276574 100644 --- a/redis/main.tf +++ b/redis/main.tf @@ -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 } diff --git a/redis/providers.tf b/redis/providers.tf index b811743..aa59fd5 100644 --- a/redis/providers.tf +++ b/redis/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = ">=0.15" + version = ">=0.53.1" } } } diff --git a/redis/variables.tf b/redis/variables.tf index b8e2f0c..ceda98e 100644 --- a/redis/variables.tf +++ b/redis/variables.tf @@ -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" diff --git a/s3/main.tf b/s3/main.tf index f556275..0bf8c3c 100644 --- a/s3/main.tf +++ b/s3/main.tf @@ -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 } diff --git a/s3/providers.tf b/s3/providers.tf index 26848f3..aa59fd5 100644 --- a/s3/providers.tf +++ b/s3/providers.tf @@ -3,8 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = ">=0.15" + version = ">=0.53.1" } } } - diff --git a/s3/variables.tf b/s3/variables.tf index 705a156..635004f 100644 --- a/s3/variables.tf +++ b/s3/variables.tf @@ -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"