From 565c7964171449e35f3d0f06a0c4cef93cc0ef97 Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Tue, 30 Sep 2025 16:50:50 -0400 Subject: [PATCH 1/7] Add callouts to 1.13 docs to help users find search and actions docs --- content/terraform/v1.13.x/data/cli-nav-data.json | 15 ++++++++++++--- .../terraform/v1.13.x/data/language-nav-data.json | 11 ++++++++--- .../v1.13.x/docs/cli/commands/import.mdx | 6 ++++++ .../terraform/v1.13.x/docs/cli/import/index.mdx | 6 ++++++ .../terraform/v1.13.x/docs/cli/import/usage.mdx | 6 ++++++ .../v1.13.x/docs/language/block/import.mdx | 6 ++++++ .../language/import/generating-configuration.mdx | 8 +++++++- .../v1.13.x/docs/language/import/index.mdx | 6 ++++++ 8 files changed, 57 insertions(+), 7 deletions(-) diff --git a/content/terraform/v1.13.x/data/cli-nav-data.json b/content/terraform/v1.13.x/data/cli-nav-data.json index 4b704614a5..bea786f303 100644 --- a/content/terraform/v1.13.x/data/cli-nav-data.json +++ b/content/terraform/v1.13.x/data/cli-nav-data.json @@ -56,11 +56,20 @@ { "title": "Import Infrastructure", "routes": [ - { "title": "Overview", "path": "import" }, - { "title": "Import existing resources", "path": "import/usage" }, + { + "title": "Overview", + "path": "import", + "alias": "search, query" + }, + { + "title": "Import existing resources", + "path": "import/usage", + "alias": "search, query" + }, { "title": "Reference", - "href": "/cli/commands/import" + "href": "/cli/commands/import", + "alias": "search, query" } ] }, diff --git a/content/terraform/v1.13.x/data/language-nav-data.json b/content/terraform/v1.13.x/data/language-nav-data.json index 3284ff046a..e5d5bd0802 100644 --- a/content/terraform/v1.13.x/data/language-nav-data.json +++ b/content/terraform/v1.13.x/data/language-nav-data.json @@ -192,10 +192,14 @@ { "title": "Import existing resources", "routes": [ - { "title": "Import a resource", "path": "import" }, + { "title": "Import a resource", + "path": "import", + "alias": "search, query" + }, { "title": "Generate resource configuration", - "path": "import/generating-configuration" + "path": "import/generating-configuration", + "alias": "search, query" } ] }, @@ -276,7 +280,8 @@ }, { "title": "import", - "path": "block/import" + "path": "block/import", + "alias": "search, query" }, { "title": "locals", diff --git a/content/terraform/v1.13.x/docs/cli/commands/import.mdx b/content/terraform/v1.13.x/docs/cli/commands/import.mdx index c6b3796993..23c60c7808 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/import.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/import.mdx @@ -5,6 +5,12 @@ description: The `terraform import` command imports existing resources into Terr # `terraform import` command reference + + +The beta release of Terraform 1.14 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. + + + The `terraform import` command imports existing resources into Terraform. Refer to [Import](/terraform/cli/import) for additional information. diff --git a/content/terraform/v1.13.x/docs/cli/import/index.mdx b/content/terraform/v1.13.x/docs/cli/import/index.mdx index 6d1e7b13a3..401e4230d6 100644 --- a/content/terraform/v1.13.x/docs/cli/import/index.mdx +++ b/content/terraform/v1.13.x/docs/cli/import/index.mdx @@ -6,6 +6,12 @@ description: >- # Import existing resources overview + + +The beta release of Terraform 1.14 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. + + + This topic provides an overview of the Terraform commands that let you import existing infrastructure resources so that you can manage them with Terraform. > **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. diff --git a/content/terraform/v1.13.x/docs/cli/import/usage.mdx b/content/terraform/v1.13.x/docs/cli/import/usage.mdx index ea9ddc2def..1ea1764131 100644 --- a/content/terraform/v1.13.x/docs/cli/import/usage.mdx +++ b/content/terraform/v1.13.x/docs/cli/import/usage.mdx @@ -5,6 +5,12 @@ description: Learn now to use the `terraform import` command to import existing # Import existing resources + + +The beta release of Terraform 1.14 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. + + + This topic describes how to use the `terraform import` command to import existing infrastructure resources so that you can manage them as code. > **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. diff --git a/content/terraform/v1.13.x/docs/language/block/import.mdx b/content/terraform/v1.13.x/docs/language/block/import.mdx index b7bf0277a5..6b259586ae 100644 --- a/content/terraform/v1.13.x/docs/language/block/import.mdx +++ b/content/terraform/v1.13.x/docs/language/block/import.mdx @@ -6,6 +6,12 @@ description: >- # `import` block reference + + +The beta release of Terraform 1.14 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. + + + The `import` block instructs Terraform to import existing infrastructure resources into Terraform. Refer to [Import existing resources](/terraform/language/import) for more information. ## Configuration model diff --git a/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx b/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx index e717036a63..363ed93a34 100644 --- a/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx +++ b/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx @@ -6,10 +6,16 @@ description: >- # Generating configuration -~> **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. + + +The beta release of Terraform 1.14 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. + + 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. +~> **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. + 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. To generate configuration, run `terraform plan` with the `-generate-config-out` flag and supply a new file path. Do not supply a path to an existing file, or Terraform throws an error. diff --git a/content/terraform/v1.13.x/docs/language/import/index.mdx b/content/terraform/v1.13.x/docs/language/import/index.mdx index ea0aaff1ab..9a6d7b0403 100644 --- a/content/terraform/v1.13.x/docs/language/import/index.mdx +++ b/content/terraform/v1.13.x/docs/language/import/index.mdx @@ -5,6 +5,12 @@ description: Learn how to import existing resources into Terraform state so that # Import an existing resource + + +The beta release of Terraform 1.14 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. + + + You can import existing infrastructure resources into your Terraform state so that you can begin managing them using Terraform. This page describes how to write Terraform configuration for importing resources, which lets you import multiple resources at the same time and review the import as part of your Terraform workflow. > **Hands-on:** Try the [State Import](/terraform/tutorials/state/state-import?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial. From 4021d614cd897d98f529bba4432731204ef19d95 Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Tue, 30 Sep 2025 17:00:52 -0400 Subject: [PATCH 2/7] Add beta callout for Terraform search --- content/terraform/v1.14.x (beta)/docs/language/import/bulk.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/terraform/v1.14.x (beta)/docs/language/import/bulk.mdx b/content/terraform/v1.14.x (beta)/docs/language/import/bulk.mdx index 75d3baf1fe..3228a6aea3 100644 --- a/content/terraform/v1.14.x (beta)/docs/language/import/bulk.mdx +++ b/content/terraform/v1.14.x (beta)/docs/language/import/bulk.mdx @@ -7,6 +7,8 @@ description: Learn how to query existing infrastructure for unmanaged resources You can configure queries that instruct Terraform to search your existing infrastructure for unmanaged resources. Terraform can also generate configuration for importing the resources it finds so that you can import them to your Terraform workspace in bulk. For information about importing single resources or small batches of resources, refer to [Import single resources](/terraform/language/import/single-resource) for instructions. +@include 'beta.mdx' + ## Introduction For organizations with large sets of infrastructure resources, manually identifying and importing them is tedious and labor intensive, even when using third-party tools or custom scripts. To alleviate this burden, you can write HCL-based queries and run them with the Terraform CLI to retrieve unmanaged resources so that you can import them in bulk. From 8acc4711120615aba91e52c52168063196a476cd Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Wed, 1 Oct 2025 10:44:53 -0400 Subject: [PATCH 3/7] Add callouts for actions beta release --- content/terraform/v1.13.x/data/cli-nav-data.json | 12 ++++++------ .../terraform/v1.13.x/data/language-nav-data.json | 6 ++++-- .../terraform/v1.13.x/docs/cli/commands/apply.mdx | 6 ++++++ content/terraform/v1.13.x/docs/cli/commands/plan.mdx | 6 ++++++ .../v1.13.x/docs/language/block/resource.mdx | 6 ++++++ .../v1.13.x/docs/language/meta-arguments.mdx | 6 ++++++ 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/content/terraform/v1.13.x/data/cli-nav-data.json b/content/terraform/v1.13.x/data/cli-nav-data.json index bea786f303..4585685ea8 100644 --- a/content/terraform/v1.13.x/data/cli-nav-data.json +++ b/content/terraform/v1.13.x/data/cli-nav-data.json @@ -14,8 +14,8 @@ "title": "Provisioning Infrastructure", "routes": [ { "title": "Overview", "path": "run" }, - { "title": "plan", "href": "/cli/commands/plan" }, - { "title": "apply", "href": "/cli/commands/apply" }, + { "title": "plan", "href": "/cli/commands/plan", "alias": "actions" }, + { "title": "apply", "href": "/cli/commands/apply", "alias": "actions" }, { "title": "destroy", "href": "/cli/commands/destroy" } ] }, @@ -305,7 +305,7 @@ "title": "Alphabetical List of Commands", "routes": [ { "title": "Overview", "href": "/cli/commands" }, - { "title": "apply", "href": "/cli/commands/apply" }, + { "title": "apply", "href": "/cli/commands/apply", "alias": "actions" }, { "title": "console", "href": "/cli/commands/console" }, { "title": "destroy", "href": "/cli/commands/destroy" }, { "title": "fmt", "href": "/cli/commands/fmt" }, @@ -321,7 +321,7 @@ { "title": "logout", "href": "/cli/commands/logout" }, { "title": "modules", "href": "/cli/commands/modules" }, { "title": "output", "href": "/cli/commands/output" }, - { "title": "plan", "href": "/cli/commands/plan" }, + { "title": "plan", "href": "/cli/commands/plan", "alias": "actions" }, { "title": "providers", "href": "/cli/commands/providers" }, { "title": "providers lock", @@ -401,7 +401,7 @@ "hidden": true, "routes": [ { "title": "Overview", "path": "commands" }, - { "title": "apply", "path": "commands/apply" }, + { "title": "apply", "path": "commands/apply", "alias": "actions" }, { "title": "console", "path": "commands/console" }, { "title": "destroy", "path": "commands/destroy" }, { "title": "fmt", "path": "commands/fmt" }, @@ -414,7 +414,7 @@ { "title": "logout", "path": "commands/logout" }, { "title": "modules", "path": "commands/modules" }, { "title": "output", "path": "commands/output" }, - { "title": "plan", "path": "commands/plan" }, + { "title": "plan", "path": "commands/plan", "alias": "actions" }, { "title": "providers", "routes": [ diff --git a/content/terraform/v1.13.x/data/language-nav-data.json b/content/terraform/v1.13.x/data/language-nav-data.json index e5d5bd0802..af340c727d 100644 --- a/content/terraform/v1.13.x/data/language-nav-data.json +++ b/content/terraform/v1.13.x/data/language-nav-data.json @@ -309,7 +309,8 @@ }, { "title": "resource", - "path": "block/resource" + "path": "block/resource", + "alias": "actions" }, { "title": "terraform", @@ -354,7 +355,8 @@ }, { "title": "Meta-arguments", - "path": "meta-arguments" + "path": "meta-arguments", + "alias": "actions" }, { "title": "Built-in resources", diff --git a/content/terraform/v1.13.x/docs/cli/commands/apply.mdx b/content/terraform/v1.13.x/docs/cli/commands/apply.mdx index 2c2abe1489..88b3d1badd 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/apply.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/apply.mdx @@ -6,6 +6,12 @@ description: The `terraform apply` command executes the actions proposed in a Te # `terraform apply` command + + +The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. + + + The `terraform apply` command executes the actions proposed in a Terraform plan. diff --git a/content/terraform/v1.13.x/docs/cli/commands/plan.mdx b/content/terraform/v1.13.x/docs/cli/commands/plan.mdx index e55b247ba6..513d72b09d 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/plan.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/plan.mdx @@ -7,6 +7,12 @@ description: >- # `terraform plan` command + + +The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. + + + The `terraform plan` command creates an execution plan, which lets you preview the changes that Terraform plans to make to your infrastructure. diff --git a/content/terraform/v1.13.x/docs/language/block/resource.mdx b/content/terraform/v1.13.x/docs/language/block/resource.mdx index 95194d4876..882a87a8ef 100644 --- a/content/terraform/v1.13.x/docs/language/block/resource.mdx +++ b/content/terraform/v1.13.x/docs/language/block/resource.mdx @@ -6,6 +6,12 @@ description: >- # `resource` block reference + + +The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. + + + 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. ## Configuration model diff --git a/content/terraform/v1.13.x/docs/language/meta-arguments.mdx b/content/terraform/v1.13.x/docs/language/meta-arguments.mdx index 89298d3f65..b2b3013bdf 100644 --- a/content/terraform/v1.13.x/docs/language/meta-arguments.mdx +++ b/content/terraform/v1.13.x/docs/language/meta-arguments.mdx @@ -5,6 +5,12 @@ description: Meta-arguments are built-in Terraform arguments that determine how # Meta-arguments + + +The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. + + + Meta-arguments are a class of arguments built into the Terraform configuration language that control how Terraform creates your infrastructure. This page provides an overview of the meta-arguments included with Terraform. ## Introduction From b3d622fea2127019b3e392ada7d2a6d91ba70863 Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Fri, 3 Oct 2025 16:38:55 -0400 Subject: [PATCH 4/7] Apply suggestions from code review Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- content/terraform/v1.13.x/docs/cli/commands/apply.mdx | 2 +- content/terraform/v1.13.x/docs/cli/commands/import.mdx | 2 +- content/terraform/v1.13.x/docs/cli/commands/plan.mdx | 2 +- content/terraform/v1.13.x/docs/cli/import/index.mdx | 2 +- content/terraform/v1.13.x/docs/cli/import/usage.mdx | 2 +- content/terraform/v1.13.x/docs/language/block/import.mdx | 2 +- .../v1.13.x/docs/language/import/generating-configuration.mdx | 2 +- content/terraform/v1.13.x/docs/language/import/index.mdx | 2 +- content/terraform/v1.13.x/docs/language/meta-arguments.mdx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/terraform/v1.13.x/docs/cli/commands/apply.mdx b/content/terraform/v1.13.x/docs/cli/commands/apply.mdx index 88b3d1badd..45745fdd3c 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/apply.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/apply.mdx @@ -8,7 +8,7 @@ description: The `terraform apply` command executes the actions proposed in a Te -The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. +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. diff --git a/content/terraform/v1.13.x/docs/cli/commands/import.mdx b/content/terraform/v1.13.x/docs/cli/commands/import.mdx index 23c60c7808..ad5c3de3f7 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/import.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/import.mdx @@ -7,7 +7,7 @@ description: The `terraform import` command imports existing resources into Terr -The beta release of Terraform 1.14 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. +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. diff --git a/content/terraform/v1.13.x/docs/cli/commands/plan.mdx b/content/terraform/v1.13.x/docs/cli/commands/plan.mdx index 513d72b09d..8faa0def66 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/plan.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/plan.mdx @@ -9,7 +9,7 @@ description: >- -The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. +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. diff --git a/content/terraform/v1.13.x/docs/cli/import/index.mdx b/content/terraform/v1.13.x/docs/cli/import/index.mdx index 401e4230d6..7fea8fecf9 100644 --- a/content/terraform/v1.13.x/docs/cli/import/index.mdx +++ b/content/terraform/v1.13.x/docs/cli/import/index.mdx @@ -8,7 +8,7 @@ description: >- -The beta release of Terraform 1.14 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. +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. diff --git a/content/terraform/v1.13.x/docs/cli/import/usage.mdx b/content/terraform/v1.13.x/docs/cli/import/usage.mdx index 1ea1764131..fa71173011 100644 --- a/content/terraform/v1.13.x/docs/cli/import/usage.mdx +++ b/content/terraform/v1.13.x/docs/cli/import/usage.mdx @@ -7,7 +7,7 @@ description: Learn now to use the `terraform import` command to import existing -The beta release of Terraform 1.14 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. +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. diff --git a/content/terraform/v1.13.x/docs/language/block/import.mdx b/content/terraform/v1.13.x/docs/language/block/import.mdx index 6b259586ae..15259dcd0f 100644 --- a/content/terraform/v1.13.x/docs/language/block/import.mdx +++ b/content/terraform/v1.13.x/docs/language/block/import.mdx @@ -8,7 +8,7 @@ description: >- -The beta release of Terraform 1.14 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. +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. diff --git a/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx b/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx index 363ed93a34..f0acdeb49c 100644 --- a/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx +++ b/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx @@ -8,7 +8,7 @@ description: >- -The beta release of Terraform 1.14 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. +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. diff --git a/content/terraform/v1.13.x/docs/language/import/index.mdx b/content/terraform/v1.13.x/docs/language/import/index.mdx index 9a6d7b0403..e7927613a2 100644 --- a/content/terraform/v1.13.x/docs/language/import/index.mdx +++ b/content/terraform/v1.13.x/docs/language/import/index.mdx @@ -7,7 +7,7 @@ description: Learn how to import existing resources into Terraform state so that -The beta release of Terraform 1.14 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. +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. diff --git a/content/terraform/v1.13.x/docs/language/meta-arguments.mdx b/content/terraform/v1.13.x/docs/language/meta-arguments.mdx index b2b3013bdf..e00b6bf44a 100644 --- a/content/terraform/v1.13.x/docs/language/meta-arguments.mdx +++ b/content/terraform/v1.13.x/docs/language/meta-arguments.mdx @@ -7,7 +7,7 @@ description: Meta-arguments are built-in Terraform arguments that determine how -The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. +Terraform `v1.14.x (beta)` adds the `action_trigger` meta-argument, which lets you trigger actions that extend Terraform CRUD operations. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. From f8c96cc4af488672c3fdbab77c8fd69871376d08 Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Fri, 3 Oct 2025 16:40:47 -0400 Subject: [PATCH 5/7] Apply suggestions from code review Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- content/terraform/v1.13.x/docs/language/block/resource.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/terraform/v1.13.x/docs/language/block/resource.mdx b/content/terraform/v1.13.x/docs/language/block/resource.mdx index 882a87a8ef..6cb24d5b73 100644 --- a/content/terraform/v1.13.x/docs/language/block/resource.mdx +++ b/content/terraform/v1.13.x/docs/language/block/resource.mdx @@ -8,7 +8,7 @@ description: >- -The beta release of Terraform 1.14 lets you trigger automations outside of Terraform with actions. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. +Terraform `v1.14.x (beta)` adds the `action_trigger` block to the `resource` block so that you can 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. From 506806b4c3e55f009c27b08c334aab9eba4f2fe6 Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Fri, 3 Oct 2025 17:02:09 -0400 Subject: [PATCH 6/7] Move callouts under intro paragraph --- content/terraform/v1.13.x/docs/cli/commands/apply.mdx | 10 +++++----- content/terraform/v1.13.x/docs/cli/commands/import.mdx | 10 ++++------ content/terraform/v1.13.x/docs/cli/commands/plan.mdx | 7 ++++--- content/terraform/v1.13.x/docs/cli/import/index.mdx | 9 ++++----- content/terraform/v1.13.x/docs/cli/import/usage.mdx | 8 ++++---- .../terraform/v1.13.x/docs/language/block/import.mdx | 4 ++-- .../terraform/v1.13.x/docs/language/block/resource.mdx | 4 ++-- .../docs/language/import/generating-configuration.mdx | 8 ++++---- .../terraform/v1.13.x/docs/language/import/index.mdx | 9 ++++----- .../terraform/v1.13.x/docs/language/meta-arguments.mdx | 4 ++-- 10 files changed, 35 insertions(+), 38 deletions(-) diff --git a/content/terraform/v1.13.x/docs/cli/commands/apply.mdx b/content/terraform/v1.13.x/docs/cli/commands/apply.mdx index 45745fdd3c..4a39c7a221 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/apply.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/apply.mdx @@ -6,17 +6,17 @@ description: The `terraform apply` command executes the actions proposed in a Te # `terraform apply` command +The `terraform apply` command executes the actions proposed in a Terraform +plan. + +> **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. + 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. -The `terraform apply` command executes the actions proposed in a Terraform -plan. - -> **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. - ## Usage Usage: `terraform apply [options] [plan file]` diff --git a/content/terraform/v1.13.x/docs/cli/commands/import.mdx b/content/terraform/v1.13.x/docs/cli/commands/import.mdx index ad5c3de3f7..3ec423766f 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/import.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/import.mdx @@ -5,18 +5,16 @@ description: The `terraform import` command imports existing resources into Terr # `terraform import` command reference +The `terraform import` command imports existing resources into Terraform. Refer to [Import](/terraform/cli/import) for additional information. + +> **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. + 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. -The `terraform import` command imports existing resources into Terraform. Refer to [Import](/terraform/cli/import) for additional information. - - -> **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. - - ## Usage Usage: `terraform import [options] ADDRESS ID` diff --git a/content/terraform/v1.13.x/docs/cli/commands/plan.mdx b/content/terraform/v1.13.x/docs/cli/commands/plan.mdx index 8faa0def66..c380bef152 100644 --- a/content/terraform/v1.13.x/docs/cli/commands/plan.mdx +++ b/content/terraform/v1.13.x/docs/cli/commands/plan.mdx @@ -7,16 +7,17 @@ description: >- # `terraform plan` command +The `terraform plan` command creates an execution plan, which lets you preview +the changes that Terraform plans to make to your infrastructure. + 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. -The `terraform plan` command creates an execution plan, which lets you preview -the changes that Terraform plans to make to your infrastructure. - ## Introduction + By default, Terraform performs the following operations when it creates a plan: * Reads the current state of any already-existing remote objects to make sure diff --git a/content/terraform/v1.13.x/docs/cli/import/index.mdx b/content/terraform/v1.13.x/docs/cli/import/index.mdx index 7fea8fecf9..9b2c47a229 100644 --- a/content/terraform/v1.13.x/docs/cli/import/index.mdx +++ b/content/terraform/v1.13.x/docs/cli/import/index.mdx @@ -6,17 +6,16 @@ description: >- # Import existing resources overview +This topic provides an overview of the Terraform commands that let you import existing infrastructure resources so that you can manage them with Terraform. + +> **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. + 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. -This topic provides an overview of the Terraform commands that let you import existing infrastructure resources so that you can manage them with Terraform. - -> **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. - - ## Workflows You can import an existing resource to state from the Terraform CLI. You can also perform import operations using HCP Terraform. To import multiple resources, use the `import` block. diff --git a/content/terraform/v1.13.x/docs/cli/import/usage.mdx b/content/terraform/v1.13.x/docs/cli/import/usage.mdx index fa71173011..1b8c063371 100644 --- a/content/terraform/v1.13.x/docs/cli/import/usage.mdx +++ b/content/terraform/v1.13.x/docs/cli/import/usage.mdx @@ -5,16 +5,16 @@ description: Learn now to use the `terraform import` command to import existing # Import existing resources +This topic describes how to use the `terraform import` command to import existing infrastructure resources so that you can manage them as code. + +> **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. + 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. -This topic describes how to use the `terraform import` command to import existing infrastructure resources so that you can manage them as code. - -> **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. - ## Overview 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. diff --git a/content/terraform/v1.13.x/docs/language/block/import.mdx b/content/terraform/v1.13.x/docs/language/block/import.mdx index 15259dcd0f..7264481f85 100644 --- a/content/terraform/v1.13.x/docs/language/block/import.mdx +++ b/content/terraform/v1.13.x/docs/language/block/import.mdx @@ -6,14 +6,14 @@ description: >- # `import` block reference +The `import` block instructs Terraform to import existing infrastructure resources into Terraform. Refer to [Import existing resources](/terraform/language/import) for more information. + 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. -The `import` block instructs Terraform to import existing infrastructure resources into Terraform. Refer to [Import existing resources](/terraform/language/import) for more information. - ## Configuration model An `import` block supports the following configuration: diff --git a/content/terraform/v1.13.x/docs/language/block/resource.mdx b/content/terraform/v1.13.x/docs/language/block/resource.mdx index 6cb24d5b73..396b873745 100644 --- a/content/terraform/v1.13.x/docs/language/block/resource.mdx +++ b/content/terraform/v1.13.x/docs/language/block/resource.mdx @@ -6,14 +6,14 @@ description: >- # `resource` block reference +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. + Terraform `v1.14.x (beta)` adds the `action_trigger` block to the `resource` block so that you can 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. -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. - ## Configuration model The `resource` block supports the following arguments: diff --git a/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx b/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx index f0acdeb49c..3fe7337d5e 100644 --- a/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx +++ b/content/terraform/v1.13.x/docs/language/import/generating-configuration.mdx @@ -6,16 +6,16 @@ description: >- # Generating configuration +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. + +~> **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. + 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. -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. - -~> **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. - 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. To generate configuration, run `terraform plan` with the `-generate-config-out` flag and supply a new file path. Do not supply a path to an existing file, or Terraform throws an error. diff --git a/content/terraform/v1.13.x/docs/language/import/index.mdx b/content/terraform/v1.13.x/docs/language/import/index.mdx index e7927613a2..2d0ae5bbb2 100644 --- a/content/terraform/v1.13.x/docs/language/import/index.mdx +++ b/content/terraform/v1.13.x/docs/language/import/index.mdx @@ -5,17 +5,16 @@ description: Learn how to import existing resources into Terraform state so that # Import an existing resource +You can import existing infrastructure resources into your Terraform state so that you can begin managing them using Terraform. This page describes how to write Terraform configuration for importing resources, which lets you import multiple resources at the same time and review the import as part of your Terraform workflow. + +> **Hands-on:** Try the [State Import](/terraform/tutorials/state/state-import?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial. + 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. -You can import existing infrastructure resources into your Terraform state so that you can begin managing them using Terraform. This page describes how to write Terraform configuration for importing resources, which lets you import multiple resources at the same time and review the import as part of your Terraform workflow. - -> **Hands-on:** Try the [State Import](/terraform/tutorials/state/state-import?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial. - - ## Overview When you import existing infrastructure into state, you must also define the Terraform configuration corresponding to that resource to manage the rest of its lifecycle. You can manually write all of the configuration or use the Terraform CLI to generate configuration for resources your are importing. When you import resources, Terraform pulls all of the resource's attributes into the state file, but you do not need to define all of them in the `resource` block. diff --git a/content/terraform/v1.13.x/docs/language/meta-arguments.mdx b/content/terraform/v1.13.x/docs/language/meta-arguments.mdx index e00b6bf44a..d66d68ffeb 100644 --- a/content/terraform/v1.13.x/docs/language/meta-arguments.mdx +++ b/content/terraform/v1.13.x/docs/language/meta-arguments.mdx @@ -5,14 +5,14 @@ description: Meta-arguments are built-in Terraform arguments that determine how # Meta-arguments +Meta-arguments are a class of arguments built into the Terraform configuration language that control how Terraform creates your infrastructure. This page provides an overview of the meta-arguments included with Terraform. + Terraform `v1.14.x (beta)` adds the `action_trigger` meta-argument, which lets you trigger actions that extend Terraform CRUD operations. Refer to the [Invoke an action](/terraform/language/v1.14.x/invoke-actions) beta documentation for more information. -Meta-arguments are a class of arguments built into the Terraform configuration language that control how Terraform creates your infrastructure. This page provides an overview of the meta-arguments included with Terraform. - ## Introduction You can use meta-arguments in any type of resource, including resources created with `data` blocks. You can also use most meta-arguments in `module` blocks. From 72e64182073e4ecddbfcaa982beaac671cff898c Mon Sep 17 00:00:00 2001 From: Brian McClain Date: Mon, 6 Oct 2025 14:14:44 -0400 Subject: [PATCH 7/7] Update content/terraform/v1.13.x/docs/language/block/resource.mdx Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- content/terraform/v1.13.x/docs/language/block/resource.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/terraform/v1.13.x/docs/language/block/resource.mdx b/content/terraform/v1.13.x/docs/language/block/resource.mdx index 396b873745..61c8f0b960 100644 --- a/content/terraform/v1.13.x/docs/language/block/resource.mdx +++ b/content/terraform/v1.13.x/docs/language/block/resource.mdx @@ -10,7 +10,7 @@ The `resource` block defines a piece of infrastructure and specifies the setting -Terraform `v1.14.x (beta)` adds the `action_trigger` block to the `resource` block so that you can 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. +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.