Fix some CI

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Dec 27, 2024 · 40e6614 · 40e6614
1 parent af82c27
commit 40e6614
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml
@@ -20,6 +20,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      # TEMPORARY until this is on Maven
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+      - name: Checkout Metadata Client
+        uses: actions/checkout@v4
+        with:
+          repository: dbwiddis/opensearch-remote-metadata-sdk
+          ref: main
+          path: opensearch-remote-metadata-sdk
+      - name: Publish to maven local
+        working-directory: opensearch-remote-metadata-sdk
+        run: ./gradlew publishToMavenLocal
+      # end TEMPORARY code
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
@@ -34,6 +34,22 @@ jobs:
       options: --user root
 
     steps:
+      # TEMPORARY until this is on Maven
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+      - name: Checkout Metadata Client
+        uses: actions/checkout@v4
+        with:
+          repository: dbwiddis/opensearch-remote-metadata-sdk
+          ref: main
+          path: opensearch-remote-metadata-sdk
+      - name: Publish to maven local
+        working-directory: opensearch-remote-metadata-sdk
+        run: ./gradlew publishToMavenLocal
+      # end TEMPORARY code
       - name: Checkout Flow Framework
         uses: actions/checkout@v3
       - name: Setup Java ${{ matrix.java }}

diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java
@@ -33,8 +33,8 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
 import static org.opensearch.common.xcontent.XContentType.JSON;
-import static org.opensearch.flowframework.common.CommonValue.*;
-import static org.opensearch.flowframework.common.FlowFrameworkSettings.*;
+import static org.opensearch.flowframework.common.CommonValue.TENANT_ID_HEADER;
+import static org.opensearch.flowframework.common.FlowFrameworkSettings.FLOW_FRAMEWORK_MULTI_TENANCY_ENABLED;
 
 public abstract class FlowFrameworkTenantAwareRestTestCase extends FlowFrameworkRestTestCase {
 

diff --git a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java
@@ -46,6 +46,7 @@ public void testWorkflowCRUD() throws Exception {
         response = makeRequest(tenantRequest, GET, WORKFLOW_PATH + workflowId);
         assertOK(response);
         map = responseToMap(response);
+        logger.error("DEBUG: " + map.toString());
         assertEquals("noop", map.get("name"));
         if (multiTenancyEnabled) {
             assertEquals(tenantId, map.get(TENANT_ID_FIELD));