From 4f23efc14eaccef48d69adfdc1aa644fcdfaba9f Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Fri, 23 Feb 2024 14:00:53 +0100 Subject: [PATCH] remove unused config --- internal/moduletest/config/config.go | 2 -- internal/moduletest/hcl/provider.go | 6 ++---- internal/moduletest/hcl/provider_test.go | 9 --------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/internal/moduletest/config/config.go b/internal/moduletest/config/config.go index 8bcc41d4bb..a1ea88b289 100644 --- a/internal/moduletest/config/config.go +++ b/internal/moduletest/config/config.go @@ -91,7 +91,6 @@ func TransformConfigForTest(config *configs.Config, run *moduletest.Run, file *m Version: testProvider.Version, Config: &hcltest.ProviderConfig{ Original: testProvider.Config, - ConfigVariables: config.Module.Variables, AvailableVariables: availableVariables, AvailableRunOutputs: availableRunOutputs, }, @@ -119,7 +118,6 @@ func TransformConfigForTest(config *configs.Config, run *moduletest.Run, file *m Version: provider.Version, Config: &hcltest.ProviderConfig{ Original: provider.Config, - ConfigVariables: config.Module.Variables, AvailableVariables: availableVariables, AvailableRunOutputs: availableRunOutputs, }, diff --git a/internal/moduletest/hcl/provider.go b/internal/moduletest/hcl/provider.go index 03d1fc7bc8..2b3784eeed 100644 --- a/internal/moduletest/hcl/provider.go +++ b/internal/moduletest/hcl/provider.go @@ -8,7 +8,6 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/lang" "github.com/hashicorp/terraform/internal/terraform" ) @@ -26,7 +25,6 @@ var _ hcl.Body = (*ProviderConfig)(nil) type ProviderConfig struct { Original hcl.Body - ConfigVariables map[string]*configs.Variable AvailableVariables terraform.InputValues AvailableRunOutputs map[addrs.Run]cty.Value } @@ -52,7 +50,7 @@ func (p *ProviderConfig) PartialContent(schema *hcl.BodySchema) (*hcl.BodyConten Attributes: attrs, Blocks: p.transformBlocks(content.Blocks), MissingItemRange: content.MissingItemRange, - }, &ProviderConfig{rest, p.ConfigVariables, p.AvailableVariables, p.AvailableRunOutputs}, diags + }, &ProviderConfig{rest, p.AvailableVariables, p.AvailableRunOutputs}, diags } func (p *ProviderConfig) JustAttributes() (hcl.Attributes, hcl.Diagnostics) { @@ -127,7 +125,7 @@ func (p *ProviderConfig) transformBlocks(originals hcl.Blocks) hcl.Blocks { blocks[name] = &hcl.Block{ Type: block.Type, Labels: block.Labels, - Body: &ProviderConfig{block.Body, p.ConfigVariables, p.AvailableVariables, p.AvailableRunOutputs}, + Body: &ProviderConfig{block.Body, p.AvailableVariables, p.AvailableRunOutputs}, DefRange: block.DefRange, TypeRange: block.TypeRange, LabelRanges: block.LabelRanges, diff --git a/internal/moduletest/hcl/provider_test.go b/internal/moduletest/hcl/provider_test.go index d23cb2f334..97bffb9b48 100644 --- a/internal/moduletest/hcl/provider_test.go +++ b/internal/moduletest/hcl/provider_test.go @@ -174,15 +174,6 @@ func TestProviderConfig(t *testing.T) { config := ProviderConfig{ Original: file.Body, - ConfigVariables: func() map[string]*configs.Variable { - variables := make(map[string]*configs.Variable) - for variable := range tc.variables { - variables[variable] = &configs.Variable{ - Name: variable, - } - } - return variables - }(), AvailableVariables: func() terraform.InputValues { variables := make(terraform.InputValues) for name, value := range tc.variables {