skip running OPENAI when key is not present and fix yaml test issue

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
opensearch-project · Jul 17, 2024 · 50afa89 · 50afa89
1 parent 037d2fc
commit 50afa89
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -24,6 +24,7 @@ ext {
 apply plugin: 'opensearch.opensearchplugin'
 apply plugin: 'opensearch.testclusters'
 apply plugin: 'opensearch.pluginzip'
+apply plugin: 'opensearch.yaml-rest-test'
 ext {
     projectSubstitutions = [:]
     licenseFile = rootProject.file('LICENSE.txt')

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java
@@ -159,6 +159,10 @@ public void setup() throws Exception {
      * @throws Exception if any error occurs during the test
      */
     public void testMLInferenceProcessorRemoteModelRewriteQueryString() throws Exception {
+        // Skip test if key is null
+        if (OPENAI_KEY == null) {
+            return;
+        }
         String createPipelineRequestBody = "{\n"
             + "  \"request_processors\": [\n"
             + "    {\n"

diff --git a/plugin/src/yamlRestTest/java/org/opensearch/ml/plugin/PluginClientYamlTestSuiteIT.java b/plugin/src/yamlRestTest/java/org/opensearch/ml/plugin/PluginClientYamlTestSuiteIT.java
@@ -14,7 +14,7 @@
 
 public class PluginClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase {
 
-    public ConversationalClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
+    public PluginClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
         super(testCandidate);
     }
 

diff --git a/plugin/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml b/plugin/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml
@@ -5,4 +5,4 @@
         h: component
 
   - match:
-      $body: /^plugin\n$/
+      $body: /opensearch-ml\n$/
diff --git a/plugin/src/yamlRestTest/resources/rest-api-spec/test/20_inference_ingest_processor.yml b/plugin/src/yamlRestTest/resources/rest-api-spec/test/20_inference_ingest_processor.yml
@@ -6,7 +6,10 @@ teardown:
         ignore: 404
 
 ---
-"Test ML Inference Processor":
+"Test ML Inference Ingest Processor":
+  - skip:
+      version: " - 2.13.99"
+      reason: "Added in 2.14.0"
   - do:
       ingest.put_pipeline:
         id: "my_pipeline"
@@ -21,4 +24,4 @@ teardown:
               }
             ]
           }
-  - match: { acknowledged: true }
+  - match: { acknowledged: true }
diff --git a/...0_inference_search_request_processor.yml → ...30_inference_search_request_processor.yml b/...0_inference_search_request_processor.yml → ...30_inference_search_request_processor.yml
@@ -1,14 +1,17 @@
 ---
 teardown:
   - do:
-      search.delete_pipeline:
+      search_pipeline.delete:
         id: "my_pipeline"
         ignore: 404
 
 ---
-"Test ML Inference Processor":
+"Test ML Inference Search Request Processor":
+  - skip:
+      version: " - 2.15.99"
+      reason: "Added in 2.16.0"
   - do:
-      search.put_pipeline:
+      search_pipeline.put:
         id: "my_pipeline"
         body:  >
          {
@@ -35,4 +38,4 @@ teardown:
              }
            ]
          }
-  - match: { acknowledged: true }
+  - match: { acknowledged: true }