Refactor grpc flags for standardized naming (vitessio#18009)

Signed-off-by: mounicasruthi <[email protected]>

Author: mounicasruthi

.gitignore

@@ -93,3 +93,4 @@ report
 # mise files
 .mise.toml
 /errors/
+go/flags/endtoend/count_flags.sh

docker/mini/vtctld-mini-up.sh

@@ -23,6 +23,7 @@ grpc_port=15999
 
 echo "- Starting vtctld..."
 # shellcheck disable=SC2086
+#TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 vtctld \
  $TOPOLOGY_FLAGS \
  --disable_active_reparents \

docker/mini/vttablet-mini-up.sh

@@ -39,6 +39,7 @@ echo "> Starting vttablet for server $mysql_host:$mysql_port"
 echo "  - Tablet alias is $alias"
 echo "  - Tablet listens on http://$hostname:$port"
 # shellcheck disable=SC2086
+#TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 vttablet \
  $TOPOLOGY_FLAGS \
  -log_dir $VTDATAROOT/tmp \

examples/common/scripts/vtctld-up.sh

@@ -23,6 +23,7 @@ grpc_port=15999
 
 echo "Starting vtctld..."
 # shellcheck disable=SC2086
+#TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 vtctld \
  $TOPOLOGY_FLAGS \
  --cell $cell \

examples/common/scripts/vtgate-up.sh

@@ -26,6 +26,7 @@ mysql_server_socket_path="/tmp/mysql.sock"
 
 echo "Starting vtgate..."
 # shellcheck disable=SC2086
+#TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 vtgate \
   $TOPOLOGY_FLAGS \
   --log_dir $VTDATAROOT/tmp \

examples/compose/docker-compose.beginners.yml

@@ -63,14 +63,15 @@ services:
       - "15000:$WEB_PORT"
       - "$GRPC_PORT"
     command: ["sh", "-c", " /vt/bin/vtctld \
+        # TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
         $TOPOLOGY_FLAGS \
         --cell $CELL \
         --service_map 'grpc-vtctl,grpc-vtctld' \
         --backup_storage_implementation file \
         --file_backup_storage_root /vt/vtdataroot/backups \
         --logtostderr=true \
         --port $WEB_PORT \
-        --grpc_port $GRPC_PORT
+        --grpc-port $GRPC_PORT
         "]
     depends_on:
       consul1:
@@ -89,10 +90,11 @@ services:
       - "$GRPC_PORT"
       - "15306:$MYSQL_PORT"
     command: ["sh", "-c", "/vt/bin/vtgate \
+        # TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
         $TOPOLOGY_FLAGS \
         --logtostderr=true \
         --port $WEB_PORT \
-        --grpc_port $GRPC_PORT \
+        --grpc-port $GRPC_PORT \
         --mysql_server_port $MYSQL_PORT \
         --mysql_auth_server_impl none \
         --cell $CELL \

examples/compose/docker-compose.yml

@@ -139,7 +139,7 @@ services:
     - ' /vt/bin/vtctld --topo-implementation consul --topo-global-server-address consul1:8500
       --topo-global-root vitess/global --cell test
       --service_map ''grpc-vtctl,grpc-vtctld'' --backup_storage_implementation file --file_backup_storage_root
-      /vt/vtdataroot/backups --logtostderr=true --port 8080 --grpc_port 15999 '
+      /vt/vtdataroot/backups --logtostderr=true --port 8080 --grpc-port 15999 '
     depends_on:
       external_db_host:
         condition: service_healthy
@@ -154,7 +154,7 @@ services:
     - sh
     - -c
     - '/script/run-forever.sh /vt/bin/vtgate --topo-implementation consul --topo-global-server-address
-      consul1:8500 --topo-global-root vitess/global --logtostderr=true --port 8080 --grpc_port
+      consul1:8500 --topo-global-root vitess/global --logtostderr=true --port 8080 --grpc-port
       15999 --mysql_server_port 15306 --mysql_auth_server_impl none --cell test --cells_to_watch
       test --tablet_types_to_wait PRIMARY,REPLICA,RDONLY --service_map ''grpc-vtgateservice''
       --normalize_queries=true '

examples/compose/vtcompose/docker-compose.test.yml

@@ -152,10 +152,10 @@ services:
       - sh
       - -c
       - ' /vt/bin/vtctld --topo-implementation consul --topo-global-server-address consul1:8500
-      --topo-global-root vitess/global --cell test
-      --service_map ''grpc-vtctl,grpc-vtctld'' --backup_storage_implementation file
-      --file_backup_storage_root /vt/vtdataroot/backups --logtostderr=true --port
-      8080 --grpc_port 15999 '
+       --topo-global-root vitess/global --cell test
+       --service_map ''grpc-vtctl,grpc-vtctld'' --backup_storage_implementation file
+       --file_backup_storage_root /vt/vtdataroot/backups --logtostderr=true --port
+       8080 --grpc-port 15999 '
     depends_on:
       external_db_host:
         condition: service_healthy
@@ -170,10 +170,10 @@ services:
       - sh
       - -c
       - '/script/run-forever.sh /vt/bin/vtgate --topo-implementation consul --topo-global-server-address
-      consul1:8500 --topo-global-root vitess/global --logtostderr=true --port 8080
-      --grpc_port 15999 --mysql_server_port 15306 --mysql_auth_server_impl none --cell
-      test --cells_to_watch test --tablet_types_to_wait PRIMARY,REPLICA,RDONLY --service_map
-      ''grpc-vtgateservice'' --normalize_queries=true '
+       consul1:8500 --topo-global-root vitess/global --logtostderr=true --port 8080
+       --grpc-port 15999 --mysql_server_port 15306 --mysql_auth_server_impl none --cell
+       test --cells_to_watch test --tablet_types_to_wait PRIMARY,REPLICA,RDONLY --service_map
+       ''grpc-vtgateservice'' --normalize_queries=true '
     depends_on:
       - vtctld
     image: vitess/lite:${VITESS_TAG:-latest}

examples/compose/vtcompose/vtcompose.go

@@ -637,7 +637,7 @@ func generateVtctld(opts vtOptions) string {
         --file_backup_storage_root /vt/vtdataroot/backups \
         --logtostderr=true \
         --port %[1]d \
-        --grpc_port %[2]d \
+        --grpc-port %[2]d \
         "]
     volumes:
       - .:/script
@@ -665,7 +665,7 @@ func generateVtgate(opts vtOptions) string {
         %[4]s \
         --logtostderr=true \
         --port %[1]d \
-        --grpc_port %[2]d \
+        --grpc-port %[2]d \
         --mysql_server_port %[3]d \
         --mysql_auth_server_impl none \
         --cell %[5]s \

examples/compose/vttablet-up.sh

@@ -142,7 +142,7 @@ else
                       --restore_from_backup"
 fi
 
-
+#TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 echo "Starting vttablet..."
 exec $VTROOT/bin/vttablet \
   $TOPOLOGY_FLAGS \