Shares resource with users backend role by default upon config creation

DarshitChanpura · DarshitChanpura · commit deebd8ddff67 · 2025-03-31T18:58:46.000-04:00
Signed-off-by: Darshit Chanpura &lt;dchanp@amazon.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -133,7 +133,7 @@ configurations {
 
 dependencies {
     implementation (group: 'org.opensearch', name:'opensearch-security-client', version: "${opensearch_build}")
-    compileOnly "org.opensearch:opensearch-resource-sharing-spi:${opensearch_build}"
+    compileOnly group: 'org.opensearch', name:'opensearch-resource-sharing-spi', version:"${opensearch_build}"
     implementation "org.opensearch:opensearch:${opensearch_version}"
     compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${opensearch_version}"
     compileOnly "org.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}"
diff --git a/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java
@@ -21,6 +21,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.Version;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.action.support.WriteRequest;
@@ -54,6 +55,7 @@
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 import com.google.common.collect.Sets;
 
@@ -151,7 +153,9 @@ public AbstractAnomalyDetectorActionHandler(
         String validationType,
         boolean isDryRun,
         Clock clock,
-        Settings settings
+        Settings settings,
+        NodeClient nodeClient,
+        Version nodeVersion
     ) {
         super(
             anomalyDetector,
@@ -181,7 +185,9 @@ public AbstractAnomalyDetectorActionHandler(
             maxHCAnomalyDetectors,
             clock,
             settings,
-            ValidationAspect.DETECTOR
+            ValidationAspect.DETECTOR,
+            nodeClient,
+            nodeVersion
         );
 
     }
diff --git a/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java
@@ -11,6 +11,7 @@
 
 package org.opensearch.ad.rest.handler;
 
+import org.opensearch.Version;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.ad.indices.ADIndexManagement;
 import org.opensearch.ad.model.AnomalyDetector;
@@ -26,6 +27,7 @@
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * Anomaly detector REST action handler to process POST/PUT request.
@@ -80,7 +82,9 @@ public IndexAnomalyDetectorActionHandler(
         User user,
         ADTaskManager adTaskManager,
         SearchFeatureDao searchFeatureDao,
-        Settings settings
+        Settings settings,
+        NodeClient nodeClient,
+        Version nodeVersion
     ) {
         super(
             clusterService,
@@ -106,7 +110,9 @@ public IndexAnomalyDetectorActionHandler(
             null,
             false,
             null,
-            settings
+            settings,
+            nodeClient,
+            nodeVersion
         );
     }
 }
diff --git a/src/main/java/org/opensearch/ad/rest/handler/ValidateAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/ValidateAnomalyDetectorActionHandler.java
@@ -13,6 +13,7 @@
 
 import java.time.Clock;
 
+import org.opensearch.Version;
 import org.opensearch.ad.indices.ADIndexManagement;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
@@ -25,6 +26,7 @@
 import org.opensearch.timeseries.transport.ValidateConfigResponse;
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * Anomaly detector REST action handler to process POST request.
@@ -70,7 +72,9 @@ public ValidateAnomalyDetectorActionHandler(
         SearchFeatureDao searchFeatureDao,
         String validationType,
         Clock clock,
-        Settings settings
+        Settings settings,
+        NodeClient nodeClient,
+        Version nodeVersion
     ) {
         super(
             clusterService,
@@ -96,7 +100,9 @@ public ValidateAnomalyDetectorActionHandler(
             validationType,
             true,
             clock,
-            settings
+            settings,
+            nodeClient,
+            nodeVersion
         );
     }
 }
diff --git a/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java
@@ -68,7 +68,6 @@ public class IndexAnomalyDetectorTransportAction extends HandledTransportAction<
     private final SearchFeatureDao searchFeatureDao;
     private final Settings settings;
     private final NodeClient nodeClient;
-    private final Version nodeVersion;
 
     @Inject
     public IndexAnomalyDetectorTransportAction(
@@ -97,7 +96,6 @@ public IndexAnomalyDetectorTransportAction(
         clusterService.getClusterSettings().addSettingsUpdateConsumer(AD_FILTER_BY_BACKEND_ROLES, it -> filterByEnabled = it);
         this.settings = settings;
         this.nodeClient = nodeClient;
-        this.nodeVersion = transportService.getLocalNode().getVersion();
     }
 
     @Override
@@ -242,7 +240,9 @@ protected void adExecute(
                 detectorUser,
                 adTaskManager,
                 searchFeatureDao,
-                settings
+                settings,
+                nodeClient,
+                transportService.getLocalNode().getVersion()
             );
             indexAnomalyDetectorActionHandler.start(listener);
         }, listener);
diff --git a/src/main/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportAction.java
@@ -35,6 +35,7 @@
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 public class ValidateAnomalyDetectorTransportAction extends BaseValidateConfigTransportAction<ADIndex, ADIndexManagement> {
     public static final Logger logger = LogManager.getLogger(ValidateAnomalyDetectorTransportAction.class);
@@ -49,7 +50,8 @@ public ValidateAnomalyDetectorTransportAction(
         ADIndexManagement anomalyDetectionIndices,
         ActionFilters actionFilters,
         TransportService transportService,
-        SearchFeatureDao searchFeatureDao
+        SearchFeatureDao searchFeatureDao,
+        NodeClient nodeClient
     ) {
         super(
             ValidateAnomalyDetectorAction.NAME,
@@ -63,7 +65,8 @@ public ValidateAnomalyDetectorTransportAction(
             transportService,
             searchFeatureDao,
             AD_FILTER_BY_BACKEND_ROLES,
-            ValidationAspect.DETECTOR
+            ValidationAspect.DETECTOR,
+            nodeClient
         );
     }
 
@@ -86,7 +89,9 @@ protected Processor<ValidateConfigResponse> createProcessor(Config detector, Val
             searchFeatureDao,
             request.getValidationType(),
             clock,
-            settings
+            settings,
+            nodeClient,
+            clusterService.localNode().getVersion()
         );
     }
 }
diff --git a/src/main/java/org/opensearch/forecast/rest/handler/AbstractForecasterActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/AbstractForecasterActionHandler.java
@@ -19,6 +19,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.Version;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.action.support.WriteRequest;
@@ -52,6 +53,7 @@
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 import com.google.common.collect.Sets;
 
@@ -166,7 +168,9 @@ public AbstractForecasterActionHandler(
         String validationType,
         boolean isDryRun,
         Clock clock,
-        Settings settings
+        Settings settings,
+        NodeClient nodeClient,
+        Version nodeVersion
     ) {
         super(
             forecaster,
@@ -196,7 +200,9 @@ public AbstractForecasterActionHandler(
             maxHCForecasters,
             clock,
             settings,
-            ValidationAspect.FORECASTER
+            ValidationAspect.FORECASTER,
+            nodeClient,
+            nodeVersion
         );
     }
 
diff --git a/src/main/java/org/opensearch/forecast/rest/handler/IndexForecasterActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/IndexForecasterActionHandler.java
@@ -11,6 +11,7 @@
 
 package org.opensearch.forecast.rest.handler;
 
+import org.opensearch.Version;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
@@ -26,6 +27,7 @@
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * process create/update forecaster request
@@ -74,7 +76,9 @@ public IndexForecasterActionHandler(
         User user,
         ForecastTaskManager taskManager,
         SearchFeatureDao searchFeatureDao,
-        Settings settings
+        Settings settings,
+        NodeClient nodeClient,
+        Version nodeVersion
     ) {
         super(
             clusterService,
@@ -100,7 +104,9 @@ public IndexForecasterActionHandler(
             null,
             false,
             null,
-            settings
+            settings,
+            nodeClient,
+            nodeVersion
         );
     }
 }
diff --git a/src/main/java/org/opensearch/forecast/rest/handler/ValidateForecasterActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/ValidateForecasterActionHandler.java
@@ -7,6 +7,7 @@
 
 import java.time.Clock;
 
+import org.opensearch.Version;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
@@ -19,6 +20,7 @@
 import org.opensearch.timeseries.transport.ValidateConfigResponse;
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * ValidateForecasterActionHandler extends the AbstractForecasterActionHandler to specifically handle
@@ -68,7 +70,9 @@ public ValidateForecasterActionHandler(
         SearchFeatureDao searchFeatureDao,
         String validationType,
         Clock clock,
-        Settings settings
+        Settings settings,
+        NodeClient nodeClient,
+        Version nodeVersion
     ) {
         super(
             clusterService,
@@ -94,7 +98,9 @@ public ValidateForecasterActionHandler(
             validationType,
             true,
             clock,
-            settings
+            settings,
+            nodeClient,
+            nodeVersion
         );
     }
 
diff --git a/src/main/java/org/opensearch/forecast/transport/IndexForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/IndexForecasterTransportAction.java
@@ -223,7 +223,9 @@ protected void forecastExecute(
                 forecastUser,
                 taskManager,
                 searchFeatureDao,
-                settings
+                settings,
+                nodeClient,
+                transportService.getLocalNode().getVersion()
             );
             indexForecasterActionHandler.start(listener);
         }, listener);
diff --git a/src/main/java/org/opensearch/forecast/transport/ValidateForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/ValidateForecasterTransportAction.java
@@ -29,6 +29,7 @@
 import org.opensearch.timeseries.util.SecurityClientUtil;
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 
 public class ValidateForecasterTransportAction extends BaseValidateConfigTransportAction<ForecastIndex, ForecastIndexManagement> {
     public static final Logger logger = LogManager.getLogger(ValidateForecasterTransportAction.class);
@@ -43,7 +44,8 @@ public ValidateForecasterTransportAction(
         ForecastIndexManagement anomalyDetectionIndices,
         ActionFilters actionFilters,
         TransportService transportService,
-        SearchFeatureDao searchFeatureDao
+        SearchFeatureDao searchFeatureDao,
+        NodeClient nodeClient
     ) {
         super(
             ValidateForecasterAction.NAME,
@@ -57,7 +59,8 @@ public ValidateForecasterTransportAction(
             transportService,
             searchFeatureDao,
             FORECAST_FILTER_BY_BACKEND_ROLES,
-            ValidationAspect.FORECASTER
+            ValidationAspect.FORECASTER,
+            nodeClient
         );
     }
 
@@ -80,7 +83,9 @@ protected Processor<ValidateConfigResponse> createProcessor(Config forecaster, V
             searchFeatureDao,
             request.getValidationType(),
             clock,
-            settings
+            settings,
+            nodeClient,
+            clusterService.localNode().getVersion()
         );
     }
 }
diff --git a/src/main/java/org/opensearch/timeseries/TimeSeriesAnalyticsPlugin.java b/src/main/java/org/opensearch/timeseries/TimeSeriesAnalyticsPlugin.java
@@ -274,9 +274,9 @@
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestHandler;
 import org.opensearch.script.ScriptService;
+import org.opensearch.security.spi.resources.ResourceSharingExtension;
 import org.opensearch.security.spi.resources.ShareableResource;
 import org.opensearch.security.spi.resources.ShareableResourceParser;
-import org.opensearch.security.spi.resources.ResourceSharingExtension;
 import org.opensearch.threadpool.ExecutorBuilder;
 import org.opensearch.threadpool.ScalingExecutorBuilder;
 import org.opensearch.threadpool.ThreadPool;
diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java b/src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java
diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseValidateConfigTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseValidateConfigTransportAction.java
diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java
diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexForecasterActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexForecasterActionHandlerTests.java
diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateAnomalyDetectorActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateAnomalyDetectorActionHandlerTests.java
diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateForecasterActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateForecasterActionHandlerTests.java
