Merge pull request #2 from unifio/wc-updates

Refactor & upgrade

Author: blakeneyops

.env.docker

@@ -0,0 +1,7 @@
+AWS_REGION=us-east-2
+COVALENCE_PACKER_DIR=./
+COVALENCE_TERRAFORM_DIR=./
+COVALENCE_TEST_ENVS=basic,complete
+CHECKPOINT_DISABLE=1
+GODEBUG=netdns=cgo
+USER=root

.gitignore

@@ -1,6 +1,4 @@
-**/.terraform
-**/.terraform.d
-**/.terraform/*
-**/*.tfstate.backup
-**/*.tfstate
-**/*.box
+*.tfstate*
+.terraform/
+.env
+spec/reports/**

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "editor.renderWhitespace": "all",
+  "files.associations": {
+    "*.tpl": "hcl",
+    "*.tf": "terraform"
+  },
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true
+}

CHANGELOG.md

@@ -0,0 +1,58 @@
+## Unreleased
+
+#### IMPROVEMENTS / NEW FEATURES:
+* Add support for application autoscaling
+
+## 0.2.0 (April 9, 2017)
+
+#### BACKWARDS INCOMPATIBILITIES / NOTES:
+* Versions of Terraform prior to v0.8.0 no longer supported.
+* The `common` module has been removed. Similar functionality has been moved into the `cluster` module. Existing resources will be recreated in an update.
+* The following input variables have been changed:
+  * `agent_role_name (string, required)` -> (Removed. Use the `agent_role_id` output to add additional policies.)
+  * `ami (string, required)` -> `ami_override (string, optional)`
+  * `domain (string, optional)` -> Removed
+  * `ecs_config (string, optional)` -> (Removed. Use `user_data_override` to specify custom configuraton.)
+  * `hc_grace_period (string, default: 420)` -> `hc_grace_period (string, optional)`
+  * `instance_type (string, default: t2.small)` -> `instance_type (string, required)`
+  * `key_name (string, required)` -> `key_name (string, optional)`
+  * `max_size (string, default: 3)` -> `max_size (string, required)`
+  * `min_size (string, default: 3)` -> `min_size (string, required)`
+  * `subnets (string, required)` -> `subnets (list, required)`
+
+#### IMPROVEMENTS / NEW FEATURES:
+* Module now provides a default ECS configuration to the cluster hosts in the abscense of user supplied `user_data`.
+* The following parameters are now configurable:
+  * `associate_public_ip_address`
+  * `default_cooldown`
+  * `desired_capacity`
+  * `ebs_optimized`
+  * `ebs_vol_del_on_term`
+  * `ebs_vol_device_name`
+  * `ebs_vol_encrypted`
+  * `ebs_vol_iops`
+  * `ebs_vol_size`
+  * `ebs_vol_snapshot_id`
+  * `ebs_vol_type`
+  * `enable_monitoring`
+  * `enabled_metrics`
+  * `force_delete`
+  * `iam_path`
+  * `instance_based_naming_enabled`
+  * `instance_name_prefix`
+  * `instance_tags`
+  * `logs_bucket_enabled`
+  * `logs_bucket_name`
+  * `placenment_group`
+  * `placement_tenancy`
+  * `protect_from_scale_in`
+  * `root_vol_del_on_temr`
+  * `root_vol_iops`
+  * `root_vol_size`
+  * `root_vol_type`
+  * `security_groups`
+  * `spot_price`
+  * `suspended_processes`
+  * `termination_policies`
+  * `user_data_override`
+  * `wait_for_capacity_timeout`

README.md

@@ -1,107 +1,113 @@
 # Terraform AWS ECS Stack #
 [![Circle CI](https://circleci.com/gh/unifio/terraform-aws-ecs/tree/master.svg?style=svg)](https://circleci.com/gh/unifio/terraform-aws-ecs/tree/master)
 
-Terraform module for the deployment of an AWS ECS cluster.
+Terraform module for the deployment of an AWS Elastic Container Service (ECS) cluster.
 
 ## Requirements ##
 
-- Terraform 0.6.16 or newer
+- Terraform 0.8.0 or newer
 - AWS provider
 
-## Common Module ##
-
-The common module provisions the following resources for use with the ECS cluster:
-
-- IAM role & instance profile
-- Default policies
-- S3 bucket for ECS logs
+## Cluster module ##
 
-These resources can be shared amongst multiple clusters if desired.
+The cluster module provisions an ECS cluster and auto scaling group of agent instances.
 
 ### Input Variables ###
 
-Name | Type | Default | Description
+#### Resource tags
+Name | Type | Required | Description
 --- | --- | --- | ---
-`bucket_prefix` | string | | Label to prepend S3 bucket names with.
-`stack_item_fullname` | string | | Long form descriptive name for this stack item. This value is used to create the 'application' resource tag for resources created by this stack item.
-`stack_item_label` | string | | Short form identifier for this stack. This value is used to create the 'Name' resource tag for resources created by this stack item, and also serves as a unique key for re-use.
-
-### Usage ###
-
-```js
-module "ecs" {
-  source = "github.com/unifio/terraform-aws-ecs?ref=master//common"
-
-  bucket_prefix       = "xmplco"
-  stack_item_fullname = "Example Cluster"
-  stack_item_label    = "xmpl"
-}
-```
+`cluster_name` | string | yes | Name of the ECS based application stack.
+`stack_item_fullname` | string | yes | Long form descriptive name for this stack item. This value is used to create the 'application' resource tag for resources created by this stack item.
+`stack_item_label` | string | yes | Short form identifier for this stack. This value is used to create the 'Name' resource tag for resources created by this stack item, and also serves as a unique key for re-use.
 
-### Outputs ###
-
-Name | Type | Description
+#### VPC parameters
+Name | Type | Required | Description
 --- | --- | --- | ---
-`ecs_agent_role_arn` | string | ARN of the ECS IAM role.
-`ecs_agent_role_id` | string | ID of the ECS IAM role.
-`ecs_agent_role_name` | string | Name of the ECS IAM role.
-`ecs_agent_role_unique_id` | string | Unique ID of the ECS IAM role.
-`ecs_logs_bucket_name` | string | Name of the ECS S3 logs bucket.
-
-## Cluster module ##
-
-The cluster module provisions an ECS cluster and auto scaling group of agent instances.
+`subnets` | list | yes | A list of subnet IDs to launch resources in.
+`vpc_id` | string | yes | ID of the target VPC.
 
-### Input Variables ###
-
-Name | Type | Default | Description
+#### Cluster launch configuration parameters
+Name | Type | Required | Description
+--- | --- | --- | ---
+`ami_override` | string | | Custom Amazon Machine Image (AMI) to associate with the launch configuration.
+`associate_public_ip_address` | string | | Flag for associating public IP addresses with instances managed by the auto scaling group.
+`ebs_optimized` | string | | Flag to enable EBS optimization.
+`ebs_vol_del_on_term` | string | Default: true | Whether the volume should be destroyed on instance termination.
+`ebs_vol_device_name` | string | | The name of the device to mount.
+`ebs_vol_encrypted` | string | | Whether the volume should be encrypted or not. Do not use this option if you are using `ebs_vol_snapshot_id` as the encrypted flag will be determined by the snapshot.
+`ebs_vol_iops` | string | Default: 2000 | The amount of provisioned IOPS. Only utilized with `ebs_vol_type` of `io1`.
+`ebs_vol_size` | string | | The size of the volume in gigabytes.
+`ebs_vol_snapshot_id` | string | | The Snapshot ID to mount.
+`ebs_vol_type` | string | Default: gp2 | The type of volume. Valid values are `standard`, `gp2` and `io1`.
+`enable_monitoring` | string | | Flag to enable detailed monitoring.
+`iam_path` | string | Default: / | The path to the IAM resource.
+`instance_based_naming_enabled` | string | | Flag to enable instance-id based name tagging. Requires the AWS CLI to be installed on the instance. Currently only supports Linux based systems.
+`instance_name_prefix` | string | | String to prepend instance-id based name tags with.
+`instance_tags` | map | | Map of tags to add to instances. Requires the AWS CLI to be installed on the instance. Currently only supports Linux based systems.
+`instance_type` | string | yes | The EC2 instance type to associate with the launch configuration.
+`key_name` | string | | The SSH key pair to associate with the launch configuration.
+`logs_bucket_enabled` | string | Default: false | Flag for enabling access to the logs bucket from the instances.
+`logs_bucket_name` | string | | Name of the S3 bucket for logging.
+`placement_tenancy` | string | Default: default | The tenancy of the instance. Valid values are `default` or `dedicated`.
+`root_vol_del_on_term` | string | Default: true | Whether the volume should be destroyed on instance termination.
+`root_vol_iops` | string | Default: 2000 | The amount of provisioned IOPS. Only utilized with `root_vol_type` of `io1`.
+`root_vol_size` | string | | The size of the volume in gigabytes.
+`root_vol_type` | string | Default: gp2 | The type of volume. Valid values are `standard`, `gp2` and `io1`.
+`security_groups` | list | Default: [] | A list of security group IDs to associate with the instances.
+`spot_price` | string | | The price to use for reserving spot instances.
+`user_data_override` | string | | Custom instance initialization data to associate with the launch configuration.
+
+#### Cluster auto scaling group parameters
+Name | Type | Required | Description
 --- | --- | --- | ---
-`agent_role_name` | string | | Name of the IAM role to be associated with the cluster members.
-`ami` | string | | Amazon Machine Image (AMI) of the cluster host.
-`cluster_name` | string | | Name of the ECS based application stack.
-`domain` | string | "" | The suffix domain name.
-`ecs_config` | string | "" | ECS agent configuration.
-`hc_check_type` | string | EC2 | Type of health check performed by the cluster. Valid values are 'ELB' or 'EC2'.
-`hc_grace_period` | string | 420 | Time allowed after an instance comes into service before checking health.
-`instance_type` | string | t2.small | EC2 instance type to associate with the cluster members.
-`key_name` | string | | SSH key pair to associate with the cluster members.
-`max_size` | string | 3 | Maximum number of instances allowed by the cluster.
-`min_size` | string | 3 | Minimum number of instances allowed by the cluster.
-`region` | string | us-east-1 | AWS region to be utilized.
-`stack_item_fullname` | string | | Long form descriptive name for this stack item. This value is used to create the 'application' resource tag for resources created by this stack item.
-`stack_item_label` | string | | Short form identifier for this stack. This value is used to create the 'Name' resource tag for resources created by this stack item, and also serves as a unique key for re-use.
-`subnets` | string | | List of VPC subnets to associate with the auto scaling group.
-`user_data` | string | "" | Instance initialization data to associate with the cluster members.
-`vpc_id` | string | | ID of the target VPC.
+`default_cooldown` | string | | The amount of time, in seconds, after a scaling activity completes before another scaling activity can start.
+`desired_capacity` | string | | The number of Amazon EC2 instances that should be running in the group.
+`enabled_metrics` | string | Default: [] | A list of metrics to collect. The allowed values are `GroupMinSize`, `GroupMaxSize`, `GroupDesiredCapacity`, `GroupInServiceInstances`, `GroupPendingInstances`, `GroupStandbyInstances`, `GroupTerminatingInstances`, `GroupTotalInstances`.
+`force_delete` | string | Default: false | Flag to allow deletion of the auto scaling group without waiting for all instances in the pool to terminate.
+`hc_check_type` | string | | Type of health check performed by the auto scaling group. Valid values are `ELB` or `EC2`.
+`hc_grace_period` | string | | Time allowed after an instance comes into service before checking health.
+`max_size` | string | yes | The maximum number of instances allowed by the auto scaling group.
+`min_size` | string | yes | Minimum number of instance to be maintained by the auto scaling group.
+`placement_group` | string | | The name of the placement group into which you'll launch your instances, if any.
+`protect_from_scale_in` | string | | Allows setting instance protection. The autoscaling group will not select instances with this setting for terminination during scale in events.
+`suspended_processes` | list | Default: [] | A list of processes to suspend for the AutoScaling Group. The allowed values are `Launch`, `Terminate`, `HealthCheck`, `ReplaceUnhealthy`, `AZRebalance`, `AlarmNotification`, `ScheduledActions`, `AddToLoadBalancer`. Note that if you suspend either the `Launch` or `Terminate` process types, it can prevent your autoscaling group from functioning properly.
+`termination_policies` | list | Default: [] | A list of policies to decide how the instances in the auto scale group should be terminated. The allowed values are `OldestInstance`, `NewestInstance`, `OldestLaunchConfiguration`, `ClosestToNextInstanceHour`, `Default`.
+`wait_for_capacity_timeout` | string | | A maximum duration that Terraform should wait for ASG managed instances to become healthy before timing out.
 
 ### Usage ###
 
 ```js
 module "cluster" {
   source = "github.com/unifio/terraform-aws-ecs?ref=master//cluster"
 
-  agent_role_name     = "ecs"
-  ami                 = "ami-xxxxxxxx"
+  # Resource tags
   cluster_name        = "xmpl-prod"
-  domain              = "service.consul"
-  instance_type       = "t2.small"
-  key_name            = "xmplprd"
-  max_size            = "3"
-  min_size            = "3"
-  region              = "us-east-1"
   stack_item_fullname = "Example Cluster"
   stack_item_label    = "xmpl"
-  subnets             = "subnet-aaaaaaaa,subnet-bbbbbbbb,subnet-cccccccc"
-  vpc_id              = "vpc-xxxxxxxx" 
+
+  # VPC parameters
+  subnets             = ["subnet-aaaaaaaa","subnet-bbbbbbbb","subnet-cccccccc"]
+  vpc_id              = "vpc-xxxxxxxx"
+
+  # LC parameters
+  iam_path                      = "/tf_managed/"
+  instance_based_naming_enabled = "true"
+  instance_type                 = "t2.small"
+
+  # ASG parameters
+  max_size = "3"
+  min_size = "3"
 }
 ```
 
 ### Outputs ###
 
 Name | Type | Description
 --- | --- | --- | ---
-`cluster_id` | string | ID of the ECS cluster
-`cluster_name` | string | Name of the ECS cluster
+`agent_role_id` | string | ID of the ECS agent IAM role.
+`cluster_id` | string | ID of the ECS cluster.
+`cluster_name` | string | Name of the ECS cluster.
 `sg_id` | string | ID of the security group associated with the agent instances.
 
 ## Examples ##

Rakefile

@@ -0,0 +1,4 @@
+require 'rake'
+require 'covalence/environment_tasks'
+require 'covalence/packer_tasks'
+require 'covalence/spec_tasks'