[ML] Add 'xpack' into action names to match what the rest of X-Pack does (elastic/x-pack-elasticsearch#909)

Original commit: elastic/x-pack-elasticsearch@36be904ad9
This commit is contained in:
David Roberts 2017-03-31 11:22:53 +01:00 committed by GitHub
parent 23123b9219
commit 95fd6777a0
38 changed files with 71 additions and 71 deletions

View File

@ -52,7 +52,7 @@ import java.util.Optional;
public class CloseJobAction extends Action<CloseJobAction.Request, CloseJobAction.Response, CloseJobAction.RequestBuilder> {
public static final CloseJobAction INSTANCE = new CloseJobAction();
public static final String NAME = "cluster:admin/ml/job/close";
public static final String NAME = "cluster:admin/xpack/ml/job/close";
private CloseJobAction() {
super(NAME);

View File

@ -41,7 +41,7 @@ public class DeleteDatafeedAction extends Action<DeleteDatafeedAction.Request, D
DeleteDatafeedAction.RequestBuilder> {
public static final DeleteDatafeedAction INSTANCE = new DeleteDatafeedAction();
public static final String NAME = "cluster:admin/ml/datafeeds/delete";
public static final String NAME = "cluster:admin/xpack/ml/datafeeds/delete";
private DeleteDatafeedAction() {
super(NAME);

View File

@ -37,7 +37,7 @@ public class DeleteExpiredDataAction extends Action<DeleteExpiredDataAction.Requ
DeleteExpiredDataAction.RequestBuilder> {
public static final DeleteExpiredDataAction INSTANCE = new DeleteExpiredDataAction();
public static final String NAME = "cluster:admin/ml/delete_expired_data";
public static final String NAME = "cluster:admin/xpack/ml/delete_expired_data";
private DeleteExpiredDataAction() {
super(NAME);

View File

@ -50,7 +50,7 @@ import java.util.Objects;
public class DeleteFilterAction extends Action<DeleteFilterAction.Request, DeleteFilterAction.Response, DeleteFilterAction.RequestBuilder> {
public static final DeleteFilterAction INSTANCE = new DeleteFilterAction();
public static final String NAME = "cluster:admin/ml/filters/delete";
public static final String NAME = "cluster:admin/xpack/ml/filters/delete";
private DeleteFilterAction() {
super(NAME);

View File

@ -38,7 +38,7 @@ import java.util.Objects;
public class DeleteJobAction extends Action<DeleteJobAction.Request, DeleteJobAction.Response, DeleteJobAction.RequestBuilder> {
public static final DeleteJobAction INSTANCE = new DeleteJobAction();
public static final String NAME = "cluster:admin/ml/job/delete";
public static final String NAME = "cluster:admin/xpack/ml/job/delete";
private DeleteJobAction() {
super(NAME);

View File

@ -42,7 +42,7 @@ public class DeleteModelSnapshotAction extends Action<DeleteModelSnapshotAction.
DeleteModelSnapshotAction.Response, DeleteModelSnapshotAction.RequestBuilder> {
public static final DeleteModelSnapshotAction INSTANCE = new DeleteModelSnapshotAction();
public static final String NAME = "cluster:admin/ml/job/model_snapshots/delete";
public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/delete";
private DeleteModelSnapshotAction() {
super(NAME);

View File

@ -37,7 +37,7 @@ public class FinalizeJobExecutionAction extends Action<FinalizeJobExecutionActio
FinalizeJobExecutionAction.Response,FinalizeJobExecutionAction.RequestBuilder> {
public static final FinalizeJobExecutionAction INSTANCE = new FinalizeJobExecutionAction();
public static final String NAME = "cluster:internal/ml/job/finalize_job_execution";
public static final String NAME = "cluster:internal/xpack/ml/job/finalize_job_execution";
private FinalizeJobExecutionAction() {
super(NAME);

View File

@ -38,7 +38,7 @@ import java.util.Objects;
public class FlushJobAction extends Action<FlushJobAction.Request, FlushJobAction.Response, FlushJobAction.RequestBuilder> {
public static final FlushJobAction INSTANCE = new FlushJobAction();
public static final String NAME = "cluster:admin/ml/job/flush";
public static final String NAME = "cluster:admin/xpack/ml/job/flush";
private FlushJobAction() {
super(NAME);

View File

@ -45,7 +45,7 @@ import java.util.Objects;
public class GetBucketsAction extends Action<GetBucketsAction.Request, GetBucketsAction.Response, GetBucketsAction.RequestBuilder> {
public static final GetBucketsAction INSTANCE = new GetBucketsAction();
public static final String NAME = "cluster:monitor/ml/job/results/buckets/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/results/buckets/get";
private GetBucketsAction() {
super(NAME);

View File

@ -44,7 +44,7 @@ public class GetCategoriesAction extends
Action<GetCategoriesAction.Request, GetCategoriesAction.Response, GetCategoriesAction.RequestBuilder> {
public static final GetCategoriesAction INSTANCE = new GetCategoriesAction();
public static final String NAME = "cluster:monitor/ml/job/results/categories/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/results/categories/get";
private GetCategoriesAction() {
super(NAME);

View File

@ -43,7 +43,7 @@ public class GetDatafeedsAction extends Action<GetDatafeedsAction.Request, GetDa
GetDatafeedsAction.RequestBuilder> {
public static final GetDatafeedsAction INSTANCE = new GetDatafeedsAction();
public static final String NAME = "cluster:monitor/ml/datafeeds/get";
public static final String NAME = "cluster:monitor/xpack/ml/datafeeds/get";
public static final String ALL = "_all";

View File

@ -54,7 +54,7 @@ public class GetDatafeedsStatsAction extends Action<GetDatafeedsStatsAction.Requ
GetDatafeedsStatsAction.RequestBuilder> {
public static final GetDatafeedsStatsAction INSTANCE = new GetDatafeedsStatsAction();
public static final String NAME = "cluster:monitor/ml/datafeeds/stats/get";
public static final String NAME = "cluster:monitor/xpack/ml/datafeeds/stats/get";
public static final String ALL = "_all";
private static final String STATE = "state";

View File

@ -57,7 +57,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFiltersAction.Response, GetFiltersAction.RequestBuilder> {
public static final GetFiltersAction INSTANCE = new GetFiltersAction();
public static final String NAME = "cluster:admin/ml/filters/get";
public static final String NAME = "cluster:admin/xpack/ml/filters/get";
private GetFiltersAction() {
super(NAME);

View File

@ -44,7 +44,7 @@ public class GetInfluencersAction
extends Action<GetInfluencersAction.Request, GetInfluencersAction.Response, GetInfluencersAction.RequestBuilder> {
public static final GetInfluencersAction INSTANCE = new GetInfluencersAction();
public static final String NAME = "cluster:monitor/ml/job/results/influencers/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/results/influencers/get";
private GetInfluencersAction() {
super(NAME);

View File

@ -39,7 +39,7 @@ import java.util.Objects;
public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.Response, GetJobsAction.RequestBuilder> {
public static final GetJobsAction INSTANCE = new GetJobsAction();
public static final String NAME = "cluster:monitor/ml/job/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/get";
private GetJobsAction() {
super(NAME);

View File

@ -64,7 +64,7 @@ import java.util.stream.Collectors;
public class GetJobsStatsAction extends Action<GetJobsStatsAction.Request, GetJobsStatsAction.Response, GetJobsStatsAction.RequestBuilder> {
public static final GetJobsStatsAction INSTANCE = new GetJobsStatsAction();
public static final String NAME = "cluster:monitor/ml/job/stats/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/stats/get";
private static final String DATA_COUNTS = "data_counts";
private static final String MODEL_SIZE_STATS = "model_size_stats";

View File

@ -44,7 +44,7 @@ public class GetModelSnapshotsAction
extends Action<GetModelSnapshotsAction.Request, GetModelSnapshotsAction.Response, GetModelSnapshotsAction.RequestBuilder> {
public static final GetModelSnapshotsAction INSTANCE = new GetModelSnapshotsAction();
public static final String NAME = "cluster:monitor/ml/job/model_snapshots/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/model_snapshots/get";
private GetModelSnapshotsAction() {
super(NAME);

View File

@ -45,7 +45,7 @@ import java.util.Objects;
public class GetRecordsAction extends Action<GetRecordsAction.Request, GetRecordsAction.Response, GetRecordsAction.RequestBuilder> {
public static final GetRecordsAction INSTANCE = new GetRecordsAction();
public static final String NAME = "cluster:monitor/ml/job/results/records/get";
public static final String NAME = "cluster:monitor/xpack/ml/job/results/records/get";
private GetRecordsAction() {
super(NAME);

View File

@ -70,7 +70,7 @@ import static org.elasticsearch.xpack.ml.job.process.autodetect.AutodetectProces
public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.Response, OpenJobAction.RequestBuilder> {
public static final OpenJobAction INSTANCE = new OpenJobAction();
public static final String NAME = "cluster:admin/ml/job/open";
public static final String NAME = "cluster:admin/xpack/ml/job/open";
private OpenJobAction() {
super(NAME);

View File

@ -40,7 +40,7 @@ import java.util.Optional;
public class PostDataAction extends Action<PostDataAction.Request, PostDataAction.Response, PostDataAction.RequestBuilder> {
public static final PostDataAction INSTANCE = new PostDataAction();
public static final String NAME = "cluster:admin/ml/job/data/post";
public static final String NAME = "cluster:admin/xpack/ml/job/data/post";
private PostDataAction() {
super(NAME);

View File

@ -51,7 +51,7 @@ public class PreviewDatafeedAction extends Action<PreviewDatafeedAction.Request,
PreviewDatafeedAction.RequestBuilder> {
public static final PreviewDatafeedAction INSTANCE = new PreviewDatafeedAction();
public static final String NAME = "cluster:admin/ml/datafeeds/preview";
public static final String NAME = "cluster:admin/xpack/ml/datafeeds/preview";
private PreviewDatafeedAction() {
super(NAME);

View File

@ -56,7 +56,7 @@ import java.util.Objects;
public class PutDatafeedAction extends Action<PutDatafeedAction.Request, PutDatafeedAction.Response, PutDatafeedAction.RequestBuilder> {
public static final PutDatafeedAction INSTANCE = new PutDatafeedAction();
public static final String NAME = "cluster:admin/ml/datafeeds/put";
public static final String NAME = "cluster:admin/xpack/ml/datafeeds/put";
private PutDatafeedAction() {
super(NAME);

View File

@ -44,7 +44,7 @@ import java.util.Objects;
public class PutFilterAction extends Action<PutFilterAction.Request, PutFilterAction.Response, PutFilterAction.RequestBuilder> {
public static final PutFilterAction INSTANCE = new PutFilterAction();
public static final String NAME = "cluster:admin/ml/filters/put";
public static final String NAME = "cluster:admin/xpack/ml/filters/put";
private PutFilterAction() {
super(NAME);

View File

@ -45,7 +45,7 @@ import java.util.Objects;
public class PutJobAction extends Action<PutJobAction.Request, PutJobAction.Response, PutJobAction.RequestBuilder> {
public static final PutJobAction INSTANCE = new PutJobAction();
public static final String NAME = "cluster:admin/ml/job/put";
public static final String NAME = "cluster:admin/xpack/ml/job/put";
private PutJobAction() {
super(NAME);

View File

@ -55,7 +55,7 @@ public class RevertModelSnapshotAction
extends Action<RevertModelSnapshotAction.Request, RevertModelSnapshotAction.Response, RevertModelSnapshotAction.RequestBuilder> {
public static final RevertModelSnapshotAction INSTANCE = new RevertModelSnapshotAction();
public static final String NAME = "cluster:admin/ml/job/model_snapshots/revert";
public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/revert";
private RevertModelSnapshotAction() {
super(NAME);

View File

@ -75,7 +75,7 @@ public class StartDatafeedAction
public static final ParseField TIMEOUT = new ParseField("timeout");
public static final StartDatafeedAction INSTANCE = new StartDatafeedAction();
public static final String NAME = "cluster:admin/ml/datafeeds/start";
public static final String NAME = "cluster:admin/xpack/ml/datafeeds/start";
private StartDatafeedAction() {
super(NAME);

View File

@ -54,7 +54,7 @@ public class StopDatafeedAction
extends Action<StopDatafeedAction.Request, StopDatafeedAction.Response, StopDatafeedAction.RequestBuilder> {
public static final StopDatafeedAction INSTANCE = new StopDatafeedAction();
public static final String NAME = "cluster:admin/ml/datafeeds/stop";
public static final String NAME = "cluster:admin/xpack/ml/datafeeds/stop";
public static final ParseField TIMEOUT = new ParseField("timeout");
public static final ParseField FORCE = new ParseField("force");

View File

@ -41,7 +41,7 @@ public class UpdateDatafeedAction extends Action<UpdateDatafeedAction.Request, P
UpdateDatafeedAction.RequestBuilder> {
public static final UpdateDatafeedAction INSTANCE = new UpdateDatafeedAction();
public static final String NAME = "cluster:admin/ml/datafeeds/update";
public static final String NAME = "cluster:admin/xpack/ml/datafeeds/update";
private UpdateDatafeedAction() {
super(NAME);

View File

@ -38,7 +38,7 @@ import java.util.Objects;
public class UpdateJobAction extends Action<UpdateJobAction.Request, PutJobAction.Response, UpdateJobAction.RequestBuilder> {
public static final UpdateJobAction INSTANCE = new UpdateJobAction();
public static final String NAME = "cluster:admin/ml/job/update";
public static final String NAME = "cluster:admin/xpack/ml/job/update";
private UpdateJobAction() {
super(NAME);

View File

@ -46,7 +46,7 @@ public class UpdateModelSnapshotAction extends Action<UpdateModelSnapshotAction.
UpdateModelSnapshotAction.Response, UpdateModelSnapshotAction.RequestBuilder> {
public static final UpdateModelSnapshotAction INSTANCE = new UpdateModelSnapshotAction();
public static final String NAME = "cluster:admin/ml/job/model_snapshots/update";
public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/update";
private UpdateModelSnapshotAction() {
super(NAME);

View File

@ -36,7 +36,7 @@ public class UpdateProcessAction extends
Action<UpdateProcessAction.Request, UpdateProcessAction.Response, UpdateProcessAction.RequestBuilder> {
public static final UpdateProcessAction INSTANCE = new UpdateProcessAction();
public static final String NAME = "cluster:internal/ml/job/update/process";
public static final String NAME = "cluster:internal/xpack/ml/job/update/process";
private UpdateProcessAction() {
super(NAME);

View File

@ -34,7 +34,7 @@ public class ValidateDetectorAction
extends Action<ValidateDetectorAction.Request, ValidateDetectorAction.Response, ValidateDetectorAction.RequestBuilder> {
public static final ValidateDetectorAction INSTANCE = new ValidateDetectorAction();
public static final String NAME = "cluster:admin/ml/job/validate/detector";
public static final String NAME = "cluster:admin/xpack/ml/job/validate/detector";
protected ValidateDetectorAction() {
super(NAME);

View File

@ -35,7 +35,7 @@ public class ValidateJobConfigAction
extends Action<ValidateJobConfigAction.Request, ValidateJobConfigAction.Response, ValidateJobConfigAction.RequestBuilder> {
public static final ValidateJobConfigAction INSTANCE = new ValidateJobConfigAction();
public static final String NAME = "cluster:admin/ml/job/validate";
public static final String NAME = "cluster:admin/xpack/ml/job/validate";
protected ValidateJobConfigAction() {
super(NAME);

View File

@ -1038,7 +1038,7 @@ public class JobProvider {
*
* gets mapped to:
*
* action [cluster:monitor/ml/anomaly_detectors/results/buckets/get] is unauthorized for user [ml_test] for job [farequote]
* action [cluster:monitor/xpack/ml/anomaly_detectors/results/buckets/get] is unauthorized for user [ml_test] for job [farequote]
*
* Exceptions that are not related to authorization are returned unaltered.
* @param e An exception that occurred while getting ML data

View File

@ -26,10 +26,10 @@ public final class ClusterPrivilege extends Privilege {
// shared automatons
private static final Automaton MANAGE_SECURITY_AUTOMATON = patterns("cluster:admin/xpack/security/*");
private static final Automaton MONITOR_AUTOMATON = patterns("cluster:monitor/*");
private static final Automaton MONITOR_ML_AUTOMATON = patterns("cluster:monitor/ml/*");
private static final Automaton MONITOR_ML_AUTOMATON = patterns("cluster:monitor/xpack/ml/*");
private static final Automaton ALL_CLUSTER_AUTOMATON = patterns("cluster:*", "indices:admin/template/*");
private static final Automaton MANAGE_AUTOMATON = minusAndMinimize(ALL_CLUSTER_AUTOMATON, MANAGE_SECURITY_AUTOMATON);
private static final Automaton MANAGE_ML_AUTOMATON = patterns("cluster:admin/ml/*", "cluster:monitor/ml/*");
private static final Automaton MANAGE_ML_AUTOMATON = patterns("cluster:admin/xpack/ml/*", "cluster:monitor/xpack/ml/*");
private static final Automaton TRANSPORT_CLIENT_AUTOMATON = patterns("cluster:monitor/nodes/liveness", "cluster:monitor/state");
private static final Automaton MANAGE_IDX_TEMPLATE_AUTOMATON = patterns("indices:admin/template/*");
private static final Automaton MANAGE_INGEST_PIPELINE_AUTOMATON = patterns("cluster:admin/ingest/pipeline/*");

View File

@ -104,42 +104,42 @@ cluster:admin/ingest/pipeline/delete
cluster:admin/ingest/pipeline/get
cluster:admin/ingest/pipeline/put
cluster:admin/ingest/pipeline/simulate
cluster:admin/ml/filters/get
cluster:monitor/ml/job/results/categories/get
cluster:monitor/ml/job/stats/get
cluster:monitor/ml/job/results/buckets/get
cluster:monitor/ml/job/model_snapshots/get
cluster:monitor/ml/job/results/records/get
cluster:monitor/ml/job/results/influencers/get
cluster:admin/ml/datafeeds/preview
cluster:admin/ml/datafeeds/put
cluster:admin/ml/datafeeds/update
cluster:admin/ml/job/model_snapshots/delete
cluster:admin/ml/job/validate/detector
cluster:admin/ml/job/validate
cluster:admin/ml/job/delete
cluster:admin/ml/job/model_snapshots/revert
cluster:admin/ml/datafeeds/delete
cluster:admin/ml/job/data/post
cluster:admin/ml/job/close
cluster:admin/ml/filters/put
cluster:admin/ml/job/put
cluster:monitor/ml/job/get
cluster:monitor/ml/datafeeds/get
cluster:admin/ml/job/model_snapshots/update
cluster:admin/ml/job/flush
cluster:admin/ml/filters/delete
cluster:monitor/ml/datafeeds/stats/get
cluster:admin/ml/datafeeds/stop
cluster:admin/ml/datafeeds/start
cluster:admin/ml/job/open
cluster:admin/ml/job/update
cluster:admin/xpack/ml/filters/get
cluster:monitor/xpack/ml/job/results/categories/get
cluster:monitor/xpack/ml/job/stats/get
cluster:monitor/xpack/ml/job/results/buckets/get
cluster:monitor/xpack/ml/job/model_snapshots/get
cluster:monitor/xpack/ml/job/results/records/get
cluster:monitor/xpack/ml/job/results/influencers/get
cluster:admin/xpack/ml/datafeeds/preview
cluster:admin/xpack/ml/datafeeds/put
cluster:admin/xpack/ml/datafeeds/update
cluster:admin/xpack/ml/job/model_snapshots/delete
cluster:admin/xpack/ml/job/validate/detector
cluster:admin/xpack/ml/job/validate
cluster:admin/xpack/ml/job/delete
cluster:admin/xpack/ml/job/model_snapshots/revert
cluster:admin/xpack/ml/datafeeds/delete
cluster:admin/xpack/ml/job/data/post
cluster:admin/xpack/ml/job/close
cluster:admin/xpack/ml/filters/put
cluster:admin/xpack/ml/job/put
cluster:monitor/xpack/ml/job/get
cluster:monitor/xpack/ml/datafeeds/get
cluster:admin/xpack/ml/job/model_snapshots/update
cluster:admin/xpack/ml/job/flush
cluster:admin/xpack/ml/filters/delete
cluster:monitor/xpack/ml/datafeeds/stats/get
cluster:admin/xpack/ml/datafeeds/stop
cluster:admin/xpack/ml/datafeeds/start
cluster:admin/xpack/ml/job/open
cluster:admin/xpack/ml/job/update
indices:internal/data/write/mldeletebyquery
cluster:internal/ml/job/update/process
cluster:admin/ml/delete_expired_data
cluster:internal/xpack/ml/job/update/process
cluster:admin/xpack/ml/delete_expired_data
cluster:admin/persistent/create
cluster:admin/persistent/start
cluster:admin/persistent/completion
cluster:admin/persistent/update_status
cluster:admin/persistent/remove
cluster:internal/ml/job/finalize_job_execution
cluster:internal/xpack/ml/job/finalize_job_execution

View File

@ -24,7 +24,7 @@ public class MlWithSecurityInsufficientRoleIT extends MlWithSecurityIT {
public void test() throws IOException {
AssertionError ae = expectThrows(AssertionError.class, super::test);
assertThat(ae.getMessage(),
either(containsString("action [cluster:monitor/ml")).or(containsString("action [cluster:admin/ml")));
either(containsString("action [cluster:monitor/xpack/ml")).or(containsString("action [cluster:admin/xpack/ml")));
assertThat(ae.getMessage(), containsString("returned [403 Forbidden]"));
assertThat(ae.getMessage(), containsString("is unauthorized for user [no_ml]"));
}

View File

@ -40,7 +40,7 @@ public class MlWithSecurityUserRoleIT extends MlWithSecurityIT {
}
} catch (AssertionError ae) {
assertThat(ae.getMessage(),
either(containsString("action [cluster:monitor/ml")).or(containsString("action [cluster:admin/ml")));
either(containsString("action [cluster:monitor/xpack/ml")).or(containsString("action [cluster:admin/xpack/ml")));
assertThat(ae.getMessage(), containsString("returned [403 Forbidden]"));
assertThat(ae.getMessage(), containsString("is unauthorized for user [ml_user]"));
}