Add environment and label_order variable to label module (#33)

* Add label_order variable to label module

* Updated README.md

* Update variables.tf

avoid `environment` variable duplication

* Updated README.md

Co-authored-by: Maxim Mironenko <simixido@gmail.com>
Co-authored-by: actions-bot <58130806+actions-bot@users.noreply.github.com>

README.md

@@ -171,6 +171,7 @@ Available targets:
 | instance_count | Number of data nodes in the cluster | number | `4` | no |
 | instance_type | Elasticsearch instance type for data nodes in the cluster | string | `t2.small.elasticsearch` | no |
 | kibana_subdomain_name | The name of the subdomain for Kibana in the DNS zone (_e.g._ `kibana`, `ui`, `ui-es`, `search-ui`, `kibana.elasticsearch`) | string | `kibana` | no |
+| label_order | The naming order of the id output and Name tag | list(string) | `<list>` | no |
 | log_publishing_application_cloudwatch_log_group_arn | ARN of the CloudWatch log group to which log for ES_APPLICATION_LOGS needs to be published | string | `` | no |
 | log_publishing_application_enabled | Specifies whether log publishing option for ES_APPLICATION_LOGS is enabled or not | bool | `false` | no |
 | log_publishing_index_cloudwatch_log_group_arn | ARN of the CloudWatch log group to which log for INDEX_SLOW_LOGS needs to be published | string | `` | no |

docs/terraform.md

@@ -28,6 +28,7 @@
 | instance_count | Number of data nodes in the cluster | number | `4` | no |
 | instance_type | Elasticsearch instance type for data nodes in the cluster | string | `t2.small.elasticsearch` | no |
 | kibana_subdomain_name | The name of the subdomain for Kibana in the DNS zone (_e.g._ `kibana`, `ui`, `ui-es`, `search-ui`, `kibana.elasticsearch`) | string | `kibana` | no |
+| label_order | The naming order of the id output and Name tag | list(string) | `<list>` | no |
 | log_publishing_application_cloudwatch_log_group_arn | ARN of the CloudWatch log group to which log for ES_APPLICATION_LOGS needs to be published | string | `` | no |
 | log_publishing_application_enabled | Specifies whether log publishing option for ES_APPLICATION_LOGS is enabled or not | bool | `false` | no |
 | log_publishing_index_cloudwatch_log_group_arn | ARN of the CloudWatch log group to which log for INDEX_SLOW_LOGS needs to be published | string | `` | no |

main.tf

@@ -7,6 +7,7 @@ module "label" {
   environment = var.environment
   delimiter   = var.delimiter
   attributes  = var.attributes
+  label_order = var.label_order
   tags        = var.tags
 }
 
@@ -19,6 +20,7 @@ module "user_label" {
   environment = var.environment
   delimiter   = var.delimiter
   attributes  = concat(var.attributes, ["user"])
+  label_order = var.label_order
   tags        = var.tags
 }
 

variables.tf

@@ -40,6 +40,12 @@ variable "attributes" {
   description = "Additional attributes (e.g. `1`)"
 }
 
+variable "label_order" {
+  type        = list(string)
+  default     = []
+  description = "The naming order of the id output and Name tag"
+}
+
 variable "tags" {
   type        = map(string)
   default     = {}