From ed80defb3ff73996f462d78a1229afbfbc6b0f0b Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Thu, 4 Sep 2025 16:44:52 +0200 Subject: [PATCH] Use a newer provider --- terraform/main.tf | 36 +++++++++++++++++++++++------------- terraform/provider.tf | 10 +++------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index 63d2eb7..3c6ddfb 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -23,29 +23,39 @@ # } # =========== Cloud Foundry Resources =========== -resource "cloudfoundry_org" "org" { +# resource "cloudfoundry_org" "org" { +# name = var.cf_org_name +# } + +# resource "cloudfoundry_space" "space" { +# name = var.cf_space_name +# org = cloudfoundry_org.org.id +# } + +data "cloudfoundry_org" "org" { name = var.cf_org_name } -resource "cloudfoundry_space" "space" { +data "cloudfoundry_space" "space" { name = var.cf_space_name - org = cloudfoundry_org.org.id + org = data.cloudfoundry_org.org.id } resource "cloudfoundry_app" "versatiles" { - name = var.cf_app_name - space = cloudfoundry_space.space.id - memory = "1G" - disk_quota = "1G" + name = var.cf_app_name + space_name = data.cloudfoundry_space.space.name + org_name = data.cloudfoundry_org.org.name + memory = "2G" + disk_quota = "2G" instances = 1 command = "versatiles serve -p $PORT -s frontend-dev.br.tar ${var.tiles_url}" - timeout = 10 health_check_type = "http" health_check_http_endpoint = "/" - docker_image = var.docker_image + docker_image = var.docker_image docker_credentials = { - docker_username = var.docker_username - docker_password = var.docker_password + username = var.docker_username + password = var.docker_password } - strategy = "rolling" -} \ No newline at end of file + random_route = true + strategy = "rolling" +} diff --git a/terraform/provider.tf b/terraform/provider.tf index 66ae300..b7fb738 100644 --- a/terraform/provider.tf +++ b/terraform/provider.tf @@ -5,12 +5,8 @@ terraform { version = ">= 0.62.0" } cloudfoundry = { - source = "cloudfoundry-community/cloudfoundry" - version = ">= 0.53.0" - } - local = { - source = "hashicorp/local" - version = ">= 2.4.0" + source = "cloudfoundry/cloudfoundry" + version = ">= 1.8.0" } } } @@ -20,7 +16,7 @@ provider "stackit" { } provider "cloudfoundry" { - api_url = "https://api.cf.eu01.stackit.cloud" + api_url = "https://api.system.01.cf.eu01.stackit.cloud" user = var.cf_user password = var.cf_password } \ No newline at end of file