From 1bd0f3512c3294746b512a683900b05c40077ea7 Mon Sep 17 00:00:00 2001 From: Sebastian Brandt <793580+sebbrandt87@users.noreply.github.com> Date: Tue, 2 Apr 2019 16:11:51 +0200 Subject: [PATCH 1/2] Removed -index from README There is no `-index` option, instead you need to set the index as additional describer to the resource. --- website/docs/commands/untaint.html.markdown | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/website/docs/commands/untaint.html.markdown b/website/docs/commands/untaint.html.markdown index 97c2507c8..1dfad9590 100644 --- a/website/docs/commands/untaint.html.markdown +++ b/website/docs/commands/untaint.html.markdown @@ -17,9 +17,7 @@ This command _will not_ modify infrastructure, but does modify the state file in order to unmark a resource as tainted. ~> **NOTE on Tainted Indexes:** In certain edge cases, more than one tainted -instance can be present for a single resource. When this happens, the `-index` -flag is required to select which of the tainted instances to restore as -primary. You can use the `terraform show` command to inspect the state and +instance can be present for a single resource. When this happens, you need to specify the index after the resources, e.g. `my-resource-example.2`. You can use the `terraform show` command to inspect the state and determine which index holds the instance you'd like to restore. In the vast majority of cases, there will only be one tainted instance, and the `-index` flag can be omitted. @@ -41,12 +39,6 @@ certain cases, see above note). The list of available flags are: * `-backup=path` - Path to the backup file. Defaults to `-state-out` with the ".backup" extension. Disabled by setting to "-". -* `-index=n` - Selects a single tainted instance when there are more than one - tainted instances present in the state for a given resource. This flag is - required when multiple tainted instances are present. The vast majority of the - time, there is a maximum of one tainted instance per resource, so this flag - can be safely omitted. - * `-lock=true` - Lock the state file when locking is supported. * `-lock-timeout=0s` - Duration to retry a state lock. From 5d4826894c38067fa6c39814ba93a5624f695096 Mon Sep 17 00:00:00 2001 From: Sebastian Brandt <793580+sebbrandt87@users.noreply.github.com> Date: Tue, 6 Aug 2019 21:18:20 +0200 Subject: [PATCH 2/2] Update website/docs/commands/untaint.html.markdown Co-Authored-By: The Terraform Team <52939924+teamterraform@users.noreply.github.com> --- website/docs/commands/untaint.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/commands/untaint.html.markdown b/website/docs/commands/untaint.html.markdown index 1dfad9590..c0bf081a6 100644 --- a/website/docs/commands/untaint.html.markdown +++ b/website/docs/commands/untaint.html.markdown @@ -17,7 +17,7 @@ This command _will not_ modify infrastructure, but does modify the state file in order to unmark a resource as tainted. ~> **NOTE on Tainted Indexes:** In certain edge cases, more than one tainted -instance can be present for a single resource. When this happens, you need to specify the index after the resources, e.g. `my-resource-example.2`. You can use the `terraform show` command to inspect the state and +instance can be present for a single resource. When this happens, you need to specify the index after the resources, e.g. `my-resource-example[2]`. You can use the `terraform show` command to inspect the state and determine which index holds the instance you'd like to restore. In the vast majority of cases, there will only be one tainted instance, and the `-index` flag can be omitted.