From a15a2e018bc16e037ab5483093ad347e552c8c8d Mon Sep 17 00:00:00 2001 From: Attila Szakacs Date: Sat, 12 Oct 2024 14:45:15 +0200 Subject: [PATCH] grpc: rename grpc_dest_option to grpc_dest_general option We are planning to introduce an opt-in grpc_dest_schema_option nonterminal. Signed-off-by: Attila Szakacs --- modules/grpc/bigquery/bigquery-grammar.ym | 2 +- modules/grpc/common/grpc-grammar.ym | 2 +- modules/grpc/loki/loki-grammar.ym | 2 +- modules/grpc/otel/otel-grammar.ym | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/grpc/bigquery/bigquery-grammar.ym b/modules/grpc/bigquery/bigquery-grammar.ym index cef67cc111..f7bb1f89a3 100644 --- a/modules/grpc/bigquery/bigquery-grammar.ym +++ b/modules/grpc/bigquery/bigquery-grammar.ym @@ -83,13 +83,13 @@ bigquery_dest_option : KW_PROJECT '(' string ')' { bigquery_dd_set_project(last_driver, $3); free($3); } | KW_DATASET '(' string ')' { bigquery_dd_set_dataset(last_driver, $3); free($3); } | KW_TABLE '(' string ')' { bigquery_dd_set_table(last_driver, $3); free($3); } + | grpc_dest_general_option | KW_SCHEMA '(' bigquery_schema_fields ')' | KW_PROTOBUF_SCHEMA '(' path_check LL_ARROW template_content_list ')' { bigquery_dd_set_protobuf_schema(last_driver, $3, $5); free($3); } - | grpc_dest_option ; bigquery_schema_fields diff --git a/modules/grpc/common/grpc-grammar.ym b/modules/grpc/common/grpc-grammar.ym index 3d6fa6ea6a..3ffd3aa232 100644 --- a/modules/grpc/common/grpc-grammar.ym +++ b/modules/grpc/common/grpc-grammar.ym @@ -90,7 +90,7 @@ grpc_source_channel_arg | string LL_ARROW string { grpc_sd_add_string_channel_arg(last_driver, $1, $3); free($1); free($3); } ; -grpc_dest_option +grpc_dest_general_option : KW_URL '(' string ')' { grpc_dd_set_url(last_driver, $3); free($3); } | KW_AUTH { last_grpc_client_credentials_builder = grpc_dd_get_credentials_builder(last_driver); } '(' grpc_client_credentials_option ')' | KW_COMPRESSION '(' yesno ')' { grpc_dd_set_compression(last_driver, $3); } diff --git a/modules/grpc/loki/loki-grammar.ym b/modules/grpc/loki/loki-grammar.ym index baa87a1f07..12ce2c2f7b 100644 --- a/modules/grpc/loki/loki-grammar.ym +++ b/modules/grpc/loki/loki-grammar.ym @@ -84,7 +84,7 @@ loki_dest_option free($3); } | KW_TEMPLATE '(' template_name_or_content ')' { loki_dd_set_message_template_ref(last_driver, $3); } - | grpc_dest_option + | grpc_dest_general_option ; loki_labels diff --git a/modules/grpc/otel/otel-grammar.ym b/modules/grpc/otel/otel-grammar.ym index 368a0e285e..86ede311fe 100644 --- a/modules/grpc/otel/otel-grammar.ym +++ b/modules/grpc/otel/otel-grammar.ym @@ -123,7 +123,7 @@ destination_otel_options ; destination_otel_option - : grpc_dest_option + : grpc_dest_general_option ; destination_syslog_ng_otlp