update module to 0.12

Author: shawnmssu

.gitignore

@@ -1,4 +1,9 @@
-.terraform
-terraform.tfstate
-*.tfstate*
-terraform.tfvars
+*.tfvars
+*.tfstate
+*.tfstate.backup
+.terraform/
+*.log
+.DS_Store
+.idea
+*.bak
+*.bk

README.md

@@ -1,6 +1,6 @@
 # UCloud UHost Instance Terraform module
 
-Terraform module which creates UHost instance(s) on UCloud.
+Terraform module which creates UHost instance(s) on UCloud (required Terraform 0.12.).
 
 These types of resources are supported:
 
@@ -15,32 +15,30 @@ These types of resources are supported:
 ```hcl
 # Create uhost instance attached with eip and cloud disk
 module "uhost_instance" {
-  source = "terraform-ucloud-modules/uhost_instance/ucloud"
+  source  = "terraform-ucloud-modules/uhost-instance/ucloud"
   version = "1.0.0"
 
   # uhost instance
-  instance_count = 2
+  instance_count   = 2
   instance_name    = "example-complete-instance"
-  password    = "ucloud_2019"
+  password         = "ucloud_2019"
   image_name_regex = "^CentOS 7.[1-2] 64"
   image_type       = "base"
   instance_type    = "n-standard-2"
-  tag     = "example-complete"
-  
-  # the default Web Security Group that UCloud recommend to users
-  security_group = "${data.ucloud_security_groups.default.security_groups.0.id}"
+  boot_disk_type   = "cloud_ssd"
+  tag              = "example-complete"
 
   # eip
   eip_count_per_instance = 1
   eip_internet_type      = "bgp"
   eip_charge_mode        = "bandwidth"
-  eip_name  = "example-complete-eip"
+  eip_name               = "example-complete-eip"
 
   # disk
   disk_count_per_instance = 1
   disk_size               = 30
   disk_type               = "ssd_data_disk"
-  disk_name   = "example-complete-disk"
+  disk_name               = "example-complete-disk"
 }
 ```
 

examples/complete/main.tf

@@ -18,10 +18,11 @@ module "uhost_instance" {
   image_name_regex = "^CentOS 7.[1-2] 64"
   image_type       = "base"
   instance_type    = "n-standard-2"
+  boot_disk_type   = "cloud_ssd"
   tag              = "example-complete"
 
   # the default Web Security Group that UCloud recommend to users
-  security_group = "${data.ucloud_security_groups.default.security_groups.0.id}"
+  security_group = data.ucloud_security_groups.default.security_groups[0].id
 
   # eip
   eip_count_per_instance = 1
@@ -34,4 +35,4 @@ module "uhost_instance" {
   disk_size               = 30
   disk_type               = "ssd_data_disk"
   disk_name               = "example-complete-disk"
-}
+}

examples/complete/outputs.tf

@@ -1,14 +1,15 @@
 output "ids" {
   description = "List of IDs of instances"
-  value       = "${module.uhost_instance.instance_ids}"
+  value       = module.uhost_instance.instance_ids
 }
 
 output "public_ips" {
   description = "List of public IP addresses assigned to the instances"
-  value       = "${module.uhost_instance.public_ips}"
+  value       = module.uhost_instance.public_ips
 }
 
 output "disk_ids" {
   description = "List of IDs of disks"
-  value       = "${module.uhost_instance.disk_ids}"
+  value       = module.uhost_instance.disk_ids
 }
+

main.tf

@@ -1,72 +1,85 @@
 # Query availability zone
-data "ucloud_zones" "default" {}
+data "ucloud_zones" "default" {
+}
 
 # Query image
 data "ucloud_images" "default" {
-  availability_zone = "${data.ucloud_zones.default.zones.0.id}"
-  name_regex        = "${var.image_name_regex}"
-  image_type        = "${var.image_type}"
+  availability_zone = data.ucloud_zones.default.zones[0].id
+  name_regex        = var.image_name_regex
+  image_type        = var.image_type
 }
 
 # Create uhost instance
 resource "ucloud_instance" "instances" {
-  image_id          = "${var.image_id == "" ? data.ucloud_images.default.images.0.id : var.image_id }"
-  availability_zone = "${var.availability_zone == "" ? data.ucloud_zones.default.zones.0.id : var.availability_zone}"
-  instance_type     = "${var.instance_type}"
-  root_password     = "${var.password}"
-  name              = "${var.instance_count < 2 ? var.instance_name : format("%s-%s", var.instance_name, format(var.count_format, count.index+1))}"
-  charge_type       = "${var.charge_type}"
-  duration          = "${var.duration}"
-  tag               = "${var.tag}"
-  security_group    = "${var.security_group}"
-  vpc_id            = "${var.vpc_id}"
-  subnet_id         = "${var.subnet_id}"
+  image_id          = var.image_id == "" ? data.ucloud_images.default.images[0].id : var.image_id
+  availability_zone = var.availability_zone == "" ? data.ucloud_zones.default.zones[0].id : var.availability_zone
+  instance_type     = var.instance_type
+  root_password     = var.password
+  name = var.instance_count < 2 ? var.instance_name : format(
+    "%s-%s",
+    var.instance_name,
+    format(var.count_format, count.index + 1),
+  )
+  charge_type    = var.charge_type
+  duration       = var.duration
+  tag            = var.tag
+  security_group = var.security_group
+  vpc_id         = var.vpc_id
+  subnet_id      = var.subnet_id
 
-  data_disk_size = "${var.local_disk_size}"
-  data_disk_type = "${var.local_disk_type}"
+  data_disk_size = var.local_disk_size
+  data_disk_type = var.local_disk_type
 
-  # boot_disk_size = "${var.boot_disk_size}"
-  boot_disk_type = "${var.boot_disk_type}"
+  boot_disk_type = var.boot_disk_type
 
-  count = "${var.instance_count}"
+  count = var.instance_count
 }
 
 # Create eip
 resource "ucloud_eip" "eips" {
-  bandwidth     = "${var.eip_bandwidth}"
-  internet_type = "${var.eip_internet_type}"
-  charge_type   = "${var.charge_type}"
-  charge_mode   = "${var.eip_charge_mode}"
-  duration      = "${var.duration}"
-  name          = "${var.eip_count_per_instance < 2 ? var.eip_name : format("%s-%s", var.eip_name, format(var.count_format, count.index+1))}"
-  tag           = "${var.tag}"
+  bandwidth     = var.eip_bandwidth
+  internet_type = var.eip_internet_type
+  charge_type   = var.charge_type
+  charge_mode   = var.eip_charge_mode
+  duration      = var.duration
+  name = var.eip_count_per_instance < 2 ? var.eip_name : format(
+    "%s-%s",
+    var.eip_name,
+    format(var.count_format, count.index + 1),
+  )
+  tag = var.tag
 
-  count = "${var.eip_count_per_instance * var.instance_count}"
+  count = var.eip_count_per_instance * var.instance_count
 }
 
 # Bind eip to instance
 resource "ucloud_eip_association" "default" {
-  resource_id = "${ucloud_instance.instances.*.id[count.index%var.instance_count]}"
-  eip_id      = "${ucloud_eip.eips.*.id[count.index]}"
-  count       = "${(var.instance_count > 0 && var.eip_count_per_instance > 0) ? var.eip_count_per_instance * var.instance_count : 0}"
+  resource_id = ucloud_instance.instances[count.index % var.instance_count].id
+  eip_id      = ucloud_eip.eips[count.index].id
+  count       = var.instance_count > 0 && var.eip_count_per_instance > 0 ? var.eip_count_per_instance * var.instance_count : 0
 }
 
 # Create cloud disk
 resource "ucloud_disk" "disks" {
-  availability_zone = "${var.availability_zone == "" ? data.ucloud_zones.default.zones.0.id : var.availability_zone}"
-  name              = "${var.disk_count_per_instance < 2 ? var.disk_name : format("%s-%s", var.disk_name, format(var.count_format, count.index+1))}"
-  disk_size         = "${var.disk_size}"
-  disk_type         = "${var.disk_type}"
-  charge_type       = "${var.charge_type}"
-  duration          = "${var.duration}"
-  tag               = "${var.tag}"
-  count             = "${var.disk_count_per_instance * var.instance_count}"
+  availability_zone = var.availability_zone == "" ? data.ucloud_zones.default.zones[0].id : var.availability_zone
+  name = var.disk_count_per_instance < 2 ? var.disk_name : format(
+    "%s-%s",
+    var.disk_name,
+    format(var.count_format, count.index + 1),
+  )
+  disk_size   = var.disk_size
+  disk_type   = var.disk_type
+  charge_type = var.charge_type
+  duration    = var.duration
+  tag         = var.tag
+  count       = var.disk_count_per_instance * var.instance_count
 }
 
 # Attach disk to instance
 resource "ucloud_disk_attachment" "default" {
-  availability_zone = "${var.availability_zone == "" ? data.ucloud_zones.default.zones.0.id : var.availability_zone}"
-  instance_id       = "${ucloud_instance.instances.*.id[count.index%var.instance_count]}"
-  disk_id           = "${ucloud_disk.disks.*.id[count.index]}"
-  count             = "${(var.disk_count_per_instance > 0 && var.instance_count > 0) ? var.disk_count_per_instance * var.instance_count: 0}"
+  availability_zone = var.availability_zone == "" ? data.ucloud_zones.default.zones[0].id : var.availability_zone
+  instance_id       = ucloud_instance.instances[count.index % var.instance_count].id
+  disk_id           = ucloud_disk.disks[count.index].id
+  count             = var.disk_count_per_instance > 0 && var.instance_count > 0 ? var.disk_count_per_instance * var.instance_count : 0
 }
+

outputs.tf

@@ -1,19 +1,20 @@
 output "instance_ids" {
   description = "List of IDs of instances"
-  value       = "${ucloud_instance.instances.*.id}"
+  value       = ucloud_instance.instances.*.id
 }
 
 output "eip_ids" {
   description = "List of IDs of eips"
-  value       = "${ucloud_eip.eips.*.id}"
+  value       = ucloud_eip.eips.*.id
 }
 
 output "public_ips" {
   description = "List of public IP addresses assigned to the instances, if applicable"
-  value       = "${ucloud_eip.eips.*.public_ip}"
+  value       = ucloud_eip.eips.*.public_ip
 }
 
 output "disk_ids" {
   description = "List of IDs of disks"
-  value       = "${ucloud_disk.disks.*.id}"
+  value       = ucloud_disk.disks.*.id
 }
+