Skip to content

Commit 1b4498d

Browse files
cytopiacytopia
authored
Merge pull request #45 from cytopia/release-0.25
Release 0.25
2 parents 697bb27 + e00d196 commit 1b4498d

35 files changed

+2929
-525
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
fail-fast: False
2828
matrix:
2929
version:
30-
- '0.1.0'
31-
- '0.1.1'
32-
- '0.2.0'
33-
- '0.3.0'
3430
- '0.4.0'
3531
- '0.4.5'
3632
- '0.5.0'
@@ -43,6 +39,10 @@ jobs:
4339
- '0.9.1'
4440
- '0.10.0'
4541
- '0.10.1'
42+
- '0.11.0'
43+
- '0.11.1'
44+
- '0.11.2'
45+
- '0.12.0-beta.1'
4646
- 'latest'
4747
steps:
4848

‎.github/workflows/nightly.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ jobs:
2626
fail-fast: False
2727
matrix:
2828
version:
29-
- '0.1.0'
30-
- '0.1.1'
31-
- '0.2.0'
32-
- '0.3.0'
3329
- '0.4.0'
3430
- '0.4.5'
3531
- '0.5.0'
@@ -42,10 +38,14 @@ jobs:
4238
- '0.9.1'
4339
- '0.10.0'
4440
- '0.10.1'
41+
- '0.11.0'
42+
- '0.11.1'
43+
- '0.11.2'
44+
- '0.12.0-beta.1'
4545
- 'latest'
4646
refs:
4747
- 'master'
48-
- '0.24'
48+
- '0.25'
4949
steps:
5050

5151
# ------------------------------------------------------------

‎Dockerfile-0.12‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,41 @@
1-
FROM golang:alpine3.11 as builder
1+
FROM golang:1.16.0-alpine as builder
22

33
# Install dependencies
44
RUN set -x \
5-
&& apk add --no-cache \
6-
bash \
7-
curl \
8-
gcc \
9-
git \
10-
make \
11-
musl-dev \
12-
&& curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
5+
&& apk add --update --no-cache \
6+
bash \
7+
ca-certificates \
8+
curl \
9+
gcc \
10+
git \
11+
make \
12+
musl-dev \
13+
openssh \
14+
wget
1315

1416
# Get and build terraform-docs
1517
ARG VERSION=latest
1618
RUN set -x \
17-
&& export GOPATH=/go \
18-
&& mkdir -p /go/src/github.com/terraform-docs \
19-
&& git clone https://github.com/terraform-docs/terraform-docs /go/src/github.com/terraform-docs/terraform-docs \
20-
&& cd /go/src/github.com/terraform-docs/terraform-docs \
19+
&& mkdir -p /go/src/github.com \
20+
&& git clone https://github.com/terraform-docs/terraform-docs /go/src/github.com/terraform-docs \
21+
&& cd /go/src/github.com/terraform-docs \
22+
\
23+
# Check out specific tag
2124
&& if [ "${VERSION}" != "latest" ]; then \
2225
git checkout v${VERSION}; \
2326
fi \
24-
# Build terraform-docs latest
25-
&& if [ "${VERSION}" = "latest" ]; then \
26-
make gox \
27-
&& make build-all GOOS=linux GOARCH=amd64 \
28-
&& mv bin/terraform-docs-${VERSION}-linux-amd64 /usr/local/bin/terraform-docs; \
29-
# Build terraform-docs 0.8.0-rc.1 and above
30-
else \
31-
make gox \
32-
&& make build-all GOOS=linux GOARCH=amd64 \
33-
&& mv bin/terraform-docs-${VERSION}-linux-amd64 /usr/local/bin/terraform-docs; \
34-
fi \
35-
&& chmod +x /usr/local/bin/terraform-docs
27+
\
28+
# Build
29+
&& go mod download \
30+
&& make build \
31+
&& mv /go/src/github.com/terraform-docs/bin//linux-amd64/terraform-docs /usr/local/bin/terraform-docs
3632

3733
# Version pre-check
3834
RUN set -x \
3935
&& if [ "${VERSION}" != "latest" ]; then \
4036
terraform-docs --version | grep "${VERSION}"; \
4137
else \
42-
terraform-docs --version | grep -E "(terraform-docs[[:space:]])?(version[[:space:]])?(dev|latest)"; \
38+
terraform-docs --version | grep -E "(terraform-docs[[:space:]])?(version[[:space:]])?(v?[.0-9]+)?-?(dev|latest|beta)?"; \
4339
fi
4440

4541

‎Makefile‎

Lines changed: 105 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ _test-version:
115115
| head -1 \
116116
| sed 's/.*v//g' \
117117
)"; \
118-
echo "Testing for latest: (dev|latest)"; \
119-
if ! docker run --rm $(IMAGE) | grep -E "^(terraform-docs[[:space:]])?(version[[:space:]])?(dev|latest)"; then \
118+
echo "Testing for latest: (dev|latest|beta)"; \
119+
if ! docker run --rm $(IMAGE) | grep -E "^(terraform-docs[[:space:]])?(version[[:space:]])?(v?[.0-9]+)?-?(dev|latest|beta)?"; then \
120120
echo "Failed"; \
121121
exit 1; \
122122
fi; \
@@ -134,11 +134,11 @@ _test-run-generate-one:
134134
@echo "------------------------------------------------------------"
135135
@echo "- Testing terraform-docs (1/2)"
136136
@echo "------------------------------------------------------------"
137-
@if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs md /data/output/generate/basic/ > tests/output/generate/basic/TEST-$(VERSION).md; then \
137+
if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs md /data/output/generate/basic/ > tests/output/generate/basic/TEST-$(VERSION).md; then \
138138
echo "Failed"; \
139139
exit 1; \
140-
fi; \
141-
if ! grep '## Inputs' tests/output/generate/basic/TEST-$(VERSION).md; then \
140+
fi;
141+
@if ! grep '## Inputs' tests/output/generate/basic/TEST-$(VERSION).md; then \
142142
echo "Failed"; \
143143
exit 1; \
144144
fi; \
@@ -163,24 +163,53 @@ _test-run-generate-two:
163163
echo "--with-aggregate-type-defaults"; \
164164
fi; \
165165
))
166+
@#
166167
@# ---- Test Terraform < 0.12 ----
167-
@if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/generate/default/ > tests/output/generate/default/TEST-$(VERSION).md; then \
168-
echo "Failed"; \
168+
if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/generate/default/ > tests/output/generate/default/TEST-$(VERSION).md; then \
169+
echo "Failed 1"; \
169170
exit 1; \
170-
fi; \
171-
if ! grep -E '^variable.*$$' tests/output/generate/default/main.tf | awk -F'"' '{print $$2}' | xargs -n1 sh -c 'if ! cat tests/output/generate/default/TEST-$(VERSION).md | sed "s/\\\//g" | grep -E "[[:space:]]$$1[[:space:]]" >/dev/null; then echo "[ERROR] $$1"; false; else echo "[SUCC] $$1"; true; fi' -- ; then \
172-
echo "Failed"; \
171+
fi;
172+
@if ! grep -E '^variable.*$$' tests/output/generate/default/main.tf \
173+
| awk -F'"' '{print $$2}' \
174+
| xargs -n1 sh -c '\
175+
if ! cat tests/output/generate/default/TEST-$(VERSION).md \
176+
| sed "s/\\\//g" \
177+
| grep -E "([[:space:]]|\[)$$1([[:space:]]|\])" >/dev/null; \
178+
then \
179+
echo "[ERROR] $$1"; \
180+
false; \
181+
else \
182+
echo "[SUCC] $$1"; \
183+
true; \
184+
fi' -- ; \
185+
then \
186+
echo "Failed 2"; \
173187
exit 1; \
174-
fi
188+
fi;
189+
@#
175190
@# ---- Test Terraform >= 0.12 ----
176-
@if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-012 $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/generate/0.12/ > tests/output/generate/0.12/TEST-$(VERSION).md; then \
177-
echo "Failed"; \
191+
if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-012 $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/generate/0.12/ > tests/output/generate/0.12/TEST-$(VERSION).md; then \
192+
echo "Failed 3"; \
178193
exit 1; \
179-
fi; \
180-
if ! grep -E '^variable.*$$' tests/output/generate/0.12/main.tf | awk -F'"' '{print $$2}' | xargs -n1 sh -c 'if ! cat tests/output/generate/0.12/TEST-$(VERSION).md | sed "s/\\\//g" | grep -E "[[:space:]]$$1[[:space:]]" >/dev/null; then echo "[ERROR] $$1"; false; else echo "[SUCC] $$1"; true; fi' -- ; then \
181-
echo "Failed"; \
194+
fi;
195+
@if ! grep -E '^variable.*$$' tests/output/generate/0.12/main.tf \
196+
| awk -F'"' '{print $$2}' \
197+
| xargs -n1 sh -c '\
198+
if ! cat tests/output/generate/0.12/TEST-$(VERSION).md \
199+
| sed "s/\\\//g" \
200+
| grep -E "([[:space:]]|\[)$$1([[:space:]]|\])" >/dev/null; \
201+
then \
202+
echo "[ERROR] $$1"; \
203+
false; \
204+
else \
205+
echo "[SUCC] $$1"; \
206+
true; \
207+
fi' -- ;\
208+
then \
209+
echo "Failed 4"; \
182210
exit 1; \
183-
fi
211+
fi;
212+
@#
184213
@echo "Success";
185214

186215
.PHONY: _test-run-replace-one
@@ -191,20 +220,33 @@ _test-run-replace-one:
191220
@echo '<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->' > tests/output/replace/basic/TEST-$(VERSION).md
192221
@echo >> tests/output/replace/basic/TEST-$(VERSION).md
193222
@echo '<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->' >> tests/output/replace/basic/TEST-$(VERSION).md
194-
@if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-replace md /data/output/replace/basic/TEST-$(VERSION).md; then \
195-
echo "Failed"; \
223+
if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-replace md /data/output/replace/basic/TEST-$(VERSION).md; then \
224+
echo "Failed 1"; \
196225
exit 1; \
197-
fi; \
198-
if ! grep '## Inputs' tests/output/replace/basic/TEST-$(VERSION).md; then \
199-
echo "Failed"; \
226+
fi;
227+
@if ! grep '## Inputs' tests/output/replace/basic/TEST-$(VERSION).md; then \
228+
echo "Failed 2"; \
200229
exit 1; \
201230
fi; \
202231
if ! grep 'test description' tests/output/replace/basic/TEST-$(VERSION).md; then \
203-
echo "Failed"; \
232+
echo "Failed 3"; \
204233
exit 1; \
205234
fi; \
206-
if ! grep -E '^variable.*$$' tests/output/replace/basic/main.tf | awk -F'"' '{print $$2}' | xargs -n1 sh -c 'if ! cat tests/output/replace/basic/TEST-$(VERSION).md | sed "s/\\\//g" | grep -E "[[:space:]]$$1[[:space:]]" >/dev/null; then echo "[ERROR] $$1"; false; else echo "[SUCC] $$1"; true; fi' -- ; then \
207-
echo "Failed"; \
235+
if ! grep -E '^variable.*$$' tests/output/replace/basic/main.tf \
236+
| awk -F'"' '{print $$2}' \
237+
| xargs -n1 sh -c '\
238+
if ! cat tests/output/replace/basic/TEST-$(VERSION).md \
239+
| sed "s/\\\//g" \
240+
| grep -E "([[:space:]]|\[)$$1([[:space:]]|\])" >/dev/null; \
241+
then \
242+
echo "[ERROR] $$1"; \
243+
false; \
244+
else \
245+
echo "[SUCC] $$1"; \
246+
true; \
247+
fi' -- ; \
248+
then \
249+
echo "Failed 4"; \
208250
exit 1; \
209251
fi; \
210252
echo "Success";
@@ -224,22 +266,50 @@ _test-run-replace-two:
224266
echo "--with-aggregate-type-defaults"; \
225267
fi; \
226268
))
269+
@#
227270
@# ---- Test Terraform < 0.12 ----
228-
@if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-replace $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/replace/default/TEST-$(VERSION).md; then \
229-
echo "Failed"; \
271+
if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-replace $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/replace/default/TEST-$(VERSION).md; then \
272+
echo "Failed 1"; \
230273
exit 1; \
231-
fi; \
232-
if ! grep -E '^variable.*$$' tests/output/replace/default/main.tf | awk -F'"' '{print $$2}' | xargs -n1 sh -c 'if ! cat tests/output/replace/default/TEST-$(VERSION).md | sed "s/\\\//g" | grep -E "[[:space:]]$$1[[:space:]]" >/dev/null; then echo "[ERROR] $$1"; false; else echo "[SUCC] $$1"; true; fi' -- ; then \
233-
echo "Failed"; \
274+
fi;
275+
@if ! grep -E '^variable.*$$' tests/output/replace/default/main.tf \
276+
| awk -F'"' '{print $$2}' \
277+
| xargs -n1 sh -c '\
278+
if ! cat tests/output/replace/default/TEST-$(VERSION).md \
279+
| sed "s/\\\//g" \
280+
| grep -E "([[:space:]]|\[)$$1([[:space:]]|\])" >/dev/null; \
281+
then \
282+
echo "[ERROR] $$1"; \
283+
false; \
284+
else \
285+
echo "[SUCC] $$1"; \
286+
true; \
287+
fi' -- ; \
288+
then \
289+
echo "Failed 2"; \
234290
exit 1; \
235-
fi
291+
fi;
292+
@#
236293
@# ---- Test Terraform >= 0.12 ----
237-
@if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-replace-012 $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/replace/0.12/TEST-$(VERSION).md; then \
294+
if ! docker run --rm -v $(PWD)/tests:/data $(IMAGE) terraform-docs-replace-012 $(TFDOC_ARG_SORT) $(TFDOC_ARG_AGGREGATE) md /data/output/replace/0.12/TEST-$(VERSION).md; then \
238295
echo "Failed"; \
239296
exit 1; \
240-
fi; \
241-
if ! grep -E '^variable.*$$' tests/output/replace/0.12/main.tf | awk -F'"' '{print $$2}' | xargs -n1 sh -c 'if ! cat tests/output/replace/0.12/TEST-$(VERSION).md | sed "s/\\\//g" | grep -E "[[:space:]]$$1[[:space:]]" >/dev/null; then echo "[ERROR] $$1"; false; else echo "[SUCC] $$1"; true; fi' -- ; then \
242-
echo "Failed"; \
297+
fi;
298+
@if ! grep -E '^variable.*$$' tests/output/replace/0.12/main.tf \
299+
| awk -F'"' '{print $$2}' \
300+
| xargs -n1 sh -c '\
301+
if ! cat tests/output/replace/0.12/TEST-$(VERSION).md \
302+
| sed "s/\\\//g" \
303+
| grep -E "([[:space:]]|\[)$$1([[:space:]]|\])" >/dev/null; \
304+
then \
305+
echo "[ERROR] $$1"; \
306+
false; \
307+
else \
308+
echo "[SUCC] $$1"; \
309+
true; \
310+
fi' -- ; \
311+
then \
312+
echo "Failed 3"; \
243313
exit 1; \
244314
fi; \
245315
echo "Success";

0 commit comments

Comments
 (0)