diff --git a/released/cicd/setup_subaccount_cf/provider.tf b/released/cicd/setup_subaccount_cf/provider.tf index 7e5d68c6..c45641ff 100644 --- a/released/cicd/setup_subaccount_cf/provider.tf +++ b/released/cicd/setup_subaccount_cf/provider.tf @@ -2,11 +2,11 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/usecases/dev_test_prod_setup/provider.tf b/released/usecases/dev_test_prod_setup/provider.tf index d63e1dbd..a7e7a7a4 100644 --- a/released/usecases/dev_test_prod_setup/provider.tf +++ b/released/usecases/dev_test_prod_setup/provider.tf @@ -6,7 +6,7 @@ terraform { } cloudfoundry = { source = "cloudfoundry/cloudfoundry" - version = "1.0.0" + version = "~> 1.0.0" } } } diff --git a/released/usecases/devops/provider.tf b/released/usecases/devops/provider.tf index 12bb760e..16fb89c1 100644 --- a/released/usecases/devops/provider.tf +++ b/released/usecases/devops/provider.tf @@ -3,11 +3,11 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.3.0" + version = "~> 1.8.0" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/usecases/trial_cf_deployment/README.md b/released/usecases/trial_cf_deployment/README.md index c0c0fefc..85d19821 100644 --- a/released/usecases/trial_cf_deployment/README.md +++ b/released/usecases/trial_cf_deployment/README.md @@ -8,10 +8,17 @@ This sample shows how to deploy a Cloud Foundry application to SAP BTP trial. The setup comprises the following resources: -- Creation of a Cloud Foundry space, domain and route +- Creation of a Cloud Foundry domain and route - Creation of XSUAA service instance - Deployment of "Hello World" application +## Pre-requisite for the setup + +- You must have an SAP BTP trial account with a subaccount created named trial. +- The BTP subaccount should be enabled for Cloud Foundry, specifically with the Application Runtime is added. +- Ensure that you have created a space named Dev within the Cloud Foundry environment of your subaccount. +- Verify that the XSUAA service is available in your Cloud Foundry environment. + ## Deploying the resources To deploy the resources you must: diff --git a/released/usecases/trial_cf_deployment/main.tf b/released/usecases/trial_cf_deployment/main.tf index 113e8fa8..4ce2d3ab 100644 --- a/released/usecases/trial_cf_deployment/main.tf +++ b/released/usecases/trial_cf_deployment/main.tf @@ -22,14 +22,14 @@ resource "cloudfoundry_route" "helloterraform" { host = "helloterraform-${random_id.suffix.hex}" } -data "cloudfoundry_service" "xsuaa" { - name = "xsuaa" +data "cloudfoundry_service_plans" "xsuaa" { + service_offering_name = "xsuaa" } resource "cloudfoundry_service_instance" "helloterraform_xsuaa" { name = "helloterraform-xsuaa" space = data.cloudfoundry_space.dev.id - service_plan = data.cloudfoundry_service.xsuaa.service_plans["application"] + service_plan = data.cloudfoundry_service_plans.xsuaa.service_plans[0].id type = "managed" parameters = jsonencode({ xsappname = "helloterraform-${random_id.suffix.hex}" diff --git a/released/usecases/trial_cf_deployment/provider.tf b/released/usecases/trial_cf_deployment/provider.tf index a0cd4983..37094302 100644 --- a/released/usecases/trial_cf_deployment/provider.tf +++ b/released/usecases/trial_cf_deployment/provider.tf @@ -2,11 +2,11 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "1.0.0" } } }