Skip to content

Commit 2501ad2

Browse files
Add callouts to 1.13 docs to help users find search and actions docs (#1022)
1 parent 41fafe5 commit 2501ad2

File tree

13 files changed

+91
-16
lines changed

13 files changed

+91
-16
lines changed

content/terraform/v1.13.x/data/cli-nav-data.json

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"title": "Provisioning Infrastructure",
1515
"routes": [
1616
{ "title": "Overview", "path": "run" },
17-
{ "title": "<code>plan</code>", "href": "/cli/commands/plan" },
18-
{ "title": "<code>apply</code>", "href": "/cli/commands/apply" },
17+
{ "title": "<code>plan</code>", "href": "/cli/commands/plan", "alias": "actions" },
18+
{ "title": "<code>apply</code>", "href": "/cli/commands/apply", "alias": "actions" },
1919
{ "title": "<code>destroy</code>", "href": "/cli/commands/destroy" }
2020
]
2121
},
@@ -56,11 +56,20 @@
5656
{
5757
"title": "Import Infrastructure",
5858
"routes": [
59-
{ "title": "Overview", "path": "import" },
60-
{ "title": "Import existing resources", "path": "import/usage" },
59+
{
60+
"title": "Overview",
61+
"path": "import",
62+
"alias": "search, query"
63+
},
64+
{
65+
"title": "Import existing resources",
66+
"path": "import/usage",
67+
"alias": "search, query"
68+
},
6169
{
6270
"title": "Reference",
63-
"href": "/cli/commands/import"
71+
"href": "/cli/commands/import",
72+
"alias": "search, query"
6473
}
6574
]
6675
},
@@ -296,7 +305,7 @@
296305
"title": "Alphabetical List of Commands",
297306
"routes": [
298307
{ "title": "Overview", "href": "/cli/commands" },
299-
{ "title": "<code>apply</code>", "href": "/cli/commands/apply" },
308+
{ "title": "<code>apply</code>", "href": "/cli/commands/apply", "alias": "actions" },
300309
{ "title": "<code>console</code>", "href": "/cli/commands/console" },
301310
{ "title": "<code>destroy</code>", "href": "/cli/commands/destroy" },
302311
{ "title": "<code>fmt</code>", "href": "/cli/commands/fmt" },
@@ -312,7 +321,7 @@
312321
{ "title": "<code>logout</code>", "href": "/cli/commands/logout" },
313322
{ "title": "<code>modules</code>", "href": "/cli/commands/modules" },
314323
{ "title": "<code>output</code>", "href": "/cli/commands/output" },
315-
{ "title": "<code>plan</code>", "href": "/cli/commands/plan" },
324+
{ "title": "<code>plan</code>", "href": "/cli/commands/plan", "alias": "actions" },
316325
{ "title": "<code>providers</code>", "href": "/cli/commands/providers" },
317326
{
318327
"title": "<code>providers lock</code>",
@@ -392,7 +401,7 @@
392401
"hidden": true,
393402
"routes": [
394403
{ "title": "Overview", "path": "commands" },
395-
{ "title": "apply", "path": "commands/apply" },
404+
{ "title": "apply", "path": "commands/apply", "alias": "actions" },
396405
{ "title": "console", "path": "commands/console" },
397406
{ "title": "destroy", "path": "commands/destroy" },
398407
{ "title": "fmt", "path": "commands/fmt" },
@@ -405,7 +414,7 @@
405414
{ "title": "logout", "path": "commands/logout" },
406415
{ "title": "modules", "path": "commands/modules" },
407416
{ "title": "output", "path": "commands/output" },
408-
{ "title": "plan", "path": "commands/plan" },
417+
{ "title": "plan", "path": "commands/plan", "alias": "actions" },
409418
{
410419
"title": "providers",
411420
"routes": [

content/terraform/v1.13.x/data/language-nav-data.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,14 @@
192192
{
193193
"title": "Import existing resources",
194194
"routes": [
195-
{ "title": "Import a resource", "path": "import" },
195+
{ "title": "Import a resource",
196+
"path": "import",
197+
"alias": "search, query"
198+
},
196199
{
197200
"title": "Generate resource configuration",
198-
"path": "import/generating-configuration"
201+
"path": "import/generating-configuration",
202+
"alias": "search, query"
199203
}
200204
]
201205
},
@@ -276,7 +280,8 @@
276280
},
277281
{
278282
"title": "import",
279-
"path": "block/import"
283+
"path": "block/import",
284+
"alias": "search, query"
280285
},
281286
{
282287
"title": "locals",
@@ -304,7 +309,8 @@
304309
},
305310
{
306311
"title": "resource",
307-
"path": "block/resource"
312+
"path": "block/resource",
313+
"alias": "actions"
308314
},
309315
{
310316
"title": "terraform",
@@ -349,7 +355,8 @@
349355
},
350356
{
351357
"title": "Meta-arguments",
352-
"path": "meta-arguments"
358+
"path": "meta-arguments",
359+
"alias": "actions"
353360
},
354361
{
355362
"title": "Built-in resources",

content/terraform/v1.13.x/docs/cli/commands/apply.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ plan.
1111

1212
> **Hands On:** Try the [Apply Terraform Configuration](/terraform/tutorials/cli/apply?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial to learn how Terraform applies a configuration, how Terraform recovers from errors during apply, and common ways to use this command.
1313
14+
<Note>
15+
16+
Terraform `v1.14.x (beta)` adds the `-invoke` flag, which lets you trigger actions outside of Terraform CRUD operations. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information.
17+
18+
</Note>
19+
1420
## Usage
1521

1622
Usage: `terraform apply [options] [plan file]`

content/terraform/v1.13.x/docs/cli/commands/import.mdx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ description: The `terraform import` command imports existing resources into Terr
77

88
The `terraform import` command imports existing resources into Terraform. Refer to [Import](/terraform/cli/import) for additional information.
99

10-
1110
> **Hands-on:** Try the [Import Terraform Configuration](/terraform/tutorials/state/state-import?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial.
1211
12+
<Note>
13+
14+
Terraform `v1.14.x (beta)` lets you search existing infrastructure for resources, generate configuration, and import them in bulk. Refer to the [Import existing resources in bulk](/terraform/language/v1.14.x/import/bulk) beta documentation for more information.
15+
16+
</Note>
1317

1418
## Usage
1519

content/terraform/v1.13.x/docs/cli/commands/plan.mdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ description: >-
1010
The `terraform plan` command creates an execution plan, which lets you preview
1111
the changes that Terraform plans to make to your infrastructure.
1212

13+
<Note>
14+
15+
Terraform `v1.14.x (beta)` adds the `-invoke` flag, which lets you trigger actions outside of Terraform CRUD operations. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information.
16+
17+
</Note>
18+
1319
## Introduction
20+
1421
By default, Terraform performs the following operations when it creates a plan:
1522

1623
* Reads the current state of any already-existing remote objects to make sure

content/terraform/v1.13.x/docs/cli/import/index.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ This topic provides an overview of the Terraform commands that let you import ex
1010

1111
> **Hands-on:** Try the [Import Terraform Configuration](/terraform/tutorials/state/state-import?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial.
1212
13+
<Note>
14+
15+
Terraform `v1.14.x (beta)` lets you search existing infrastructure for resources, generate configuration, and import them in bulk. Refer to the [Import existing resources in bulk](/terraform/language/v1.14.x/import/bulk) beta documentation for more information.
16+
17+
</Note>
1318

1419
## Workflows
1520

content/terraform/v1.13.x/docs/cli/import/usage.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ This topic describes how to use the `terraform import` command to import existin
99

1010
> **Hands-on:** Try the [Import Terraform Configuration](/terraform/tutorials/state/state-import?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial.
1111
12+
<Note>
13+
14+
Terraform `v1.14.x (beta)` implements a new workflow for searching existing infrastructure for resources, generating configuration, and importing them in bulk. Refer to the [Import existing resources in bulk](/terraform/language/v1.14.x/import/bulk) beta documentation for more information.
15+
16+
</Note>
17+
1218
## Overview
1319

1420
Use the `terraform import` command to import existing infrastructure to Terraform state. The `terraform import` command can only import one resource at a time. It cannot simultaneously import an entire collection of resources, such as an AWS VPC.

content/terraform/v1.13.x/docs/language/block/import.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ description: >-
88

99
The `import` block instructs Terraform to import existing infrastructure resources into Terraform. Refer to [Import existing resources](/terraform/language/import) for more information.
1010

11+
<Note>
12+
13+
Terraform `v1.14.x (beta)` lets you configure queries to search your existing infrastructure for resources and generate configuration to import them. Refer to the [list block reference](/terraform/language/v1.14.x/block/tfquery/list) beta documentation for more information.
14+
15+
</Note>
16+
1117
## Configuration model
1218

1319
An `import` block supports the following configuration:

content/terraform/v1.13.x/docs/language/block/resource.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ description: >-
88

99
The `resource` block defines a piece of infrastructure and specifies the settings for Terraform to create it with. The arguments that an individual resource supports are determined by the provider. Refer to the provider documentation for more information about specific resource configuration.
1010

11+
<Note>
12+
13+
Terraform `v1.14.x (beta)` supports the `action_trigger` block, which you can add to resource configurations to trigger actions outside of Terraform CRUD operations. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information.
14+
15+
</Note>
16+
1117
## Configuration model
1218

1319
The `resource` block supports the following arguments:

content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@ description: >-
66

77
# Generating configuration
88

9+
Terraform can generate code for the resources you define in [`import` blocks](/terraform/language/import) that do not already exist in your configuration. Terraform produces HCL to act as a template that contains Terraform's best guess at the appropriate value for each resource argument.
10+
911
~> **Experimental:** Configuration generation is available in Terraform v1.5 as an experimental feature. Later minor versions may contain changes to the formatting of generated configuration and behavior of the `terraform plan` command using the `-generate-config-out` flag.
1012

11-
Terraform can generate code for the resources you define in [`import` blocks](/terraform/language/import) that do not already exist in your configuration. Terraform produces HCL to act as a template that contains Terraform's best guess at the appropriate value for each resource argument.
13+
<Note>
14+
15+
Terraform `v1.14.x (beta)` lets you configure queries to search your existing infrastructure for resources and generate configuration to import them. Refer to the [Import existing resources in bulk](/terraform/language/v1.14.x/import/bulk) beta documentation for more information.
16+
17+
</Note>
1218

1319
Starting with Terraform's generated HCL, we recommend iterating to find your ideal configuration by removing some attributes, adjusting the value of others, and rearranging `resource` blocks into files and modules as appropriate.
1420

0 commit comments

Comments
 (0)