Mission: 4356 & 4038- Added free plan for integration suite & minor fix (#308)

navyakhurana · web-flow · commit 68644667c875 · 2024-09-09T10:38:06.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 }
diff --git a/released/discovery_center/mission_4356/step2/provider.tf b/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
 ######################################################################

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ resource "btp_subaccount_entitlement" "sap_integration_suite" {`
`98`	`98`	`subaccount_id = data.btp_subaccount.dc_mission.id`
`99`	`99`	`service_name = local.service_name__sap_integration_suite`
`100`	`100`	`plan_name = var.service_plan__sap_integration_suite`
	`101`	`+ amount = var.service_plan__sap_integration_suite == "free" ? 1 : null`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`data "btp_subaccount_subscriptions" "all" {`
`@@ -123,3 +124,4 @@ resource "btp_subaccount_role_collection_assignment" "int_prov" {`
`123`	`124`	`role_collection_name = "Integration_Provisioner"`
`124`	`125`	`user_name = each.value`
`125`	`126`	`}`
	`127`	`+`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ output "subaccount_id" {`
`5`	`5`
`6`	`6`	`output "integrationsuite_url" {`
`7`	`7`	`value = btp_subaccount_subscription.sap_integration_suite.subscription_url`
`8`		`- description = "Subscription URL for SAP Business Process Automation"`
	`8`	`+ description = "Subscription URL for SAP Integration Suite."`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`btp = {`
`5`		`- source = "sap/btp"`
	`5`	`+ source = "SAP/btp"`
`6`	`6`	`version = "~> 1.5.0"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ variable "service_plan__sap_integration_suite" {`
`70`	`70`	`description = "The plan for SAP Integration Suite"`
`71`	`71`	`default = "enterprise_agreement"`
`72`	`72`	`validation {`
`73`		`- condition = contains(["enterprise_agreement"], var.service_plan__sap_integration_suite)`
`74`		`- error_message = "Invalid value for service_plan__sap_integration_suite. Only 'enterprise_agreement' are allowed."`
	`73`	`+ condition = contains(["free", "enterprise_agreement"], var.service_plan__sap_integration_suite)`
	`74`	`+ error_message = "Invalid value for service_plan__sap_integration_suite. Only 'free' and 'enterprise_agreement' are allowed."`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ resource "btp_subaccount_entitlement" "sap_integration_suite" {`
`96`	`96`	`subaccount_id = data.btp_subaccount.dc_mission.id`
`97`	`97`	`service_name = local.service_name__sap_integration_suite`
`98`	`98`	`plan_name = var.service_plan__sap_integration_suite`
	`99`	`+ amount = var.service_plan__sap_integration_suite == "free" ? 1 : null`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`data "btp_subaccount_subscriptions" "all" {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`btp = {`
`4`		`- source = "sap/btp"`
	`4`	`+ source = "SAP/btp"`
`5`	`5`	`version = "1.5.0"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ variable "service_plan__sap_integration_suite" {`
`101`	`101`	`description = "The plan for SAP Integration Suite"`
`102`	`102`	`default = "enterprise_agreement"`
`103`	`103`	`validation {`
`104`		`- condition = contains(["enterprise_agreement"], var.service_plan__sap_integration_suite)`
`105`		`- error_message = "Invalid value for service_plan__sap_integration_suite. Only 'enterprise_agreement' is allowed."`
	`104`	`+ condition = contains(["free", "enterprise_agreement"], var.service_plan__sap_integration_suite)`
	`105`	`+ error_message = "Invalid value for service_plan__sap_integration_suite. Only 'free' and 'enterprise_agreement' are allowed."`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`@@ -205,5 +205,5 @@ variable "cf_space_developers" {`
`205`	`205`	`variable "create_tfvars_file_for_step2" {`
`206`	`206`	`type = bool`
`207`	`207`	`description = "Switch to enable the creation of the tfvars file for step 2."`
`208`		`- default = false`
	`208`	`+ default = true`
`209`	`209`	`}`