Allow Fleet post secret and get secret to accept array of strings

Author: jen-huang

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetSecretResponse.java

@@ -20,15 +20,19 @@
 public class GetSecretResponse extends ActionResponse implements ToXContentObject {
 
     private final String id;
-    private final String value;
+    private final Object value;
 
     public GetSecretResponse(StreamInput in) throws IOException {
         super(in);
         id = in.readString();
-        value = in.readString();
+        if (in.readByte() == 0) {
+            value = in.readString();
+        } else {
+            value = in.readStringArray();
+        }
     }
 
-    public GetSecretResponse(String id, String value) {
+    public GetSecretResponse(String id, Object value) {
         this.id = id;
         this.value = value;
     }
@@ -40,15 +44,24 @@ public String id() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(id);
-        out.writeString(value);
+        if (value instanceof String) {
+            out.writeString((String) value);
+        } else if (value instanceof String[]) {
+            out.writeStringArray((String[]) value);
+        }
     }
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
         builder.startObject();
         builder.field("id", id);
-        builder.field("value", value);
-        return builder.endObject();
+        if (value instanceof String) {
+            builder.field("value", (String) value);
+        } else if (value instanceof String[]) {
+            builder.field("value", (String[]) value);
+        }
+        builder.endObject();
+        return builder;
     }
 
     @Override

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java

@@ -27,49 +27,71 @@ public class PostSecretRequest extends ActionRequest {
     public static final ConstructingObjectParser<PostSecretRequest, Void> PARSER = new ConstructingObjectParser<>(
         "post_secret_request",
         args -> {
-            return new PostSecretRequest((String) args[0]);
+            return new PostSecretRequest(args[0]);
         }
     );
 
     static {
         PARSER.declareField(
             ConstructingObjectParser.optionalConstructorArg(),
-            (p, c) -> p.text(),
+            (p, c) -> {
+                if (p.currentToken() == XContentParser.Token.VALUE_STRING) {
+                    return p.text();
+                } else if (p.currentToken() == XContentParser.Token.START_ARRAY) {
+                    return p.list().stream().map(s -> (String) s).toArray(String[]::new);
+                } else {
+                    throw new IllegalArgumentException("Unexpected token: " + p.currentToken());
+                }
+            },
             VALUE_FIELD,
-            ObjectParser.ValueType.STRING
+            ObjectParser.ValueType.STRING_ARRAY
         );
     }
 
     public static PostSecretRequest fromXContent(XContentParser parser) throws IOException {
         return PARSER.parse(parser, null);
     }
 
-    private final String value;
+    private final Object value;
 
-    public PostSecretRequest(String value) {
+    public PostSecretRequest(Object value) {
         this.value = value;
     }
 
     public PostSecretRequest(StreamInput in) throws IOException {
         super(in);
-        this.value = in.readString();
+        if (in.readByte() == 0) {
+            this.value = in.readString();
+        } else {
+            this.value = in.readStringArray();
+        }
     }
 
-    public String value() {
+    public Object value() {
         return value;
     }
 
     public XContentBuilder toXContent(XContentBuilder builder) throws IOException {
         builder.startObject();
-        builder.field(VALUE_FIELD.getPreferredName(), this.value);
+        if (value instanceof String) {
+            builder.field(VALUE_FIELD.getPreferredName(), (String) value);
+        } else if (value instanceof String[]) {
+            builder.field(VALUE_FIELD.getPreferredName(), (String[]) value);
+        }
         builder.endObject();
         return builder;
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeString(value);
+        if (value instanceof String) {
+            out.writeBoolean(true);
+            out.writeString((String) value);
+        } else if (value instanceof String[]) {
+            out.writeBoolean(false);
+            out.writeStringArray((String[]) value);
+        }
     }
 
     @Override

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/TransportGetSecretAction.java

@@ -21,6 +21,8 @@
 import static org.elasticsearch.xpack.core.ClientHelper.FLEET_ORIGIN;
 import static org.elasticsearch.xpack.fleet.Fleet.FLEET_SECRETS_INDEX_NAME;
 
+import java.util.List;
+
 public class TransportGetSecretAction extends HandledTransportAction<GetSecretRequest, GetSecretResponse> {
     private final Client client;
 
@@ -36,7 +38,19 @@ protected void doExecute(Task task, GetSecretRequest request, ActionListener<Get
                 delegate.onFailure(new ResourceNotFoundException("No secret with id [" + request.id() + "]"));
                 return;
             }
-            delegate.onResponse(new GetSecretResponse(getResponse.getId(), getResponse.getSource().get("value").toString()));
+            Object value = getResponse.getSource().get("value");
+            if (value instanceof String) {
+                delegate.onResponse(new GetSecretResponse(getResponse.getId(), value.toString()));
+            } else if (value instanceof List) {
+                List<?> valueList = (List<?>) value;
+                if (valueList.stream().allMatch(item -> item instanceof String)) {
+                    delegate.onResponse(new GetSecretResponse(getResponse.getId(), valueList.toArray(new String[0])));
+                } else {
+                    delegate.onFailure(new IllegalArgumentException("Unexpected value type in list for id [" + request.id() + "]"));
+                }
+            } else {
+                delegate.onFailure(new IllegalArgumentException("Unexpected value type for id [" + request.id() + "]"));
+            }
         }));
     }
 }