Fix integration tests

The specific user used in some tests of OpenSerachSinkIT needs get permissions on all aliases to test for their existence. Another bug with determining the alias name is fixed as well. As a final result, the DataPrepper OpenSearch user requires write access to the indices and now additionally read access to the aliases. This can be a change for self-managed indices. Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
opensearch-project · Nov 7, 2023 · 7bba080 · 7bba080
1 parent 05fcfe3
commit 7bba080
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/...t/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java b/...t/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java
@@ -37,6 +37,10 @@ private void createRole(final String role, final String indexPattern, final Stri
                         .array("index_patterns", new String[]{indexPattern})
                         .array("allowed_actions", allowedActions)
                         .endObject()
+                        .startObject()
+                        .array("index_patterns", new String[]{"*"})
+                        .array("allowed_actions", "indices:admin/aliases/get")
+                        .endObject()
                         .endArray()
                         .endObject()
         );

diff --git a/...arch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java b/...arch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java
@@ -217,7 +217,7 @@ private void doInitializeInternal() throws IOException {
     }
     indexManager.setupIndex();
 
-    boolean requireAlias = indexManager.isIndexAlias();
+    boolean requireAlias = indexManager.isIndexAlias(configuredIndexAlias);
     final boolean isEstimateBulkSizeUsingCompression = openSearchSinkConfig.getIndexConfiguration().isEstimateBulkSizeUsingCompression();
     final boolean isRequestCompressionEnabled = openSearchSinkConfig.getConnectionConfiguration().isRequestCompressionEnabled();
     if (isEstimateBulkSizeUsingCompression && isRequestCompressionEnabled) {

diff --git a/...n/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/AbstractIndexManager.java b/...n/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/AbstractIndexManager.java
@@ -184,10 +184,9 @@ public static ZonedDateTime getCurrentUtcTime() {
     }
 
     @Override
-    public boolean isIndexAlias() throws IOException {
+    public boolean isIndexAlias(final String dynamicIndexAlias) throws IOException {
         if (isIndexAlias == null) {
-            String indexAlias = getIndexName(null);
-            ExistsAliasRequest request = new ExistsAliasRequest.Builder().name(indexAlias).build();
+            ExistsAliasRequest request = new ExistsAliasRequest.Builder().name(dynamicIndexAlias).build();
             BooleanResponse response = openSearchClient.indices().existsAlias(request);
             isIndexAlias = response.value() && checkISMEnabled();
         }

diff --git a/.../src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManager.java b/.../src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManager.java
@@ -6,5 +6,5 @@ public interface IndexManager{
 
 	void setupIndex() throws IOException;
 	String getIndexName(final String indexAlias) throws IOException;
-	boolean isIndexAlias() throws IOException;
+	boolean isIndexAlias(final String indexAlias) throws IOException;
 }
diff --git a/...va/org/opensearch/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java b/...va/org/opensearch/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java
@@ -320,7 +320,7 @@ void isIndexAlias_True() throws IOException {
                 IndexType.CUSTOM, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy);
         when(openSearchIndicesClient.existsAlias(any(ExistsAliasRequest.class))).thenReturn(new BooleanResponse(true));
         when(clusterSettingsParser.getStringValueClusterSetting(any(GetClusterSettingsResponse.class), anyString())).thenReturn("true");
-        assertEquals(true, defaultIndexManager.isIndexAlias());
+        assertEquals(true, defaultIndexManager.isIndexAlias(INDEX_ALIAS));
         verify(openSearchSinkConfiguration, times(2)).getIndexConfiguration();
         verify(indexConfiguration).getIsmPolicyFile();
         verify(indexConfiguration).getIndexAlias();
@@ -335,7 +335,7 @@ void isIndexAlias_False_NoAlias() throws IOException {
         defaultIndexManager = indexManagerFactory.getIndexManager(
                 IndexType.CUSTOM, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy);
         when(openSearchIndicesClient.existsAlias(any(ExistsAliasRequest.class))).thenReturn(new BooleanResponse(false));
-        assertEquals(false, defaultIndexManager.isIndexAlias());
+        assertEquals(false, defaultIndexManager.isIndexAlias(INDEX_ALIAS));
         verify(openSearchSinkConfiguration, times(2)).getIndexConfiguration();
         verify(indexConfiguration).getIsmPolicyFile();
         verify(indexConfiguration).getIndexAlias();
@@ -349,7 +349,7 @@ void isIndexAlias_False_NoISM() throws IOException {
                 IndexType.CUSTOM, openSearchClient, restHighLevelClient, openSearchSinkConfiguration, templateStrategy);
         when(openSearchIndicesClient.existsAlias(any(ExistsAliasRequest.class))).thenReturn(new BooleanResponse(true));
         when(clusterSettingsParser.getStringValueClusterSetting(any(GetClusterSettingsResponse.class), anyString())).thenReturn("false");
-        assertEquals(false, defaultIndexManager.isIndexAlias());
+        assertEquals(false, defaultIndexManager.isIndexAlias(INDEX_ALIAS));
         verify(openSearchSinkConfiguration, times(2)).getIndexConfiguration();
         verify(indexConfiguration).getIsmPolicyFile();
         verify(indexConfiguration).getIndexAlias();