diff --git a/README.md b/README.md
index 408fc7f..56ccfe2 100644
--- a/README.md
+++ b/README.md
@@ -188,24 +188,24 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
-| [config\_repo](#input\_config\_repo) | The URL for the repository storing the configuration to use for the application to run through Enterprise Application Service on IBM Cloud. | `string` | `null` | no |
-| [ease\_name](#input\_ease\_name) | The name for the newly provisioned Enterprise Application Service instance. If a prefix input variable is specified, the prefix is added to the name in the `-` format. | `string` | `"instance"` | no |
-| [maven\_repository\_password](#input\_maven\_repository\_password) | Maven repository authentication password if needed. Default to null. | `string` | `null` | no |
-| [maven\_repository\_username](#input\_maven\_repository\_username) | Maven repository authentication username if needed. Default to null. | `string` | `null` | 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 repositories. 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 |
-| [source\_repo](#input\_source\_repo) | The URL for the repository storing the source code of the application or the URL of the Maven artifact repository storing the existing prebuilt archive (WAR or EAR) to deploy and run through Enterprise Application Service on IBM Cloud. | `string` | `null` | no |
-| [source\_repo\_type](#input\_source\_repo\_type) | Type of the source code repository. For maven source repository type, use value `maven`. Git for GitHub repository. Default value set to git. | `string` | `"git"` | no |
+| [config\_repo](#input\_config\_repo) | The URL for the repository that contains the configuration of the application to run through Enterprise Application Service on IBM Cloud. | `string` | `null` | no |
+| [ease\_name](#input\_ease\_name) | The name of the Enterprise Application Service instance to create. If a `prefix` input variable is specified, the prefix is added to the name in the `-` format. | `string` | `"instance"` | no |
+| [maven\_repository\_password](#input\_maven\_repository\_password) | Password to authenticate with a Maven repository, if applicable. Default value is `null`. | `string` | `null` | no |
+| [maven\_repository\_username](#input\_maven\_repository\_username) | Username to authenticate with a Maven repository, if applicable. Default value is `null`. | `string` | `null` | no |
+| [plan](#input\_plan) | The pricing plan for the Enterprise Application Service instance. Possible values are `standard` and `free`. | `string` | `"standard"` | no |
+| [region](#input\_region) | The region where the Enterprise Application Service instance is created. | `string` | `"us-east"` | no |
+| [repos\_git\_token](#input\_repos\_git\_token) | The GitHub token to read from the application and configuration repositories. This variable must be consistently set with `var.source_repo` and `var.config_repo`. All of these variables must be set to `null` or they must all be set to valid values. | `string` | `null` | no |
+| [resource\_group\_id](#input\_resource\_group\_id) | The ID of the resource group that contains the Enterprise Application Service instance. | `string` | n/a | yes |
+| [source\_repo](#input\_source\_repo) | The URL for the GitHub repository that contains the source code, or the URL of the Maven artifact repository that contains enterprise archive (EAR) or web archive (WAR) files for the application to deploy and run through Enterprise Application Service on IBM Cloud. | `string` | `null` | no |
+| [source\_repo\_type](#input\_source\_repo\_type) | Type of the source code repository. Possible values are `maven` for Maven repository types and `git` for GitHub repository types. Default value is `git`. | `string` | `"git"` | no |
| [subscription\_id](#input\_subscription\_id) | ID of the subscription to use to create the Enterprise Application Service instance. | `string` | n/a | yes |
-| [tags](#input\_tags) | Metadata labels describing the service instance, i.e. test | `list(string)` | `[]` | no |
+| [tags](#input\_tags) | Metadata labels that describe the Enterprise Application Service instance, i.e. `test`. | `list(string)` | `[]` | no |
### Outputs
| Name | Description |
|------|-------------|
-| [ease\_instance](#output\_ease\_instance) | Enterprise Application Service instance details |
+| [ease\_instance](#output\_ease\_instance) | Details of the Enterprise Application Service instance. |
diff --git a/ibm_catalog.json b/ibm_catalog.json
index 8858c8e..1e4e647 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -24,32 +24,24 @@
"Jakarta",
"microprofile"
],
- "short_description": "Cloud architecture including instance of Enterprise Application Service for Java with essential security and observability cloud services",
- "long_description": "IBM Enterprise Application Service for Java is an end-to-end solution to building and running secure Jakarta EE/MicroProfile applications running efficiently in Liberty deployed on public clouds. This architecture supports deploying an instance of Enterprise Application Service for Java on cloud together with optional security and observability cloud services.
***Note:*** *enabling the Observability additional services, the region to deploy the Event Notification component must be updated to one of its supported regions*.
ℹ️ This Terraform-based automation is part of a broader suite of IBM-maintained Infrastructure as Code (IaC) assets, each following the naming pattern \"Cloud automation for *servicename*\" and focusing on single IBM Cloud service. These single-service deployable architectures can be used on their own to streamline and automate service deployments through an [IaC approach](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects), or assembled together into a broader [automated IaC stack](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-config-stack) to automate the deployment of an end-to-end solution architecture.",
+ "short_description": "Creates and configures an IBM Enterprise Application Service for Java instance with optional security and observability tools. ",
+ "long_description": "IBM Enterprise Application Service for Java is an end-to-end solution for building and running Java applications on IBM Cloud. This deployable architecture supports deploying an instance of Enterprise Application Service together with optional security and observability tools.\n\nℹ️ This deployable architecture is a part of a larger collection that IBM provides. Each deployable architecture focuses on a single IBM Cloud service. You can use these deployable architectures on their own to automate deployments by following an [IaC approach](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects), or you can [combine them together](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-config-stack) to deploy a more complex end-to-end solution architecture.",
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-ease/blob/main/README.md",
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-ease/main/images/deploy-arch-ibm-ease.svg",
"support_details": "This product is in the community registry, as such support is handled through the originated repo. If you experience issues please open an issue in the repository [https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/issues](https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/issues). Please note this product is not supported via the IBM Cloud Support Center.",
"provider_name": "IBM",
"features": [
{
- "title": "Supports building, deploying and running Jakarta EE/MicroProfile applications on Liberty in public cloud",
- "description": "Supports building, deploying and running Jakarta EE/MicroProfile applications on Liberty in public cloud.
For more details about the features and the options available please refer to this [page](https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/blob/main/solutions/fully-configurable/DA-details.md)."
+ "title": "Creates an Enterprise Application Service instance",
+ "description": "Supports building, deploying, and running Jakarta EE and MicroProfile applications on Liberty in public cloud. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-enterprise-app-java/blob/main/solutions/fully-configurable/DA-details.md)."
},
{
- "title": "Sets up logging for the Enterprise Application Service for Java instance",
- "description": "Optionally, you can deploy Cloud automation for Cloud Logs to route, alert, and visualize platform logs that are generated by your Enterprise Application Service for Java instance."
+ "title": "Sets up optional observability tools",
+ "description": "Use Enterprise Application Service with [Cloud automation for Observability](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-observability-a3137d28-79e0-479d-8a24-758ebd5a0eab-global), which provides monitoring and logging capabilities to deliver deep operational insights into your Enterprise Application Service deployment."
},
{
- "title": "Sets up monitoring operational metrics for the Enterprise Application Service for Java instance",
- "description": "Optionally, you can deploy Cloud automation for Cloud Monitoring to measure how users and applications interact with your Enterprise Application Service for Java instance."
- },
- {
- "title": "Sets up activity tracking for the Enterprise Application Service for Java instance",
- "description": "Optionally, you can deploy Cloud automation for Activity Tracker Event Routing to route and securely store auditing events that are related to your Enterprise Application Service for Java instance."
- },
- {
- "title": "Supports Service To Service authorisation policy creation to a MQ and DB2 instances",
- "description": "Supports Service To Service authorisation policy creation to a MQ and DB2 instances to allow the Enterprise Application Service for Java to connect to them"
+ "title": "Sets up authorization policies to MQ and Db2 instances",
+ "description": "Sets up IBM IAM authorization policies between the Enterprise Application Service instance and MQ and Db2 instances."
}
],
"flavors": [
@@ -63,31 +55,133 @@
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Editor"
],
- "service_name": "enterprise-application-service"
+ "service_name": "enterprise-application-service",
+ "notes": "Required to provision and manage Enterprise Application Service."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "dashdb-for-transactions",
+ "notes": "[Optional] Required to provision and manage IBM DB2 on Cloud."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "mqcloud",
+ "notes": "[Optional] Required to provision and manage IBM MQ on Cloud."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::role:Administrator",
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager"
+ ],
+ "service_name": "secrets-manager",
+ "notes": "[Optional] Required for creating a Secrets Manager instance."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "event-notifications",
+ "notes": "[Optional] Required for creating an Event Notifications instance."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "sysdig-monitor",
+ "notes": "[Optional] Required to create an instance of Cloud Monitoring."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "logs",
+ "notes": "[Optional] Required to create an instance of Cloud Logs."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "hs-crypto",
+ "notes": "[Optional] Required if IBM Hyper Protect Crypto Services is used for encryption."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "kms",
+ "notes": "[Optional] Required if Key Protect is used for encryption."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Writer",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "atracker",
+ "notes": "[Optional] Required to set up Activity Tracker Event Routing of auditing events."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::role:Administrator"
+ ],
+ "service_name": "All Account Management services",
+ "notes": "[Optional] Required to deploy Cloud automation for account configuration, which creates foundational IBM Cloud account resources, like IAM settings, trusted profiles, access groups, and resource groups."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::role:Administrator"
+ ],
+ "service_name": "All Identity and Access enabled services",
+ "notes": "[Optional] Required to deploy Cloud automation for account configuration, which creates foundational IBM Cloud account resources, like IAM settings, trusted profiles, access groups, and resource group with account settings."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::role:Viewer"
+ ],
+ "service_name": "Resource group only",
+ "notes": "Viewer access is required in the resource group you want to provision in."
+ },
+ {
+ "role_crns": [
+ "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+ "crn:v1:bluemix:public:iam::::role:Editor"
+ ],
+ "service_name": "cloud-object-storage",
+ "notes": "[Optional] Required to create an Object Storage instance."
}
],
"architecture": {
"features": [
{
"title": " ",
- "description": "Configured to use IBM secure by default standards, but can be edited to fit your use case."
+ "description": "Configured to use IBM secure-by-default standards, but you can edit it to fit your use case."
}
],
"diagrams": [
{
"diagram": {
- "caption": "Creates and configures an instance of Enterprise Application Service for Java with optional security and observability cloud services",
+ "caption": "Creates and configures an instance of Enterprise Application Service for Java with optional security and observability tools.",
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-ease/main/reference-architecture/deployable-architecture-ease.svg",
"type": "image/svg+xml"
},
- "description": "This architecture supports creating and configuring Enterprise Application Service for Java resources"
+ "description": "This architecture supports deploying an instance of Enterprise Application Service: IBM Enterprise Application Service for Java is an end-to-end solution for building and running Java applications on IBM Cloud.
You can integrate your Enterprise Application Service instance with IBM DB2 on Cloud by selecting the [Cloud automation for DB2 on Cloud](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-db2-cloud-90a14f92-4b86-4b27-acc1-dd6eefe0bfe9-global) dependency or you can use an existing IBM DB2 on Cloud instance if any.
You can also integrate it with IBM MQ on Cloud by selecting the [Cloud automation for MQ on Cloud](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-mq-cloud-30a698d4-ab56-4668-bc01-03cd2135d7e4-global) dependency or you can use an existing IBM MQ on Cloud instance if any.
For logging and monitoring needs, you can enable Observability for your Enterprise Application Service instance. [Cloud automation for Observability](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-observability-a3137d28-79e0-479d-8a24-758ebd5a0eab-global) provides advanced monitoring, logging, and operational insights into the performance and health of your deployment.
Secrets Manager Integration can also be enabled using [Cloud automation for Secrets Manager](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-secrets-manager-6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global) for centrally managing GitHub token and Subscription ID, ensuring secure management of sensitive credentials."
}
]
},
"dependencies": [
{
"name": "deploy-arch-ibm-secrets-manager",
- "description": "Configure an IBM Cloud Secrets Manager to securely store generated secrets.",
+ "description": "Creates and configures an IBM Cloud Secrets Manager instance for securely storing secrets like API keys.",
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
"flavors": [
"fully-configurable"
@@ -120,8 +214,8 @@
]
},
{
- "name": "deploy-arch-ibm-cloud-monitoring",
- "description": "Set up a Cloud Monitoring instance to collect platform metrics.",
+ "name": "deploy-arch-ibm-observability",
+ "description": "Configure IBM Cloud Logs, Cloud Monitoring, and Activity Tracker event routing for analyzing logs and metrics that are generated by the Enterprise Application Service instance.",
"flavors": [
"fully-configurable"
],
@@ -203,7 +297,7 @@
},
{
"name": "deploy-arch-ibm-account-infra-base",
- "description": "Organize your IBM Cloud account with preconfigured resource groups. If not selected, the default resource group is used. Optionally, expand to apply recommended security controls via \"with Account Settings\" variation.",
+ "description": "Advanced users can leverage the Cloud automation for account configuration deployable architecture to configure an IBM Cloud account with a ready-made set of resource groups by default. When you enable the \"with account settings\" option, it also applies baseline security and governance settings.",
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"flavors": [
"resource-group-only",
@@ -228,9 +322,9 @@
},
{
"name": "deploy-arch-ibm-db2-cloud",
- "description": "Configure a DB2 on Cloud instance and the authorization policy with Enterprise Application Service.",
- "label": "Cloud automation for DB2 on Cloud",
- "version": "v1.2.0",
+ "description": "Creates and configures an IBM Db2 on Cloud instance and sets up the IAM authorization policy between the Enterprise Application Service instance and the Db2 instance.",
+ "label": "Cloud automation for Db2 on Cloud",
+ "version": "v1.1.0",
"id": "90a14f92-4b86-4b27-acc1-dd6eefe0bfe9-global",
"flavors": [
"fully-configurable"
@@ -262,8 +356,8 @@
},
{
"name": "deploy-arch-ibm-mq-cloud",
- "description": "Configure a MQ on Cloud instance and the authorization policy with Enterprise Application Service.",
- "version": "v1.1.0",
+ "description": "Creates and configures an IBM MQ on Cloud instance and sets up the IAM authorization policy between the Enterprise Application Service instance and the MQ instance.",
+ "version": "v1.0.0",
"label": "Cloud automation for MQ on Cloud",
"id": "30a698d4-ab56-4668-bc01-03cd2135d7e4-global",
"flavors": [
@@ -362,7 +456,7 @@
},
{
"key": "subscription_id",
- "description": "ID of the subscription to use to create the Enterprise Application Service instance. If you don't want to pass it explicitly you should set it to null.",
+ "description": "ID of the subscription to use to create the Enterprise Application Service instance. If you don't want to pass it explicitly, set the value to `null`.",
"required": true
},
{
@@ -385,7 +479,7 @@
"required": true,
"virtual": true,
"default_value": "us-south",
- "description": "The region to provision a new Secrets Manager instance in.",
+ "description": "The region where the Secrets Manager instance is created.",
"options": [
{
"displayname": "Osaka (jp-osa)",
@@ -448,14 +542,14 @@
"value": "trial"
}
],
- "default_value": "standard",
- "description": "The pricing plan to use when provisioning a Secrets Manager instance. Possible values: `standard`, `trial`. You can create only one Trial instance of Secrets Manager per account. Before you can create a new Trial instance, you must delete the existing Trial instance and its reclamation. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard)."
+ "default_value": "__NOT_SET__",
+ "description": "The pricing plan to use to create a Secrets Manager instance. Possible values are `standard` or `trial`. You can create only one Trial instance of Secrets Manager per account. Before you can create a new Trial instance, you must delete the existing Trial instance and its reclamation. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard)."
},
{
"key": "enable_platform_metrics",
- "type": "boolean",
- "default_value": false,
- "description": "When set to `true`, the IBM Cloud Monitoring instance will be configured to collect platform metrics from the provided region. You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another monitoring instance has already been configured. You may not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).",
+ "type": "string",
+ "default_value": "true",
+ "description": "When set to `true`, the IBM Cloud Monitoring instance is configured to collect platform metrics from the specified region. You can configure only one instance of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another Monitoring instance is already configured. You might not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).",
"required": true,
"virtual": true
},
diff --git a/outputs.tf b/outputs.tf
index 0584c2b..00f8359 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -3,6 +3,6 @@
########################################################################################################################
output "ease_instance" {
- description = "Enterprise Application Service instance details"
+ description = "Details of the Enterprise Application Service instance."
value = ibm_resource_instance.ease_instance
}
diff --git a/variables.tf b/variables.tf
index 2c21418..f902b7a 100644
--- a/variables.tf
+++ b/variables.tf
@@ -4,58 +4,58 @@
variable "resource_group_id" {
type = string
- description = "The ID of the resource group to use for the creation of the Enterprise Application Service instance."
+ description = "The ID of the resource group that contains the Enterprise Application Service instance."
}
variable "ease_name" {
type = string
- description = "The name for the newly provisioned Enterprise Application Service instance. If a prefix input variable is specified, the prefix is added to the name in the `-` format."
+ description = "The name of the Enterprise Application Service instance to create. If a `prefix` input variable is specified, the prefix is added to the name in the `-` format."
default = "instance"
}
variable "tags" {
type = list(string)
- description = "Metadata labels describing the service instance, i.e. test"
+ description = "Metadata labels that describe the Enterprise Application Service instance, i.e. `test`."
default = []
}
variable "plan" {
type = string
- description = "The desired pricing plan for Enterprise Application Service instance."
- default = "Standard"
+ description = "The pricing plan for the Enterprise Application Service instance. Possible values are `standard` and `free`."
+ default = "standard"
validation {
# free plan is added only to allow test/validation execution (its catalog name is Trial)
- condition = contains(["Standard", "free"], var.plan)
- error_message = "The only values accepted for the plan field are Standard and free."
+ condition = contains(["standard", "free"], var.plan)
+ error_message = "The value is not valid. Possible values are `standard` and `free`."
}
}
variable "region" {
type = string
- description = "The desired region for deploying Enterprise Application Service instance."
+ description = "The region where the Enterprise Application Service instance is created."
default = "us-east"
}
variable "source_repo" {
type = string
- description = "The URL for the repository storing the source code of the application or the URL of the Maven artifact repository storing the existing prebuilt archive (WAR or EAR) to deploy and run through Enterprise Application Service on IBM Cloud."
+ description = "The URL for the GitHub repository that contains the source code, or the URL of the Maven artifact repository that contains enterprise archive (EAR) or web archive (WAR) files for the application to deploy and run through Enterprise Application Service on IBM Cloud."
default = null
}
variable "config_repo" {
type = string
- description = "The URL for the repository storing the configuration to use for the application to run through Enterprise Application Service on IBM Cloud."
+ description = "The URL for the repository that contains the configuration of the application to run through Enterprise Application Service on IBM Cloud."
default = null
}
variable "repos_git_token" {
type = string
- description = "The GitHub token to read from the application and configuration repositories. It cannot be null if var.source_repo and var.config_repo are not null."
+ description = "The GitHub token to read from the application and configuration repositories. This variable must be consistently set with `var.source_repo` and `var.config_repo`. All of these variables must be set to `null` or they must all be set to valid values."
default = null
sensitive = true
validation {
condition = var.repos_git_token != null ? (var.source_repo != null && var.config_repo != null) : (var.source_repo == null && var.config_repo == null)
- error_message = "If at least one of var.source_repo, var.config_repo, var.repos_git_token input parameters is not null all of them must be assigned with a value, but var.repos_git_token is null."
+ error_message = "To maintain proper access to the application and configuration repositories, `var.repos_git_token` must be consistently set along with `var.source_repo` and `var.config_repo`. All of these variables must be set to `null`, or they must all be set to valid values."
}
}
@@ -71,24 +71,24 @@ variable "subscription_id" {
# maven repository input variables validation
variable "source_repo_type" {
type = string
- description = "Type of the source code repository. For maven source repository type, use value `maven`. Git for GitHub repository. Default value set to git."
+ description = "Type of the source code repository. Possible values are `maven` for Maven repository types and `git` for GitHub repository types. Default value is `git`."
default = "git"
nullable = false
validation {
condition = var.source_repo_type == "maven" || var.source_repo_type == "git"
- error_message = "maven or git are the only allowed values for var.source_repo_type"
+ error_message = "The value is not valid. Possible values are `maven` or `git`."
}
}
variable "maven_repository_username" {
type = string
default = null
- description = "Maven repository authentication username if needed. Default to null."
+ description = "Username to authenticate with a Maven repository, if applicable. Default value is `null`."
}
variable "maven_repository_password" {
type = string
sensitive = true
default = null
- description = "Maven repository authentication password if needed. Default to null."
+ description = "Password to authenticate with a Maven repository, if applicable. Default value is `null`."
}