Skip to content

Adds resource types to DocRequests #1566

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

Merged
merged 5 commits into from
Oct 1, 2025
Merged

Adds resource types to DocRequests #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5d42dc
Adds resource types to DocRequests
DarshitChanpura Oct 1, 2025
fd8acf6
Adds changelog entry
DarshitChanpura Oct 1, 2025
d5bc34d
Adds awaitility to a flaky test
DarshitChanpura Oct 1, 2025
0198a4b
Boost delete config test
DarshitChanpura Oct 1, 2025
221e184
Merge remote-tracking branch 'upstream/main'
DarshitChanpura Oct 1, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)

### Refactoring
- Updates search handler to consume resource authz and updates resource authz related tests ([#1546](https://github.com/opensearch-project/anomaly-detection/pull/1546))
- Adds resource types to DocRequests ([#1566](https://github.com/opensearch-project/anomaly-detection/pull/1566))

## [Unreleased 2.x](https://github.com/opensearch-project/anomaly-detection/compare/2.19...2.x)
### Features
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.DocRequest;
import org.opensearch.action.support.WriteRequest;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.ad.model.AnomalyDetector;
import org.opensearch.common.unit.TimeValue;
Expand Down Expand Up @@ -147,6 +148,11 @@ public ActionRequestValidationException validate() {
return null;
}

@Override
public String type() {
return ADCommonName.AD_RESOURCE_TYPE;
}

@Override
public String index() {
return ADIndex.CONFIG.getIndexName();
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.DocRequest;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.ad.model.AnomalyDetector;
import org.opensearch.core.common.io.stream.StreamInput;
Expand Down Expand Up @@ -76,6 +77,11 @@ public ActionRequestValidationException validate() {
return null;
}

@Override
public String type() {
return ADCommonName.AD_RESOURCE_TYPE;
}

@Override
public String index() {
return ADIndex.CONFIG.getIndexName();
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/opensearch/forecast/transport/IndexForecasterRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.forecast.constant.ForecastCommonName;
import org.opensearch.forecast.indices.ForecastIndex;
import org.opensearch.forecast.model.Forecaster;
import org.opensearch.rest.RestRequest;
Expand Down Expand Up @@ -144,6 +145,11 @@ public ActionRequestValidationException validate() {
return null;
}

@Override
public String type() {
return ForecastCommonName.FORECAST_RESOURCE_TYPE;
}

@Override
public String index() {
return ForecastIndex.CONFIG.getIndexName();
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/opensearch/timeseries/transport/DeleteConfigRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.DocRequest;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.core.common.Strings;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.forecast.constant.ForecastCommonName;
import org.opensearch.timeseries.constant.CommonMessages;

public class DeleteConfigRequest extends ActionRequest implements DocRequest {
Expand Down Expand Up @@ -60,6 +63,13 @@ public ActionRequestValidationException validate() {
return validationException;
}

@Override
public String type() {
return configIndex.startsWith(ADIndex.CONFIG.getIndexName())
? ADCommonName.AD_RESOURCE_TYPE
: ForecastCommonName.FORECAST_RESOURCE_TYPE;
}

@Override
public String index() {
return configIndex;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/opensearch/timeseries/transport/GetConfigRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.DocRequest;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.core.common.io.stream.InputStreamStreamInput;
import org.opensearch.core.common.io.stream.OutputStreamStreamOutput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.forecast.constant.ForecastCommonName;
import org.opensearch.timeseries.model.Entity;

public class GetConfigRequest extends ActionRequest implements DocRequest {
Expand Down Expand Up @@ -145,6 +148,13 @@ public static GetConfigRequest fromActionRequest(final ActionRequest actionReque
}
}

@Override
public String type() {
return configIndex.startsWith(ADIndex.CONFIG.getIndexName())
? ADCommonName.AD_RESOURCE_TYPE
: ForecastCommonName.FORECAST_RESOURCE_TYPE;
}

@Override
public String index() {
return configIndex;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/opensearch/timeseries/transport/JobRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.DocRequest;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.forecast.constant.ForecastCommonName;
import org.opensearch.timeseries.model.DateRange;

public class JobRequest extends ActionRequest implements DocRequest {
Expand Down Expand Up @@ -102,6 +105,13 @@ public ActionRequestValidationException validate() {
return null;
}

@Override
public String type() {
return configIndex.startsWith(ADIndex.CONFIG.getIndexName())
? ADCommonName.AD_RESOURCE_TYPE
: ForecastCommonName.FORECAST_RESOURCE_TYPE;
}

@Override
public String index() {
return configIndex;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/opensearch/timeseries/transport/SuggestConfigParamRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.DocRequest;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.ad.model.AnomalyDetector;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.forecast.constant.ForecastCommonName;
import org.opensearch.forecast.indices.ForecastIndex;
import org.opensearch.forecast.model.Forecaster;
import org.opensearch.timeseries.AnalysisType;
Expand Down Expand Up @@ -85,6 +87,11 @@ public AnalysisType getContext() {
return context;
}

@Override
public String type() {
return context.isAD() ? ADCommonName.AD_RESOURCE_TYPE : ForecastCommonName.FORECAST_RESOURCE_TYPE;
}

@Override
public String index() {
if (context.isAD()) {
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/opensearch/timeseries/transport/DeleteAnomalyDetectorActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.delete.DeleteResponse;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.ad.constant.ADCommonName;
import org.opensearch.ad.indices.ADIndex;
import org.opensearch.ad.settings.AnomalyDetectorSettings;
import org.opensearch.ad.task.ADTaskManager;
Expand Down Expand Up @@ -95,6 +96,7 @@ public void testDeleteRequest() throws IOException {
DeleteConfigRequest newRequest = new DeleteConfigRequest(input);
Assert.assertEquals(request.getConfigID(), newRequest.getConfigID());
Assert.assertNull(newRequest.validate());
Assert.assertEquals(newRequest.type(), ADCommonName.AD_RESOURCE_TYPE);
}

@Test
Expand Down
Loading