Skip to content

Commit

Permalink
Merge pull request #14 from confusdcodr/t12
Browse files Browse the repository at this point in the history
Upgrade to terraform 0.12.x
  • Loading branch information
confusdcodr authored Sep 23, 2019
2 parents 1bf1df7 + 628635b commit fe60b7f
Show file tree
Hide file tree
Showing 20 changed files with 428 additions and 198 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.0.3
current_version = 1.0.0
commit = True
message = Bumps version to {new_version}
tag = False
Expand Down
12 changes: 12 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,15 @@ update_configs:
- package_manager: "terraform"
directory: "/"
update_schedule: "daily"

- package_manager: "terraform"
directory: "/tests/create_config_recorder"
update_schedule: "daily"

- package_manager: "terraform"
directory: "/tests/no_create"
update_schedule: "daily"

- package_manager: "go:modules"
directory: "/tests"
update_schedule: "daily"
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,22 @@ insert_final_newline = true
indent_style = space
indent_size = 2
charset = utf-8
tab_width = 4

[*.md]
trim_trailing_whitespace = false

[*.py]
indent_size = 4

[go.mod]
indent_style = tab
indent_size = 1

[*.go]
indent_style = tab
indent_size = 1

[Makefile]
indent_style = tab
indent_size = 1
Expand Down
33 changes: 32 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,40 @@ 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/).

### 1.0.0

**Released**: 2019.09.23

**Commit Delta**: [Change from 0.0.3 release](https://github.com/plus3it/terraform-aws-tardigrade-config-rules/compare/0.0.3...1.0.0)

**Summary**:

* Upgrade to terraform 0.12.x
* Add test cases

### 0.0.3

**Commit Delta**: [Change from 0.0.2 release](https://github.com/plus3it/terraform-aws-tardigrade-config-rules/compare/0.0.2...0.0.3)

**Released**: 2019.09.19

**Summary**:

* New config rules for unrestricted security group ports and public ebs snapshots

### 0.0.2

**Commit Delta**: [Change from 0.0.1 release](https://github.com/plus3it/terraform-aws-tardigrade-config-rules/compare/0.0.1...0.0.2)

**Released**: 2019.09.04

**Summary**:

* Patched location of vendored community rules

### 0.0.1

**Commit Delta**: https://github.com/plus3it/terraform-aws-tardigrade-config-rules/compare/0.0.0...0.0.1
**Commit Delta**: [Change from 0.0.0 release](https://github.com/plus3it/terraform-aws-tardigrade-config-rules/compare/0.0.0...0.0.1)

**Released**: 2019.09.04

Expand Down
24 changes: 15 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,28 +100,34 @@ json/format: | guard/program/jq
$(FIND_JSON) | $(XARGS) bash -c 'echo "$$(jq --indent 4 -S . "{}")" > "{}"'
@ echo "[$@]: Successfully formatted JSON files!"

docs/%: README_PARTS := _docs/MAIN.md <(echo) <(terraform-docs markdown table .)
tfdocs-awk/install: $(BIN_DIR)
tfdocs-awk/install: ARCHIVE := https://github.com/plus3it/tfdocs-awk/archive/master.tar.gz
tfdocs-awk/install:
$(CURL) $(ARCHIVE) | tar -C $(BIN_DIR) --strip-components=1 --wildcards '*.sh' --wildcards '*.awk' -xzvf -

docs/%: README_PARTS := _docs/MAIN.md <(echo) <($(BIN_DIR)/terraform-docs.sh markdown table .)
docs/%: README_FILE ?= README.md

docs/lint: | guard/program/terraform-docs
docs/lint: | guard/program/terraform-docs tfdocs-awk/install
@ echo "[$@]: Linting documentation files.."
diff $(README_FILE) <(cat $(README_PARTS))
@ echo "[$@]: Documentation files PASSED lint test!"

docs/generate: | guard/program/terraform-docs
docs/generate: | guard/program/terraform-docs tfdocs-awk/install
@ echo "[$@]: Creating documentation files.."
cat $(README_PARTS) > $(README_FILE)
@ echo "[$@]: Documentation files creation complete!"

dep/install: guard/program/curl
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh

terratest/install: | guard/program/go guard/program/dep
cd tests && dep ensure
terratest/install: | guard/program/go
cd tests && go mod init terraform-aws-tardigrade-config-rules/tests
cd tests && go build ./...
cd tests && go mod tidy

terratest/test: | guard/program/go guard/program/dep
terratest/test: | guard/program/go
cd tests && go test -timeout 20m

test: terratest/test

clean:
rm -rf vendor

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ make clean && make vendor

| Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:|
| cloudtrail\_bucket | Name of S3 bucket to validate that CloudTrail logs are being delivered | string | `""` | no |
| config\_bucket | Name of S3 bucket to validate that Config is configured to send inventory to | string | `""` | no |
| config\_recorder | The name of the AWS Config recorder | string | `""` | no |
| config\_sns\_topic\_arn | ARN of SNS topic to validate that Config changes are being streamed to | string | `""` | no |
| cloudtrail\_bucket | Name of S3 bucket to validate that CloudTrail logs are being delivered | string | `"null"` | no |
| config\_bucket | Name of S3 bucket to validate that Config is configured to send inventory to | string | `"null"` | no |
| config\_recorder | The name of the AWS Config recorder | string | `"null"` | no |
| config\_sns\_topic\_arn | ARN of SNS topic to validate that Config changes are being streamed to | string | `"null"` | no |
| create\_config\_rules | Controls whether to create the AWS Config Rules | string | `"true"` | no |
| exclude\_rules | List of config rule resource names to exclude from creation | list | `<list>` | no |
| tags | Map of tags to apply to the resources | map | `<map>` | no |
| exclude\_rules | List of config rule resource names to exclude from creation | list(string) | `<list>` | no |
| tags | Map of tags to apply to the resources | map(string) | `<map>` | no |

Loading

0 comments on commit fe60b7f

Please sign in to comment.