Revert "Feature branch sync 06/29/2023"

.github/workflows/ci.yml

@@ -6,34 +6,13 @@ env:
   GRADLE_OPTS: -Dhttp.keepAlive=false
 
 jobs:
-  generate-test-list:
-    runs-on: ubuntu-latest
-    outputs:
-      separateTestsNames: ${{ steps.set-matrix.outputs.separateTestsNames }}
-    steps:
-    - name: Set up JDK for build and test
-      uses: actions/setup-java@v2
-      with:
-        distribution: temurin # Temurin is a distribution of adoptium
-        java-version: 17
-
-    - name: Checkout security
-      uses: actions/checkout@v2
-
-    - name: Generate list of tasks
-      id: set-matrix
-      run: |
-        echo "separateTestsNames=$(./gradlew listTasksAsJSON -q --console=plain | tail -n 1)" >> $GITHUB_OUTPUT
-
-  test:
-    name: test
-    needs: generate-test-list
+  build:
+    name: build
     strategy:
       fail-fast: false
       matrix:
-        gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
-        platform: [windows-latest, ubuntu-latest]
         jdk: [11, 17]
+        platform: ["ubuntu-latest", "windows-latest"]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -50,8 +29,12 @@ jobs:
       uses: gradle/gradle-build-action@v2
       with:
         arguments: |
-          ${{ matrix.gradle_task }} -Dbuild.snapshot=false
-          -x test
+          build test -Dbuild.snapshot=false
+          -x integrationTest
+          -x spotlessCheck
+          -x checkstyleMain
+          -x checkstyleTest
+          -x spotbugsMain
 
     - name: Coverage
       uses: codecov/codecov-action@v1
@@ -76,7 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         jdk: [17]
-        platform: [ubuntu-latest, windows-latest]
+        platform: ["ubuntu-latest", "windows-latest"]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -95,13 +78,18 @@ jobs:
       with:
         arguments: |
           integrationTest -Dbuild.snapshot=false
+          -x spotlessCheck
+          -x checkstyleMain
+          -x checkstyleTest
+          -x spotbugsMain
 
   backward-compatibility:
+
     strategy:
       fail-fast: false
       matrix:
         jdk: [11, 17]
-        platform: [ubuntu-latest, windows-latest]
+        platform: ["ubuntu-latest", "windows-latest"]
     runs-on: ${{ matrix.platform }}
 
     steps:

.github/workflows/code-hygiene.yml

@@ -57,26 +57,3 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: spotbugsMain
-
-  check-permissions-order:
-    runs-on: ubuntu-latest
-    name: Check permissions orders
-    steps:
-    - uses: actions/checkout@v2
-    - run: npm install yaml
-
-    - name: Check permissions order
-      run: |
-        exclude_pattern="(^|/)roles_invalidxcontent.yml($|/)
-                          (^|/)invalid_config/config.yml($|/)"
-        # Set pattern to exclude certain files
-        set -e
-        exit_code=0
-        for file in $(find . -name '*.yml' | grep -Ev "$exclude_pattern"); do
-          if ! node check-permissions-order.js "$file" --slient; then
-            exit_code=1
-            echo "Error: $file requires changes. Run the following command to fix:"
-            echo "node check-permissions-order.js $file --fix"
-          fi
-        done
-        exit $exit_code

.gitignore

@@ -43,7 +43,3 @@ out/
 build/
 gradle-build/
 .gradle/
-
-# nodejs
-node_modules/
-package-lock.json

TRIAGING.md

@@ -25,8 +25,9 @@ Meetings are lightly structured as follows:
 1. Announcements: If there are any announcements to be made they will happen at the start of the meeting.
 2. Review of new issues: The meetings always start with reviewing all untriaged [issues](https://github.com/search?q=label%3Auntriaged+is%3Aopen++repo%3Aopensearch-project%2Fsecurity+repo%3Aopensearch-project%2Fsecurity-dashboards-plugin&type=issues&ref=advsearch&s=created&o=desc) for the security and security-dashboards repositories.
 3. Untriaged items: Review any [issues](https://github.com/search?q=-label%3Atriaged+is%3Aopen++is%3Aissue+repo%3Aopensearch-project%2Fsecurity+repo%3Aopensearch-project%2Fsecurity-dashboards-plugin&type=issues) that might have had the 'untriaged' label removed but require additional triage discussion.
-4. Pull request discussion: Then, we review the status of outstanding [pull requests](https://github.com/search?q=+is%3Aopen++repo%3Aopensearch-project%2Fsecurity+repo%3Aopensearch-project%2Fsecurity-dashboards-plugin&type=pullrequests&ref=advsearch) from the security and security-dashboards repositories.
-5. Open discussion: Finally, we open the floor in case anyone wants to highlight an issue.
+4. Open discussion: Next, we open the floor in case anyone wants to highlight an issue.
+5. Backlog discussion: Then, we review issues from the [backlogs](https://github.com/search?q=label%3A%22sprint+backlog%22+is%3Aopen++repo%3Aopensearch-project%2Fsecurity+repo%3Aopensearch-project%2Fsecurity-dashboards-plugin&type=issues&ref=advsearch&s=created&o=desc) of the security and security-dashboards repositories.
+6. Least recent discussed issue: Finally, to close out the meeting we will [review the oldest](https://github.com/search?q=+is%3Aopen++repo%3Aopensearch-project%2Fsecurity+repo%3Aopensearch-project%2Fsecurity-dashboards-plugin&type=issues&ref=advsearch&s=updated&o=asc) issues from both repositories, security and security-dashboards, to help identify issues that have languished.
 
 There is no specific ordering within each category.