cluster: Switch license strings

Signed-off-by: Ben Pope <ben@redpanda.com>
redpanda-data · Nov 25, 2024 · f599d83 · f599d83
1 parent fb700d9
commit f599d83
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/src/v/cluster/partition_balancer_backend.cc b/src/v/cluster/partition_balancer_backend.cc
@@ -23,6 +23,7 @@
 #include "cluster/types.h"
 #include "config/configuration.h"
 #include "config/property.h"
+#include "features/enterprise_feature_messages.h"
 #include "features/enterprise_features.h"
 #include "features/feature_table.h"
 #include "model/metadata.h"
@@ -370,9 +371,9 @@ ss::future<> partition_balancer_backend::do_tick() {
     if (is_sanctioned) {
         vlog(
           clusterlog.warn,
-          "A Redpanda Enterprise Edition license is required to use enterprise "
-          "feature \"partition_autobalancing_mode\" with value \"{}\". "
-          "Behavior is being restricted to \"{}\".",
+          "{}",
+          features::enterprise_error_message::
+            partition_autobalancing_continuous(),
           _mode(false).first,
           mode);
     }

diff --git a/src/v/cluster/scheduling/leader_balancer.cc b/src/v/cluster/scheduling/leader_balancer.cc
@@ -25,6 +25,7 @@
 #include "config/configuration.h"
 #include "config/node_config.h"
 #include "container/fragmented_vector.h"
+#include "features/enterprise_feature_messages.h"
 #include "model/metadata.h"
 #include "model/namespace.h"
 #include "raft/rpc_client_protocol.h"
@@ -465,12 +466,7 @@ bool leader_balancer::leadership_pinning_enabled() const {
             vlog(
               clusterlog.warn,
               "{}",
-              "A Redpanda Enterprise Edition license is required to use the "
-              "enterprise feature \"leadership pinning\". This feature is "
-              "disabled. The values of the cluster property \"{}\" and the "
-              "topic property \"redpanda.leaders.preference\" are being "
-              "ignored.",
-              config::shard_local_cfg().default_leaders_preference.name());
+              features::enterprise_error_message::default_leaders_preference());
         }
         return false;
     }

diff --git a/src/v/cluster/security_frontend.cc b/src/v/cluster/security_frontend.cc
@@ -21,6 +21,7 @@
 #include "cluster/logger.h"
 #include "cluster/partition_leaders_table.h"
 #include "cluster/types.h"
+#include "features/enterprise_feature_messages.h"
 #include "model/errc.h"
 #include "model/metadata.h"
 #include "model/namespace.h"
@@ -235,8 +236,8 @@ ss::future<std::vector<errc>> security_frontend::do_create_acls(
         err = errc::feature_disabled;
         vlog(
           clusterlog.warn,
-          "An enterprise license is required to create an ACL with a role "
-          "binding");
+          "{}",
+          features::enterprise_error_message::acl_with_rbac());
     } else {
         try {
             create_acls_cmd_data data;

diff --git a/src/v/cluster/shard_balancer.cc b/src/v/cluster/shard_balancer.cc
@@ -14,6 +14,7 @@
 #include "cluster/cluster_utils.h"
 #include "cluster/logger.h"
 #include "config/node_config.h"
+#include "features/enterprise_feature_messages.h"
 #include "features/enterprise_features.h"
 #include "random/generators.h"
 #include "ssx/async_algorithm.h"
@@ -469,9 +470,8 @@ void shard_balancer::maybe_assign(
         if (is_sanctioned) {
             vlog(
               clusterlog.warn,
-              "A Redpanda Enterprise Edition license is required to use "
-              "enterprise feature \"core_balancing_continuous\". "
-              "This property is being ignored.");
+              "{}",
+              features::enterprise_error_message::core_balancing_continuous());
         }
 
         if (

diff --git a/src/v/cluster/topics_frontend.cc b/src/v/cluster/topics_frontend.cc
@@ -34,6 +34,7 @@
 #include "config/configuration.h"
 #include "config/leaders_preference.h"
 #include "data_migration_types.h"
+#include "features/enterprise_feature_messages.h"
 #include "features/feature_table.h"
 #include "fwd.h"
 #include "model/errc.h"
@@ -428,8 +429,8 @@ ss::future<std::vector<topic_result>> topics_frontend::update_topic_properties(
                 && is_user_topic(update.tp_ns)) {
                   if (auto f = get_enterprise_features(_metadata_cache, update);
                       !f.empty()) {
-                      auto msg = ssx::sformat(
-                        "An enterprise license is required to enable {}.", f);
+                      auto msg
+                        = features::enterprise_error_message::topic_property(f);
                       vlog(clusterlog.warn, "{}", msg);
                       return ss::make_ready_future<topic_result>(topic_result(
                         update.tp_ns,
@@ -609,8 +610,7 @@ topic_result topics_frontend::validate_topic_configuration(
       && is_user_topic(assignable_config.cfg.tp_ns)) {
         if (auto f = get_enterprise_features(assignable_config.cfg);
             !f.empty()) {
-            auto msg = ssx::sformat(
-              "An enterprise license is required to enable {}.", f);
+            auto msg = features::enterprise_error_message::topic_property(f);
             vlog(clusterlog.warn, "{}", msg);
             return make_result(errc::topic_invalid_config, std::move(msg));
         }
@@ -1635,9 +1635,7 @@ ss::future<topic_result> topics_frontend::do_create_partition(
 
     if (_features.local().should_sanction() && is_user_topic(tp_cfg->tp_ns)) {
         if (auto f = get_enterprise_features(*tp_cfg); !f.empty()) {
-            auto msg = ssx::sformat(
-              "An enterprise license is required to create partitions with {}.",
-              f);
+            auto msg = features::enterprise_error_message::create_partition(f);
             vlog(clusterlog.warn, "{}", msg);
             co_return make_error_result(
               p_cfg.tp_ns, errc::topic_invalid_config, std::move(msg));