diff --git a/src/main/java/org/opensearch/security/configuration/ConfigurationLoaderSecurity7.java b/src/main/java/org/opensearch/security/configuration/ConfigurationLoaderSecurity7.java index 2ac2bf8cdb..f1062cede3 100644 --- a/src/main/java/org/opensearch/security/configuration/ConfigurationLoaderSecurity7.java +++ b/src/main/java/org/opensearch/security/configuration/ConfigurationLoaderSecurity7.java @@ -300,23 +300,6 @@ private SecurityDynamicConfiguration toConfig(GetResponse singleGetResponse, log.debug("Load " + id + " with version " + configVersion); } - if (CType.ACTIONGROUPS.toLCString().equals(id)) { - try { - return SecurityDynamicConfiguration.fromJson( - jsonAsString, - CType.fromString(id), - configVersion, - seqNo, - primaryTerm, - acceptInvalid - ); - } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("Unable to load " + id + " with version " + configVersion + " - Try loading legacy format ..."); - } - return SecurityDynamicConfiguration.fromJson(jsonAsString, CType.fromString(id), 0, seqNo, primaryTerm, acceptInvalid); - } - } return SecurityDynamicConfiguration.fromJson( jsonAsString, CType.fromString(id), diff --git a/src/main/java/org/opensearch/security/securityconf/impl/SecurityDynamicConfiguration.java b/src/main/java/org/opensearch/security/securityconf/impl/SecurityDynamicConfiguration.java index a56d8e8aa3..6abe37b542 100644 --- a/src/main/java/org/opensearch/security/securityconf/impl/SecurityDynamicConfiguration.java +++ b/src/main/java/org/opensearch/security/securityconf/impl/SecurityDynamicConfiguration.java @@ -127,7 +127,7 @@ public static SecurityDynamicConfiguration fromMap(Map ma public static void validate(SecurityDynamicConfiguration sdc, int version, CType ctype) throws IOException { if (version < 2) { - throw new IOException("Config version " + version + " is not supported"); + throw new IOException("Config version " + version + " is not supported; config type: " + ctype); } if (sdc.get_meta() == null) { diff --git a/src/test/java/org/opensearch/security/SecurityAdminTests.java b/src/test/java/org/opensearch/security/SecurityAdminTests.java index 44c2934469..0f2d5b3caa 100644 --- a/src/test/java/org/opensearch/security/SecurityAdminTests.java +++ b/src/test/java/org/opensearch/security/SecurityAdminTests.java @@ -598,21 +598,6 @@ public void testSecurityAdminValidateConfig() throws Exception { returnCode = SecurityAdmin.execute(argsAsList.toArray(new String[0])); Assert.assertNotEquals(0, returnCode); - argsAsList = new ArrayList<>(); - addDirectoryPath(argsAsList, TEST_RESOURCE_ABSOLUTE_PATH + "legacy/securityconfig_v6"); - argsAsList.add("-vc"); - - returnCode = SecurityAdmin.execute(argsAsList.toArray(new String[0])); - Assert.assertNotEquals(0, returnCode); - - argsAsList = new ArrayList<>(); - addDirectoryPath(argsAsList, TEST_RESOURCE_ABSOLUTE_PATH + "legacy/securityconfig_v6"); - argsAsList.add("-vc"); - argsAsList.add("6"); - - returnCode = SecurityAdmin.execute(argsAsList.toArray(new String[0])); - assertThat(returnCode, is(0)); - argsAsList = new ArrayList<>(); addDirectoryPath(argsAsList, TEST_RESOURCE_ABSOLUTE_PATH); argsAsList.add("-vc"); diff --git a/src/test/resources/ldap/internal_users.yml b/src/test/resources/ldap/internal_users.yml index ae3789c1c8..d07fe17947 100644 --- a/src/test/resources/ldap/internal_users.yml +++ b/src/test/resources/ldap/internal_users.yml @@ -1,3 +1,6 @@ +_meta: + type: "internalusers" + config_version: 2 admin: hash: $2a$12$VcCDgh2NDk07JGN0rjGbM.Ad41qVR/YFJcgHp0UGns5JDymv..TOG #password is: admin