Skip to content

Fix package-level variables in system tests #1288

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 4 commits into from
Jun 1, 2023
Merged

Fix package-level variables in system tests #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83e4be5
Fix variables in GCP test package and remove default for project ID
jsoriano May 31, 2023
5fcf790
Add variables at the root level too
jsoriano May 31, 2023
20b3bf6
Don't include null vars
jsoriano May 31, 2023
c3bae7a
Set package level variables
jsoriano May 31, 2023
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
1 change: 1 addition & 0 deletions internal/kibana/policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ type PackageDataStream struct {
Enabled bool `json:"enabled"`
OutputID string `json:"output_id"`
Inputs []Input `json:"inputs"`
Vars Vars `json:"vars,omitempty"`
Package struct {
Name string `json:"name"`
Title string `json:"title"`
Expand Down
10 changes: 4 additions & 6 deletions internal/testrunner/runners/system/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,16 +582,14 @@ func createIntegrationPackageDatastream(
streams[0].Vars = setKibanaVariables(stream.Vars, config.DataStream.Vars)
r.Inputs[0].Streams = streams

// Add package-level vars
var inputVars []packages.Variable
// Add input-level vars
input := policyTemplate.FindInputByType(streamInput)
if input != nil {
// copy package-level vars into each input
inputVars = append(inputVars, input.Vars...)
inputVars = append(inputVars, pkg.Vars...)
r.Inputs[0].Vars = setKibanaVariables(input.Vars, config.Vars)
}

r.Inputs[0].Vars = setKibanaVariables(inputVars, config.Vars)
// Add package-level vars
r.Vars = setKibanaVariables(pkg.Vars, config.Vars)

return r
}
Expand Down
7 changes: 4 additions & 3 deletions test/packages/parallel/gcp/data_stream/compute/_dev/test/system/test-default-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# wait_for_data_timeout: 10m
vars:
project_id: "{{GCP_PROJECT_ID}}"
zone: "{{GCP_ZONE}}"
credentials_json: '{{{GOOGLE_CREDENTIALS}}}'
data_streams:
vars: ~
data_stream:
vars:
zone: "{{GCP_ZONE}}"
region: "{{GCP_REGION}}"
1 change: 0 additions & 1 deletion test/packages/parallel/gcp/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ vars:
multi: false
required: true
show_user: true
default: SET_PROJECT_NAME
- name: credentials_file
type: text
title: Credentials File
Expand Down