From 4fbd3bd6efff110dc86833965902aa8b4bac2aa5 Mon Sep 17 00:00:00 2001 From: prajin-op Date: Tue, 29 Oct 2024 10:58:41 +0530 Subject: [PATCH 1/6] chore: version update of the providers --- .../modules/subaccount_setup/subaccount_setup.tf | 2 +- released/usecases/dev_test_prod_setup/provider.tf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf b/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf index 3eef429a..d1f80ea4 100644 --- a/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf +++ b/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.7.0" } } } diff --git a/released/usecases/dev_test_prod_setup/provider.tf b/released/usecases/dev_test_prod_setup/provider.tf index b2582e67..d63e1dbd 100644 --- a/released/usecases/dev_test_prod_setup/provider.tf +++ b/released/usecases/dev_test_prod_setup/provider.tf @@ -2,11 +2,11 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.7.0" } cloudfoundry = { - source = "cloudfoundry-community/cloudfoundry" - version = "0.53.1" + source = "cloudfoundry/cloudfoundry" + version = "1.0.0" } } } From ee1158a2975d1e06ae120b9b4f5b8799e82574de Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 30 Oct 2024 12:18:14 +0530 Subject: [PATCH 2/6] chore: Update usecase trial cf deployment --- released/usecases/trial_cf_deployment/README.md | 9 ++++++++- released/usecases/trial_cf_deployment/main.tf | 6 +++--- released/usecases/trial_cf_deployment/provider.tf | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) 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..d8275913 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.7.0" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "1.0.0" } } } From 96168c50a930aeab1a454c73baf5c4704b9fffa7 Mon Sep 17 00:00:00 2001 From: prajin-op Date: Mon, 4 Nov 2024 13:50:01 +0530 Subject: [PATCH 3/6] chore: update provider version --- released/usecases/devops/provider.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/released/usecases/devops/provider.tf b/released/usecases/devops/provider.tf index 12bb760e..504f6ff7 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.7.0" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "1.0.0" } } } From beca565343ed605480491fdbd57d0095b0a1f987 Mon Sep 17 00:00:00 2001 From: prajin-op Date: Mon, 4 Nov 2024 14:00:13 +0530 Subject: [PATCH 4/6] chore: update provider version --- released/cicd/setup_subaccount_cf/provider.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/released/cicd/setup_subaccount_cf/provider.tf b/released/cicd/setup_subaccount_cf/provider.tf index 7e5d68c6..6d2414f3 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.7.0" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "1.0.0" } } } From f75931e1b5d38198c493b2d1b98cb5b29950f29d Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 6 Nov 2024 09:17:26 +0530 Subject: [PATCH 5/6] chore: update provider version constraints --- released/cicd/setup_subaccount_cf/provider.tf | 2 +- released/usecases/dev_test_prod_setup/provider.tf | 2 +- released/usecases/devops/provider.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/released/cicd/setup_subaccount_cf/provider.tf b/released/cicd/setup_subaccount_cf/provider.tf index 6d2414f3..c2b9da92 100644 --- a/released/cicd/setup_subaccount_cf/provider.tf +++ b/released/cicd/setup_subaccount_cf/provider.tf @@ -6,7 +6,7 @@ terraform { } cloudfoundry = { source = "cloudfoundry/cloudfoundry" - version = "1.0.0" + 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 504f6ff7..4b29949c 100644 --- a/released/usecases/devops/provider.tf +++ b/released/usecases/devops/provider.tf @@ -7,7 +7,7 @@ terraform { } cloudfoundry = { source = "cloudfoundry/cloudfoundry" - version = "1.0.0" + version = "~> 1.0.0" } } } From ede028d518751f7b7fa39a1cf7d45335d1615657 Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 6 Nov 2024 09:21:35 +0530 Subject: [PATCH 6/6] chore: update btp terraform provider version --- released/cicd/setup_subaccount_cf/provider.tf | 2 +- released/usecases/devops/provider.tf | 2 +- released/usecases/trial_cf_deployment/provider.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/released/cicd/setup_subaccount_cf/provider.tf b/released/cicd/setup_subaccount_cf/provider.tf index c2b9da92..c45641ff 100644 --- a/released/cicd/setup_subaccount_cf/provider.tf +++ b/released/cicd/setup_subaccount_cf/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } cloudfoundry = { source = "cloudfoundry/cloudfoundry" diff --git a/released/usecases/devops/provider.tf b/released/usecases/devops/provider.tf index 4b29949c..16fb89c1 100644 --- a/released/usecases/devops/provider.tf +++ b/released/usecases/devops/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } cloudfoundry = { source = "cloudfoundry/cloudfoundry" diff --git a/released/usecases/trial_cf_deployment/provider.tf b/released/usecases/trial_cf_deployment/provider.tf index d8275913..37094302 100644 --- a/released/usecases/trial_cf_deployment/provider.tf +++ b/released/usecases/trial_cf_deployment/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } cloudfoundry = { source = "cloudfoundry/cloudfoundry"