Merge pull request #27611 from hashicorp/pselle/ignore-remote-version-docstring

Update docstring for ignore-remote-version
This commit is contained in:
Pam Selle 2021-01-27 16:59:01 -05:00 committed by GitHub
commit 29dd334fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions

View File

@ -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")
@ -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)

View File

@ -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
}

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)