Skip to content

Commit b7ed864

Browse files
committed
Fix multitency config update
Moved multi-tenancy to REST API implementation Signed-off-by: Andrey Pleskach <ples@aiven.io>
1 parent 7c4e06d commit b7ed864

21 files changed

+472
-694
lines changed

src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@
117117
import org.opensearch.search.query.QuerySearchResult;
118118
import org.opensearch.security.action.configupdate.ConfigUpdateAction;
119119
import org.opensearch.security.action.configupdate.TransportConfigUpdateAction;
120-
import org.opensearch.security.action.tenancy.TenancyConfigRestHandler;
121-
import org.opensearch.security.action.tenancy.TenancyConfigRetrieveActions;
122-
import org.opensearch.security.action.tenancy.TenancyConfigRetrieveTransportAction;
123-
import org.opensearch.security.action.tenancy.TenancyConfigUpdateAction;
124-
import org.opensearch.security.action.tenancy.TenancyConfigUpdateTransportAction;
125120
import org.opensearch.security.action.whoami.TransportWhoAmIAction;
126121
import org.opensearch.security.action.whoami.WhoAmIAction;
127122
import org.opensearch.security.auditlog.AuditLog;
@@ -480,7 +475,6 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
480475
Objects.requireNonNull(cs), Objects.requireNonNull(adminDns), Objects.requireNonNull(cr)));
481476
handlers.add(new SecurityConfigUpdateAction(settings, restController, Objects.requireNonNull(threadPool), adminDns, configPath, principalExtractor));
482477
handlers.add(new SecurityWhoAmIAction(settings, restController, Objects.requireNonNull(threadPool), adminDns, configPath, principalExtractor));
483-
handlers.add(new TenancyConfigRestHandler());
484478
handlers.addAll(
485479
SecurityRestApiActions.getHandler(
486480
settings,
@@ -518,10 +512,6 @@ public UnaryOperator<RestHandler> getRestHandlerWrapper(final ThreadContext thre
518512
if(!disabled && !SSLConfig.isSslOnlyMode()) {
519513
actions.add(new ActionHandler<>(ConfigUpdateAction.INSTANCE, TransportConfigUpdateAction.class));
520514
actions.add(new ActionHandler<>(WhoAmIAction.INSTANCE, TransportWhoAmIAction.class));
521-
522-
actions.add(new ActionHandler<>(TenancyConfigRetrieveActions.INSTANCE, TenancyConfigRetrieveTransportAction.class));
523-
actions.add(new ActionHandler<>(TenancyConfigUpdateAction.INSTANCE, TenancyConfigUpdateTransportAction.class));
524-
525515
}
526516
return actions;
527517
}

src/main/java/org/opensearch/security/action/tenancy/EmptyRequest.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/org/opensearch/security/action/tenancy/TenancyConfigRestHandler.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/main/java/org/opensearch/security/action/tenancy/TenancyConfigRetrieveActions.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/org/opensearch/security/action/tenancy/TenancyConfigRetrieveResponse.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/java/org/opensearch/security/action/tenancy/TenancyConfigRetrieveTransportAction.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/main/java/org/opensearch/security/action/tenancy/TenancyConfigUpdateAction.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/main/java/org/opensearch/security/action/tenancy/TenancyConfigUpdateRequest.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)