From 4fbd3bd6efff110dc86833965902aa8b4bac2aa5 Mon Sep 17 00:00:00 2001 From: prajin-op Date: Tue, 29 Oct 2024 10:58:41 +0530 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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" From 7a9596aa0ab62cf9c89d5f1d7751712f2fc0b26b Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 6 Nov 2024 13:38:59 +0530 Subject: [PATCH 07/10] chore: update terraform provider versions --- released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf | 6 +++--- released/usecases/subaccount_setup/provider.tf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf b/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf index 92067e3e..382e2be7 100644 --- a/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf +++ b/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf @@ -5,11 +5,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/subaccount_setup/provider.tf b/released/usecases/subaccount_setup/provider.tf index 20fa2a60..357bab99 100644 --- a/released/usecases/subaccount_setup/provider.tf +++ b/released/usecases/subaccount_setup/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" } } From 7554f119bdb758aa5d08616afbc1f83cfe4fb21c Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 6 Nov 2024 13:46:19 +0530 Subject: [PATCH 08/10] chore: update terraform provider versions --- released/SAP-Inside-Tracks/SITBLR2024/provider.tf | 2 +- released/discovery_center/mission_3061/step1/provider.tf | 2 +- released/discovery_center/mission_3061/step2/provider.tf | 4 ++-- released/discovery_center/mission_3239/provider.tf | 6 +++--- .../discovery_center/mission_3248_trial/step1/provider.tf | 2 +- .../discovery_center/mission_3248_trial/step2/provider.tf | 6 +++--- released/discovery_center/mission_3252/provider.tf | 2 +- released/discovery_center/mission_3260/step1/provider.tf | 2 +- released/discovery_center/mission_3260/step2/provider.tf | 6 +++--- released/discovery_center/mission_3348/provider.tf | 2 +- released/discovery_center/mission_3488/step1/provider.tf | 2 +- released/discovery_center/mission_3488/step2/provider.tf | 6 +++--- released/discovery_center/mission_3501/step1/provider.tf | 2 +- released/discovery_center/mission_3501/step2/provider.tf | 6 +++--- released/discovery_center/mission_3585/provider.tf | 2 +- released/discovery_center/mission_3585_trial/provider.tf | 2 +- released/discovery_center/mission_3680/step1/provider.tf | 2 +- released/discovery_center/mission_3680/step2/provider.tf | 6 +++--- released/discovery_center/mission_3774/step1/provider.tf | 2 +- released/discovery_center/mission_3774/step2/provider.tf | 4 ++-- released/discovery_center/mission_3808/step1/provider.tf | 2 +- released/discovery_center/mission_3808/step2/provider.tf | 4 ++-- released/discovery_center/mission_3945/provider.tf | 2 +- released/discovery_center/mission_4024/step1/provider.tf | 2 +- released/discovery_center/mission_4024/step2/provider.tf | 2 +- .../discovery_center/mission_4024_trial/step1/provider.tf | 2 +- .../discovery_center/mission_4024_trial/step2/provider.tf | 2 +- released/discovery_center/mission_4033/step1/provider.tf | 2 +- released/discovery_center/mission_4033/step2/provider.tf | 2 +- released/discovery_center/mission_4038/provider.tf | 2 +- released/discovery_center/mission_4104/provider.tf | 2 +- released/discovery_center/mission_4172/step1/provider.tf | 2 +- released/discovery_center/mission_4172/step2/provider.tf | 6 +++--- released/discovery_center/mission_4259/provider.tf | 2 +- released/discovery_center/mission_4327/step1/provider.tf | 2 +- released/discovery_center/mission_4327/step2_cf/provider.tf | 6 +++--- .../discovery_center/mission_4327/step2_kyma/provider.tf | 2 +- released/discovery_center/mission_4356/step1/provider.tf | 2 +- released/discovery_center/mission_4356/step2/provider.tf | 6 +++--- released/discovery_center/mission_4371/step1/provider.tf | 2 +- released/discovery_center/mission_4371/step2/provider.tf | 6 +++--- .../mission_4441/full_setup_enterprise/step1/provider.tf | 2 +- .../mission_4441/full_setup_enterprise/step2/provider.tf | 6 +++--- .../mission_4441/minimal_setup_enterprise/step1/provider.tf | 2 +- .../mission_4441/minimal_setup_enterprise/step2/provider.tf | 6 +++--- released/discovery_center/mission_4441_trial/provider.tf | 2 +- .../exercises/EXERCISE6/SOLUTION_EX6/provider.tf | 2 +- released/dsag/betriebstag2024/exercises/EXERCISE7/README.md | 4 ++-- released/import/data-collection/provider.tf | 2 +- released/import/resource-import/provider.tf | 2 +- released/learning_journey/btp200/provider.tf | 2 +- .../modules/btp-cf/btp-cf-org-space/btp_cf_org_space.tf | 6 +++--- .../btp-cf/serviceinstance_btp_cf/serviceinstance_btp_cf.tf | 4 ++-- released/modules/btp-cf/space-btp-cf/space_cf.tf | 4 ++-- .../cloudfoundry/envinstance_cf/envinstance_cf.tf | 2 +- .../environment/kyma/envinstance_kyma/envinstance_kyma.tf | 2 +- .../services_apps/sap_build_apps/standard/sap_build_apps.tf | 2 +- released/terraform-be/artifactoryasbackend/provider.tf | 2 +- released/terraform-be/k8sasbackend/provider.tf | 2 +- released/terraform-be/s3asbackend/provider.tf | 2 +- .../cf_enable_application_runtime_memory/provider.tf | 2 +- .../modules/subaccount_setup/subaccount_setup.tf | 2 +- released/usecases/dev_test_prod_setup/provider.tf | 2 +- released/usecases/genai-setup/modules/ai/ai.tf | 2 +- .../usecases/genai-setup/modules/hana-cloud/hana_cloud.tf | 2 +- released/usecases/genai-setup/provider.tf | 2 +- released/usecases/kyma_devcontainer_runtime/version.tf | 2 +- .../modules/subaccount_setup/subaccount_setup.tf | 2 +- released/usecases/multi_account_setup/provider.tf | 6 +++--- released/usecases/multi_provider_setup/provider.tf | 6 +++--- released/usecases/resillient_apps/provider.tf | 6 +++--- released/usecases/role_assignments/provider.tf | 2 +- released/usecases/services_apps/sap_build_apps/provider.tf | 2 +- .../usecases/services_apps/sap_build_code/step1/provider.tf | 2 +- .../usecases/services_apps/sap_build_code/step2/provider.tf | 6 +++--- tests/compliance/libs/constants/providers.py | 2 +- 76 files changed, 116 insertions(+), 116 deletions(-) diff --git a/released/SAP-Inside-Tracks/SITBLR2024/provider.tf b/released/SAP-Inside-Tracks/SITBLR2024/provider.tf index c044517b..8babc224 100644 --- a/released/SAP-Inside-Tracks/SITBLR2024/provider.tf +++ b/released/SAP-Inside-Tracks/SITBLR2024/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3061/step1/provider.tf b/released/discovery_center/mission_3061/step1/provider.tf index 5a3fdfb7..b5bda120 100644 --- a/released/discovery_center/mission_3061/step1/provider.tf +++ b/released/discovery_center/mission_3061/step1/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } diff --git a/released/discovery_center/mission_3061/step2/provider.tf b/released/discovery_center/mission_3061/step2/provider.tf index 740999a3..05bab063 100644 --- a/released/discovery_center/mission_3061/step2/provider.tf +++ b/released/discovery_center/mission_3061/step2/provider.tf @@ -1,8 +1,8 @@ terraform { required_providers { cloudfoundry = { - source = "sap/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/discovery_center/mission_3239/provider.tf b/released/discovery_center/mission_3239/provider.tf index 7215813a..58deba89 100644 --- a/released/discovery_center/mission_3239/provider.tf +++ b/released/discovery_center/mission_3239/provider.tf @@ -3,11 +3,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/discovery_center/mission_3248_trial/step1/provider.tf b/released/discovery_center/mission_3248_trial/step1/provider.tf index 72c5ef0f..c99895fc 100644 --- a/released/discovery_center/mission_3248_trial/step1/provider.tf +++ b/released/discovery_center/mission_3248_trial/step1/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } diff --git a/released/discovery_center/mission_3248_trial/step2/provider.tf b/released/discovery_center/mission_3248_trial/step2/provider.tf index 7d04ed08..8297587d 100644 --- a/released/discovery_center/mission_3248_trial/step2/provider.tf +++ b/released/discovery_center/mission_3248_trial/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3252/provider.tf b/released/discovery_center/mission_3252/provider.tf index 0d729c9d..dec153da 100644 --- a/released/discovery_center/mission_3252/provider.tf +++ b/released/discovery_center/mission_3252/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3260/step1/provider.tf b/released/discovery_center/mission_3260/step1/provider.tf index a743a7a6..3ad7760a 100644 --- a/released/discovery_center/mission_3260/step1/provider.tf +++ b/released/discovery_center/mission_3260/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3260/step2/provider.tf b/released/discovery_center/mission_3260/step2/provider.tf index 4ec94611..b03ee70a 100644 --- a/released/discovery_center/mission_3260/step2/provider.tf +++ b/released/discovery_center/mission_3260/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3348/provider.tf b/released/discovery_center/mission_3348/provider.tf index 29e1fdd8..386d3a59 100644 --- a/released/discovery_center/mission_3348/provider.tf +++ b/released/discovery_center/mission_3348/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.6.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3488/step1/provider.tf b/released/discovery_center/mission_3488/step1/provider.tf index 810dc107..b7a886a6 100644 --- a/released/discovery_center/mission_3488/step1/provider.tf +++ b/released/discovery_center/mission_3488/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3488/step2/provider.tf b/released/discovery_center/mission_3488/step2/provider.tf index 75f1118b..dd15b1ac 100644 --- a/released/discovery_center/mission_3488/step2/provider.tf +++ b/released/discovery_center/mission_3488/step2/provider.tf @@ -2,11 +2,11 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.7.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/discovery_center/mission_3501/step1/provider.tf b/released/discovery_center/mission_3501/step1/provider.tf index 9dd731a0..417dece9 100644 --- a/released/discovery_center/mission_3501/step1/provider.tf +++ b/released/discovery_center/mission_3501/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "1.5.0" + version = "1.8.0" } } } diff --git a/released/discovery_center/mission_3501/step2/provider.tf b/released/discovery_center/mission_3501/step2/provider.tf index 7d04ed08..8297587d 100644 --- a/released/discovery_center/mission_3501/step2/provider.tf +++ b/released/discovery_center/mission_3501/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3585/provider.tf b/released/discovery_center/mission_3585/provider.tf index d1351409..a211aca0 100644 --- a/released/discovery_center/mission_3585/provider.tf +++ b/released/discovery_center/mission_3585/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3585_trial/provider.tf b/released/discovery_center/mission_3585_trial/provider.tf index d1351409..a211aca0 100644 --- a/released/discovery_center/mission_3585_trial/provider.tf +++ b/released/discovery_center/mission_3585_trial/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3680/step1/provider.tf b/released/discovery_center/mission_3680/step1/provider.tf index 4054a1d9..b25403db 100644 --- a/released/discovery_center/mission_3680/step1/provider.tf +++ b/released/discovery_center/mission_3680/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3680/step2/provider.tf b/released/discovery_center/mission_3680/step2/provider.tf index 4ec94611..b03ee70a 100644 --- a/released/discovery_center/mission_3680/step2/provider.tf +++ b/released/discovery_center/mission_3680/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3774/step1/provider.tf b/released/discovery_center/mission_3774/step1/provider.tf index dedf2215..635fbea6 100644 --- a/released/discovery_center/mission_3774/step1/provider.tf +++ b/released/discovery_center/mission_3774/step1/provider.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3774/step2/provider.tf b/released/discovery_center/mission_3774/step2/provider.tf index 5cd35902..44037eca 100644 --- a/released/discovery_center/mission_3774/step2/provider.tf +++ b/released/discovery_center/mission_3774/step2/provider.tf @@ -7,8 +7,8 @@ terraform { source = "sap/btp" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/discovery_center/mission_3808/step1/provider.tf b/released/discovery_center/mission_3808/step1/provider.tf index d1351409..a211aca0 100644 --- a/released/discovery_center/mission_3808/step1/provider.tf +++ b/released/discovery_center/mission_3808/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_3808/step2/provider.tf b/released/discovery_center/mission_3808/step2/provider.tf index 5cd35902..44037eca 100644 --- a/released/discovery_center/mission_3808/step2/provider.tf +++ b/released/discovery_center/mission_3808/step2/provider.tf @@ -7,8 +7,8 @@ terraform { source = "sap/btp" } cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/discovery_center/mission_3945/provider.tf b/released/discovery_center/mission_3945/provider.tf index 29e1fdd8..386d3a59 100644 --- a/released/discovery_center/mission_3945/provider.tf +++ b/released/discovery_center/mission_3945/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.6.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4024/step1/provider.tf b/released/discovery_center/mission_4024/step1/provider.tf index 96c49aa2..d06faf06 100644 --- a/released/discovery_center/mission_4024/step1/provider.tf +++ b/released/discovery_center/mission_4024/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4024/step2/provider.tf b/released/discovery_center/mission_4024/step2/provider.tf index a743a7a6..3ad7760a 100644 --- a/released/discovery_center/mission_4024/step2/provider.tf +++ b/released/discovery_center/mission_4024/step2/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4024_trial/step1/provider.tf b/released/discovery_center/mission_4024_trial/step1/provider.tf index 96c49aa2..d06faf06 100644 --- a/released/discovery_center/mission_4024_trial/step1/provider.tf +++ b/released/discovery_center/mission_4024_trial/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4024_trial/step2/provider.tf b/released/discovery_center/mission_4024_trial/step2/provider.tf index a743a7a6..3ad7760a 100644 --- a/released/discovery_center/mission_4024_trial/step2/provider.tf +++ b/released/discovery_center/mission_4024_trial/step2/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4033/step1/provider.tf b/released/discovery_center/mission_4033/step1/provider.tf index c55ef6c8..98fed2f3 100644 --- a/released/discovery_center/mission_4033/step1/provider.tf +++ b/released/discovery_center/mission_4033/step1/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.6.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4033/step2/provider.tf b/released/discovery_center/mission_4033/step2/provider.tf index f10f869c..3ad7760a 100644 --- a/released/discovery_center/mission_4033/step2/provider.tf +++ b/released/discovery_center/mission_4033/step2/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.6.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4038/provider.tf b/released/discovery_center/mission_4038/provider.tf index 863fa642..d13f751d 100644 --- a/released/discovery_center/mission_4038/provider.tf +++ b/released/discovery_center/mission_4038/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4104/provider.tf b/released/discovery_center/mission_4104/provider.tf index 0e2ee179..17d2e775 100644 --- a/released/discovery_center/mission_4104/provider.tf +++ b/released/discovery_center/mission_4104/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4172/step1/provider.tf b/released/discovery_center/mission_4172/step1/provider.tf index 9dd731a0..417dece9 100644 --- a/released/discovery_center/mission_4172/step1/provider.tf +++ b/released/discovery_center/mission_4172/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "1.5.0" + version = "1.8.0" } } } diff --git a/released/discovery_center/mission_4172/step2/provider.tf b/released/discovery_center/mission_4172/step2/provider.tf index 7d04ed08..8297587d 100644 --- a/released/discovery_center/mission_4172/step2/provider.tf +++ b/released/discovery_center/mission_4172/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4259/provider.tf b/released/discovery_center/mission_4259/provider.tf index fb9b04e0..386d3a59 100644 --- a/released/discovery_center/mission_4259/provider.tf +++ b/released/discovery_center/mission_4259/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4327/step1/provider.tf b/released/discovery_center/mission_4327/step1/provider.tf index 2fb0e38f..9e7b85fd 100644 --- a/released/discovery_center/mission_4327/step1/provider.tf +++ b/released/discovery_center/mission_4327/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4327/step2_cf/provider.tf b/released/discovery_center/mission_4327/step2_cf/provider.tf index a1645b26..2da70887 100644 --- a/released/discovery_center/mission_4327/step2_cf/provider.tf +++ b/released/discovery_center/mission_4327/step2_cf/provider.tf @@ -2,11 +2,11 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.7.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/discovery_center/mission_4327/step2_kyma/provider.tf b/released/discovery_center/mission_4327/step2_kyma/provider.tf index 579b7363..7c3ae378 100644 --- a/released/discovery_center/mission_4327/step2_kyma/provider.tf +++ b/released/discovery_center/mission_4327/step2_kyma/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4356/step1/provider.tf b/released/discovery_center/mission_4356/step1/provider.tf index 9dd731a0..417dece9 100644 --- a/released/discovery_center/mission_4356/step1/provider.tf +++ b/released/discovery_center/mission_4356/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "1.5.0" + version = "1.8.0" } } } diff --git a/released/discovery_center/mission_4356/step2/provider.tf b/released/discovery_center/mission_4356/step2/provider.tf index 4ec94611..b03ee70a 100644 --- a/released/discovery_center/mission_4356/step2/provider.tf +++ b/released/discovery_center/mission_4356/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4371/step1/provider.tf b/released/discovery_center/mission_4371/step1/provider.tf index 532a1be2..e039eb26 100644 --- a/released/discovery_center/mission_4371/step1/provider.tf +++ b/released/discovery_center/mission_4371/step1/provider.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.6.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4371/step2/provider.tf b/released/discovery_center/mission_4371/step2/provider.tf index ebed9fd7..b03ee70a 100644 --- a/released/discovery_center/mission_4371/step2/provider.tf +++ b/released/discovery_center/mission_4371/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.6.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4441/full_setup_enterprise/step1/provider.tf b/released/discovery_center/mission_4441/full_setup_enterprise/step1/provider.tf index d1351409..a211aca0 100644 --- a/released/discovery_center/mission_4441/full_setup_enterprise/step1/provider.tf +++ b/released/discovery_center/mission_4441/full_setup_enterprise/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4441/full_setup_enterprise/step2/provider.tf b/released/discovery_center/mission_4441/full_setup_enterprise/step2/provider.tf index 7d04ed08..8297587d 100644 --- a/released/discovery_center/mission_4441/full_setup_enterprise/step2/provider.tf +++ b/released/discovery_center/mission_4441/full_setup_enterprise/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/provider.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/provider.tf index d1351409..a211aca0 100644 --- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/provider.tf +++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/provider.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/provider.tf index 7d04ed08..8297587d 100644 --- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/provider.tf +++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/discovery_center/mission_4441_trial/provider.tf b/released/discovery_center/mission_4441_trial/provider.tf index d1351409..a211aca0 100644 --- a/released/discovery_center/mission_4441_trial/provider.tf +++ b/released/discovery_center/mission_4441_trial/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE6/SOLUTION_EX6/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE6/SOLUTION_EX6/provider.tf index 3cb0d983..96cf1596 100644 --- a/released/dsag/betriebstag2024/exercises/EXERCISE6/SOLUTION_EX6/provider.tf +++ b/released/dsag/betriebstag2024/exercises/EXERCISE6/SOLUTION_EX6/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE7/README.md b/released/dsag/betriebstag2024/exercises/EXERCISE7/README.md index 8792470c..f1f8fec8 100644 --- a/released/dsag/betriebstag2024/exercises/EXERCISE7/README.md +++ b/released/dsag/betriebstag2024/exercises/EXERCISE7/README.md @@ -70,8 +70,8 @@ As we are using an additional provider we must make Terraform aware of this in t ```terraform cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } ``` diff --git a/released/import/data-collection/provider.tf b/released/import/data-collection/provider.tf index 3068ddb2..ad30fe33 100644 --- a/released/import/data-collection/provider.tf +++ b/released/import/data-collection/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/import/resource-import/provider.tf b/released/import/resource-import/provider.tf index 3068ddb2..ad30fe33 100644 --- a/released/import/resource-import/provider.tf +++ b/released/import/resource-import/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/learning_journey/btp200/provider.tf b/released/learning_journey/btp200/provider.tf index 43f5e744..b799119d 100644 --- a/released/learning_journey/btp200/provider.tf +++ b/released/learning_journey/btp200/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/modules/btp-cf/btp-cf-org-space/btp_cf_org_space.tf b/released/modules/btp-cf/btp-cf-org-space/btp_cf_org_space.tf index ba102a93..49e4a105 100644 --- a/released/modules/btp-cf/btp-cf-org-space/btp_cf_org_space.tf +++ b/released/modules/btp-cf/btp-cf-org-space/btp_cf_org_space.tf @@ -5,11 +5,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/modules/btp-cf/serviceinstance_btp_cf/serviceinstance_btp_cf.tf b/released/modules/btp-cf/serviceinstance_btp_cf/serviceinstance_btp_cf.tf index 48ce1531..2db86f15 100644 --- a/released/modules/btp-cf/serviceinstance_btp_cf/serviceinstance_btp_cf.tf +++ b/released/modules/btp-cf/serviceinstance_btp_cf/serviceinstance_btp_cf.tf @@ -4,8 +4,8 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/modules/btp-cf/space-btp-cf/space_cf.tf b/released/modules/btp-cf/space-btp-cf/space_cf.tf index 662d09f4..5f985f2d 100644 --- a/released/modules/btp-cf/space-btp-cf/space_cf.tf +++ b/released/modules/btp-cf/space-btp-cf/space_cf.tf @@ -4,8 +4,8 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } } } diff --git a/released/modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf b/released/modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf index 4bfe9a10..09c49f4e 100644 --- a/released/modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf +++ b/released/modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" diff --git a/released/modules/environment/kyma/envinstance_kyma/envinstance_kyma.tf b/released/modules/environment/kyma/envinstance_kyma/envinstance_kyma.tf index 3f47b713..e126f32b 100644 --- a/released/modules/environment/kyma/envinstance_kyma/envinstance_kyma.tf +++ b/released/modules/environment/kyma/envinstance_kyma/envinstance_kyma.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/modules/services_apps/sap_build_apps/standard/sap_build_apps.tf b/released/modules/services_apps/sap_build_apps/standard/sap_build_apps.tf index 93e6014d..c5dac6f8 100644 --- a/released/modules/services_apps/sap_build_apps/standard/sap_build_apps.tf +++ b/released/modules/services_apps/sap_build_apps/standard/sap_build_apps.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/terraform-be/artifactoryasbackend/provider.tf b/released/terraform-be/artifactoryasbackend/provider.tf index fdf1c46c..8c9c76e1 100644 --- a/released/terraform-be/artifactoryasbackend/provider.tf +++ b/released/terraform-be/artifactoryasbackend/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/terraform-be/k8sasbackend/provider.tf b/released/terraform-be/k8sasbackend/provider.tf index 3a9d1b84..cae37752 100644 --- a/released/terraform-be/k8sasbackend/provider.tf +++ b/released/terraform-be/k8sasbackend/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/terraform-be/s3asbackend/provider.tf b/released/terraform-be/s3asbackend/provider.tf index 3a9d1b84..cae37752 100644 --- a/released/terraform-be/s3asbackend/provider.tf +++ b/released/terraform-be/s3asbackend/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/cf_enable_application_runtime_memory/provider.tf b/released/usecases/cf_enable_application_runtime_memory/provider.tf index 18c74094..c38802ee 100644 --- a/released/usecases/cf_enable_application_runtime_memory/provider.tf +++ b/released/usecases/cf_enable_application_runtime_memory/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "1.7.0" + version = "1.8.0" } } } 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 d1f80ea4..0208b460 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.7.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/dev_test_prod_setup/provider.tf b/released/usecases/dev_test_prod_setup/provider.tf index a7e7a7a4..abb06729 100644 --- a/released/usecases/dev_test_prod_setup/provider.tf +++ b/released/usecases/dev_test_prod_setup/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/genai-setup/modules/ai/ai.tf b/released/usecases/genai-setup/modules/ai/ai.tf index 5048bb69..33ce8117 100644 --- a/released/usecases/genai-setup/modules/ai/ai.tf +++ b/released/usecases/genai-setup/modules/ai/ai.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/genai-setup/modules/hana-cloud/hana_cloud.tf b/released/usecases/genai-setup/modules/hana-cloud/hana_cloud.tf index eaa3d204..2d985f1a 100644 --- a/released/usecases/genai-setup/modules/hana-cloud/hana_cloud.tf +++ b/released/usecases/genai-setup/modules/hana-cloud/hana_cloud.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/genai-setup/provider.tf b/released/usecases/genai-setup/provider.tf index d1351409..a211aca0 100644 --- a/released/usecases/genai-setup/provider.tf +++ b/released/usecases/genai-setup/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/kyma_devcontainer_runtime/version.tf b/released/usecases/kyma_devcontainer_runtime/version.tf index 5e0b729c..dcc01d55 100644 --- a/released/usecases/kyma_devcontainer_runtime/version.tf +++ b/released/usecases/kyma_devcontainer_runtime/version.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf b/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf index d0bf8bc5..6acc8d40 100644 --- a/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf +++ b/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf @@ -5,7 +5,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "1.5.0" + version = "1.8.0" } } } diff --git a/released/usecases/multi_account_setup/provider.tf b/released/usecases/multi_account_setup/provider.tf index 467f664c..84208935 100644 --- a/released/usecases/multi_account_setup/provider.tf +++ b/released/usecases/multi_account_setup/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/multi_provider_setup/provider.tf b/released/usecases/multi_provider_setup/provider.tf index 6dd50faf..181f39c8 100644 --- a/released/usecases/multi_provider_setup/provider.tf +++ b/released/usecases/multi_provider_setup/provider.tf @@ -3,11 +3,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/resillient_apps/provider.tf b/released/usecases/resillient_apps/provider.tf index 66f50e4b..e993fbfc 100644 --- a/released/usecases/resillient_apps/provider.tf +++ b/released/usecases/resillient_apps/provider.tf @@ -3,11 +3,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/role_assignments/provider.tf b/released/usecases/role_assignments/provider.tf index c1de5022..f4705aaa 100644 --- a/released/usecases/role_assignments/provider.tf +++ b/released/usecases/role_assignments/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "sap/btp" - version = "~> 1.7.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/services_apps/sap_build_apps/provider.tf b/released/usecases/services_apps/sap_build_apps/provider.tf index 73c9cdde..a6795c15 100644 --- a/released/usecases/services_apps/sap_build_apps/provider.tf +++ b/released/usecases/services_apps/sap_build_apps/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/services_apps/sap_build_code/step1/provider.tf b/released/usecases/services_apps/sap_build_code/step1/provider.tf index d1351409..a211aca0 100644 --- a/released/usecases/services_apps/sap_build_code/step1/provider.tf +++ b/released/usecases/services_apps/sap_build_code/step1/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/released/usecases/services_apps/sap_build_code/step2/provider.tf b/released/usecases/services_apps/sap_build_code/step2/provider.tf index ee60bab1..3afe0b0f 100644 --- a/released/usecases/services_apps/sap_build_code/step2/provider.tf +++ b/released/usecases/services_apps/sap_build_code/step2/provider.tf @@ -1,12 +1,12 @@ terraform { required_providers { cloudfoundry = { - source = "SAP/cloudfoundry" - version = "1.0.0-rc1" + source = "cloudfoundry/cloudfoundry" + version = "~> 1.0.0" } btp = { source = "SAP/btp" - version = "~> 1.5.0" + version = "~> 1.8.0" } } } diff --git a/tests/compliance/libs/constants/providers.py b/tests/compliance/libs/constants/providers.py index 99d017df..b39533fd 100644 --- a/tests/compliance/libs/constants/providers.py +++ b/tests/compliance/libs/constants/providers.py @@ -4,7 +4,7 @@ # BTP Provider PROVIDER_BTP = "btp" PROVIDER_BTP_REQUIRED_SOURCE = "sap/btp" -PROVIDER_BTP_REQUIRED_version = "~> 1.5.0" +PROVIDER_BTP_REQUIRED_version = "~> 1.8.0" # Cloudfoundry Provider PROVIDER_CLOUDFOUNDRY = "cloudfoundry" From ecdf6dee6976eda0e490b3672208b4e2e93f368e Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 6 Nov 2024 14:08:58 +0530 Subject: [PATCH 09/10] chore: fixes --- .../sap_build_code/step2/main.tf | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/released/usecases/services_apps/sap_build_code/step2/main.tf b/released/usecases/services_apps/sap_build_code/step2/main.tf index cc5cfd83..d1e76531 100644 --- a/released/usecases/services_apps/sap_build_code/step2/main.tf +++ b/released/usecases/services_apps/sap_build_code/step2/main.tf @@ -20,7 +20,7 @@ resource "btp_subaccount_entitlement" "sdm" { } # Create the service instance -data "cloudfoundry_service" "sdm" { +data "cloudfoundry_service_plans" "sdm" { name = "sdm" depends_on = [btp_subaccount_entitlement.sdm] } @@ -28,7 +28,7 @@ resource "cloudfoundry_service_instance" "sdm" { name = "default_sdm" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.sdm.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.sdm.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.sdm] } # Create service key @@ -51,7 +51,7 @@ resource "btp_subaccount_entitlement" "mobile_services" { plan_name = "build-code" } # Create the service instance -data "cloudfoundry_service" "mobile_services" { +data cloudfoundry_service_plans "mobile_services" { name = "mobile-services" depends_on = [btp_subaccount_entitlement.mobile_services] } @@ -59,7 +59,7 @@ resource "cloudfoundry_service_instance" "mobile_services" { name = "default_mobile-services" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.mobile_services.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.mobile_services.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.mobile_services] } # Create service key @@ -82,7 +82,7 @@ resource "btp_subaccount_entitlement" "cloud_logging" { plan_name = "build-code" } # Create the service instance -data "cloudfoundry_service" "cloud_logging" { +data cloudfoundry_service_plans "cloud_logging" { name = "cloud-logging" depends_on = [btp_subaccount_entitlement.cloud_logging] } @@ -90,7 +90,7 @@ resource "cloudfoundry_service_instance" "cloud_logging" { name = "default_cloud-logging" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.cloud_logging.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.cloud_logging.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.cloud_logging] } # Create service key @@ -113,7 +113,7 @@ resource "btp_subaccount_entitlement" "alert_notification" { plan_name = "build-code" } # Create the service instance -data "cloudfoundry_service" "alert_notification" { +data cloudfoundry_service_plans "alert_notification" { name = "alert-notification" depends_on = [btp_subaccount_entitlement.alert_notification] } @@ -121,7 +121,7 @@ resource "cloudfoundry_service_instance" "alert_notification" { name = "default_alert-notification" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.alert_notification.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.alert_notification.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.alert_notification] } # Create service key @@ -144,7 +144,7 @@ resource "btp_subaccount_entitlement" "transport" { plan_name = "standard" } # Create the service instance -data "cloudfoundry_service" "transport" { +data cloudfoundry_service_plans "transport" { name = "transport" depends_on = [btp_subaccount_entitlement.transport] } @@ -152,7 +152,7 @@ resource "cloudfoundry_service_instance" "transport" { name = "default_transport" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.transport.service_plans["standard"] + service_plan = data.cloudfoundry_service_plans.transport.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.transport] } # Create service key @@ -175,7 +175,7 @@ resource "btp_subaccount_entitlement" "autoscaler" { plan_name = "standard" } # Create the service instance -data "cloudfoundry_service" "autoscaler" { +data cloudfoundry_service_plans "autoscaler" { name = "autoscaler" depends_on = [btp_subaccount_entitlement.autoscaler] } @@ -183,7 +183,7 @@ resource "cloudfoundry_service_instance" "autoscaler" { name = "default_autoscaler" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.autoscaler.service_plans["standard"] + service_plan = data.cloudfoundry_service_plans.autoscaler.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.autoscaler] } @@ -197,7 +197,7 @@ resource "btp_subaccount_entitlement" "feature_flags" { plan_name = "standard" } # Create the service instance -data "cloudfoundry_service" "feature_flags" { +data cloudfoundry_service_plans "feature_flags" { name = "feature-flags" depends_on = [btp_subaccount_entitlement.feature_flags] } @@ -205,7 +205,7 @@ resource "cloudfoundry_service_instance" "feature_flags" { name = "default_feature-flags" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.feature_flags.service_plans["standard"] + service_plan = data.cloudfoundry_service_plans.feature_flags.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.feature_flags] } # Create service key From ef848aea918eb1e206cb81b2a04abd76670fc0d7 Mon Sep 17 00:00:00 2001 From: prajin-op Date: Wed, 6 Nov 2024 14:18:20 +0530 Subject: [PATCH 10/10] chore: fixes --- .../full_setup_enterprise/step2/main.tf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/released/discovery_center/mission_4441/full_setup_enterprise/step2/main.tf b/released/discovery_center/mission_4441/full_setup_enterprise/step2/main.tf index 7e2cba6d..7b69e9ca 100644 --- a/released/discovery_center/mission_4441/full_setup_enterprise/step2/main.tf +++ b/released/discovery_center/mission_4441/full_setup_enterprise/step2/main.tf @@ -19,7 +19,7 @@ resource "btp_subaccount_entitlement" "sdm" { plan_name = "build-code" } # Create the service instance -data "cloudfoundry_service" "sdm" { +data "cloudfoundry_service_plans" "sdm" { name = "sdm" depends_on = [btp_subaccount_entitlement.sdm] } @@ -27,7 +27,7 @@ resource "cloudfoundry_service_instance" "sdm" { name = "default_sdm" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.sdm.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.sdm.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.sdm] } # Create service key @@ -49,7 +49,7 @@ resource "btp_subaccount_entitlement" "mobile_services" { amount = 1 } # Create the service instance -data "cloudfoundry_service" "mobile_services" { +data "cloudfoundry_service_plans" "mobile_services" { name = "mobile-services" depends_on = [btp_subaccount_entitlement.mobile_services] } @@ -57,7 +57,7 @@ resource "cloudfoundry_service_instance" "mobile_services" { name = "default_mobile-services" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.mobile_services.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.mobile_services.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.mobile_services] } # Create service key @@ -78,7 +78,7 @@ resource "btp_subaccount_entitlement" "transport_standard" { plan_name = "standard" } # Create the service instance -data "cloudfoundry_service" "transport_standard" { +data "cloudfoundry_service_plans" "transport_standard" { name = "transport" depends_on = [btp_subaccount_entitlement.transport_standard] } @@ -86,7 +86,7 @@ resource "cloudfoundry_service_instance" "transport_standard" { name = "default_transport_standard" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.transport_standard.service_plans["standard"] + service_plan = data.cloudfoundry_service_plans.transport_standard.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.transport_standard] } # Create service key @@ -107,7 +107,7 @@ resource "btp_subaccount_entitlement" "transport_export" { plan_name = "export" } # Create the service instance -data "cloudfoundry_service" "transport_export" { +data "cloudfoundry_service_plans" "transport_export" { name = "transport" depends_on = [btp_subaccount_entitlement.transport_export] } @@ -115,7 +115,7 @@ resource "cloudfoundry_service_instance" "transport_export" { name = "default_transport_export" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.transport_export.service_plans["export"] + service_plan = data.cloudfoundry_service_plans.transport_export.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.transport_export] } # Create service key @@ -136,7 +136,7 @@ resource "btp_subaccount_entitlement" "transport_operator" { plan_name = "transport_operator" } # Create the service instance -data "cloudfoundry_service" "transport_operator" { +data "cloudfoundry_service_plans" "transport_operator" { name = "transport" depends_on = [btp_subaccount_entitlement.transport_operator] } @@ -144,7 +144,7 @@ resource "cloudfoundry_service_instance" "transport_operator" { name = "default_transport_operator" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.transport_operator.service_plans["transport_operator"] + service_plan = data.cloudfoundry_service_plans.transport_operator.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.transport_operator] } # Create service key @@ -166,7 +166,7 @@ resource "btp_subaccount_entitlement" "cloud_logging" { amount = 1 } # Create the service instance -data "cloudfoundry_service" "cloud_logging" { +data "cloudfoundry_service_plans" "cloud_logging" { name = "cloud-logging" depends_on = [btp_subaccount_entitlement.cloud_logging] } @@ -174,7 +174,7 @@ resource "cloudfoundry_service_instance" "cloud_logging" { name = "default_cloud-logging" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.cloud_logging.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.cloud_logging.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.cloud_logging] } # Create service key @@ -194,7 +194,7 @@ resource "btp_subaccount_entitlement" "autoscaler" { service_name = "autoscaler" plan_name = "standard" } -data "cloudfoundry_service" "autoscaler" { +data "cloudfoundry_service_plans" "autoscaler" { name = "autoscaler" depends_on = [btp_subaccount_entitlement.autoscaler] } @@ -203,7 +203,7 @@ resource "cloudfoundry_service_instance" "autoscaler" { name = "default_autoscaler" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.autoscaler.service_plans["standard"] + service_plan = data.cloudfoundry_service_plans.autoscaler.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.autoscaler] } @@ -217,7 +217,7 @@ resource "btp_subaccount_entitlement" "feature_flags" { plan_name = "standard" } # Create the service instance -data "cloudfoundry_service" "feature_flags" { +data "cloudfoundry_service_plans" "feature_flags" { name = "feature-flags" depends_on = [btp_subaccount_entitlement.feature_flags] } @@ -225,7 +225,7 @@ resource "cloudfoundry_service_instance" "feature_flags" { name = "default_feature-flags" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.feature_flags.service_plans["standard"] + service_plan = data.cloudfoundry_service_plans.feature_flags.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.feature_flags] } # Create service key @@ -247,7 +247,7 @@ resource "btp_subaccount_entitlement" "alert_notification" { amount = 1 } # Create the service instance -data "cloudfoundry_service" "alert_notification" { +data "cloudfoundry_service_plans" "alert_notification" { name = "alert-notification" depends_on = [btp_subaccount_entitlement.alert_notification] } @@ -255,7 +255,7 @@ resource "cloudfoundry_service_instance" "alert_notification" { name = "default_alert-notification" space = cloudfoundry_space.dev.id type = "managed" - service_plan = data.cloudfoundry_service.alert_notification.service_plans["build-code"] + service_plan = data.cloudfoundry_service_plans.alert_notification.service_plans[0].id depends_on = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.alert_notification] } # Create service key