upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-05-28 04:03:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

remove unused config

Browse source
This commit is contained in:
Daniel Schmidt 2024-02-23 14:00:53 +01:00
parent 5a72e696ce
commit 4f23efc14e
No known key found for this signature in database
GPG key ID: 377C3A4D62FBBBE2
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/moduletest/config/config.go
View file

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

6
internal/moduletest/hcl/provider.go
View file

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

9
internal/moduletest/hcl/provider_test.go
View file

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