Skip to content

Commit

Permalink
nitpicks for hashicorp#10310
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchellh authored and Gustavo Mateus committed Dec 6, 2016
1 parent c5a18ab commit 71664dc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions command/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion terraform/context_import_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// TODO
package terraform

import (
Expand Down
6 changes: 4 additions & 2 deletions website/source/docs/commands/import.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 71664dc

Please sign in to comment.