From cbc1b283c8345ba9b64fdc91f1d0e42df5c27983 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Thu, 25 Mar 2021 10:31:41 +0100 Subject: [PATCH] Fix: replace pipeline tests (replace json configs with yml) (#804) --- go.mod | 2 +- go.sum | 8 ++++---- .../audit/_dev/test/pipeline/test-audit.log-config.json | 5 ----- .../audit/_dev/test/pipeline/test-audit.log-config.yml | 2 ++ .../_dev/test/pipeline/test-firewall.log-config.json | 5 ----- .../_dev/test/pipeline/test-firewall.log-config.yml | 2 ++ .../_dev/test/pipeline/test-vpcflow.log-config.json | 5 ----- .../_dev/test/pipeline/test-vpcflow.log-config.yml | 1 + 8 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.json create mode 100644 packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.yml delete mode 100644 packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.json create mode 100644 packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.yml delete mode 100644 packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.json create mode 100644 packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.yml diff --git a/go.mod b/go.mod index 0222ec3cb36..96447bc92a4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/blang/semver v3.5.1+incompatible - github.com/elastic/elastic-package v0.0.0-20210323050956-96ac7e929cae + github.com/elastic/elastic-package v0.0.0-20210324160257-57698a40f3e3 github.com/elastic/package-registry v0.17.0 github.com/magefile/mage v1.11.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index fadd2662cc0..4d9526a70a1 100644 --- a/go.sum +++ b/go.sum @@ -84,8 +84,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/elastic/elastic-package v0.0.0-20210323050956-96ac7e929cae h1:bXhapBhoygVi0pI/HHMFL7Lg1UdxiEaIoYS5eGALkkI= -github.com/elastic/elastic-package v0.0.0-20210323050956-96ac7e929cae/go.mod h1:zlwA6eqY17P630VjzQVkJAdSpXkIgdA3+xhcpcS/qis= +github.com/elastic/elastic-package v0.0.0-20210324160257-57698a40f3e3 h1:OR5L0qConItz7eBvpTIbfEYu6r3+FzqLC/oH+AV12/M= +github.com/elastic/elastic-package v0.0.0-20210324160257-57698a40f3e3/go.mod h1:zE/RmGwaG/pY0/YV/hR1uq/IiRQyGsZm206ZOLZJgtQ= github.com/elastic/go-elasticsearch/v7 v7.9.0 h1:UEau+a1MiiE/F+UrDj60kqIHFWdzU1M2y/YtBU2NC2M= github.com/elastic/go-elasticsearch/v7 v7.9.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/elastic/go-licenser v0.3.1/go.mod h1:D8eNQk70FOCVBl3smCGQt/lv7meBeQno2eI1S5apiHQ= @@ -94,8 +94,8 @@ github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6 h1:Ehbr7du4rSSEy github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo= github.com/elastic/package-registry v0.17.0 h1:Gh7u3TlHA3GJh+C/OZ8Pf4EUrFxcCXMAe2kUCjAiYgQ= github.com/elastic/package-registry v0.17.0/go.mod h1:fMVt9ozLSPAIgYTDgV23IZrSoDKZma7VKpA4uSkfPts= -github.com/elastic/package-spec/code/go v0.0.0-20210310145052-baee4c3da9cc h1:ISojb0A3dI2aOIWabY5p4QsQzB1TrtEOsVfVIPkz4cw= -github.com/elastic/package-spec/code/go v0.0.0-20210310145052-baee4c3da9cc/go.mod h1:dog1l3e8NoRYxuB8yIbbOWglE6GSQuU6ZL75wT9pKL8= +github.com/elastic/package-spec/code/go v0.0.0-20210323141903-9ce2ae1d6842 h1:nleodxbyE5xUe3hDRXPZRXMlWXvRhXAp3p2DgeXAAa4= +github.com/elastic/package-spec/code/go v0.0.0-20210323141903-9ce2ae1d6842/go.mod h1:dog1l3e8NoRYxuB8yIbbOWglE6GSQuU6ZL75wT9pKL8= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= diff --git a/packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.json b/packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.json deleted file mode 100644 index f71947c2f04..00000000000 --- a/packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dynamic_fields": { - "event.ingested": ".*" - } -} \ No newline at end of file diff --git a/packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.yml b/packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.yml new file mode 100644 index 00000000000..c39dc386179 --- /dev/null +++ b/packages/gcp/data_stream/audit/_dev/test/pipeline/test-audit.log-config.yml @@ -0,0 +1,2 @@ +dynamic_fields: + event.ingested: ".*" diff --git a/packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.json b/packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.json deleted file mode 100644 index f71947c2f04..00000000000 --- a/packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dynamic_fields": { - "event.ingested": ".*" - } -} \ No newline at end of file diff --git a/packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.yml b/packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.yml new file mode 100644 index 00000000000..c39dc386179 --- /dev/null +++ b/packages/gcp/data_stream/firewall/_dev/test/pipeline/test-firewall.log-config.yml @@ -0,0 +1,2 @@ +dynamic_fields: + event.ingested: ".*" diff --git a/packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.json b/packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.json deleted file mode 100644 index f71947c2f04..00000000000 --- a/packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dynamic_fields": { - "event.ingested": ".*" - } -} \ No newline at end of file diff --git a/packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.yml b/packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.yml new file mode 100644 index 00000000000..780b0823140 --- /dev/null +++ b/packages/gcp/data_stream/vpcflow/_dev/test/pipeline/test-vpcflow.log-config.yml @@ -0,0 +1 @@ +{"dynamic_fields": {"event.ingested": ".*"}}