Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Resolve ImmutableOpenMap issue from core refactor #2908

Merged
merged 6 commits into from
Jun 27, 2023
Merged

[Backport 2.x] Resolve ImmutableOpenMap issue from core refactor #2908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2407128
Resolve ImmutableOpenMap issue from core refactor (#2715)
stephen-crawford Apr 25, 2023
52f79f0
Switch from ImmutableOpenMap to Map in AliasExistsMatcher (#2725)
cwperks Apr 26, 2023
2fb50a4
Switch from ImmutableOpenMap to Map in AliasExistsMatcher (#2725)
cwperks Apr 26, 2023
28fb0bd
Removes a missed reference for ImmutableOpenMap (#2726)
DarshitChanpura Apr 28, 2023
91f6792
Update ClusterInfoHolder
cwperks Jun 27, 2023
4b7ff50
Run spotlessApply
cwperks Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/security/configuration/ClusterInfoHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private static boolean clusterHas6xNodes(ClusterState state) {
}

private static boolean clusterHas6xIndices(ClusterState state) {
final Iterator<IndexMetadata> indices = state.metadata().indices().valuesIt();
final Iterator<IndexMetadata> indices = state.metadata().indices().values().iterator();
while (indices.hasNext()) {
final IndexMetadata indexMetadata = indices.next();
if (indexMetadata.getCreationVersion().before(LegacyESVersion.V_7_0_0)) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Strings;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.common.util.concurrent.ThreadContext;
Expand Down Expand Up @@ -677,6 +676,7 @@ public static boolean isClusterPerm(String action0) {
);
}

@SuppressWarnings("unchecked")
private boolean checkFilteredAliases(Resolved requestedResolved, String action, boolean isDebugEnabled) {
final String faMode = dcm.getFilteredAliasMode();// getConfigSettings().dynamic.filtered_alias_mode;

Expand All @@ -694,7 +694,7 @@ private boolean checkFilteredAliases(Resolved requestedResolved, String action,
indexMetaDataCollection = new Iterable<IndexMetadata>() {
@Override
public Iterator<IndexMetadata> iterator() {
return clusterService.state().getMetadata().getIndices().valuesIt();
return clusterService.state().getMetadata().getIndices().values().iterator();
}
};
} else {
Expand All @@ -719,14 +719,14 @@ public Iterator<IndexMetadata> iterator() {

final List<AliasMetadata> filteredAliases = new ArrayList<AliasMetadata>();

final ImmutableOpenMap<String, AliasMetadata> aliases = indexMetaData.getAliases();
final Map<String, AliasMetadata> aliases = indexMetaData.getAliases();

if (aliases != null && aliases.size() > 0) {
if (isDebugEnabled) {
log.debug("Aliases for {}: {}", indexMetaData.getIndex().getName(), aliases);
}

final Iterator<String> it = aliases.keysIt();
final Iterator<String> it = aliases.keySet().iterator();
while (it.hasNext()) {
final String alias = it.next();
final AliasMetadata aliasMetadata = aliases.get(alias);
Expand Down