Fix actions by legacy cluster endpoints (#21)

* Fix actions by legacy cluster endpoints Signed-off-by: Sruti Parthiban <[email protected]> * Update upstream to use 1.0 Signed-off-by: Sruti Parthiban <[email protected]>
opensearch-project · Jun 1, 2021 · 1357d86 · 1357d86
1 parent 762286f
commit 1357d86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -42,7 +42,7 @@ jobs:
       with:
         repository: 'opensearch-project/OpenSearch'
         path: OpenSearch
-        ref: '1.x'
+        ref: '1.0'
     - name: Build OpenSearch
       working-directory: ./OpenSearch
       run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false

diff --git a/...search/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java b/...search/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java
@@ -181,11 +181,14 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No
                     clusterSettingHandler.getCurrentClusterSettingValue());
 
             if (value instanceof Boolean) {
-                if (request.path().contains(RCA_CLUSTER_CONFIG_PATH)) {
+                if (request.path().contains(RCA_CLUSTER_CONFIG_PATH)
+                        || request.path().contains(LEGACY_RCA_CLUSTER_CONFIG_PATH)) {
                     clusterSettingHandler.updateRcaSetting((Boolean) value);
-                } else if (request.path().contains(LOGGING_CLUSTER_CONFIG_PATH)) {
+                } else if (request.path().contains(LOGGING_CLUSTER_CONFIG_PATH)
+                        || request.path().contains(LEGACY_LOGGING_CLUSTER_CONFIG_PATH)) {
                     clusterSettingHandler.updateLoggingSetting((Boolean) value);
-                } else if (request.path().contains(BATCH_METRICS_CLUSTER_CONFIG_PATH)) {
+                } else if (request.path().contains(BATCH_METRICS_CLUSTER_CONFIG_PATH)
+                        || request.path().contains(LEGACY_BATCH_METRICS_CLUSTER_CONFIG_PATH)) {
                     clusterSettingHandler.updateBatchMetricsSetting((Boolean) value);
                 } else {
                     clusterSettingHandler.updatePerformanceAnalyzerSetting((Boolean) value);