Skip to content

Commit

Permalink
Merge pull request #17 from userhas404d/docs_fixup
Browse files Browse the repository at this point in the history
Docs fixup
  • Loading branch information
confusdcodr authored Oct 28, 2019
2 parents a7a3b8b + 34446d3 commit a43b1fc
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 14 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 = 1.0.2
current_version = 1.0.3
commit = True
message = Bumps version to {new_version}
tag = False
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,24 @@ 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.3

**Released**: 2019.10.28

**Commit Delta**: [Change from 1.0.2 release](https://github.com/plus3it/terraform-aws-tardigrade-security-group/compare/1.0.2...1.0.3)

**Summary**:

* Pins tfdocs-awk version
* Updates documentation generation make targets
* Adds documentation to the test modules
* Minor Changelog fix

### 1.0.2

**Released**: 2019.10.02

**Commit Delta**: [Change from 1.0.0 release](https://github.com/plus3it/terraform-aws-tardigrade-security-group/compare/1.0.1...1.0.2)
**Commit Delta**: [Change from 1.0.1 release](https://github.com/plus3it/terraform-aws-tardigrade-security-group/compare/1.0.1...1.0.2)

**Summary**:

Expand Down
21 changes: 9 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,19 @@ json/format: | guard/program/jq
@ echo "[$@]: Successfully formatted JSON files!"

tfdocs-awk/install: $(BIN_DIR)
tfdocs-awk/install: ARCHIVE := https://github.com/plus3it/tfdocs-awk/archive/master.tar.gz
tfdocs-awk/install: ARCHIVE := https://github.com/plus3it/tfdocs-awk/archive/0.0.0.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 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 tfdocs-awk/install
docs/generate: | tfdocs-awk/install guard/program/terraform-docs
@ echo "[$@]: Creating documentation files.."
cat $(README_PARTS) > $(README_FILE)
@ echo "[$@]: Documentation files creation complete!"
@ bash -eu -o pipefail autodocs.sh -g
@ echo "[$@]: Documentation generated!"

docs/lint: | tfdocs-awk/install guard/program/terraform-docs
@ echo "[$@] Linting documentation files.."
@ bash -eu -o pipefail autodocs.sh -l
@ echo "[$@] documentation linting complete!"

terratest/install: | guard/program/go
cd tests && go mod init terraform-aws-tardigrade-security-group/tests
Expand Down
3 changes: 3 additions & 0 deletions tests/create_sg/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Create SG Test


1 change: 1 addition & 0 deletions tests/create_sg/_docs/MAIN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Create SG Test
3 changes: 3 additions & 0 deletions tests/no_create_sg/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Don't Create SG Test


1 change: 1 addition & 0 deletions tests/no_create_sg/_docs/MAIN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Don't Create SG Test
3 changes: 3 additions & 0 deletions tests/use_all_variables/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Use All Variables Test


1 change: 1 addition & 0 deletions tests/use_all_variables/_docs/MAIN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Use All Variables Test

0 comments on commit a43b1fc

Please sign in to comment.