diff --git a/command/import.go b/command/import.go index 46d0324ef6..c31c6e5423 100644 --- a/command/import.go +++ b/command/import.go @@ -134,14 +134,16 @@ Options: -no-color If specified, output won't contain any color. + -provider=provider Specific provider to use for import. This is used for + specifying aliases, such as "aws.eu". Defaults to the + normal provider prefix of the resource being imported. + -state=path Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate". -state-out=path Path to write updated state file. By default, the "-state" path will be used. - -provider=provider Provider used for import. Defaults to: "" - ` return strings.TrimSpace(helpText) } diff --git a/terraform/context_import_test.go b/terraform/context_import_test.go index 5ad2273b49..de4df0a836 100644 --- a/terraform/context_import_test.go +++ b/terraform/context_import_test.go @@ -1,4 +1,3 @@ -// TODO package terraform import ( diff --git a/website/source/docs/commands/import.html.md b/website/source/docs/commands/import.html.md index 4ae785b64a..171456b6a2 100644 --- a/website/source/docs/commands/import.html.md +++ b/website/source/docs/commands/import.html.md @@ -49,8 +49,10 @@ The command-line flags are all optional. The list of available flags are: the state path. Ignored when [remote state](/docs/state/remote/index.html) is used. -* `-provider=provider` - Provider used for import. Defaults to the default - provider of the resource to import. +* `-provider=provider` - Specified provider to use for import. This is used for + specifying provider aliases, such as "aws.eu". This defaults to the normal + provider based on the prefix of the resource being imported. You usually + don't need to specify this. ## Provider Configuration