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 177de35152..7ced81225a 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.client.node.NodeClient; import org.opensearch.core.xcontent.XContentParser; @@ -22,12 +23,13 @@ import org.opensearch.ml.settings.MLFeatureEnabledSetting; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; 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 a20fb5bd0f..1539d7d8ec 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.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; @@ -29,12 +30,13 @@ import org.opensearch.ml.settings.MLFeatureEnabledSetting; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; 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 3398e7b24f..6b95d2f1f2 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.client.node.NodeClient; @@ -24,12 +25,13 @@ import org.opensearch.ml.settings.MLFeatureEnabledSetting; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; 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 5f71c66633..ccd4f2933a 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; @@ -26,11 +27,12 @@ import org.opensearch.ml.settings.MLFeatureEnabledSetting; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; 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"); + } }