chore(vdev): Regularize vdev integration test arguments to cargo (#16652

) * set up test fields and yaml configuration changes * add fields to IntegrationTestConfig and append them to args * modify config files and implement PR feedback * add message to show test args is empty * use unwrap adapter * cargo vdev fmt * shorten comment documenting logic * fix clippy * change splunk and databend configs * add test args to show command, append test_filter to cargo * implement PR feedback, don't append empty string to args
vectordotdev · Mar 2, 2023 · 2e0de1f · 2e0de1f
1 parent 90ae9f7
commit 2e0de1f
Show file tree

Hide file tree

Showing 36 changed files with 140 additions and 135 deletions.
diff --git a/scripts/integration/amqp/test.yaml b/scripts/integration/amqp/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - amqp-integration-tests
-- --lib
-- '::amqp::'
+
+test_filter: '::amqp::'
 
 matrix:
   version: ['3.8']
diff --git a/scripts/integration/aws/test.yaml b/scripts/integration/aws/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - aws-integration-tests
-- --lib
-- ::aws_
+
+test_filter: ::aws_
 
 env:
   AWS_ACCESS_KEY_ID: dummy

diff --git a/scripts/integration/axiom/test.yaml b/scripts/integration/axiom/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - axiom-integration-tests
-- --lib
-- '::axiom::'
+
+test_filter: '::axiom::'
 
 runner:
   env:

diff --git a/scripts/integration/azure/test.yaml b/scripts/integration/azure/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - azure-integration-tests
-- --lib
-- ::azure_
+
+test_filter: ::azure_
 
 env:
   AZURE_ADDRESS: local-azure-blob

diff --git a/scripts/integration/chronicle/test.yaml b/scripts/integration/chronicle/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - chronicle-integration-tests
-- --lib
-- '::chronicle_unstructured::'
+
+test_filter: '::chronicle_unstructured::'
 
 env:
   CHRONICLE_ADDRESS: http://chronicle-emulator:3000

diff --git a/scripts/integration/clickhouse/test.yaml b/scripts/integration/clickhouse/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - clickhouse-integration-tests
-- --lib
-- '::clickhouse::'
+
+test_filter: '::clickhouse::'
 
 env:
   CLICKHOUSE_ADDRESS: http://clickhouse:8123

diff --git a/scripts/integration/databend/test.yaml b/scripts/integration/databend/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - databend-integration-tests
-- --lib
-- '::databend::'
+
+test_filter: '::databend::'
 
 runner:
   env:

diff --git a/scripts/integration/datadog-agent/test.yaml b/scripts/integration/datadog-agent/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - datadog-agent-integration-tests
-- --lib
-- 'sources::datadog_agent::integration_tests::'
+
+test_filter: 'sources::datadog_agent::integration_tests::'
 
 env:
   AGENT_ADDRESS: datadog-agent:8181

diff --git a/scripts/integration/datadog-logs/test.yaml b/scripts/integration/datadog-logs/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - datadog-logs-integration-tests
-- --lib
-- '::datadog::logs::'
+
+test_filter: '::datadog::logs::'
 
 runner:
   env:

diff --git a/scripts/integration/datadog-metrics/test.yaml b/scripts/integration/datadog-metrics/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - datadog-metrics-integration-tests
-- --lib
-- '::datadog::metrics::'
+
+test_filter: '::datadog::metrics::'
 
 runner:
   env:

diff --git a/scripts/integration/datadog-traces/test.yaml b/scripts/integration/datadog-traces/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - datadog-traces-integration-tests
-- --lib
-- '::datadog::traces::'
+
+test_filter: '::datadog::traces::'
 
 env:
   AGENT_PORT: '8082'

diff --git a/scripts/integration/dnstap/test.yaml b/scripts/integration/dnstap/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - dnstap-integration-tests
-- --lib
-- '::dnstap::'
+
+test_filter: '::dnstap::'
 
 runner:
   env:

diff --git a/scripts/integration/docker-logs/test.yaml b/scripts/integration/docker-logs/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - docker-logs-integration-tests
-- --lib
-- "::docker_logs::"
+
+test_filter: "::docker_logs::"
 
 runner:
   needs_docker_socket: true

diff --git a/scripts/integration/elasticsearch/test.yaml b/scripts/integration/elasticsearch/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - es-integration-tests
-- --lib
-- '::elasticsearch::integration_tests::'
+
+test_filter: '::elasticsearch::integration_tests::'
 
 env:
   AWS_ACCESS_KEY_ID: dummy

diff --git a/scripts/integration/eventstoredb/test.yaml b/scripts/integration/eventstoredb/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - eventstoredb_metrics-integration-tests
-- --lib
-- '::eventstoredb_metrics::'
+
+test_filter: '::eventstoredb_metrics::'
 
 matrix:
   version: [latest]
diff --git a/scripts/integration/fluent/test.yaml b/scripts/integration/fluent/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - fluent-integration-tests
-- --lib
-- "::fluent::"
+
+test_filter: "::fluent::"
 
 runner:
   needs_docker_socket: true

diff --git a/scripts/integration/gcp/test.yaml b/scripts/integration/gcp/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - gcp-integration-tests
-- --lib
-- '::gcp::'
+
+test_filter: '::gcp::'
 
 env:
   EMULATOR_ADDRESS: http://gcloud-pubsub:8681

diff --git a/scripts/integration/http-client/test.yaml b/scripts/integration/http-client/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - http-client-integration-tests
-- --lib
-- 'sources::http_client::'
+
+test_filter: 'sources::http_client::'
 
 env:
   DUFS_ADDRESS: http://dufs:5000

diff --git a/scripts/integration/humio/test.yaml b/scripts/integration/humio/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - humio-integration-tests
-- --lib
-- '::humio::'
+
+test_filter: '::humio::'
 
 runner:
   env:

diff --git a/scripts/integration/influxdb/test.yaml b/scripts/integration/influxdb/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - influxdb-integration-tests
-- --lib
-- '::influxdb::'
+
+test_filter: '::influxdb::'
 
 env:
   INFLUXDB_V1_HTTPS_ADDRESS: https://influxdb-v1-tls:8086

diff --git a/scripts/integration/kafka/test.yaml b/scripts/integration/kafka/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - kafka-integration-tests
-- --lib
-- '::kafka::'
+
+test_filter: '::kafka::'
 
 env:
   KAFKA_HOST: kafka

diff --git a/scripts/integration/logstash/test.yaml b/scripts/integration/logstash/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - logstash-integration-tests
-- --lib
-- '::logstash::integration_tests::'
+
+test_filter: '::logstash::integration_tests::'
 
 env:
   HEARTBEAT_ADDRESS: 0.0.0.0:8080

diff --git a/scripts/integration/loki/test.yaml b/scripts/integration/loki/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - loki-integration-tests
-- --lib
-- '::loki::'
+
+test_filter: '::loki::'
 
 env:
   LOKI_ADDRESS: http://loki:3100

diff --git a/scripts/integration/mongodb/test.yaml b/scripts/integration/mongodb/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - mongodb_metrics-integration-tests
-- --lib
-- '::mongodb_metrics::'
+
+test_filter: '::mongodb_metrics::'
 
 env:
   PRIMARY_MONGODB_ADDRESS: mongodb://root:toor@mongodb-primary

diff --git a/scripts/integration/nats/test.yaml b/scripts/integration/nats/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - nats-integration-tests
-- --lib
-- '::nats::'
+
+test_filter: '::nats::'
 
 env:
   NATS_ADDRESS: nats://nats:4222

diff --git a/scripts/integration/nginx/test.yaml b/scripts/integration/nginx/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - nginx-integration-tests
-- --lib
-- '::nginx_metrics::'
+
+test_filter: '::nginx_metrics::'
 
 runner:
   env:

diff --git a/scripts/integration/opentelemetry/test.yaml b/scripts/integration/opentelemetry/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - opentelemetry-integration-tests
-- --lib
-- '::opentelemetry::'
+
+test_filter: '::opentelemetry::'
 
 runner:
   env:

diff --git a/scripts/integration/postgres/test.yaml b/scripts/integration/postgres/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - postgresql_metrics-integration-tests
-- --lib
-- ::postgres
+
+test_filter: ::postgres
 
 env:
   PG_HOST: postgres

diff --git a/scripts/integration/prometheus/test.yaml b/scripts/integration/prometheus/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+test_filter: '::prometheus::remote_write::'
+
+features:
 - prometheus-integration-tests
-- --lib
-- '::prometheus::remote_write::'
 
 env:
   REMOTE_WRITE_SOURCE_RECEIVE_ADDRESS: runner:9102

diff --git a/scripts/integration/pulsar/test.yaml b/scripts/integration/pulsar/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - pulsar-integration-tests
-- --lib
-- '::pulsar::'
+
+test_filter: '::pulsar::'
 
 env:
   PULSAR_ADDRESS: pulsar://pulsar:6650

diff --git a/scripts/integration/redis/test.yaml b/scripts/integration/redis/test.yaml
@@ -1,8 +1,7 @@
-args:
-- --features
+features:
 - redis-integration-tests
-- --lib
-- '::redis::'
+
+test_filter: "::redis::"
 
 env:
   REDIS_URL: redis://redis:6379/0

diff --git a/scripts/integration/shutdown/test.yaml b/scripts/integration/shutdown/test.yaml
@@ -1,11 +1,12 @@
 args:
-- --features
-- shutdown-tests
-- --test
-- integration
 - --test-threads
 - '4'
 
+features:
+- shutdown-tests
+
+test: "integration"
+
 env:
   KAFKA_HOST: kafka