-
Notifications
You must be signed in to change notification settings - Fork 2
Cloud automation for Enterprise Application Service content review #112
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 3 commits
b7969dd
5c1fd4d
6df0fa9
94a1c68
8559cda
1240f37
c311829
777f0a7
e8f9ed3
283509d
58e6a4a
8f5e566
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 `<prefix>-<name>` 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 `<prefix>-<name>` 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." | ||
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." | ||
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 repository that contains the source code of the application to deploy and run through Enterprise Application Service on IBM Cloud." | ||
vbontempi marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
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. It cannot be set to `null` if `var.source_repo` and `var.config_repo` are not also set to `null`." | ||
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 = "`var.repos_git_token` cannot be set to `null` if `var.source_repo` and `var.config_repo` are not also set to `null`." | ||
|
||
} | ||
} | ||
|
||
|
@@ -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`." | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I took the description from the Enterprise application service description, I think it provides a better idea to the user of what is going to deploy
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated