Removed v6 configuration related code

Signed-off-by: Nils Bandener <nils.bandener@eliatra.com>
opensearch-project · Sep 24, 2024 · 5631248 · 5631248
1 parent 8c43198
commit 5631248
Show file tree

Hide file tree

Showing 39 changed files with 21 additions and 4,085 deletions.
diff --git a/src/main/java/org/opensearch/security/configuration/ConfigurationLoaderSecurity7.java b/src/main/java/org/opensearch/security/configuration/ConfigurationLoaderSecurity7.java
@@ -54,11 +54,8 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.security.DefaultObjectMapper;
 import org.opensearch.security.auditlog.config.AuditConfig;
-import org.opensearch.security.securityconf.Migration;
 import org.opensearch.security.securityconf.impl.CType;
 import org.opensearch.security.securityconf.impl.SecurityDynamicConfiguration;
-import org.opensearch.security.securityconf.impl.v6.RoleV6;
-import org.opensearch.security.securityconf.impl.v7.TenantV7;
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.security.support.ConfigHelper;
 import org.opensearch.security.support.SecurityUtils;
@@ -121,17 +118,6 @@ public void success(SecurityDynamicConfiguration<?> dConf) {
 
                 result.with(dConf);
 
-                if (dConf.getCType() == CType.ROLES && dConf.getAutoConvertedFrom() != null) {
-                    // Special case for configuration that was auto-converted from v6:
-                    // We need to generate tenant config from role config.
-                    // Having such a special case here is not optimal, but IMHO acceptable, as this
-                    // should be only a temporary measure until V6 configuration is completely discontinued.
-                    @SuppressWarnings("unchecked")
-                    SecurityDynamicConfiguration<RoleV6> roleV6config = (SecurityDynamicConfiguration<RoleV6>) dConf.getAutoConvertedFrom();
-                    SecurityDynamicConfiguration<TenantV7> tenants = Migration.createTenants(roleV6config);
-                    result.with(tenants);
-                }
-
                 latch.countDown();
                 if (isDebugEnabled) {
                     log.debug(

diff --git a/src/main/java/org/opensearch/security/dlic/rest/api/MigrateApiAction.java b/src/main/java/org/opensearch/security/dlic/rest/api/MigrateApiAction.java
diff --git a/src/main/java/org/opensearch/security/dlic/rest/api/SecurityRestApiActions.java b/src/main/java/org/opensearch/security/dlic/rest/api/SecurityRestApiActions.java
@@ -88,8 +88,6 @@ public static Collection<RestHandler> getHandler(
             ),
             new AuthTokenProcessorAction(clusterService, threadPool, securityApiDependencies),
             new TenantsApiAction(clusterService, threadPool, securityApiDependencies),
-            new MigrateApiAction(clusterService, threadPool, securityApiDependencies),
-            new ValidateApiAction(clusterService, threadPool, securityApiDependencies),
             new AccountApiAction(clusterService, threadPool, securityApiDependencies, passwordHasher),
             new NodesDnApiAction(clusterService, threadPool, securityApiDependencies),
             new WhitelistApiAction(clusterService, threadPool, securityApiDependencies),