Merge pull request #27611 from hashicorp/pselle/ignore-remote-version-docstring
Update docstring for ignore-remote-version
This commit is contained in:
commit
29dd334fe8
|
@ -35,7 +35,7 @@ func (c *ImportCommand) Run(args []string) int {
|
||||||
args = c.Meta.process(args)
|
args = c.Meta.process(args)
|
||||||
|
|
||||||
cmdFlags := c.Meta.extendedFlagSet("import")
|
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.IntVar(&c.Meta.parallelism, "parallelism", DefaultParallelism, "parallelism")
|
||||||
cmdFlags.StringVar(&c.Meta.statePath, "state", "", "path")
|
cmdFlags.StringVar(&c.Meta.statePath, "state", "", "path")
|
||||||
cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path")
|
cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path")
|
||||||
|
@ -331,8 +331,8 @@ Options:
|
||||||
files are present, they will be automatically loaded.
|
files are present, they will be automatically loaded.
|
||||||
|
|
||||||
-ignore-remote-version Continue even if remote and local Terraform versions
|
-ignore-remote-version Continue even if remote and local Terraform versions
|
||||||
differ. This may result in an unusable workspace, and
|
are incompatible. This may result in an unusable
|
||||||
should be used with extreme caution.
|
workspace, and should be used with extreme caution.
|
||||||
|
|
||||||
`
|
`
|
||||||
return strings.TrimSpace(helpText)
|
return strings.TrimSpace(helpText)
|
||||||
|
|
|
@ -512,7 +512,7 @@ func (m *Meta) defaultFlagSet(n string) *flag.FlagSet {
|
||||||
func (m *Meta) ignoreRemoteVersionFlagSet(n string) *flag.FlagSet {
|
func (m *Meta) ignoreRemoteVersionFlagSet(n string) *flag.FlagSet {
|
||||||
f := m.defaultFlagSet(n)
|
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
|
return f
|
||||||
}
|
}
|
||||||
|
|
|
@ -492,8 +492,8 @@ Options:
|
||||||
used. This can be a new or existing path.
|
used. This can be a new or existing path.
|
||||||
|
|
||||||
-ignore-remote-version Continue even if remote and local Terraform versions
|
-ignore-remote-version Continue even if remote and local Terraform versions
|
||||||
differ. This may result in an unusable workspace, and
|
are incompatible. This may result in an unusable
|
||||||
should be used with extreme caution.
|
workspace, and should be used with extreme caution.
|
||||||
|
|
||||||
`
|
`
|
||||||
return strings.TrimSpace(helpText)
|
return strings.TrimSpace(helpText)
|
||||||
|
|
|
@ -187,8 +187,8 @@ Options:
|
||||||
configured backend, or "terraform.tfstate"
|
configured backend, or "terraform.tfstate"
|
||||||
|
|
||||||
-ignore-remote-version Continue even if remote and local Terraform versions
|
-ignore-remote-version Continue even if remote and local Terraform versions
|
||||||
differ. This may result in an unusable workspace, and
|
are incompatible. This may result in an unusable
|
||||||
should be used with extreme caution.
|
workspace, and should be used with extreme caution.
|
||||||
|
|
||||||
`
|
`
|
||||||
return strings.TrimSpace(helpText)
|
return strings.TrimSpace(helpText)
|
||||||
|
|
|
@ -160,8 +160,8 @@ Options:
|
||||||
current workspace state.
|
current workspace state.
|
||||||
|
|
||||||
-ignore-remote-version Continue even if remote and local Terraform versions
|
-ignore-remote-version Continue even if remote and local Terraform versions
|
||||||
differ. This may result in an unusable workspace, and
|
are incompatible. This may result in an unusable
|
||||||
should be used with extreme caution.
|
workspace, and should be used with extreme caution.
|
||||||
|
|
||||||
`
|
`
|
||||||
return strings.TrimSpace(helpText)
|
return strings.TrimSpace(helpText)
|
||||||
|
|
|
@ -245,8 +245,8 @@ Options:
|
||||||
"-state" path will be used.
|
"-state" path will be used.
|
||||||
|
|
||||||
-ignore-remote-version Continue even if remote and local Terraform versions
|
-ignore-remote-version Continue even if remote and local Terraform versions
|
||||||
differ. This may result in an unusable workspace, and
|
are incompatible. This may result in an unusable
|
||||||
should be used with extreme caution.
|
workspace, and should be used with extreme caution.
|
||||||
|
|
||||||
`
|
`
|
||||||
return strings.TrimSpace(helpText)
|
return strings.TrimSpace(helpText)
|
||||||
|
|
|
@ -210,8 +210,8 @@ Options:
|
||||||
"-state" path will be used.
|
"-state" path will be used.
|
||||||
|
|
||||||
-ignore-remote-version Continue even if remote and local Terraform versions
|
-ignore-remote-version Continue even if remote and local Terraform versions
|
||||||
differ. This may result in an unusable workspace, and
|
are incompatible. This may result in an unusable
|
||||||
should be used with extreme caution.
|
workspace, and should be used with extreme caution.
|
||||||
|
|
||||||
`
|
`
|
||||||
return strings.TrimSpace(helpText)
|
return strings.TrimSpace(helpText)
|
||||||
|
|
Loading…
Reference in New Issue