Merge pull request #5505 from dotnwat/misc

Accumulated miscellaneous changes
redpanda-data · Jul 19, 2022 · db2761d · db2761d
2 parents 60a62e8 + 1bf49d2
commit db2761d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/cmake/rpcgen.cmake b/cmake/rpcgen.cmake
@@ -3,7 +3,7 @@ function(rpcgen)
   set(multi_value_args INCLUDES LIBRARIES DEFINITIONS COMPILE_OPTIONS)
   cmake_parse_arguments(args "" "${one_value_args}" "${multi_value_args}" ${ARGN})
   get_filename_component(out_dir ${args_OUT_FILE} DIRECTORY)
-  set(generator "${PROJECT_SOURCE_DIR}/tools/rpcgen.py")
+  set(generator "${PROJECT_SOURCE_DIR}/src/v/rpc/rpc_compiler.py")
   add_custom_command(
     DEPENDS
       ${args_IN_FILE}

diff --git a/src/v/config/tests/config_store_test.cc b/src/v/config/tests/config_store_test.cc
@@ -37,8 +37,8 @@ struct test_config : public config::config_store {
     config::property<std::chrono::seconds> seconds;
     config::property<std::optional<std::chrono::seconds>> optional_seconds;
     config::property<std::chrono::milliseconds> milliseconds;
-    config::property<ss::sstring> secret_string;
     config::property<ss::sstring> default_secret_string;
+    config::property<ss::sstring> secret_string;
 
     test_config()
       : optional_int(

diff --git a/src/v/kafka/protocol/CMakeLists.txt b/src/v/kafka/protocol/CMakeLists.txt
@@ -7,14 +7,14 @@ foreach(schema ${schemata})
   get_filename_component(msg_name ${schema} NAME_WE)
   set(schema_src ${CMAKE_CURRENT_SOURCE_DIR}/schemata/${schema})
   set(msg_dir "${CMAKE_CURRENT_BINARY_DIR}/schemata")
-  set(msg_srcs
-    "${msg_dir}/${msg_name}.h"
-    "${msg_dir}/${msg_name}.cc")
-  list(APPEND message_srcs ${msg_srcs})
+  set(msg_hdr "${msg_dir}/${msg_name}.h")
+  set(msg_src "${msg_dir}/${msg_name}.cc")
+  list(APPEND message_srcs ${msg_hdr})
+  list(APPEND message_srcs ${msg_src})
   add_custom_command(
-    OUTPUT ${msg_srcs}
+    OUTPUT ${msg_hdr} ${msg_src}
     COMMAND ${KAFKA_CODEGEN_VENV} ${message_gen}
-    ARGS ${msg_dir} ${schema_src}
+    ARGS ${schema_src} ${msg_hdr} ${msg_src}
     DEPENDS ${schema_src} ${message_gen} ${KAFKA_CODEGEN_VENV}
     COMMENT "Running kafka request codegen on ${schema_src}"
     VERBATIM)

diff --git a/src/v/kafka/protocol/schemata/generator.py b/src/v/kafka/protocol/schemata/generator.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
 # Copyright 2020 Redpanda Data, Inc.
 #
 # Use of this software is governed by the Business Source License
@@ -1501,11 +1503,10 @@ def parse_flexible_versions(flex_version):
 
 
 if __name__ == "__main__":
-    assert len(sys.argv) == 3
-    outdir = pathlib.Path(sys.argv[1])
-    schema_path = pathlib.Path(sys.argv[2])
-    src = (outdir / schema_path.name).with_suffix(".cc")
-    hdr = (outdir / schema_path.name).with_suffix(".h")
+    assert len(sys.argv) == 4
+    schema_path = pathlib.Path(sys.argv[1])
+    hdr = pathlib.Path(sys.argv[2])
+    src = pathlib.Path(sys.argv[3])
 
     # remove comments from the json file. comments are a non-standard json
     # extension that is not supported by the python json parser.

diff --git a/tools/rpcgen.py → src/v/rpc/rpc_compiler.py b/tools/rpcgen.py → src/v/rpc/rpc_compiler.py
diff --git a/src/v/test_utils/http_imposter.cc b/src/v/test_utils/http_imposter.cc
@@ -10,7 +10,6 @@
 
 #include "test_utils/http_imposter.h"
 
-#include "config/node_config.h"
 #include "vlog.h"
 
 #include <seastar/http/function_handlers.hh>