Skip to content

Commit dfdc6e4

Browse files
Merge pull request #91 from terraform-aws-modules/fix/tests
updated test to remove unsupported awspec attribute
2 parents bc0c5f1 + aca6a8a commit dfdc6e4

File tree

7 files changed

+135
-126
lines changed

7 files changed

+135
-126
lines changed

.pre-commit-config.yaml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
# See http://pre-commit.com for more information
22
# See http://pre-commit.com/hooks.html for more hooks
33
repos:
4-
- repo: git://github.com/antonbabenko/pre-commit-terraform
5-
rev: v1.7.1
6-
sha: 091f8b15d7b458e5a0aca642483deb2205e7db02
7-
hooks:
8-
- id: terraform_fmt
9-
# - id: terraform_docs
10-
- repo: git://github.com/pre-commit/pre-commit-hooks
11-
rev: v1.2.3
12-
sha: 92e1570c282e3c69a1f8b5b8dd8d286fe27cfaa7
13-
hooks:
14-
- id: check-merge-conflict
15-
- id: trailing-whitespace
16-
# - id: end-of-file-fixer
17-
- id: check-yaml
18-
- id: check-added-large-files
4+
- repo: git://github.com/antonbabenko/pre-commit-terraform
5+
rev: v1.7.1
6+
hooks:
7+
- id: terraform_fmt
8+
# - id: terraform_docs
9+
- repo: git://github.com/pre-commit/pre-commit-hooks
10+
rev: v1.2.3
11+
hooks:
12+
- id: check-merge-conflict
13+
- id: trailing-whitespace
14+
# - id: end-of-file-fixer
15+
- id: check-yaml
16+
- id: check-added-large-files

CHANGELOG.md

Lines changed: 80 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -5,203 +5,213 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
66
project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [[vNEXT](https://github.com/terraform-aws-modules/terraform-aws-alb/compare/v3.5.0...HEAD)] - yyyy-mm-dd]
9+
10+
## [[v3.5.0](https://github.com/terraform-aws-modules/terraform-aws-alb/compare/v3.4.0...v3.5.0)] - 2018-12-03]
11+
12+
### Changed
13+
14+
- `slow_start` now exposed as a variable (thanks, @jwhitcraft 🥝)
15+
- `terraform-docs` doc generation process (and docs) updated as for the latest version.
16+
- tests repaired
17+
818
## [[v3.4.0](https://github.com/terraform-aws-modules/terraform-aws-alb/compare/v3.3.1...v3.4.0)] - 2018-05-17]
919

1020
### Changed
1121

12-
* resources supporting the not logging scenario added. Outputs now accommodate.
13-
* reorganized the resource explosion to separate files.
14-
* tests reorganized to confine cruft.
15-
* `terraform-docs` now supported and generating documentation. (Kiitos, @antonbabenko 🍒)
22+
- resources supporting the not logging scenario added. Outputs now accommodate.
23+
- reorganized the resource explosion to separate files.
24+
- tests reorganized to confine cruft.
25+
- `terraform-docs` now supported and generating documentation. (Kiitos, @antonbabenko 🍒)
1626

1727
## [[v3.3.1](https://github.com/terraform-aws-modules/terraform-aws-alb/compare/v3.3.0...v3.3.1)] - 2018-05-06]
1828

1929
### Changed
2030

21-
* sliced outputs were appended with a `- 1` in debugging. This introduced a bug which was fixed and verified through test.
31+
- sliced outputs were appended with a `- 1` in debugging. This introduced a bug which was fixed and verified through test.
2232

2333
## [[v3.3.0](https://github.com/terraform-aws-modules/terraform-aws-alb/compare/v3.2.0...v3.3.0)] - 2018-05-04]
2434

2535
### Added
2636

27-
* `target_group_arn_suffixes` added to support monitoring through CloudWatch (props, @jeff-everett 🤗)
28-
* Contributor Covenant gives guidelines on contributions.
29-
* Issues and PR templates.
37+
- `target_group_arn_suffixes` added to support monitoring through CloudWatch (props, @jeff-everett 🤗)
38+
- Contributor Covenant gives guidelines on contributions.
39+
- Issues and PR templates.
3040

3141
## [v3.2.0] - 2018-03-28
3242

3343
### Changed
3444

35-
* `create_before_destroy` lifecycle policy added to the target groups. This allows target groups to be modified, though means they're recreated anytime they're changed. A change MUST include a change to the `name` value or will fail on duplicates. (nice work, @egarbi 🦄)
45+
- `create_before_destroy` lifecycle policy added to the target groups. This allows target groups to be modified, though means they're recreated anytime they're changed. A change MUST include a change to the `name` value or will fail on duplicates. (nice work, @egarbi 🦄)
3646

3747
## [v3.1.0] - 2018-03-22
3848

3949
### Added
4050

41-
* extra certs can now be applied to HTTPS listeners via the `extra_ssl_certs` list variable and corresponding `extra_ssl_certs_count`.
51+
- extra certs can now be applied to HTTPS listeners via the `extra_ssl_certs` list variable and corresponding `extra_ssl_certs_count`.
4252

4353
### Changed
4454

45-
* `load_balancer_security_groups` moved to simpler `security_groups`.
46-
* `name_prefix` changed back to `name` as the inflexibility of a 6 character prefix is overly restricting. Name conflicts must be dealt with by the developer. (cheers, @michaelmoussa 🎉)
47-
* upgraded terraform and kitchen terraform. terraform 0.11.4 and above errors out on warnings but has been mitigated with `TF_WARN_OUTPUT_ERRORS=1` per [this issue](https://github.com/hashicorp/terraform/issues/17655).
55+
- `load_balancer_security_groups` moved to simpler `security_groups`.
56+
- `name_prefix` changed back to `name` as the inflexibility of a 6 character prefix is overly restricting. Name conflicts must be dealt with by the developer. (cheers, @michaelmoussa 🎉)
57+
- upgraded terraform and kitchen terraform. terraform 0.11.4 and above errors out on warnings but has been mitigated with `TF_WARN_OUTPUT_ERRORS=1` per [this issue](https://github.com/hashicorp/terraform/issues/17655).
4858

4959
## [v3.0.0] - 2018-03-20
5060

5161
### Added
5262

53-
* default values added for most target group and listener attributes.
54-
* new application load balancer attributes added as variables with defaults.
55-
* tests now cover listeners.
63+
- default values added for most target group and listener attributes.
64+
- new application load balancer attributes added as variables with defaults.
65+
- tests now cover listeners.
5666

5767
### Changed
5868

59-
* listeners and target groups now defined by lists of maps allowing many-to-many relationships of those resources.
60-
* listeners and target groups creation is now data driven through variables giving greater flexibility.
61-
* `name_prefix` used where possible to avoid naming conflicts in resource testing.
62-
* logging to S3 now made manditory and done outside the module as this is better practice. (thanks, @alexjurkiewicz 🥂)
63-
* terraform 0.11.3 now used in CI. 0.11.4 seems to have warnings on plan that become errors in CI.
69+
- listeners and target groups now defined by lists of maps allowing many-to-many relationships of those resources.
70+
- listeners and target groups creation is now data driven through variables giving greater flexibility.
71+
- `name_prefix` used where possible to avoid naming conflicts in resource testing.
72+
- logging to S3 now made manditory and done outside the module as this is better practice. (thanks, @alexjurkiewicz 🥂)
73+
- terraform 0.11.3 now used in CI. 0.11.4 seems to have warnings on plan that become errors in CI.
6474

6575
## [v2.5.0] - 2018-03-07
6676

6777
### Added
6878

69-
* `target_type` variable for targeting IPs rather than instances (nice, @angusfz 👌)
70-
* Added variables for controlling front door ALB listening ports (thanks, @egarbi ✨)
71-
* output for `target_group_name` for external consumption (boom! @ndench 🐱‍🐉)
79+
- `target_type` variable for targeting IPs rather than instances (nice, @angusfz 👌)
80+
- Added variables for controlling front door ALB listening ports (thanks, @egarbi ✨)
81+
- output for `target_group_name` for external consumption (boom! @ndench 🐱‍🐉)
7282

7383
### Changed
7484

75-
* Clarified variable description and bucket policy (right on, @angstwad 👏)
76-
* Docs and var description updates (everything helps, @tehmaspc 🦑)
85+
- Clarified variable description and bucket policy (right on, @angstwad 👏)
86+
- Docs and var description updates (everything helps, @tehmaspc 🦑)
7787

7888
## [v2.4.0] - 2018-01-19
7989

8090
### Added
8191

82-
* `alb_arn_suffix` output added for external consumption. (props, @mbolek 🐱‍🏍)
83-
* variables to control listener ports (wunderbar, @egarbi 🙌)
92+
- `alb_arn_suffix` output added for external consumption. (props, @mbolek 🐱‍🏍)
93+
- variables to control listener ports (wunderbar, @egarbi 🙌)
8494

8595
### Changed
8696

87-
* Remove `region` input. If you'd like to customise the AWS provider configuration,
97+
- Remove `region` input. If you'd like to customise the AWS provider configuration,
8898
this is supported using the new `providers` input which is a core Terraform feature.
8999
[Read more.](https://www.terraform.io/docs/modules/usage.html#providers-within-modules)
90-
* update CI to use terraform 0.11.2 and KT 3.1.0.
91-
* Several formatting changes to adhere to convention.
100+
- update CI to use terraform 0.11.2 and KT 3.1.0.
101+
- Several formatting changes to adhere to convention.
92102

93103
## [v2.3.2] - 2017-12-18
94104

95105
### Added
96106

97-
* ARN outputs of listeners for reuse outside the module. (thanks, @proj4spes! 👌)
107+
- ARN outputs of listeners for reuse outside the module. (thanks, @proj4spes! 👌)
98108

99109
## [v2.3.1] - 2017-11-27
100110

101111
### Added
102112

103-
* variable `health_check_matcher` determines a set or range of successful HTTP
113+
- variable `health_check_matcher` determines a set or range of successful HTTP
104114
status codes for target group health checks (🧀 @mbolek).
105-
* adapted test kitchen configuration to KT 3.0.x.
115+
- adapted test kitchen configuration to KT 3.0.x.
106116

107117
## [v2.1.0] - 2017-11-16
108118

109119
### Added
110120

111-
* outputs added for listeners - these can be useful for ECR integration (🍰
121+
- outputs added for listeners - these can be useful for ECR integration (🍰
112122
@mbolek).
113-
* Moved default `alb_protocols` to HTTP to lower barier of entry in getting
123+
- Moved default `alb_protocols` to HTTP to lower barier of entry in getting
114124
started.
115125

116126
## [v2.0.0] - 2017-11-06
117127

118128
### Added
119129

120-
* added `create_log_bucket` and `enable_logging` to help control logging more
130+
- added `create_log_bucket` and `enable_logging` to help control logging more
121131
granularly.
122132

123133
### Changed
124134

125-
* existing log-related variables made more descriptive (this is the breaking
135+
- existing log-related variables made more descriptive (this is the breaking
126136
change)
127-
* S3 policy related test made more explicit (⭐ @antonbabenko)
137+
- S3 policy related test made more explicit (⭐ @antonbabenko)
128138

129139
## [v1.0.3] - 2017-10-19
130140

131141
### Added
132142

133-
* TravisCI configuration added and now passing.
134-
* badge added to docs.
135-
* permissions section now in the example readme.
136-
* placeholder shell script added for CI deployment. Eventually this should
143+
- TravisCI configuration added and now passing.
144+
- badge added to docs.
145+
- permissions section now in the example readme.
146+
- placeholder shell script added for CI deployment. Eventually this should
137147
conditionally release to the registry when those APIs become available.
138148

139149
### Changed
140150

141-
* altered tf variable `aws_region` to `region`.
142-
* replaced hardcoding the region to instead use a random region as retrieved by
151+
- altered tf variable `aws_region` to `region`.
152+
- replaced hardcoding the region to instead use a random region as retrieved by
143153
an awscli docker container within CI.
144-
* example cert is now a regionally-specific resource enabling tests to run in
154+
- example cert is now a regionally-specific resource enabling tests to run in
145155
various regions at once and not collide.
146-
* ruby version bump means `Rhcl` becomes `rhcl`.
156+
- ruby version bump means `Rhcl` becomes `rhcl`.
147157

148158
## [v1.0.2] - 2017-10-12
149159

150160
### Added
151161

152-
* moved data sources to dedicated `data.tf` file.
153-
* `aws_caller_identity` now used to gather account_id rather than using a
162+
- moved data sources to dedicated `data.tf` file.
163+
- `aws_caller_identity` now used to gather account_id rather than using a
154164
variable.
155-
* tests added for `target_group` and expanded for `alb`.
156-
* input variables added for health checks, bucket policy,
165+
- tests added for `target_group` and expanded for `alb`.
166+
- input variables added for health checks, bucket policy,
157167
force_destroy_log_bucket - increasing flexibility.
158168

159169
### Changed
160170

161-
* altered structure of module to conform to the new
171+
- altered structure of module to conform to the new
162172
[Terraform registry standards](https://www.terraform.io/docs/registry/modules/publish.html#requirements)
163-
* `principle_account_id` (sp) moved to a data source rather than variable map.
173+
- `principle_account_id` (sp) moved to a data source rather than variable map.
164174
Spelling corrected.
165-
* removed redundant `/test/alb` directory which had module contents copied. Test
175+
- removed redundant `/test/alb` directory which had module contents copied. Test
166176
kitchen now uses the module itself.
167-
* pinned examples to provider and terraform versions to harden versioning.
168-
* self signed cert added to the test fixtures, eliminating the need for manual
177+
- pinned examples to provider and terraform versions to harden versioning.
178+
- self signed cert added to the test fixtures, eliminating the need for manual
169179
upload and terraform.tfvars configuration.
170-
* modules referenced in the test fixture are now sourced from the terraform
180+
- modules referenced in the test fixture are now sourced from the terraform
171181
registry.
172-
* removed bucket_policy.json in favor of creating the policy via the
182+
- removed bucket_policy.json in favor of creating the policy via the
173183
`aws_iam_policy_document` resource or optionally a variable.
174-
* stringed list variables moved to native lists
184+
- stringed list variables moved to native lists
175185

176186
## [v1.0.1] - 2017-09-14
177187

178188
### Added
179189

180-
* tag maps can now be provided (thanks @kwach)
190+
- tag maps can now be provided (thanks @kwach)
181191

182192
### Changed
183193

184-
* optional S3 logging (thanks @marocchino)
194+
- optional S3 logging (thanks @marocchino)
185195

186196
## [v1.0.0] - 2017-03-16
187197

188198
### Added
189199

190-
* Tests and fixtures for ALB components using awspec and test kitchen
191-
* S3 log bucket and policy rendering for logging now in place
192-
* root_principle_id added and referenced through a map for s3 bucket policy
193-
* string lists moved to native list types
194-
* default region removed
200+
- Tests and fixtures for ALB components using awspec and test kitchen
201+
- S3 log bucket and policy rendering for logging now in place
202+
- root_principle_id added and referenced through a map for s3 bucket policy
203+
- string lists moved to native list types
204+
- default region removed
195205

196206
### Changed
197207

198-
* Restructured project templates to alb dir to add testing. This is a breaking
208+
- Restructured project templates to alb dir to add testing. This is a breaking
199209
change so upping major version.
200-
* Redundant examples dir removed
201-
* Updated documentation
210+
- Redundant examples dir removed
211+
- Updated documentation
202212

203213
## [v0.1.0] - 2017-03-09
204214

205215
### Added
206216

207-
* Initial release.
217+
- Initial release.

0 commit comments

Comments
 (0)