Mission: 4356 & 4038- Added free plan for integration suite & minor fix

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
 ```
+

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
 }
+

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."
 }

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"
     }
   }

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."
   }
 }
 

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" {

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."

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"
     }
   }

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
 }

released/discovery_center/mission_4356/step2/provider.tf

@@ -1,12 +1,24 @@
 terraform {
   required_providers {
+    btp = {
+      source  = "SAP/btp"
+      version = "1.5.0"
+    }
     cloudfoundry = {
       source  = "SAP/cloudfoundry"
       version = "1.0.0-rc1"
     }
   }
 }
 
+######################################################################
+# Configure BTP provider
+######################################################################
+provider "btp" {
+  cli_server_url = var.cli_server_url
+  globalaccount  = var.globalaccount
+}
+
 ######################################################################
 # Configure CF provider
 ######################################################################