Merge pull request #26155 from hashicorp/unused-env-var
Remove unused env var TF_SKIP_PROVIDER_VERIFY
This commit is contained in:
commit
1ecd86d08e
|
@ -283,10 +283,6 @@ func (c *InitCommand) Run(args []string) int {
|
||||||
state = sMgr.State()
|
state = sMgr.State()
|
||||||
}
|
}
|
||||||
|
|
||||||
if v := os.Getenv(ProviderSkipVerifyEnvVar); v != "" {
|
|
||||||
c.ignorePluginChecksum = true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now that we have loaded all modules, check the module tree for missing providers.
|
// Now that we have loaded all modules, check the module tree for missing providers.
|
||||||
providersOutput, providersAbort, providerDiags := c.getProviders(config, state, flagUpgrade, flagPluginPath)
|
providersOutput, providersAbort, providerDiags := c.getProviders(config, state, flagUpgrade, flagPluginPath)
|
||||||
diags = diags.Append(providerDiags)
|
diags = diags.Append(providerDiags)
|
||||||
|
|
|
@ -121,8 +121,6 @@ type Meta struct {
|
||||||
// This overrides all other search paths when discovering plugins.
|
// This overrides all other search paths when discovering plugins.
|
||||||
pluginPath []string
|
pluginPath []string
|
||||||
|
|
||||||
ignorePluginChecksum bool
|
|
||||||
|
|
||||||
// Override certain behavior for tests within this package
|
// Override certain behavior for tests within this package
|
||||||
testingOverrides *testingOverrides
|
testingOverrides *testingOverrides
|
||||||
|
|
||||||
|
@ -373,10 +371,6 @@ func (m *Meta) RunOperation(b backend.Enhanced, opReq *backend.Operation) (*back
|
||||||
return op, nil
|
return op, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
|
||||||
ProviderSkipVerifyEnvVar = "TF_SKIP_PROVIDER_VERIFY"
|
|
||||||
)
|
|
||||||
|
|
||||||
// contextOpts returns the options to use to initialize a Terraform
|
// contextOpts returns the options to use to initialize a Terraform
|
||||||
// context with the settings from this Meta.
|
// context with the settings from this Meta.
|
||||||
func (m *Meta) contextOpts() (*terraform.ContextOpts, error) {
|
func (m *Meta) contextOpts() (*terraform.ContextOpts, error) {
|
||||||
|
@ -422,9 +416,6 @@ func (m *Meta) contextOpts() (*terraform.ContextOpts, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
opts.ProviderSHA256s = m.providerPluginsLock().Read()
|
opts.ProviderSHA256s = m.providerPluginsLock().Read()
|
||||||
if v := os.Getenv(ProviderSkipVerifyEnvVar); v != "" {
|
|
||||||
opts.SkipProviderVerify = true
|
|
||||||
}
|
|
||||||
|
|
||||||
opts.Meta = &terraform.ContextMeta{
|
opts.Meta = &terraform.ContextMeta{
|
||||||
Env: workspace,
|
Env: workspace,
|
||||||
|
|
|
@ -63,8 +63,7 @@ type ContextOpts struct {
|
||||||
|
|
||||||
// If non-nil, will apply as additional constraints on the provider
|
// If non-nil, will apply as additional constraints on the provider
|
||||||
// plugins that will be requested from the provider resolver.
|
// plugins that will be requested from the provider resolver.
|
||||||
ProviderSHA256s map[string][]byte
|
ProviderSHA256s map[string][]byte
|
||||||
SkipProviderVerify bool
|
|
||||||
|
|
||||||
UIInput UIInput
|
UIInput UIInput
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue