Skip to content

Commit d72a6bd

Browse files
committed
move security ingest processors to a sub ingest directory (#31306)
It makes sense to introduce new Security ingest processors (example: #31087), and this change would give them a good place to be written.
1 parent e681512 commit d72a6bd

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
118118
import org.elasticsearch.xpack.core.security.authz.accesscontrol.IndicesAccessControl;
119119
import org.elasticsearch.xpack.core.security.authz.accesscontrol.SecurityIndexSearcherWrapper;
120-
import org.elasticsearch.xpack.core.security.authz.accesscontrol.SetSecurityUserProcessor;
121120
import org.elasticsearch.xpack.core.security.authz.permission.FieldPermissions;
122121
import org.elasticsearch.xpack.core.security.authz.permission.FieldPermissionsCache;
123122
import org.elasticsearch.xpack.core.security.authz.store.ReservedRolesStore;
@@ -177,6 +176,7 @@
177176
import org.elasticsearch.xpack.security.authz.store.CompositeRolesStore;
178177
import org.elasticsearch.xpack.security.authz.store.FileRolesStore;
179178
import org.elasticsearch.xpack.security.authz.store.NativeRolesStore;
179+
import org.elasticsearch.xpack.security.ingest.SetSecurityUserProcessor;
180180
import org.elasticsearch.xpack.security.rest.SecurityRestFilter;
181181
import org.elasticsearch.xpack.security.rest.action.RestAuthenticateAction;
182182
import org.elasticsearch.xpack.security.rest.action.oauth2.RestGetTokenAction;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6-
package org.elasticsearch.xpack.core.security.authz.accesscontrol;
6+
package org.elasticsearch.xpack.security.ingest;
77

88
import org.elasticsearch.common.util.concurrent.ThreadContext;
99
import org.elasticsearch.ingest.AbstractProcessor;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6-
package org.elasticsearch.xpack.core.security.authz.accesscontrol;
6+
package org.elasticsearch.xpack.security.ingest;
77

88
import org.elasticsearch.ElasticsearchParseException;
99
import org.elasticsearch.test.ESTestCase;
10-
import org.elasticsearch.xpack.core.security.authz.accesscontrol.SetSecurityUserProcessor.Property;
10+
import org.elasticsearch.xpack.security.ingest.SetSecurityUserProcessor.Property;
1111

1212
import java.util.Arrays;
1313
import java.util.EnumSet;
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6-
package org.elasticsearch.xpack.security.authz.accesscontrol;
6+
package org.elasticsearch.xpack.security.ingest;
77

88
import org.elasticsearch.common.settings.Settings;
99
import org.elasticsearch.common.util.concurrent.ThreadContext;
1010
import org.elasticsearch.ingest.IngestDocument;
1111
import org.elasticsearch.test.ESTestCase;
1212
import org.elasticsearch.xpack.core.security.authc.Authentication;
1313
import org.elasticsearch.xpack.core.security.authc.AuthenticationField;
14-
import org.elasticsearch.xpack.core.security.authz.accesscontrol.SetSecurityUserProcessor;
15-
import org.elasticsearch.xpack.core.security.authz.accesscontrol.SetSecurityUserProcessor.Property;
1614
import org.elasticsearch.xpack.core.security.user.User;
15+
import org.elasticsearch.xpack.security.ingest.SetSecurityUserProcessor.Property;
1716

1817
import java.util.Collections;
1918
import java.util.EnumSet;

0 commit comments

Comments
 (0)