Skip to content

Commit d0ec116

Browse files
cwperksdlin2028
authored andcommitted
Remove backendRegistry as api dependency
Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent b794c90 commit d0ec116

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,7 @@ public List<RestHandler> getRestHandlers(
631631
Objects.requireNonNull(auditLog),
632632
sks,
633633
Objects.requireNonNull(userService),
634-
sslCertReloadEnabled,
635-
backendRegistry
634+
sslCertReloadEnabled
636635
)
637636
);
638637
log.debug("Added {} rest handler(s)", handlers.size());

src/main/java/org/opensearch/security/dlic/rest/api/SecurityApiDependencies.java

+1-9
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import org.opensearch.common.settings.Settings;
1515
import org.opensearch.security.auditlog.AuditLog;
16-
import org.opensearch.security.auth.BackendRegistry;
1716
import org.opensearch.security.configuration.AdminDNs;
1817
import org.opensearch.security.configuration.ConfigurationRepository;
1918
import org.opensearch.security.privileges.PrivilegesEvaluator;
@@ -24,7 +23,6 @@ public class SecurityApiDependencies {
2423
private final ConfigurationRepository configurationRepository;
2524
private final RestApiPrivilegesEvaluator restApiPrivilegesEvaluator;
2625
private final RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator;
27-
private final BackendRegistry backendRegistry;
2826
private final AuditLog auditLog;
2927
private final Settings settings;
3028

@@ -37,8 +35,7 @@ public SecurityApiDependencies(
3735
final RestApiPrivilegesEvaluator restApiPrivilegesEvaluator,
3836
final RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator,
3937
final AuditLog auditLog,
40-
final Settings settings,
41-
final BackendRegistry backendRegistry
38+
final Settings settings
4239
) {
4340
this.adminDNs = adminDNs;
4441
this.configurationRepository = configurationRepository;
@@ -47,7 +44,6 @@ public SecurityApiDependencies(
4744
this.restApiAdminPrivilegesEvaluator = restApiAdminPrivilegesEvaluator;
4845
this.auditLog = auditLog;
4946
this.settings = settings;
50-
this.backendRegistry = backendRegistry;
5147
}
5248

5349
public AdminDNs adminDNs() {
@@ -78,10 +74,6 @@ public Settings settings() {
7874
return settings;
7975
}
8076

81-
public BackendRegistry backendRegistry() {
82-
return backendRegistry;
83-
}
84-
8577
public String securityIndexName() {
8678
return settings().get(ConfigConstants.SECURITY_CONFIG_INDEX_NAME, ConfigConstants.OPENDISTRO_SECURITY_DEFAULT_CONFIG_INDEX);
8779
}

src/main/java/org/opensearch/security/dlic/rest/api/SecurityRestApiActions.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.opensearch.rest.RestController;
2222
import org.opensearch.rest.RestHandler;
2323
import org.opensearch.security.auditlog.AuditLog;
24-
import org.opensearch.security.auth.BackendRegistry;
2524
import org.opensearch.security.configuration.AdminDNs;
2625
import org.opensearch.security.configuration.ConfigurationRepository;
2726
import org.opensearch.security.privileges.PrivilegesEvaluator;
@@ -48,8 +47,7 @@ public static Collection<RestHandler> getHandler(
4847
final AuditLog auditLog,
4948
final SecurityKeyStore securityKeyStore,
5049
final UserService userService,
51-
final boolean certificatesReloadEnabled,
52-
final BackendRegistry backendRegistry
50+
final boolean certificatesReloadEnabled
5351
) {
5452
final var securityApiDependencies = new SecurityApiDependencies(
5553
adminDns,
@@ -63,8 +61,7 @@ public static Collection<RestHandler> getHandler(
6361
settings.getAsBoolean(SECURITY_RESTAPI_ADMIN_ENABLED, false)
6462
),
6563
auditLog,
66-
settings,
67-
backendRegistry
64+
settings
6865
);
6966
return List.of(
7067
new InternalUsersApiAction(clusterService, threadPool, userService, securityApiDependencies),

0 commit comments

Comments
 (0)