Skip to content

[Fleet] secrets as array #124626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Fleet] secrets as array #124626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ...ck/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.elasticsearch.xcontent.XContentParser;

import java.io.IOException;
import java.util.Objects;
import java.util.Arrays;

public class PostSecretRequest extends ActionRequest {

Expand All @@ -27,35 +27,35 @@ 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((String[]) args[0]);
}
);

static {
PARSER.declareField(
ConstructingObjectParser.optionalConstructorArg(),
(p, c) -> p.text(),
p -> p.list().stream().map(s -> (String) s).toArray(String[]::new),
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 String[] value;

public PostSecretRequest(String value) {
public PostSecretRequest(String[] value) {
this.value = value;
}

public PostSecretRequest(StreamInput in) throws IOException {
super(in);
this.value = in.readString();
this.value = in.readStringArray();
}

public String value() {
public String[] value() {
return value;
}

Expand All @@ -69,7 +69,7 @@ public XContentBuilder toXContent(XContentBuilder builder) throws IOException {
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeString(value);
out.writeStringArray(value);
}

@Override
Expand All @@ -88,11 +88,11 @@ public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PostSecretRequest that = (PostSecretRequest) o;
return Objects.equals(value, that.value);
return Arrays.equals(value, that.value);
}

@Override
public int hashCode() {
return Objects.hash(value);
return Arrays.hashCode(value);
}
}