Remaining ResourceType and ConfigResourceType enum values

Author: emasab

examples/incremental_alter_configs.c

@@ -186,7 +186,11 @@ cmd_incremental_alter_configs(rd_kafka_conf_t *conf, int argc, char **argv) {
                     !strcmp(restype_s, "TOPIC")    ? RD_KAFKA_RESOURCE_TOPIC
                     : !strcmp(restype_s, "BROKER") ? RD_KAFKA_RESOURCE_BROKER
                     : !strcmp(restype_s, "GROUP")  ? RD_KAFKA_RESOURCE_GROUP
-                                                   : RD_KAFKA_RESOURCE_UNKNOWN;
+                    : !strcmp(restype_s, "BROKER_LOGGER")
+                        ? RD_KAFKA_RESOURCE_BROKER_LOGGER
+                    : !strcmp(restype_s, "CLIENT_METRICS")
+                        ? RD_KAFKA_RESOURCE_CLIENT_METRICS
+                        : RD_KAFKA_RESOURCE_UNKNOWN;
 
                 if (restype == RD_KAFKA_RESOURCE_UNKNOWN) {
                         usage("Invalid resource type: %s", restype_s);

src/rdkafka.h

@@ -7883,7 +7883,15 @@ typedef enum rd_kafka_ResourceType_t {
         RD_KAFKA_RESOURCE_GROUP            = 3, /**< Group */
         RD_KAFKA_RESOURCE_BROKER           = 4, /**< Broker */
         RD_KAFKA_RESOURCE_TRANSACTIONAL_ID = 5, /**< Transactional ID */
+        RD_KAFKA_RESOURCE_DELEGATION_TOKEN = 6, /**< Delegation Token */
+        RD_KAFKA_RESOURCE_USER             = 7, /**< User */
         RD_KAFKA_RESOURCE__CNT, /**< Number of resource types defined */
+
+/* FIXME: Split the two enums in next major version. */
+#define RD_KAFKA_RESOURCE_CONFIG_RESOURCE__START RD_KAFKA_RESOURCE_BROKER_LOGGER
+        RD_KAFKA_RESOURCE_BROKER_LOGGER  = 1000008,
+        RD_KAFKA_RESOURCE_CLIENT_METRICS = 1000016,
+        RD_KAFKA_RESOURCE_CONFIG_RESOURCE__END,
 } rd_kafka_ResourceType_t;
 
 /**

src/rdkafka_admin.c

@@ -2911,8 +2911,19 @@ const char *rd_kafka_ResourcePatternType_name(
 }
 
 const char *rd_kafka_ResourceType_name(rd_kafka_ResourceType_t restype) {
-        static const char *names[] = {"UNKNOWN", "ANY",    "TOPIC",
-                                      "GROUP",   "BROKER", "TRANSACTIONAL_ID"};
+        static const char *names[] = {"UNKNOWN",
+                                      "ANY",
+                                      "TOPIC",
+                                      "GROUP",
+                                      "BROKER",
+                                      "TRANSACTIONAL_ID",
+                                      "DELEGATION_TOKEN",
+                                      "USER"};
+
+        if ((unsigned int)restype >= RD_KAFKA_RESOURCE_CONFIG_RESOURCE__START &&
+            (unsigned int)restype < RD_KAFKA_RESOURCE_CONFIG_RESOURCE__END)
+                return rd_kafka_ConfigResourceType_name(
+                    rd_kafka_ResourceType_to_ConfigResourceType(restype));
 
         if ((unsigned int)restype >= (unsigned int)RD_KAFKA_RESOURCE__CNT)
                 return "UNSUPPORTED";
@@ -2928,6 +2939,10 @@ rd_kafka_ResourceType_to_ConfigResourceType(rd_kafka_ResourceType_t restype) {
                 return RD_KAFKA_CONFIG_RESOURCE_TOPIC;
         case RD_KAFKA_RESOURCE_BROKER:
                 return RD_KAFKA_CONFIG_RESOURCE_BROKER;
+        case RD_KAFKA_RESOURCE_BROKER_LOGGER:
+                return RD_KAFKA_CONFIG_RESOURCE_BROKER_LOGGER;
+        case RD_KAFKA_RESOURCE_CLIENT_METRICS:
+                return RD_KAFKA_CONFIG_RESOURCE_CLIENT_METRICS;
         case RD_KAFKA_RESOURCE_GROUP:
                 return RD_KAFKA_CONFIG_RESOURCE_GROUP;
         default:
@@ -2942,12 +2957,33 @@ rd_kafka_ResourceType_t rd_kafka_ConfigResourceType_to_ResourceType(
                 return RD_KAFKA_RESOURCE_TOPIC;
         case RD_KAFKA_CONFIG_RESOURCE_BROKER:
                 return RD_KAFKA_RESOURCE_BROKER;
+        case RD_KAFKA_CONFIG_RESOURCE_BROKER_LOGGER:
+                return RD_KAFKA_RESOURCE_BROKER_LOGGER;
+        case RD_KAFKA_CONFIG_RESOURCE_CLIENT_METRICS:
+                return RD_KAFKA_RESOURCE_CLIENT_METRICS;
         case RD_KAFKA_CONFIG_RESOURCE_GROUP:
                 return RD_KAFKA_RESOURCE_GROUP;
         default:
                 return RD_KAFKA_RESOURCE_UNKNOWN;
         }
 }
+/**
+ * @brief Get the name of a ConfigResourceType_t.
+ */
+const char *rd_kafka_ConfigResourceType_name(
+    rd_kafka_ConfigResourceType_t config_resource_type) {
+        static const char *names[] = {
+            [0] = "UNKNOWN",       [2] = "TOPIC",           [4] = "BROKER",
+            [8] = "BROKER_LOGGER", [16] = "CLIENT_METRICS", [32] = "GROUP"};
+        if ((unsigned int)config_resource_type >=
+            (unsigned int)RD_KAFKA_CONFIG_RESOURCE__END)
+                return "UNSUPPORTED";
+
+        if (!names[(unsigned int)config_resource_type])
+                return "UNSUPPORTED";
+
+        return names[config_resource_type];
+}
 
 
 rd_kafka_ConfigResource_t *

src/rdkafka_admin.h

@@ -287,10 +287,13 @@ struct rd_kafka_ConfigResource_result_s {
  * @brief Resource type specific to config apis.
  */
 typedef enum rd_kafka_ConfigResourceType_t {
-        RD_KAFKA_CONFIG_RESOURCE_UNKNOWN = 0,
-        RD_KAFKA_CONFIG_RESOURCE_TOPIC   = 2,
-        RD_KAFKA_CONFIG_RESOURCE_BROKER  = 4,
-        RD_KAFKA_CONFIG_RESOURCE_GROUP   = 32,
+        RD_KAFKA_CONFIG_RESOURCE_UNKNOWN        = 0,
+        RD_KAFKA_CONFIG_RESOURCE_TOPIC          = 2,
+        RD_KAFKA_CONFIG_RESOURCE_BROKER         = 4,
+        RD_KAFKA_CONFIG_RESOURCE_BROKER_LOGGER  = 8,
+        RD_KAFKA_CONFIG_RESOURCE_CLIENT_METRICS = 16,
+        RD_KAFKA_CONFIG_RESOURCE_GROUP          = 32,
+        RD_KAFKA_CONFIG_RESOURCE__END,
 } rd_kafka_ConfigResourceType_t;
 
 /**
@@ -315,6 +318,9 @@ rd_kafka_ResourceType_t rd_kafka_ConfigResourceType_to_ResourceType(
     rd_kafka_ConfigResourceType_t config_resource_type);
 
 
+const char *rd_kafka_ConfigResourceType_name(
+    rd_kafka_ConfigResourceType_t config_resource_type);
+
 /**@}*/