From 22a392f1b69224aac3894dd6a05b892ccbb6a75d Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Mon, 9 Dec 2024 07:33:11 -0800
Subject: [PATCH] Remove client.type setting (#118192)

The client.type setting is a holdover from the node client which was
removed in 8.0. The setting has been a noop since 8.0. This commit
removes the setting.

relates #104574
---
 docs/changelog/118192.yaml                            | 11 +++++++++++
 .../org/elasticsearch/client/internal/Client.java     | 10 ----------
 .../common/settings/ClusterSettings.java              |  2 --
 3 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 docs/changelog/118192.yaml

diff --git a/docs/changelog/118192.yaml b/docs/changelog/118192.yaml
new file mode 100644
index 0000000000000..03542048761d3
--- /dev/null
+++ b/docs/changelog/118192.yaml
@@ -0,0 +1,11 @@
+pr: 118192
+summary: Remove `client.type` setting
+area: Infra/Core
+type: breaking
+issues: [104574]
+breaking:
+  title: Remove `client.type` setting
+  area: Cluster and node setting
+  details: The node setting `client.type` has been ignored since the node client was removed in 8.0. The setting is now removed.
+  impact: Remove the `client.type` setting from `elasticsearch.yml` 
+  notable: false
diff --git a/server/src/main/java/org/elasticsearch/client/internal/Client.java b/server/src/main/java/org/elasticsearch/client/internal/Client.java
index 4158bbfb27cda..2d1cbe0cce7f7 100644
--- a/server/src/main/java/org/elasticsearch/client/internal/Client.java
+++ b/server/src/main/java/org/elasticsearch/client/internal/Client.java
@@ -52,8 +52,6 @@
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.common.settings.Setting;
-import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.transport.RemoteClusterService;
@@ -74,14 +72,6 @@
  */
 public interface Client extends ElasticsearchClient {
 
-    // Note: This setting is registered only for bwc. The value is never read.
-    Setting<String> CLIENT_TYPE_SETTING_S = new Setting<>("client.type", "node", (s) -> {
-        return switch (s) {
-            case "node", "transport" -> s;
-            default -> throw new IllegalArgumentException("Can't parse [client.type] must be one of [node, transport]");
-        };
-    }, Property.NodeScope, Property.Deprecated);
-
     /**
      * The admin client that can be used to perform administrative operations.
      */
diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
index a9a9411de8e1f..16af7ca2915d4 100644
--- a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
+++ b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
@@ -20,7 +20,6 @@
 import org.elasticsearch.action.support.DestructiveOperations;
 import org.elasticsearch.action.support.replication.TransportReplicationAction;
 import org.elasticsearch.bootstrap.BootstrapSettings;
-import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterModule;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.InternalClusterInfoService;
@@ -483,7 +482,6 @@ public void apply(Settings value, Settings current, Settings previous) {
         AutoCreateIndex.AUTO_CREATE_INDEX_SETTING,
         BaseRestHandler.MULTI_ALLOW_EXPLICIT_INDEX,
         ClusterName.CLUSTER_NAME_SETTING,
-        Client.CLIENT_TYPE_SETTING_S,
         ClusterModule.SHARDS_ALLOCATOR_TYPE_SETTING,
         EsExecutors.NODE_PROCESSORS_SETTING,
         ThreadContext.DEFAULT_HEADERS_SETTING,