Address review feedback

n1v0lg · Dec 8, 2023 · 6b89b7c · 6b89b7c
1 parent 6e747f3
commit 6b89b7c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/...sters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java b/...sters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java
@@ -443,7 +443,10 @@ private void copyExtraConfigFiles() {
             });
         }
 
-        public void writeToKeystoreFile() {
+        public void updateStoredSecureSettings() {
+            if (usesSecureSecretsFile) {
+                throw new UnsupportedOperationException("updating stored secure settings is not supported in serverless test clusters");
+            }
             final Path keystoreFile = workingDir.resolve("config").resolve("elasticsearch.keystore");
             try {
                 Files.deleteIfExists(keystoreFile);

diff --git a/...lusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalClusterHandle.java b/...lusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalClusterHandle.java
@@ -180,8 +180,8 @@ public InputStream getNodeLog(int index, LogType logType) {
     }
 
     @Override
-    public void writeToKeystoreFile() {
-        execute(() -> nodes.parallelStream().forEach(Node::writeToKeystoreFile));
+    public void updateStoredSecureSettings() {
+        execute(() -> nodes.parallelStream().forEach(Node::updateStoredSecureSettings));
     }
 
     protected void waitUntilReady() {

diff --git a/.../src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalElasticsearchCluster.java b/.../src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalElasticsearchCluster.java
@@ -157,9 +157,9 @@ public InputStream getNodeLog(int index, LogType logType) {
     }
 
     @Override
-    public void writeToKeystoreFile() {
+    public void updateStoredSecureSettings() {
         checkHandle();
-        handle.writeToKeystoreFile();
+        handle.updateStoredSecureSettings();
     }
 
     protected H getHandle() {

diff --git a/.../test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterHandle.java b/.../test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterHandle.java
@@ -10,6 +10,7 @@
 
 import org.elasticsearch.test.cluster.ClusterHandle;
 import org.elasticsearch.test.cluster.LogType;
+import org.elasticsearch.test.cluster.MutableSettingsProvider;
 import org.elasticsearch.test.cluster.util.Version;
 
 import java.io.InputStream;
@@ -95,7 +96,11 @@ public interface LocalClusterHandle extends ClusterHandle {
     InputStream getNodeLog(int index, LogType logType);
 
     /**
-     * Writes current keystore settings to keystore file on each node.
+     * Writes secure settings to the relevant secure config file on each node. Use this method if you are dynamically updating secure
+     * settings via a {@link MutableSettingsProvider} and need the update to be written to file, without a cluster restart.
+     *
+     * @throws UnsupportedOperationException if secure settings are stored in a secrets file, i.e., in serverless. Only keystore-based
+     * storage is currently supported
      */
-    void writeToKeystoreFile();
+    void updateStoredSecureSettings();
 }
diff --git a/...jwt-realm/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRestIT.java b/...jwt-realm/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRestIT.java
@@ -555,7 +555,7 @@ private void writeSettingToKeystoreThenReload(String setting, @Nullable String v
         } else {
             keystoreSettings.put(setting, value);
         }
-        cluster.writeToKeystoreFile();
+        cluster.updateStoredSecureSettings();
         assertOK(adminClient().performRequest(new Request("POST", "/_nodes/reload_secure_settings")));
     }