examples/complete: improve the examples

Author: shanye997

examples/complete/main.tf

@@ -2,9 +2,10 @@ data "alicloud_zones" "default" {
 }
 
 data "alicloud_instance_types" "this" {
-  cpu_core_count    = 2
-  memory_size       = 4
-  availability_zone = data.alicloud_zones.default.zones.0.id
+  cpu_core_count       = 2
+  memory_size          = 8
+  instance_type_family = "ecs.g6"
+  availability_zone    = data.alicloud_zones.default.zones[0].id
 }
 
 data "alicloud_images" "ubuntu" {
@@ -13,36 +14,41 @@ data "alicloud_images" "ubuntu" {
 
 # Create a new vpc used to create ecs instance
 module "vpc" {
-  source             = "alibaba/vpc/alicloud"
+  source  = "alibaba/vpc/alicloud"
+  version = "~> 1.11"
+
   create             = true
   vpc_cidr           = "172.16.0.0/16"
   vswitch_cidrs      = ["172.16.0.0/21"]
-  availability_zones = [data.alicloud_zones.default.zones.0.id]
+  availability_zones = [data.alicloud_zones.default.zones[0].id]
 }
 
 # Create a new security group used to create ecs instance
 module "sg" {
-  source              = "alibaba/security-group/alicloud"
+  source  = "alibaba/security-group/alicloud"
+  version = "~> 2.4"
+
   vpc_id              = module.vpc.this_vpc_id
   ingress_cidr_blocks = ["0.0.0.0/0"]
   ingress_rules       = ["all-all"]
 }
 
 # Create log service by sls module
 module "sls" {
-  source = "terraform-alicloud-modules/sls/alicloud"
+  source  = "terraform-alicloud-modules/sls/alicloud"
+  version = "~> 1.2"
 }
 
-//ecs-instance
+#ecs-instance
 module "ecs" {
   source = "../.."
 
-  //ecs-instance
+  #ecs-instance
   create_instance = true
 
   number_of_instance          = 1
-  image_id                    = data.alicloud_images.ubuntu.ids.0
-  instance_type               = data.alicloud_instance_types.this.ids.0
+  image_id                    = data.alicloud_images.ubuntu.ids[0]
+  instance_type               = data.alicloud_instance_types.this.ids[0]
   use_num_suffix              = true
   security_groups             = [module.sg.this_security_group_id]
   vswitch_id                  = module.vpc.this_vswitch_ids[0]
@@ -51,28 +57,28 @@ module "ecs" {
   internet_max_bandwidth_out  = var.internet_max_bandwidth_out
   tags                        = var.tags
 
-  //sls-logtail
+  #sls-logtail
   create_log_service = false
 
 }
 
-//sls-logtail
+#sls-logtail
 module "logtail" {
   source = "../.."
 
-  //ecs-instance
+  #ecs-instance
   create_instance = false
 
-  //sls-logtail
+  #sls-logtail
   create_log_service = true
 
-  //alicloud_log_machine_group
+  #alicloud_log_machine_group
   existing_instance_private_ips = ["172.16.2.2", "172.16.2.3"]
   log_machine_group_name        = "tf-log-machine-group-name"
   project_name                  = module.sls.this_log_project_name
   log_machine_topic             = var.log_machine_topic
 
-  //alicloud_logtail_config
+  #alicloud_logtail_config
   config_input_detail = var.config_input_detail
   config_input_type   = var.config_input_type
   logstore_name       = module.sls.this_log_store_name

examples/complete/variables.tf

@@ -1,4 +1,4 @@
-// instances variables
+# instances variables
 variable "instance_password" {
   description = "Password to an instance is a string of 8 to 30 characters. It must contain uppercase/lowercase letters and numerals, but cannot contain special symbols. When it is changed, the instance will reboot to make the change take effect."
   type        = string
@@ -19,14 +19,14 @@ variable "tags" {
   }
 }
 
-// log machine group variables
+# log machine group variables
 variable "log_machine_topic" {
   description = "The topic of a machine group."
   type        = string
   default     = "tf-log-machine-topic"
 }
 
-// logtail config variables
+# logtail config variables
 variable "config_input_detail" {
   description = "The logtail configure the required JSON files, this parameter is required if you will use this module to create logtail config. ([Refer to details](https://www.alibabacloud.com/help/doc-detail/29058.htm))"
   type        = string

examples/complete/versions.tf

@@ -0,0 +1,3 @@
+terraform {
+  required_version = ">= 0.13"
+}

locals.tf

@@ -1,7 +1,7 @@
 locals {
   user_data              = <<EOF
 #!/bin/sh
-wget http://logtail-release-${data.alicloud_regions.this.ids.0}.oss-${data.alicloud_regions.this.ids.0}-internal.aliyuncs.com/linux64/logtail.sh -O logtail.sh; chmod 755 logtail.sh; ./logtail.sh install ${data.alicloud_regions.this.ids.0}
+wget http://logtail-release-${data.alicloud_regions.this.ids[0]}.oss-${data.alicloud_regions.this.ids[0]}-internal.aliyuncs.com/linux64/logtail.sh -O logtail.sh; chmod 755 logtail.sh; ./logtail.sh install ${data.alicloud_regions.this.ids[0]}
 touch /etc/ilogtail/users/${data.alicloud_account.this.id}
 EOF
   random_string          = replace(random_uuid.this.result, "-", "")

main.tf

@@ -1,6 +1,7 @@
-// Create the ECS instances to install logtail
+# Create the ECS instances to install logtail
 module "instances" {
-  source = "alibaba/ecs-instance/alicloud"
+  source  = "alibaba/ecs-instance/alicloud"
+  version = "2.12.0"
 
   number_of_instances         = var.create_instance ? var.number_of_instance : 0
   image_id                    = var.image_id
@@ -21,6 +22,7 @@ resource "alicloud_log_machine_group" "this" {
   name          = var.log_machine_group_name == "" ? local.log_machine_group_name : var.log_machine_group_name
   project       = var.project_name
   topic         = var.log_machine_topic
+  identify_type = var.log_machine_identify_type
 }
 
 resource "alicloud_logtail_config" "this" {
@@ -37,6 +39,6 @@ resource "alicloud_logtail_config" "this" {
 resource "alicloud_logtail_attachment" "this" {
   count               = var.create_log_service ? 1 : 0
   project             = var.project_name
-  logtail_config_name = concat(alicloud_logtail_config.this.*.name, [""])[0]
-  machine_group_name  = concat(alicloud_log_machine_group.this.*.name, [""])[0]
-}
+  logtail_config_name = concat(alicloud_logtail_config.this[*].name, [""])[0]
+  machine_group_name  = concat(alicloud_log_machine_group.this[*].name, [""])[0]
+}

outputs.tf

@@ -10,50 +10,50 @@ output "this_instance_name" {
 
 output "this_log_project_name" {
   description = "The name of the log project"
-  value       = concat(alicloud_logtail_config.this.*.project, [""])[0]
+  value       = concat(alicloud_logtail_config.this[*].project, [""])[0]
 }
 
 output "this_log_store_name" {
   description = "The name of the log store"
-  value       = concat(alicloud_logtail_config.this.*.logstore, [""])[0]
+  value       = concat(alicloud_logtail_config.this[*].logstore, [""])[0]
 }
 
 output "this_log_machine_group_name" {
   description = "The name of the log machine group"
-  value       = concat(alicloud_log_machine_group.this.*.name, [""])[0]
+  value       = concat(alicloud_log_machine_group.this[*].name, [""])[0]
 }
 
 output "this_log_machine_group_identify_type" {
   description = "The identify type of the log machine group"
-  value       = concat(alicloud_log_machine_group.this.*.identify_type, [""])[0]
+  value       = concat(alicloud_log_machine_group.this[*].identify_type, [""])[0]
 }
 
 output "this_log_machine_group_topic" {
   description = "The topic of the log machine group"
-  value       = concat(alicloud_log_machine_group.this.*.topic, [""])[0]
+  value       = concat(alicloud_log_machine_group.this[*].topic, [""])[0]
 }
 
 output "this_log_machine_group_identify_list" {
   description = "The identify list of the log machine group"
-  value       = concat(alicloud_log_machine_group.this.*.identify_list, [[]])[0]
+  value       = concat(alicloud_log_machine_group.this[*].identify_list, [[]])[0]
 }
 
 output "this_logtail_config_name" {
   description = "The name of the logtail config"
-  value       = concat(alicloud_logtail_config.this.*.name, [""])[0]
+  value       = concat(alicloud_logtail_config.this[*].name, [""])[0]
 }
 
 output "this_logtail_config_input_type" {
   description = "The input type of the logtail config"
-  value       = concat(alicloud_logtail_config.this.*.input_type, [""])[0]
+  value       = concat(alicloud_logtail_config.this[*].input_type, [""])[0]
 }
 
 output "this_logtail_config_log_sample" {
   description = "The log sample of the logtail config"
-  value       = concat(alicloud_logtail_config.this.*.log_sample, [""])[0]
+  value       = concat(alicloud_logtail_config.this[*].log_sample, [""])[0]
 }
 
 output "this_logtail_config_input_detail" {
   description = "The input detail of the logtail config"
-  value       = concat(alicloud_logtail_config.this.*.input_detail, [""])[0]
+  value       = concat(alicloud_logtail_config.this[*].input_detail, [""])[0]
 }

variables.tf

@@ -1,28 +1,5 @@
-variable "region" {
-  description = "(Deprecated from version 1.1.0) The region used to launch this module resources."
-  type        = string
-  default     = ""
-}
-
-variable "profile" {
-  description = "(Deprecated from version 1.1.0) The profile name as set in the shared credentials file. If not set, it will be sourced from the ALICLOUD_PROFILE environment variable."
-  type        = string
-  default     = ""
-}
-
-variable "shared_credentials_file" {
-  description = "(Deprecated from version 1.1.0) This is the path to the shared credentials file. If this is not set and a profile is specified, $HOME/.aliyun/config.json will be used."
-  type        = string
-  default     = ""
-}
-
-variable "skip_region_validation" {
-  description = "(Deprecated from version 1.1.0) Skip static validation of region ID. Used by users of alternative AlibabaCloud-like APIs or users w/ access to regions that are not public (yet)."
-  type        = bool
-  default     = false
-}
 
-// instances variables
+# instances variables
 variable "create_instance" {
   description = "Whether to create ECS instances"
   type        = bool
@@ -89,7 +66,7 @@ variable "tags" {
   default     = {}
 }
 
-// log machine group variables
+# log machine group variables
 variable "create_log_service" {
   description = "Whether to create log resources. If true, a new machine group and logtail config will be created and associate them."
   type        = bool
@@ -120,7 +97,7 @@ variable "log_machine_topic" {
   default     = ""
 }
 
-// logtail config variables
+# logtail config variables
 variable "config_input_detail" {
   description = "The logtail configure the required JSON files, this parameter is required if you will use this module to create logtail config. ([Refer to details](https://www.alibabacloud.com/help/doc-detail/29058.htm))"
   type        = string