Skip to content

Fix override of variables with dots in their names in system tests #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2022
Merged

Fix override of variables with dots in their names in system tests #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions internal/testrunner/runners/system/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,14 +639,15 @@ func createInputPackageDatastream(
return r
}

func setKibanaVariables(definitions []packages.Variable, values map[string]packages.VarValue) kibana.Vars {
func setKibanaVariables(definitions []packages.Variable, values common.MapStr) kibana.Vars {
vars := kibana.Vars{}
for _, definition := range definitions {
val := definition.Default

value, exists := values[definition.Name]
if exists {
val = value
value, err := values.GetValue(definition.Name)
if err == nil {
val = packages.VarValue{}
val.Unpack(value)
}

vars[definition.Name] = kibana.Var{
Expand Down
6 changes: 3 additions & 3 deletions internal/testrunner/runners/system/test_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/elastic/go-ucfg"
"github.com/elastic/go-ucfg/yaml"

"github.com/elastic/elastic-package/internal/packages"
"github.com/elastic/elastic-package/internal/common"
"github.com/elastic/elastic-package/internal/testrunner"
"github.com/elastic/elastic-package/internal/testrunner/runners/system/servicedeployer"
)
Expand All @@ -33,9 +33,9 @@ type testConfig struct {
ServiceNotifySignal string `config:"service_notify_signal"` // Signal to send when the agent policy is applied.
WaitForDataTimeout time.Duration `config:"wait_for_data_timeout"`

Vars map[string]packages.VarValue `config:"vars"`
Vars common.MapStr `config:"vars"`
DataStream struct {
Vars map[string]packages.VarValue `config:"vars"`
Vars common.MapStr `config:"vars"`
} `config:"data_stream"`

// NumericKeywordFields holds a list of fields that have keyword
Expand Down