Skip to content

Commit 46fe1eb

Browse files
authored
chore: Update use case trial cf deployment (#272)
1 parent 1f3bf43 commit 46fe1eb

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

released/usecases/trial_cf_deployment/main.tf

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ resource "random_id" "suffix" {
1717
}
1818

1919
resource "cloudfoundry_route" "helloterraform" {
20-
domain = data.cloudfoundry_domain.cfapps.id
21-
space = data.cloudfoundry_space.dev.id
22-
hostname = "helloterraform-${random_id.suffix.hex}"
20+
domain = data.cloudfoundry_domain.cfapps.id
21+
space = data.cloudfoundry_space.dev.id
22+
host = "helloterraform-${random_id.suffix.hex}"
2323
}
2424

2525
data "cloudfoundry_service" "xsuaa" {
@@ -30,7 +30,8 @@ resource "cloudfoundry_service_instance" "helloterraform_xsuaa" {
3030
name = "helloterraform-xsuaa"
3131
space = data.cloudfoundry_space.dev.id
3232
service_plan = data.cloudfoundry_service.xsuaa.service_plans["application"]
33-
json_params = jsonencode({
33+
type = "managed"
34+
parameters = jsonencode({
3435
xsappname = "helloterraform-${random_id.suffix.hex}"
3536
tenant-mode = "shared"
3637
scopes = [
@@ -52,19 +53,22 @@ resource "cloudfoundry_service_instance" "helloterraform_xsuaa" {
5253
}
5354

5455
resource "cloudfoundry_app" "helloterraform" {
55-
space = data.cloudfoundry_space.dev.id
56-
name = "helloterraform"
57-
buildpack = "nodejs_buildpack"
58-
memory = 512
59-
path = data.archive_file.helloterraform.output_path
60-
61-
routes {
62-
route = cloudfoundry_route.helloterraform.id
63-
}
64-
65-
service_binding {
66-
service_instance = cloudfoundry_service_instance.helloterraform_xsuaa.id
67-
}
56+
name = "helloterraform"
57+
org_name = module.trialaccount.cloudfoundry.org_name
58+
space_name = data.cloudfoundry_space.dev.name
59+
buildpacks = ["nodejs_buildpack"]
60+
memory = "512M"
61+
path = data.archive_file.helloterraform.output_path
62+
service_bindings = [
63+
{
64+
service_instance = cloudfoundry_service_instance.helloterraform_xsuaa.name
65+
}
66+
]
67+
routes = [
68+
{
69+
route = cloudfoundry_route.helloterraform.url
70+
}
71+
]
6872
}
6973

7074
data "archive_file" "helloterraform" {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
output "app_url" {
2-
value = "https://${cloudfoundry_route.helloterraform.endpoint}"
2+
value = "https://${cloudfoundry_route.helloterraform.url}"
33
}

released/usecases/trial_cf_deployment/provider.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ terraform {
55
version = "~> 1.4.0"
66
}
77
cloudfoundry = {
8-
source = "cloudfoundry-community/cloudfoundry"
9-
version = "0.53.1"
8+
source = "SAP/cloudfoundry"
9+
version = "1.0.0-rc1"
1010
}
1111
}
1212
}

0 commit comments

Comments
 (0)