Merge pull request #30220 from pgellert/sr-types-acl

security/acl: move get_resource_type body to acl.cc

Author: dotnwat

src/v/cloud_topics/frontend/BUILD

@@ -31,6 +31,7 @@ redpanda_cc_library(
         "//src/v/cloud_topics/level_zero/stm:ctp_stm",
         "//src/v/cloud_topics/level_zero/stm:placeholder",
         "//src/v/cluster",
+        "//src/v/kafka/protocol",
         "//src/v/kafka/server:write_at_offset_stm",
         "//src/v/ssx:future_util",
         "//src/v/storage:record_batch_builder",

src/v/cloud_topics/frontend/frontend.cc

@@ -26,6 +26,7 @@
 #include "cluster/partition.h"
 #include "cluster/rm_stm_types.h"
 #include "cluster/types.h"
+#include "kafka/protocol/errors.h"
 #include "kafka/server/write_at_offset_stm.h"
 #include "model/fundamental.h"
 #include "model/offset_interval.h"

src/v/security/BUILD

@@ -129,6 +129,8 @@ redpanda_cc_library(
         "types.h",
     ],
     implementation_deps = [
+        "//src/v/kafka/protocol",
+        "//src/v/pandaproxy/schema_registry:types",
         "//src/v/random:secure_random",
         "//src/v/thirdparty/krb5",
         "@abseil-cpp//absl/strings",
@@ -145,12 +147,10 @@ redpanda_cc_library(
         "//src/v/hashing:secure",
         "//src/v/http",
         "//src/v/json",
-        "//src/v/kafka/protocol",
         "//src/v/metrics",
         "//src/v/model",
         "//src/v/net",
         "//src/v/net:types",
-        "//src/v/pandaproxy/schema_registry:types",
         "//src/v/reflection:adl",
         "//src/v/security/audit:types",
         "//src/v/serde",

src/v/security/acl.cc

@@ -12,6 +12,8 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/node_hash_map.h"
+#include "kafka/protocol/types.h"
+#include "pandaproxy/schema_registry/types.h"
 #include "security/acl_store.h"
 #include "serde/read_header.h"
 #include "serde/rw/rw.h"
@@ -707,6 +709,36 @@ void acl_binding_filter::testing_serde_full_read_v2(
     *this = acl_binding_filter{res._pattern, res._acl};
 }
 
+template<typename T>
+resource_type get_resource_type() {
+    if constexpr (std::is_same_v<T, model::topic>) {
+        return resource_type::topic;
+    } else if constexpr (std::is_same_v<T, kafka::group_id>) {
+        return resource_type::group;
+    } else if constexpr (std::is_same_v<T, acl_cluster_name>) {
+        return resource_type::cluster;
+    } else if constexpr (std::is_same_v<T, kafka::transactional_id>) {
+        return resource_type::transactional_id;
+    } else if constexpr (
+      std::is_same_v<T, pandaproxy::schema_registry::context_subject>) {
+        return resource_type::sr_subject;
+    } else if constexpr (
+      std::is_same_v<T, pandaproxy::schema_registry::registry_resource>) {
+        return resource_type::sr_registry;
+    } else {
+        static_assert(base::unsupported_type<T>::value, "Unsupported type");
+    }
+}
+
+template resource_type get_resource_type<model::topic>();
+template resource_type get_resource_type<kafka::group_id>();
+template resource_type get_resource_type<acl_cluster_name>();
+template resource_type get_resource_type<kafka::transactional_id>();
+template resource_type
+get_resource_type<pandaproxy::schema_registry::context_subject>();
+template resource_type
+get_resource_type<pandaproxy::schema_registry::registry_resource>();
+
 template<typename T>
 const std::vector<acl_operation>& get_allowed_operations() {
     static const std::vector<acl_operation> topic_resource_ops{

src/v/security/acl.h

@@ -14,9 +14,7 @@
 #include "base/format_to.h"
 #include "base/seastarx.h"
 #include "base/type_traits.h"
-#include "kafka/protocol/types.h"
 #include "model/fundamental.h"
-#include "pandaproxy/schema_registry/types.h"
 #include "security/audit/schemas/types.h"
 #include "serde/envelope.h"
 #include "serde/rw/enum.h"
@@ -105,24 +103,7 @@ std::optional<resource_type>
 from_string_view<resource_type>(std::string_view str);
 
 template<typename T>
-consteval resource_type get_resource_type() {
-    namespace ppsr = pandaproxy::schema_registry;
-    if constexpr (std::is_same_v<T, model::topic>) {
-        return resource_type::topic;
-    } else if constexpr (std::is_same_v<T, kafka::group_id>) {
-        return resource_type::group;
-    } else if constexpr (std::is_same_v<T, security::acl_cluster_name>) {
-        return resource_type::cluster;
-    } else if constexpr (std::is_same_v<T, kafka::transactional_id>) {
-        return resource_type::transactional_id;
-    } else if constexpr (std::is_same_v<T, ppsr::context_subject>) {
-        return resource_type::sr_subject;
-    } else if constexpr (std::is_same_v<T, ppsr::registry_resource>) {
-        return resource_type::sr_registry;
-    } else {
-        static_assert(base::unsupported_type<T>::value, "Unsupported type");
-    }
-}
+resource_type get_resource_type();
 
 /*
  * A pattern rule for matching ACL resource names.

src/v/security/authorizer.cc

@@ -13,8 +13,10 @@
 
 #include "acl_store.h"
 #include "config/configuration.h"
+#include "kafka/protocol/types.h"
 #include "metrics/metrics.h"
 #include "metrics/prometheus_sanitize.h"
+#include "pandaproxy/schema_registry/types.h"
 #include "security/role.h"
 #include "security/role_store.h"
 

src/v/security/tests/BUILD

@@ -75,6 +75,7 @@ redpanda_cc_gtest(
     ],
     deps = [
         "//src/v/config",
+        "//src/v/kafka/protocol",
         "//src/v/pandaproxy/schema_registry:types",
         "//src/v/random:generators",
         "//src/v/security",

src/v/security/tests/authorizer_test.cc

@@ -8,6 +8,7 @@
 // by the Apache License, Version 2.0
 #include "absl/container/flat_hash_set.h"
 #include "config/mock_property.h"
+#include "kafka/protocol/types.h"
 #include "pandaproxy/schema_registry/types.h"
 #include "random/generators.h"
 #include "security/acl.h"