diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java index c41fe3784e..3f2ce10e1e 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java @@ -13,6 +13,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import java.util.Set; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.ml.common.settings.MLFeatureEnabledSetting; @@ -21,13 +22,14 @@ import org.opensearch.ml.common.transport.connector.MLCreateConnectorRequest; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.transport.client.node.NodeClient; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -public class RestMLCreateConnectorAction extends BaseRestHandler { +public class RestMLCreateConnectorAction extends BaseRestHandler implements RestRequestFilter { private static final String ML_CREATE_CONNECTOR_ACTION = "ml_create_connector_action"; private final MLFeatureEnabledSetting mlFeatureEnabledSetting; @@ -76,4 +78,9 @@ MLCreateConnectorRequest getRequest(RestRequest request) throws IOException { mlCreateConnectorInput.setTenantId(tenantId); return new MLCreateConnectorRequest(mlCreateConnectorInput); } + + @Override + public Set getFilteredFields() { + return Set.of("credential", "*.Authorization"); + } } diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLRegisterModelAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLRegisterModelAction.java index acd77b8524..cf0322d98a 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLRegisterModelAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLRegisterModelAction.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import java.util.Set; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -28,13 +29,14 @@ import org.opensearch.ml.common.transport.register.MLRegisterModelRequest; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.transport.client.node.NodeClient; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -public class RestMLRegisterModelAction extends BaseRestHandler { +public class RestMLRegisterModelAction extends BaseRestHandler implements RestRequestFilter { private static final String ML_REGISTER_MODEL_ACTION = "ml_register_model_action"; private final MLFeatureEnabledSetting mlFeatureEnabledSetting; @@ -107,4 +109,9 @@ MLRegisterModelRequest getRequest(RestRequest request) throws IOException { } return new MLRegisterModelRequest(mlInput); } + + @Override + public Set getFilteredFields() { + return Set.of("connector.credential", "*.Authorization"); + } } diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateConnectorAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateConnectorAction.java index 7693b02fab..7db22b2d47 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateConnectorAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateConnectorAction.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import java.util.Set; import org.opensearch.OpenSearchParseException; import org.opensearch.core.xcontent.XContentParser; @@ -23,13 +24,14 @@ import org.opensearch.ml.common.transport.connector.MLUpdateConnectorRequest; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.transport.client.node.NodeClient; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -public class RestMLUpdateConnectorAction extends BaseRestHandler { +public class RestMLUpdateConnectorAction extends BaseRestHandler implements RestRequestFilter { private static final String ML_UPDATE_CONNECTOR_ACTION = "ml_update_connector_action"; private MLFeatureEnabledSetting mlFeatureEnabledSetting; @@ -76,4 +78,9 @@ private MLUpdateConnectorRequest getRequest(RestRequest request) throws IOExcept throw new OpenSearchParseException(illegalStateException.getMessage()); } } + + @Override + public Set getFilteredFields() { + return Set.of("credential", "*.Authorization"); + } } diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateModelAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateModelAction.java index 0bc4255299..cfd3b8d8b5 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateModelAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateModelAction.java @@ -14,6 +14,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import java.util.Set; import org.opensearch.OpenSearchParseException; import org.opensearch.OpenSearchStatusException; @@ -25,12 +26,13 @@ import org.opensearch.ml.common.transport.model.MLUpdateModelRequest; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; -public class RestMLUpdateModelAction extends BaseRestHandler { +public class RestMLUpdateModelAction extends BaseRestHandler implements RestRequestFilter { private static final String ML_UPDATE_MODEL_ACTION = "ml_update_model_action"; private MLFeatureEnabledSetting mlFeatureEnabledSetting; @@ -90,4 +92,9 @@ private MLUpdateModelRequest getRequest(RestRequest request) throws IOException throw new OpenSearchParseException(e.getMessage()); } } + + @Override + public Set getFilteredFields() { + return Set.of("connector.credential", "*.Authorization"); + } }