Skip to content

Commit 7a31696

Browse files
trujillo-adamtrujillo-adam
authored
Merge pull request #35717 from hashicorp/backport/docs/atru/reformat-terraform-block-ref/indirectly-superb-raccoon
Backport of CLI and lang updates assoc with tagging into v1.9
2 parents 0230633 + 5e0206a commit 7a31696

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+497
-589
lines changed

‎website/data/cli-nav-data.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,13 @@
231231
{
232232
"title": "Using HCP Terraform",
233233
"routes": [
234-
{ "title": "Overview", "path": "cloud" },
235-
{ "title": "HCP Terraform Settings", "path": "cloud/settings" },
236234
{
237-
"title": "Initializing and Migrating",
238-
"path": "cloud/migrating"
235+
"title": "Overview",
236+
"path": "cloud"
237+
},
238+
{
239+
"title": "Connect to HCP Terraform",
240+
"path": "cloud/settings"
239241
},
240242
{
241243
"title": "Command Line Arguments",

‎website/data/language-nav-data.json

Lines changed: 68 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"path": "attr-as-blocks",
77
"hidden": true
88
},
9-
{
10-
"title": "Style Guide",
11-
"path": "style"
9+
{
10+
"title": "Style Guide",
11+
"path": "style"
1212
},
1313
{
1414
"title": "Files and Directories",
@@ -221,15 +221,72 @@
221221
"title": "Moved block",
222222
"path": "moved"
223223
},
224+
{
225+
"title": "Terraform block",
226+
"path": "terraform"
227+
},
228+
{
229+
"title": "Backend block",
230+
"routes": [
231+
{
232+
"title": "Overview",
233+
"path": "backend"
234+
},
235+
{
236+
"title": "local",
237+
"path": "backend/local"
238+
},
239+
{
240+
"title": "remote",
241+
"path": "backend/remote"
242+
},
243+
{
244+
"title": "azurerm",
245+
"path": "backend/azurerm"
246+
},
247+
{
248+
"title": "consul",
249+
"path": "backend/consul"
250+
},
251+
{
252+
"title": "cos",
253+
"path": "backend/cos"
254+
},
255+
{
256+
"title": "gcs",
257+
"path": "backend/gcs"
258+
},
259+
{
260+
"title": "http",
261+
"path": "backend/http"
262+
},
263+
{
264+
"title": "Kubernetes",
265+
"path": "backend/kubernetes"
266+
},
267+
{
268+
"title": "oss",
269+
"path": "backend/oss"
270+
},
271+
{
272+
"title": "pg",
273+
"path": "backend/pg"
274+
},
275+
{
276+
"title": "s3",
277+
"path": "backend/s3"
278+
}
279+
]
280+
},
224281
{ "title": "Checks", "path": "checks" },
225282
{
226-
"title": "Import",
227-
"routes": [
228-
{ "title": "Overview", "path": "import" },
229-
{
230-
"title": "Generating Configuration",
231-
"path": "import/generating-configuration"
232-
}
283+
"title": "Import",
284+
"routes": [
285+
{ "title": "Overview", "path": "import" },
286+
{
287+
"title": "Generating Configuration",
288+
"path": "import/generating-configuration"
289+
}
233290
]
234291
},
235292
{
@@ -942,126 +999,6 @@
942999
{ "title": "zipmap", "path": "functions/zipmap", "hidden": true }
9431000
]
9441001
},
945-
{
946-
"title": "Terraform Settings",
947-
"routes": [
948-
{ "title": "Overview", "path": "settings" },
949-
{ "title": "HCP Terraform", "path": "settings/cloud" },
950-
{
951-
"title": "Backends",
952-
"routes": [
953-
{
954-
"title": "Backend Configuration",
955-
"path": "settings/backends/configuration"
956-
},
957-
{
958-
"title": "Available Backends",
959-
"routes": [
960-
{
961-
"title": "local",
962-
"href": "/language/settings/backends/local"
963-
},
964-
{
965-
"title": "remote",
966-
"href": "/language/settings/backends/remote"
967-
},
968-
{
969-
"title": "azurerm",
970-
"href": "/language/settings/backends/azurerm"
971-
},
972-
{
973-
"title": "consul",
974-
"href": "/language/settings/backends/consul"
975-
},
976-
{
977-
"title": "cos",
978-
"href": "/language/settings/backends/cos"
979-
},
980-
{
981-
"title": "gcs",
982-
"href": "/language/settings/backends/gcs"
983-
},
984-
{
985-
"title": "http",
986-
"href": "/language/settings/backends/http"
987-
},
988-
{
989-
"title": "Kubernetes",
990-
"href": "/language/settings/backends/kubernetes"
991-
},
992-
{
993-
"title": "oss",
994-
"href": "/language/settings/backends/oss"
995-
},
996-
{
997-
"title": "pg",
998-
"href": "/language/settings/backends/pg"
999-
},
1000-
{
1001-
"title": "s3",
1002-
"href": "/language/settings/backends/s3"
1003-
}
1004-
]
1005-
},
1006-
{
1007-
"title": "local",
1008-
"hidden": true,
1009-
"path": "settings/backends/local"
1010-
},
1011-
{
1012-
"title": "remote",
1013-
"hidden": true,
1014-
"path": "settings/backends/remote"
1015-
},
1016-
{
1017-
"title": "azurerm",
1018-
"hidden": true,
1019-
"path": "settings/backends/azurerm"
1020-
},
1021-
{
1022-
"title": "consul",
1023-
"hidden": true,
1024-
"path": "settings/backends/consul"
1025-
},
1026-
{
1027-
"title": "cos",
1028-
"hidden": true,
1029-
"path": "settings/backends/cos"
1030-
},
1031-
{
1032-
"title": "gcs",
1033-
"hidden": true,
1034-
"path": "settings/backends/gcs"
1035-
},
1036-
{
1037-
"title": "http",
1038-
"hidden": true,
1039-
"path": "settings/backends/http"
1040-
},
1041-
{
1042-
"title": "Kubernetes",
1043-
"hidden": true,
1044-
"path": "settings/backends/kubernetes"
1045-
},
1046-
{
1047-
"title": "oss",
1048-
"hidden": true,
1049-
"path": "settings/backends/oss"
1050-
},
1051-
{
1052-
"title": "pg",
1053-
"hidden": true,
1054-
"path": "settings/backends/pg"
1055-
},
1056-
{
1057-
"title": "s3",
1058-
"hidden": true,
1059-
"path": "settings/backends/s3"
1060-
}
1061-
]
1062-
}
1063-
]
1064-
},
10651002
{
10661003
"title": "State",
10671004
"routes": [
@@ -1111,4 +1048,4 @@
11111048
},
11121049
{ "divider": true },
11131050
{ "title": "Terraform Internals", "href": "/internals" }
1114-
]
1051+
]

‎website/docs/cli/cloud/index.mdx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ Using HCP Terraform through the command line is called the [CLI-driven run workf
1414
1515
Workspaces can also be configured for local execution, in which case HCP Terraform only stores state. In this mode, HCP Terraform behaves just like a standard state backend.
1616

17-
-> **Note:** The CLI integration is available in Terraform 1.1.0 and later, and Terraform Enterprise 202201-1 and later. Previous versions can use the [`remote` backend](/terraform/language/settings/backends/remote). Refer to [Migrating from the remote
18-
backend](/terraform/cli/cloud/migrating) for details about switching to the CLI integration.
17+
-> **Note:** The CLI integration is available in Terraform 1.1.0 and later, and Terraform Enterprise 202201-1 and later. Previous versions can use the [`remote` backend](/terraform/language/backend/remote). Refer to [Migrating from the remote
18+
backend](/terraform/cli/cloud/settings#migrate-state-data) for details about switching to the CLI integration.
1919

2020
## Documentation Summary
2121

22-
- [HCP Terraform Settings](/terraform/cli/cloud/settings) documents the `cloud` block that you must add to your configuration to enable HCP Terraform support.
23-
- [Initializing and Migrating](/terraform/cli/cloud/migrating) describes
24-
how to start using HCP Terraform with a working directory that already has state data.
22+
- [Connect to HCP Terraform](/terraform/cli/cloud/settings) documents the `cloud` block that you must add to your configuration to enable HCP Terraform support.
2523
- [Command Line Arguments](/terraform/cli/cloud/command-line-arguments) lists the Terraform command flags that are specific to using Terraform with HCP Terraform.
2624

2725
Refer to the [CLI-driven Run Workflow](/terraform/cloud-docs/run/cli) for more details about how to use HCP Terraform from the command line.

‎website/docs/cli/cloud/migrating.mdx

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

0 commit comments

Comments
 (0)