Merge pull request #24775 from IoannisRP/ik-pandaproxy-protobuf-refactor

protobuf: move proto files to schema/protobuf

src/go/rpk/pkg/serde/embed/BUILD

@@ -32,7 +32,10 @@ go_test(
     name = "embed_test",
     size = "small",
     srcs = ["embed_test.go"],
-    data = ["//src/v/pandaproxy/schema_registry/protobuf:schema_registry_proto_files"],
+    data = [
+        "//src/v/schema/protobuf:confluent_type_proto_files",
+        "//src/v/schema/protobuf:google_type_proto_files",
+    ],
     embed = [":embed"],
     deps = ["@com_github_stretchr_testify//require"],
 )

src/go/rpk/pkg/serde/embed/embed_test.go

@@ -12,7 +12,7 @@ import (
 func TestEmbeddedFiles(t *testing.T) {
 	t.Run("Test Embedded files in rpk, equal to Redpanda", func(t *testing.T) {
 		// /src/v/pandaproxy/schema_registry/protobuf
-		redpandaProtoFS := os.DirFS("../../../../../v/pandaproxy/schema_registry/protobuf")
+		redpandaProtoFS := os.DirFS("../../../../../v/schema/protobuf")
 		redpandaMap := make(map[string]string)
 		err := fs.WalkDir(redpandaProtoFS, ".", func(path string, d fs.DirEntry, err error) error {
 			if err != nil {

src/v/pandaproxy/BUILD

@@ -1,5 +1,6 @@
 load("//bazel:build.bzl", "redpanda_cc_library")
 load("//bazel/thirdparty:seastar.bzl", "seastar_cc_swagger_library")
+load("//src/v/schema/protobuf:well_known.bzl", "well_known_cc_protos")
 
 seastar_cc_swagger_library(
     name = "rest_swagger",
@@ -11,83 +12,6 @@ seastar_cc_swagger_library(
     src = "api/api-doc/schema_registry.json",
 )
 
-cc_proto_library(
-    name = "descriptor_cc_proto",
-    deps = [
-        "@protobuf//:descriptor_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "struct_cc_proto",
-    deps = [
-        "@protobuf//:struct_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "field_mask_cc_proto",
-    deps = [
-        "@protobuf//:field_mask_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "source_context_cc_proto",
-    deps = [
-        "@protobuf//:source_context_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "timestamp_cc_proto",
-    deps = [
-        "@protobuf//:timestamp_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "type_cc_proto",
-    deps = [
-        "@protobuf//:type_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "wrappers_cc_proto",
-    deps = [
-        "@protobuf//:wrappers_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "api_cc_proto",
-    deps = [
-        "@protobuf//:api_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "duration_cc_proto",
-    deps = [
-        "@protobuf//:duration_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "empty_cc_proto",
-    deps = [
-        "@protobuf//:empty_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "any_cc_proto",
-    deps = [
-        "@protobuf//:any_proto",
-    ],
-)
-
 redpanda_cc_library(
     name = "pandaproxy",
     srcs = [
@@ -186,21 +110,10 @@ redpanda_cc_library(
     include_prefix = "pandaproxy",
     visibility = ["//visibility:public"],
     deps = [
-        ":any_cc_proto",
-        ":api_cc_proto",
         ":config",
-        ":descriptor_cc_proto",
-        ":duration_cc_proto",
-        ":empty_cc_proto",
-        ":field_mask_cc_proto",
         ":rest_swagger",
         ":schema_registry_swagger",
-        ":source_context_cc_proto",
-        ":struct_cc_proto",
         ":subject_name_strategy",
-        ":timestamp_cc_proto",
-        ":type_cc_proto",
-        ":wrappers_cc_proto",
         "//src/v/base",
         "//src/v/bytes:iobuf",
         "//src/v/bytes:iobuf_parser",
@@ -226,10 +139,11 @@ redpanda_cc_library(
         "//src/v/metrics",
         "//src/v/model",
         "//src/v/net",
-        "//src/v/pandaproxy/schema_registry/protobuf:schema_registry_cc_proto",
         "//src/v/random:time_jitter",
         "//src/v/reflection:type_traits",
         "//src/v/rpc",
+        "//src/v/schema/protobuf:confluent_type_cc_proto",
+        "//src/v/schema/protobuf:google_type_cc_proto",
         "//src/v/security",
         "//src/v/security:request_auth",
         "//src/v/security/audit",
@@ -274,7 +188,7 @@ redpanda_cc_library(
         "@rapidjson",
         "@re2",
         "@seastar",
-    ],
+    ] + well_known_cc_protos,
 )
 
 redpanda_cc_library(

src/v/pandaproxy/schema_registry/CMakeLists.txt

@@ -5,7 +5,6 @@ seastar_generate_swagger(
   OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/../api/api-doc/
 )
 
-find_package(Protobuf REQUIRED)
 find_package(Avro)
 find_package(jsoncons REQUIRED)
 
@@ -46,4 +45,3 @@ v_cc_library(
 
 add_subdirectory(test)
 add_subdirectory(requests)
-add_subdirectory(protobuf)

src/v/schema/CMakeLists.txt

@@ -8,3 +8,4 @@ v_cc_library(
 )
 
 add_subdirectory(tests)
+add_subdirectory(protobuf)

src/v/pandaproxy/schema_registry/protobuf/BUILD → src/v/schema/protobuf/BUILD

@@ -1,10 +1,8 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
 filegroup(
-    name = "schema_registry_proto_files",
+    name = "google_type_proto_files",
     srcs = [
-        "confluent/meta.proto",
-        "confluent/types/decimal.proto",
         "google/type/calendar_period.proto",
         "google/type/color.proto",
         "google/type/date.proto",
@@ -27,21 +25,46 @@ filegroup(
 )
 
 proto_library(
-    name = "schema_registry_protos",
-    srcs = [":schema_registry_proto_files"],
-    strip_import_prefix = "/src/v/pandaproxy/schema_registry/protobuf/",
+    name = "google_type_protos",
+    srcs = [":google_type_proto_files"],
+    strip_import_prefix = "/src/v/schema/protobuf/",
     visibility = ["//visibility:public"],
     deps = [
-        "@protobuf//:any_proto",
-        "@protobuf//:descriptor_proto",
         "@protobuf//:duration_proto",
         "@protobuf//:timestamp_proto",
         "@protobuf//:wrappers_proto",
     ],
 )
 
 cc_proto_library(
-    name = "schema_registry_cc_proto",
+    name = "google_type_cc_proto",
+    visibility = ["//visibility:public"],
+    deps = [":google_type_protos"],
+)
+
+filegroup(
+    name = "confluent_type_proto_files",
+    srcs = [
+        "confluent/meta.proto",
+        "confluent/types/decimal.proto",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+proto_library(
+    name = "confluent_type_protos",
+    srcs = [
+        ":confluent_type_proto_files",
+    ],
+    strip_import_prefix = "/src/v/schema/protobuf/",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@protobuf//:descriptor_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "confluent_type_cc_proto",
     visibility = ["//visibility:public"],
-    deps = [":schema_registry_protos"],
+    deps = [":confluent_type_protos"],
 )

src/v/pandaproxy/schema_registry/protobuf/CMakeLists.txt → src/v/schema/protobuf/CMakeLists.txt

@@ -1,3 +1,5 @@
+find_package(Protobuf REQUIRED)
+
 set(PROTO_FILES
   confluent/meta.proto
   confluent/types/decimal.proto

src/v/schema/protobuf/well_known.bzl

@@ -0,0 +1,16 @@
+"""
+This module contains definitions to group all google well_known proto types
+"""
+
+well_known_cc_protos = [
+    "@protobuf//:any_cc_proto",
+    "@protobuf//:api_cc_proto",
+    "@protobuf//:duration_cc_proto",
+    "@protobuf//:empty_cc_proto",
+    "@protobuf//:field_mask_cc_proto",
+    "@protobuf//:source_context_cc_proto",
+    "@protobuf//:struct_cc_proto",
+    "@protobuf//:timestamp_cc_proto",
+    "@protobuf//:type_cc_proto",
+    "@protobuf//:wrappers_cc_proto",
+]