Skip to content

Commit b2bed99

Browse files
authored
Merge pull request #3 from kewalaka/feat/lessons-from-avm
updates to align with lessons from AVM
2 parents a0cb197 + e443f29 commit b2bed99

22 files changed

+1159
-874
lines changed

.gitignore

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ crash.log
1010
crash.*.log
1111

1212
# Exclude all .tfvars files, which are likely to contain sensitive data, such as
13-
# password, private keys, and other secrets. These should not be part of version
14-
# control as they are data points which are potentially sensitive and subject
13+
# password, private keys, and other secrets. These should not be part of version
14+
# control as they are data points which are potentially sensitive and subject
1515
# to change depending on the environment.
1616
*.tfvars
1717
*.tfvars.json
@@ -26,12 +26,17 @@ override.tf.json
2626
# Include override files you do wish to add to version control using negated pattern
2727
# !example_override.tf
2828

29+
# Ignore Terraform lock file
30+
.terraform.lock.hcl
31+
2932
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
3033
# example: *tfplan*
3134

3235
# Ignore CLI configuration files
3336
.terraformrc
3437
terraform.rc
35-
36-
# lock files
37-
**/.terraform.lock.hcl
38+
avmmakefile
39+
README-generated.md
40+
avm.tflint.hcl
41+
avm.tflint_example.hcl
42+
*tfplan*

.terraform-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
formatter: "markdown document" # this is required
66

7-
version: "0.16.0"
7+
version: "0.17.0"
88

99
header-from: "_header.md"
1010
footer-from: "_footer.md"

.vscode/extensions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"azapi-vscode.azapi",
66
"ms-vscode-remote.remote-wsl",
77
"ms-vscode-remote.remote-containers"
8+
"davidanson.vscode-markdownlint"
89
]
910
}

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

LICENSE

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
1+
# MIT License
22

3-
Copyright (c) Microsoft Corporation.
3+
Copyright (c) kewalaka.
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1414

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE

Makefile

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
1-
.PHONY: docs
2-
docs:
3-
@echo "==> Generating module documentation..."
4-
terraform-docs -c .terraform-docs.yml .
5-
@echo "==> Generating examples documentation..."
6-
cd examples && for d in $$(ls -d */); do terraform-docs $$d; done
1+
SHELL := /bin/bash
72

8-
.PHONY: fmt
9-
fmt:
10-
@echo "==> Fixing Terraform code with terraform fmt..."
11-
terraform fmt -recursive
12-
@echo "==> Fixing embedded Terraform with terrafmt..."
13-
find . | egrep ".md|.tf" | grep -v README.md | sort | while read f; do terrafmt fmt $$f; done
14-
15-
.PHONY: tools
16-
tools:
17-
go install github.com/katbyte/terrafmt@latest
18-
go install github.com/terraform-docs/terraform-docs@latest
3+
$(shell curl -H 'Cache-Control: no-cache, no-store' -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/avmmakefile" -o avmmakefile)
4+
-include avmmakefile

0 commit comments

Comments
 (0)