Skip to content

Commit

Permalink
Update docstring for ignore-remote-version
Browse files Browse the repository at this point in the history
Update docstring for ignore-remote-version to be more accurate,
as it's not whether the versions differ, but if they are incompatible
  • Loading branch information
pselle committed Jan 27, 2021
1 parent 1a16ce8 commit c1ede28
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions command/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (c *ImportCommand) Run(args []string) int {
args = c.Meta.process(args)

cmdFlags := c.Meta.extendedFlagSet("import")
cmdFlags.BoolVar(&c.ignoreRemoteVersion, "ignore-remote-version", false, "continue even if remote and local Terraform versions differ")
cmdFlags.BoolVar(&c.ignoreRemoteVersion, "ignore-remote-version", false, "continue even if remote and local Terraform versions are incompatible")
cmdFlags.IntVar(&c.Meta.parallelism, "parallelism", DefaultParallelism, "parallelism")
cmdFlags.StringVar(&c.Meta.statePath, "state", "", "path")
cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path")
Expand Down Expand Up @@ -331,8 +331,8 @@ Options:
files are present, they will be automatically loaded.
-ignore-remote-version Continue even if remote and local Terraform versions
differ. This may result in an unusable workspace, and
should be used with extreme caution.
are incompatible. This may result in an unusable
workspace, and should be used with extreme caution.
`
return strings.TrimSpace(helpText)
Expand Down
2 changes: 1 addition & 1 deletion command/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ func (m *Meta) defaultFlagSet(n string) *flag.FlagSet {
func (m *Meta) ignoreRemoteVersionFlagSet(n string) *flag.FlagSet {
f := m.defaultFlagSet(n)

f.BoolVar(&m.ignoreRemoteVersion, "ignore-remote-version", false, "continue even if remote and local Terraform versions differ")
f.BoolVar(&m.ignoreRemoteVersion, "ignore-remote-version", false, "continue even if remote and local Terraform versions are incompatible")

return f
}
Expand Down
4 changes: 2 additions & 2 deletions command/state_mv.go
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,8 @@ Options:
used. This can be a new or existing path.
-ignore-remote-version Continue even if remote and local Terraform versions
differ. This may result in an unusable workspace, and
should be used with extreme caution.
are incompatible. This may result in an unusable
workspace, and should be used with extreme caution.
`
return strings.TrimSpace(helpText)
Expand Down
4 changes: 2 additions & 2 deletions command/state_replace_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ Options:
configured backend, or "terraform.tfstate"
-ignore-remote-version Continue even if remote and local Terraform versions
differ. This may result in an unusable workspace, and
should be used with extreme caution.
are incompatible. This may result in an unusable
workspace, and should be used with extreme caution.
`
return strings.TrimSpace(helpText)
Expand Down
4 changes: 2 additions & 2 deletions command/state_rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ Options:
current workspace state.
-ignore-remote-version Continue even if remote and local Terraform versions
differ. This may result in an unusable workspace, and
should be used with extreme caution.
are incompatible. This may result in an unusable
workspace, and should be used with extreme caution.
`
return strings.TrimSpace(helpText)
Expand Down
4 changes: 2 additions & 2 deletions command/taint.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ Options:
"-state" path will be used.
-ignore-remote-version Continue even if remote and local Terraform versions
differ. This may result in an unusable workspace, and
should be used with extreme caution.
are incompatible. This may result in an unusable
workspace, and should be used with extreme caution.
`
return strings.TrimSpace(helpText)
Expand Down
4 changes: 2 additions & 2 deletions command/untaint.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ Options:
"-state" path will be used.
-ignore-remote-version Continue even if remote and local Terraform versions
differ. This may result in an unusable workspace, and
should be used with extreme caution.
are incompatible. This may result in an unusable
workspace, and should be used with extreme caution.
`
return strings.TrimSpace(helpText)
Expand Down

0 comments on commit c1ede28

Please sign in to comment.