diff --git a/README.md b/README.md index 704195c..ed57cf2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ For information, see "Module names and descriptions" at https://terraform-ibm-modules.github.io/documentation/#/implementation-guidelines?id=module-names-and-descriptions --> -Use this module to provision and configure an [Enterprise Application Service](https://test.cloud.ibm.com/catalog/services/ease) instance on IBM Cloud. +Use this module to provision and configure an [Enterprise Application Service](https://cloud.ibm.com/catalog/services/enterprise-application-service) instance on IBM Cloud. @@ -47,7 +47,7 @@ https://terraform-ibm-modules.github.io/documentation/#/implementation-guideline This module has the following prerequisites as mandatory input parameters: 1. The IBM Cloud API Key (https://cloud.ibm.com/iam/apikeys) for the account where to deploy the Enterprise Application Service instance -1. Resource Group ID (https://test.cloud.ibm.com/account/resource-groups) containing the Enterprise Application Service instance +1. Resource Group ID (https://cloud.ibm.com/account/resource-groups) containing the Enterprise Application Service instance Optionally, the following optional input parameters are required in order to pre-configure the Enterprise Application Service instance: @@ -159,7 +159,7 @@ No modules. |------|-------------|------|---------|:--------:| | [config\_repo](#input\_config\_repo) | The URL for the repository storing the configuration to use for the application to deploy through IBM Cloud Enterprise Application Service. | `string` | `null` | no | | [ease\_name](#input\_ease\_name) | The name for the newly provisioned Enterprise Application Service instance. | `string` | n/a | yes | -| [plan](#input\_plan) | The desired pricing plan for Enterprise Application Service instance. | `string` | `"free"` | no | +| [plan](#input\_plan) | The desired pricing plan for Enterprise Application Service instance. | `string` | `"standard"` | no | | [region](#input\_region) | The desired region for deploying Enterprise Application Service instance. | `string` | `"us-east"` | no | | [repos\_git\_token](#input\_repos\_git\_token) | The GitHub token to read from the application and configuration repos. It cannot be null if var.source\_repo and var.config\_repo are not null. | `string` | `null` | no | | [resource\_group\_id](#input\_resource\_group\_id) | The ID of the resource group to use for the creation of the Enterprise Application Service instance. | `string` | n/a | yes | diff --git a/examples/basic/variables.tf b/examples/basic/variables.tf index 23bac6e..a5f01eb 100644 --- a/examples/basic/variables.tf +++ b/examples/basic/variables.tf @@ -29,7 +29,7 @@ variable "resource_group" { variable "plan" { type = string description = "The desired pricing plan for IBM Enterprise Application Service instance." - default = "free" + default = "standard" } variable "region" { diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf index bc32e4c..38864e0 100644 --- a/examples/complete/variables.tf +++ b/examples/complete/variables.tf @@ -29,7 +29,7 @@ variable "resource_group" { variable "plan" { type = string description = "The desired pricing plan for IBM Enterprise Application Service instance." - default = "free" + default = "standard" } variable "region" { diff --git a/ibm_catalog.json b/ibm_catalog.json index 986a067..6b05d77 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -107,20 +107,11 @@ }, { "key": "plan", - "default_value": "free", "required": true, "options": [ { "displayname": "Standard", "value": "standard" - }, - { - "displayname": "Free", - "value": "free" - }, - { - "displayname": "Trial (only available in test.cloud.ibm.com)", - "value": "trial" } ] }, diff --git a/solutions/standard/catalogValidationValues.json.template b/solutions/standard/catalogValidationValues.json.template index 7f31200..e991ba0 100644 --- a/solutions/standard/catalogValidationValues.json.template +++ b/solutions/standard/catalogValidationValues.json.template @@ -3,6 +3,6 @@ "region": "us-east", "resource_tags": $TAGS, "prefix": $PREFIX, - "plan": "free", + "plan": "standard", "subscription_id": "testvalue" } diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index ea26810..ce93717 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -29,10 +29,10 @@ variable "resource_group" { variable "plan" { type = string description = "The desired pricing plan for IBM Enterprise Application Service instance." - default = "free" + default = "standard" validation { - condition = contains(["trial", "standard", "free", "staging"], var.plan) - error_message = "The only values accepted for the plan field are free, standard, staging and trial." + condition = contains(["standard"], var.plan) + error_message = "The only values accepted for the plan field is standard." } } diff --git a/variables.tf b/variables.tf index 8814dd6..0d40558 100644 --- a/variables.tf +++ b/variables.tf @@ -21,10 +21,10 @@ variable "tags" { variable "plan" { type = string description = "The desired pricing plan for Enterprise Application Service instance." - default = "free" + default = "standard" validation { - condition = contains(["trial", "standard", "free", "staging"], var.plan) - error_message = "The only values accepted for the plan field are free, standard, staging and trial." + condition = contains(["standard"], var.plan) + error_message = "The only values accepted for the plan field is standard." } }