Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of docs: Terraform style guide into v1.5 #34909

Open
wants to merge 19 commits into
base: v1.5
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
906411b
backport of commit ae1ccb8d4c54979c2ea6f6c8846811fea452b2e2
BrianMMcClain Mar 22, 2024
5f3c22e
backport of commit be4434181a64144433d6f34814f2fcc843bdbdbb
BrianMMcClain Mar 22, 2024
191b869
backport of commit 55760eeb2ab660083308847904263c34281ee454
BrianMMcClain Mar 22, 2024
237a219
backport of commit 2a660d5663d534d6748f421a6eee4724ae2105b3
BrianMMcClain Mar 22, 2024
184a56b
backport of commit dacaed0087feda430f2de113327cdf5494f51b3d
BrianMMcClain Mar 22, 2024
4cdfe29
backport of commit eba067c8bc11c53fc6ec94c5ed587401ac168bf4
BrianMMcClain Mar 22, 2024
0a06abe
backport of commit 180165796e0067e39d6e7cf12945b225a987b21a
BrianMMcClain Mar 22, 2024
368c338
backport of commit df2c204a5b79831f63c857a1f11d418f24465c7b
BrianMMcClain Mar 25, 2024
791b8ae
backport of commit 6a9df4d6b2159ab462980e68efd290fcb441fef9
BrianMMcClain Mar 25, 2024
64bc153
backport of commit 82a8c9e795b465bc6b36fddbc6179e8f5a7ed262
BrianMMcClain Mar 25, 2024
ee212d6
backport of commit 8c13af38565a0bb522ab4c73a8117b487505219c
BrianMMcClain Mar 26, 2024
f97a744
backport of commit f39124b54e758943799f3f42799e412f5cf04504
BrianMMcClain Mar 26, 2024
31a0a8f
backport of commit 40c34ef4b1a06467edb8a372239d22ea5f665298
BrianMMcClain Mar 26, 2024
9a0f9dc
backport of commit 4fcd7c0c4d017242b556332d4f4d4a647c8cca92
BrianMMcClain Mar 26, 2024
58d284c
backport of commit 7e92d5f01c0af2f53ad9b6e690e2ffbcdc06dc1e
BrianMMcClain Mar 26, 2024
104fb9c
backport of commit 6f2f4a5f76b8d9547723d5ad2c3027ab81f0047a
BrianMMcClain Mar 27, 2024
a725967
Update fmt.mdx
BrianMMcClain Mar 29, 2024
810b491
Update index.mdx
BrianMMcClain Mar 29, 2024
a36192c
Fix validation condition (#34932)
markoeremija Apr 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion website/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ For more details about how to update the sidebar navigation, refer to [Editing N

## Adding Redirects

You must add a redirect when you move, rename, or delete documentation pages. Refer to https://github.com/hashicorp/terraform-website#redirects for details.
You must add a redirect when you move, rename, or delete documentation pages. Refer to https://github.com/hashicorp/terraform-docs-common#redirects for details.

## Previewing Changes

Expand Down
7 changes: 5 additions & 2 deletions website/data/language-nav-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"path": "attr-as-blocks",
"hidden": true
},
{
"title": "Style Guide",
"path": "style"
},
{
"title": "Files and Directories",
"routes": [
Expand All @@ -28,8 +32,7 @@
{
"title": "JSON Configuration Syntax",
"path": "syntax/json"
},
{ "title": "Style Conventions", "path": "syntax/style" }
}
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion website/docs/cli/commands/fmt.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description: >-

The `terraform fmt` command is used to rewrite Terraform configuration files
to a canonical format and style. This command applies a subset of
the [Terraform language style conventions](/terraform/language/syntax/style),
the [Terraform language style conventions](/terraform/language/style#code-formatting),
along with other minor adjustments for readability.

Other Terraform commands that generate Terraform configuration will produce
Expand Down