From f3ff843ffdd820c7301b6df08d3df75a37bb600c Mon Sep 17 00:00:00 2001 From: Paul Tyng Date: Mon, 7 Sep 2020 15:16:18 -0400 Subject: [PATCH] Remove unused env var TF_SKIP_PROVIDER_VERIFY --- command/init.go | 4 ---- command/meta.go | 9 --------- terraform/context.go | 3 +-- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/command/init.go b/command/init.go index 392fb5e14..1016004a1 100644 --- a/command/init.go +++ b/command/init.go @@ -283,10 +283,6 @@ func (c *InitCommand) Run(args []string) int { 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. providersOutput, providerDiags := c.getProviders(config, state, flagUpgrade, flagPluginPath) diags = diags.Append(providerDiags) diff --git a/command/meta.go b/command/meta.go index ad830fcf2..3faf3cdd1 100644 --- a/command/meta.go +++ b/command/meta.go @@ -121,8 +121,6 @@ type Meta struct { // This overrides all other search paths when discovering plugins. pluginPath []string - ignorePluginChecksum bool - // Override certain behavior for tests within this package testingOverrides *testingOverrides @@ -346,10 +344,6 @@ func (m *Meta) RunOperation(b backend.Enhanced, opReq *backend.Operation) (*back return op, nil } -const ( - ProviderSkipVerifyEnvVar = "TF_SKIP_PROVIDER_VERIFY" -) - // contextOpts returns the options to use to initialize a Terraform // context with the settings from this Meta. func (m *Meta) contextOpts() (*terraform.ContextOpts, error) { @@ -390,9 +384,6 @@ func (m *Meta) contextOpts() (*terraform.ContextOpts, error) { } opts.ProviderSHA256s = m.providerPluginsLock().Read() - if v := os.Getenv(ProviderSkipVerifyEnvVar); v != "" { - opts.SkipProviderVerify = true - } opts.Meta = &terraform.ContextMeta{ Env: workspace, diff --git a/terraform/context.go b/terraform/context.go index cc2e5c7b7..9fa56a0d5 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -62,8 +62,7 @@ type ContextOpts struct { // If non-nil, will apply as additional constraints on the provider // plugins that will be requested from the provider resolver. - ProviderSHA256s map[string][]byte - SkipProviderVerify bool + ProviderSHA256s map[string][]byte UIInput UIInput }