Merge pull request #14 from terraform-aws-modules/simplify_region_var…

…_in_tests

Simplifying tests (region) and defaulting to HTTP. Resolves #2

.travis.yml

@@ -34,7 +34,7 @@ before_script:
   - terraform -v
 
 script:
-  - echo 'before_script'
+  - echo 'script'
   # no terraform through docker until kitchen-terraform supports it
   # - docker run -i -t -v $(pwd):/app/ -w /app/ hashicorp/terraform:light init
   # - docker run -i -t -v $(pwd):/app/ -w /app/ hashicorp/terraform:light fmt -check=true

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 2017-11-16
+#### Added
+* outputs added for listeners - these can be useful for ECR integration (🍰 @mbolek).
+* Moved default `alb_protocols` to HTTP to lower barier of entry in getting started.
+
 ## [2.0.0] - 2017-11-06
 #### Added
 * added `create_log_bucket` and `enable_logging` to help control logging more granularly.

Gemfile

@@ -1,9 +1,8 @@
 ruby '2.4.2'
 
 source 'https://rubygems.org/' do
-  gem 'test-kitchen'
-  gem 'kitchen-terraform'
-  gem 'awspec'
+  gem 'kitchen-terraform', '~> 2.0'
   gem 'kitchen-verifier-awspec'
+  gem 'awspec'
   gem 'rhcl'
 end

README.md

@@ -41,6 +41,7 @@ module "alb" {
   alb_security_groups           = ["sg-edcd9784", "sg-edcd9785"]
   vpc_id                        = "vpc-abcde012"
   subnets                       = ["subnet-abcde012", "subnet-bcde012a"]
+  alb_protocols                 = ["HTTPS"]
   certificate_arn               = "arn:aws:iam::123456789012:server-certificate/test_cert-123456789012"
   create_log_bucket             = true
   enable_logging                = true
@@ -88,6 +89,7 @@ The [changelog](https://github.com/terraform-aws-modules/terraform-aws-alb/tree/
 
 ## Authors
 Created and maintained by [Brandon O'Connor](https://github.com/brandoconnor) - brandon@atscale.run.
+Many thanks to [the contributers listed here](https://github.com/terraform-aws-modules/terraform-aws-alb/graphs/contributors)!
 
 ## License
 MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-aws-alb/tree/master/LICENSE) for full details.

examples/test_fixtures/main.tf

@@ -47,6 +47,7 @@ module "alb" {
   vpc_id                   = "${module.vpc.vpc_id}"
   subnets                  = "${module.vpc.public_subnets}"
   certificate_arn          = "${aws_iam_server_certificate.fixture_cert.arn}"
+  alb_protocols            = ["HTTPS"]
   health_check_path        = "/"
   create_log_bucket        = true
   enable_logging           = true

examples/test_fixtures/outputs.tf

@@ -17,3 +17,7 @@ output "sg_id" {
 output "account_id" {
   value = "${data.aws_caller_identity.fixtures.account_id}"
 }
+
+output "region" {
+  value = "${var.region}"
+}

examples/test_fixtures/variables.tf

@@ -2,4 +2,6 @@ variable "log_location_prefix" {
   default = "my-alb-logs"
 }
 
-variable "region" {}
+variable "region" {
+  default = "us-west-2"
+}

test/integration/default/local_alb.rb

@@ -3,14 +3,17 @@
 
 module_vars = Rhcl.parse(File.open('examples/test_fixtures/variables.tf'))
 log_location_prefix = module_vars['variable']['log_location_prefix']['default']
+
 tf_state = JSON.parse(File.open('.kitchen/kitchen-terraform/default-aws/terraform.tfstate').read)
 principal_account_id = tf_state['modules'][0]['outputs']['principal_account_id']['value']
 account_id = tf_state['modules'][0]['outputs']['account_id']['value']
 vpc_id = tf_state['modules'][0]['outputs']['vpc_id']['value']
 security_group_id = tf_state['modules'][0]['outputs']['sg_id']['value']
 account_id = tf_state['modules'][0]['outputs']['account_id']['value']
+region = tf_state['modules'][0]['outputs']['region']['value']
+ENV['AWS_REGION'] = region
 # this must match the format in examples/test_fixtures/locals.tf
-log_bucket_name = 'logs-' + ENV['AWS_REGION'] + '-' + account_id
+log_bucket_name = 'logs-' + region + '-' + account_id
 # subnet_ids = tf_state['modules'][0]['outputs']['subnet_ids']['value']
 
 describe alb('my-alb') do

variables.tf

@@ -8,9 +8,9 @@ variable "alb_name" {
 }
 
 variable "alb_protocols" {
-  description = "The protocols the ALB accepts. e.g.: [\"HTTPS\"]"
+  description = "The protocols the ALB accepts. e.g.: [\"HTTP\"]"
   type        = "list"
-  default     = ["HTTPS"]
+  default     = ["HTTP"]
 }
 
 variable "alb_security_groups" {