mirror of
https://github.com/opentofu/opentofu.git
synced 2024-12-25 08:21:07 -06:00
3878b8b093
Fixes #10715 `config.Merge` was not updated to support a number of new features. This updates the codepath to merge various fields, including the `terraform` block which was the issue in #10715. The `Merge` API is called when an `_override` file is present to _merge_ configurations. Normally configurations are _appended_. Only an override file triggers a _merge_. I started working on a generic library to do this automatically awhile back but never finished it. This might motivate me to do so. In the interest of getting a fix out though, we'll continue the manual approach.
450 lines
7.1 KiB
Go
450 lines
7.1 KiB
Go
package config
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
func TestMerge(t *testing.T) {
|
|
cases := []struct {
|
|
c1, c2, result *Config
|
|
err bool
|
|
}{
|
|
// Normal good case.
|
|
{
|
|
&Config{
|
|
Atlas: &AtlasConfig{
|
|
Name: "foo",
|
|
},
|
|
Modules: []*Module{
|
|
&Module{Name: "foo"},
|
|
},
|
|
Outputs: []*Output{
|
|
&Output{Name: "foo"},
|
|
},
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Name: "foo"},
|
|
},
|
|
Resources: []*Resource{
|
|
&Resource{Name: "foo"},
|
|
},
|
|
Variables: []*Variable{
|
|
&Variable{Name: "foo"},
|
|
},
|
|
|
|
unknownKeys: []string{"foo"},
|
|
},
|
|
|
|
&Config{
|
|
Atlas: &AtlasConfig{
|
|
Name: "bar",
|
|
},
|
|
Modules: []*Module{
|
|
&Module{Name: "bar"},
|
|
},
|
|
Outputs: []*Output{
|
|
&Output{Name: "bar"},
|
|
},
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Name: "bar"},
|
|
},
|
|
Resources: []*Resource{
|
|
&Resource{Name: "bar"},
|
|
},
|
|
Variables: []*Variable{
|
|
&Variable{Name: "bar"},
|
|
},
|
|
|
|
unknownKeys: []string{"bar"},
|
|
},
|
|
|
|
&Config{
|
|
Atlas: &AtlasConfig{
|
|
Name: "bar",
|
|
},
|
|
Modules: []*Module{
|
|
&Module{Name: "foo"},
|
|
&Module{Name: "bar"},
|
|
},
|
|
Outputs: []*Output{
|
|
&Output{Name: "foo"},
|
|
&Output{Name: "bar"},
|
|
},
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Name: "foo"},
|
|
&ProviderConfig{Name: "bar"},
|
|
},
|
|
Resources: []*Resource{
|
|
&Resource{Name: "foo"},
|
|
&Resource{Name: "bar"},
|
|
},
|
|
Variables: []*Variable{
|
|
&Variable{Name: "foo"},
|
|
&Variable{Name: "bar"},
|
|
},
|
|
|
|
unknownKeys: []string{"foo", "bar"},
|
|
},
|
|
|
|
false,
|
|
},
|
|
|
|
// Test that when merging duplicates, it merges into the
|
|
// first, but keeps the duplicates so that errors still
|
|
// happen.
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Name: "foo"},
|
|
},
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Name: "foo"},
|
|
},
|
|
Resources: []*Resource{
|
|
&Resource{Name: "foo"},
|
|
},
|
|
Variables: []*Variable{
|
|
&Variable{Name: "foo", Default: "foo"},
|
|
&Variable{Name: "foo"},
|
|
},
|
|
|
|
unknownKeys: []string{"foo"},
|
|
},
|
|
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Name: "bar"},
|
|
},
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Name: "bar"},
|
|
},
|
|
Resources: []*Resource{
|
|
&Resource{Name: "bar"},
|
|
},
|
|
Variables: []*Variable{
|
|
&Variable{Name: "foo", Default: "bar"},
|
|
&Variable{Name: "bar"},
|
|
},
|
|
|
|
unknownKeys: []string{"bar"},
|
|
},
|
|
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Name: "foo"},
|
|
&Output{Name: "bar"},
|
|
},
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Name: "foo"},
|
|
&ProviderConfig{Name: "bar"},
|
|
},
|
|
Resources: []*Resource{
|
|
&Resource{Name: "foo"},
|
|
&Resource{Name: "bar"},
|
|
},
|
|
Variables: []*Variable{
|
|
&Variable{Name: "foo", Default: "bar"},
|
|
&Variable{Name: "foo"},
|
|
&Variable{Name: "bar"},
|
|
},
|
|
|
|
unknownKeys: []string{"foo", "bar"},
|
|
},
|
|
|
|
false,
|
|
},
|
|
|
|
// Terraform block
|
|
{
|
|
&Config{
|
|
Terraform: &Terraform{
|
|
RequiredVersion: "A",
|
|
},
|
|
},
|
|
&Config{},
|
|
&Config{
|
|
Terraform: &Terraform{
|
|
RequiredVersion: "A",
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{},
|
|
&Config{
|
|
Terraform: &Terraform{
|
|
RequiredVersion: "A",
|
|
},
|
|
},
|
|
&Config{
|
|
Terraform: &Terraform{
|
|
RequiredVersion: "A",
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
// Provider alias
|
|
{
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "foo"},
|
|
},
|
|
},
|
|
&Config{},
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{},
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "foo"},
|
|
},
|
|
},
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "bar"},
|
|
},
|
|
},
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "foo"},
|
|
},
|
|
},
|
|
&Config{
|
|
ProviderConfigs: []*ProviderConfig{
|
|
&ProviderConfig{Alias: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
// Variable type
|
|
{
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "foo"},
|
|
},
|
|
},
|
|
&Config{},
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{},
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "foo"},
|
|
},
|
|
},
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "bar"},
|
|
},
|
|
},
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "foo"},
|
|
},
|
|
},
|
|
&Config{
|
|
Variables: []*Variable{
|
|
&Variable{DeclaredType: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
// Output description
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "foo"},
|
|
},
|
|
},
|
|
&Config{},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "foo"},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "bar"},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "foo"},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Description: "foo"},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
// Output depends_on
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"foo"}},
|
|
},
|
|
},
|
|
&Config{},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"foo"}},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"foo"}},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"foo"}},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"bar"}},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"foo"}},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{DependsOn: []string{"foo"}},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
// Output sensitive
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: true},
|
|
},
|
|
},
|
|
&Config{},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: true},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: true},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: true},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
|
|
{
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: false},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: true},
|
|
},
|
|
},
|
|
&Config{
|
|
Outputs: []*Output{
|
|
&Output{Sensitive: true},
|
|
},
|
|
},
|
|
false,
|
|
},
|
|
}
|
|
|
|
for i, tc := range cases {
|
|
actual, err := Merge(tc.c1, tc.c2)
|
|
if err != nil != tc.err {
|
|
t.Fatalf("%d: error fail", i)
|
|
}
|
|
|
|
if !reflect.DeepEqual(actual, tc.result) {
|
|
t.Fatalf("%d: bad:\n\n%#v", i, actual)
|
|
}
|
|
}
|
|
}
|