diff --git a/released/discovery_center/mission_4038/README.md b/released/discovery_center/mission_4038/README.md index f11c1914..23387aef 100644 --- a/released/discovery_center/mission_4038/README.md +++ b/released/discovery_center/mission_4038/README.md @@ -50,3 +50,4 @@ You probably want to remove the assets after trying them out to avoid unnecessar ```bash terraform destroy ``` + diff --git a/released/discovery_center/mission_4038/main.tf b/released/discovery_center/mission_4038/main.tf index 8ce368bf..0ab4a97f 100644 --- a/released/discovery_center/mission_4038/main.tf +++ b/released/discovery_center/mission_4038/main.tf @@ -98,6 +98,7 @@ resource "btp_subaccount_entitlement" "sap_integration_suite" { subaccount_id = data.btp_subaccount.dc_mission.id service_name = local.service_name__sap_integration_suite plan_name = var.service_plan__sap_integration_suite + amount = var.service_plan__sap_integration_suite == "free" ? 1 : null } data "btp_subaccount_subscriptions" "all" { @@ -123,3 +124,4 @@ resource "btp_subaccount_role_collection_assignment" "int_prov" { role_collection_name = "Integration_Provisioner" user_name = each.value } + diff --git a/released/discovery_center/mission_4038/outputs.tf b/released/discovery_center/mission_4038/outputs.tf index 444baba8..9f034680 100644 --- a/released/discovery_center/mission_4038/outputs.tf +++ b/released/discovery_center/mission_4038/outputs.tf @@ -5,5 +5,5 @@ output "subaccount_id" { output "integrationsuite_url" { value = btp_subaccount_subscription.sap_integration_suite.subscription_url - description = "Subscription URL for SAP Business Process Automation" + description = "Subscription URL for SAP Integration Suite." } diff --git a/released/discovery_center/mission_4038/provider.tf b/released/discovery_center/mission_4038/provider.tf index fb9b04e0..863fa642 100644 --- a/released/discovery_center/mission_4038/provider.tf +++ b/released/discovery_center/mission_4038/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { btp = { - source = "sap/btp" + source = "SAP/btp" version = "~> 1.5.0" } } diff --git a/released/discovery_center/mission_4038/variables.tf b/released/discovery_center/mission_4038/variables.tf index 98da5894..73daee00 100644 --- a/released/discovery_center/mission_4038/variables.tf +++ b/released/discovery_center/mission_4038/variables.tf @@ -70,8 +70,8 @@ variable "service_plan__sap_integration_suite" { description = "The plan for SAP Integration Suite" default = "enterprise_agreement" validation { - condition = contains(["enterprise_agreement"], var.service_plan__sap_integration_suite) - error_message = "Invalid value for service_plan__sap_integration_suite. Only 'enterprise_agreement' are allowed." + condition = contains(["free", "enterprise_agreement"], var.service_plan__sap_integration_suite) + error_message = "Invalid value for service_plan__sap_integration_suite. Only 'free' and 'enterprise_agreement' are allowed." } } diff --git a/released/discovery_center/mission_4356/step1/main.tf b/released/discovery_center/mission_4356/step1/main.tf index 5ced3fc3..75358a05 100644 --- a/released/discovery_center/mission_4356/step1/main.tf +++ b/released/discovery_center/mission_4356/step1/main.tf @@ -96,6 +96,7 @@ resource "btp_subaccount_entitlement" "sap_integration_suite" { subaccount_id = data.btp_subaccount.dc_mission.id service_name = local.service_name__sap_integration_suite plan_name = var.service_plan__sap_integration_suite + amount = var.service_plan__sap_integration_suite == "free" ? 1 : null } data "btp_subaccount_subscriptions" "all" { diff --git a/released/discovery_center/mission_4356/step1/outputs.tf b/released/discovery_center/mission_4356/step1/outputs.tf index 2d717e04..b2b0b6ae 100644 --- a/released/discovery_center/mission_4356/step1/outputs.tf +++ b/released/discovery_center/mission_4356/step1/outputs.tf @@ -1,3 +1,13 @@ +output "globalaccount" { + value = var.globalaccount + description = "The globalaccount subdomain." +} + +output "cli_server_url" { + value = var.cli_server_url + description = "The BTP CLI server URL." +} + output "subaccount_id" { value = data.btp_subaccount.dc_mission.id description = "The ID of the subaccount." diff --git a/released/discovery_center/mission_4356/step1/provider.tf b/released/discovery_center/mission_4356/step1/provider.tf index 22291ee9..9dd731a0 100644 --- a/released/discovery_center/mission_4356/step1/provider.tf +++ b/released/discovery_center/mission_4356/step1/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { btp = { - source = "sap/btp" + source = "SAP/btp" version = "1.5.0" } } diff --git a/released/discovery_center/mission_4356/step1/variables.tf b/released/discovery_center/mission_4356/step1/variables.tf index f5049343..7defa44b 100644 --- a/released/discovery_center/mission_4356/step1/variables.tf +++ b/released/discovery_center/mission_4356/step1/variables.tf @@ -101,8 +101,8 @@ variable "service_plan__sap_integration_suite" { description = "The plan for SAP Integration Suite" default = "enterprise_agreement" validation { - condition = contains(["enterprise_agreement"], var.service_plan__sap_integration_suite) - error_message = "Invalid value for service_plan__sap_integration_suite. Only 'enterprise_agreement' is allowed." + condition = contains(["free", "enterprise_agreement"], var.service_plan__sap_integration_suite) + error_message = "Invalid value for service_plan__sap_integration_suite. Only 'free' and 'enterprise_agreement' are allowed." } } @@ -205,5 +205,5 @@ variable "cf_space_developers" { variable "create_tfvars_file_for_step2" { type = bool description = "Switch to enable the creation of the tfvars file for step 2." - default = false + default = true } \ No newline at end of file diff --git a/released/discovery_center/mission_4356/step2/provider.tf b/released/discovery_center/mission_4356/step2/provider.tf index b58d086e..970b90df 100644 --- a/released/discovery_center/mission_4356/step2/provider.tf +++ b/released/discovery_center/mission_4356/step2/provider.tf @@ -1,5 +1,9 @@ terraform { required_providers { + btp = { + source = "SAP/btp" + version = "1.5.0" + } cloudfoundry = { source = "SAP/cloudfoundry" version = "1.0.0-rc1" @@ -7,6 +11,14 @@ terraform { } } +###################################################################### +# Configure BTP provider +###################################################################### +provider "btp" { + cli_server_url = var.cli_server_url + globalaccount = var.globalaccount +} + ###################################################################### # Configure CF provider ######################################################################