imporve(elasticsearch): update the module to the format of the new version.

Author: lexwong

example/main.tf

@@ -9,3 +9,4 @@ module "instance" {
   vswitch_id          = "vswitch id"
   master_node_spec    = "elasticsearch.sn2ne.large"
 }
+

example/outputs.tf

@@ -1,3 +1,4 @@
 output "elasticsearch_ids" {
-  value = "${module.instance.elasticsearch_ids}"
+  value = module.instance.elasticsearch_ids
 }
+

example/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

main.tf

@@ -1,20 +1,27 @@
+provider "alicloud" {
+  version              = ">=1.56.0"
+  region               = var.region != "" ? var.region : null
+  configuration_source = "terraform-alicloud-modules/elasticsearch-instance"
+}
+
 #########################
 # Elasticsearch instance
 #########################
 
 resource "alicloud_elasticsearch_instance" "instance" {
-  instance_charge_type = "${var.instance_charge_type}"
-  data_node_amount     = "${var.data_node_amount}"
-  data_node_spec       = "${var.data_node_spec}"
-  data_node_disk_size  = "${var.data_node_disk_size}"
-  data_node_disk_type  = "${var.data_node_disk_type}"
-  vswitch_id           = "${var.vswitch_id}"
-  password             = "${var.password}"
-  version              = "${var.es_version}"
-  count                = "${var.number_of_instance}"
-  private_whitelist    = "${var.private_whitelist}"
-  kibana_whitelist     = "${var.kibana_whitelist}"
-  description          = "${var.description}"
-  master_node_spec     = "${var.master_node_spec}"
-  period               = "${var.period}"
+  instance_charge_type = var.instance_charge_type
+  data_node_amount     = var.data_node_amount
+  data_node_spec       = var.data_node_spec
+  data_node_disk_size  = var.data_node_disk_size
+  data_node_disk_type  = var.data_node_disk_type
+  vswitch_id           = var.vswitch_id
+  password             = var.password
+  version              = var.es_version
+  count                = var.number_of_instance
+  private_whitelist    = var.private_whitelist
+  kibana_whitelist     = var.kibana_whitelist
+  description          = var.description
+  master_node_spec     = var.master_node_spec
+  period               = var.period
 }
+

outputs.tf

@@ -1,3 +1,4 @@
 output "elasticsearch_ids" {
-  value = "${join(",", alicloud_elasticsearch_instance.instance.*.id)}"
+  value = join(",", alicloud_elasticsearch_instance.instance.*.id)
 }
+

variables.tf

@@ -1,3 +1,8 @@
+variable "region" {
+  description = "The region used to launch this module resources."
+  default     = ""
+}
+
 variable "instance_charge_type" {
   description = "Valid values are PrePaid, PostPaid. Default to PostPaid"
   default     = "PostPaid"
@@ -37,13 +42,13 @@ variable "password" {
 }
 
 variable "private_whitelist" {
-  type        = "list"
+  type        = list(string)
   description = "Set the instance's IP whitelist in VPC network."
   default     = ["0.0.0.0/0"]
 }
 
 variable "kibana_whitelist" {
-  type        = "list"
+  type        = list(string)
   description = "Set the Kibana's IP whitelist in internet network."
   default     = ["0.0.0.0/0"]
 }
@@ -62,3 +67,4 @@ variable "number_of_instance" {
   description = "Instance count"
   default     = 1
 }
+

versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}