From 27a4f528e9c4e3936ce72a6fead650b65967b1fe Mon Sep 17 00:00:00 2001 From: Subhobrata Dey Date: Fri, 13 Sep 2024 01:44:18 +0000 Subject: [PATCH 1/3] remove redundant code to fix OS launch exception Signed-off-by: Subhobrata Dey --- .../securityanalytics/logtype/BuiltinLogTypeLoader.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/opensearch/securityanalytics/logtype/BuiltinLogTypeLoader.java b/src/main/java/org/opensearch/securityanalytics/logtype/BuiltinLogTypeLoader.java index 80d0ae50d..2e77b0831 100644 --- a/src/main/java/org/opensearch/securityanalytics/logtype/BuiltinLogTypeLoader.java +++ b/src/main/java/org/opensearch/securityanalytics/logtype/BuiltinLogTypeLoader.java @@ -70,8 +70,6 @@ public void ensureLogTypesLoaded() { private List loadBuiltinLogTypes() throws URISyntaxException, IOException { List logTypes = new ArrayList<>(); - String pathurl = Paths.get(BuiltinLogTypeLoader.class.getClassLoader().getResource(BASE_PATH).toURI()).toString(); - final String url = Objects.requireNonNull(BuiltinLogTypeLoader.class.getClassLoader().getResource(BASE_PATH)).toURI().toString(); Path dirPath = null; if (url.contains("!")) { From f76750ced5ea7ffbfa6cc2d0adafb7f8ea1757a1 Mon Sep 17 00:00:00 2001 From: Subhobrata Dey Date: Fri, 13 Sep 2024 01:51:08 +0000 Subject: [PATCH 2/3] upgrade upload_artifact Signed-off-by: Subhobrata Dey --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb97c6862..248e787b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,14 +55,14 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: logs-ubuntu path: build/testclusters/integTest-*/logs/* - name: Upload Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: security-analytics-plugin-${{ matrix.os }} path: security-analytics-artifacts @@ -113,21 +113,21 @@ jobs: cp ./build/distributions/*.zip security-analytics-artifacts - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ failure() && matrix.os == 'macos-latest' }} with: name: logs-mac path: build/testclusters/integTest-*/logs/* - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ failure() && matrix.os == 'windows-latest' }} with: name: logs-windows path: build\testclusters\integTest-*\logs\* - name: Upload Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: security-analytics-plugin-${{ matrix.os }} path: security-analytics-artifacts From a863040a24b28ad9d9f0428e9164c926d59037b3 Mon Sep 17 00:00:00 2001 From: Subhobrata Dey Date: Fri, 13 Sep 2024 01:57:54 +0000 Subject: [PATCH 3/3] upgrade upload artifact Signed-off-by: Subhobrata Dey --- .github/workflows/multi-node-test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 36cb4d216..6bc731ae0 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -45,7 +45,7 @@ jobs: chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew integTest -PnumNodes=3" - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: logs