2.x

.ci/opensearch/Dockerfile

@@ -5,4 +5,5 @@ ARG opensearch_path=/usr/share/opensearch
 ARG opensearch_yml=$opensearch_path/config/opensearch.yml
 
 ARG SECURE_INTEGRATION
+ENV OPENSEARCH_INITIAL_ADMIN_PASSWORD=0_aD^min_0
 RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then echo "plugins.security.disabled: true" >> $opensearch_yml; fi

.github/workflows/build.yml

@@ -7,16 +7,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11 ]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        java: [ 11, 17, 21 ]
+        os: [ubuntu-latest, windows-latest, macOS-13, macOS-latest]
     steps:
+      - name: Checkout Java Client
+        uses: actions/checkout@v3
+
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-
-      - name: Checkout Branch
-        uses: actions/checkout@v2
+          distribution: 'temurin'
+          cache: 'gradle'
 
       - name: Build with Gradle
         run: ./gradlew clean build -x test

.github/workflows/changelog_verifier.yml

@@ -15,4 +15,4 @@ jobs:
 
       - uses: dangoslen/changelog-enforcer@v3
         with:
-          skipLabels: "autocut"
+          skipLabels: "autocut, skip-changelog"

.github/workflows/dependabot_pr.yml

@@ -18,7 +18,7 @@ jobs:
           installation_id: 22958780
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ steps.github_app_token.outputs.token }}
 

.github/workflows/increment-version.yml

@@ -0,0 +1,66 @@
+name: Increment Version
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+permissions: {}
+jobs:
+  build:
+    if: github.repository == 'opensearch-project/opensearch-java'
+    runs-on: ubuntu-latest
+    steps:
+      - name: GitHub App token
+        id: github_app_token
+        uses: tibdex/github-app-token@v2.1.0
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+          installation_id: 22958780
+
+      - uses: actions/checkout@v4
+      - name: Fetch Tag and Version Information
+        run: |
+          TAG=$(echo "${GITHUB_REF#refs/*/}")
+          CURRENT_VERSION_ARRAY=($(echo "${TAG//v}" | tr . '\n'))
+          CURRENT_VERSION_ARRAY[0]=$((CURRENT_VERSION_ARRAY[0]//v))
+          BASE_X=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:1}.x")
+          CURRENT_VERSION=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:3}")
+          CURRENT_VERSION_ARRAY[1]=$((CURRENT_VERSION_ARRAY[1]+1))
+          NEXT_VERSION=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:3}")
+          # if [[ ${#CURRENT_VERSION_ARRAY[2]} -gt 1 ]]; then
+          #   NEXT_VERSION_ID="${CURRENT_VERSION_ARRAY[0]:0:3}0${CURRENT_VERSION_ARRAY[1]:0:3}${CURRENT_VERSION_ARRAY[2]:0:3}99"
+          # else
+          #   NEXT_VERSION_ID=$(IFS=0 ; echo "${CURRENT_VERSION_ARRAY[*]:0:3}99")
+          # fi
+          echo "TAG=$TAG" >> $GITHUB_ENV
+          # echo "BASE=$BASE" >> $GITHUB_ENV
+          echo "BASE_X=$BASE_X" >> $GITHUB_ENV
+          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
+          echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
+          # echo "NEXT_VERSION_ID=$NEXT_VERSION_ID" >> $GITHUB_ENV
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.BASE_X }}
+          token: ${{ steps.github_app_token.outputs.token }}
+
+      - name: Increment Minor Version
+        run: |
+          echo Incrementing $CURRENT_VERSION to $NEXT_VERSION
+          sed -i "s/systemProp.version = $CURRENT_VERSION/systemProp.version = $NEXT_VERSION/g" gradle.properties
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ steps.github_app_token.outputs.token }}
+          base: ${{ env.BASE_X }}
+          branch: 'create-pull-request/patch-${{ env.BASE }}'
+          commit-message: Increment version to ${{ env.NEXT_VERSION }}
+          signoff: true
+          delete-branch: true
+          labels: |
+            autocut
+          title: '[AUTO] Increment version to ${{ env.NEXT_VERSION }}.'
+          body: |
+            I've noticed that a new tag ${{ env.TAG }} was pushed, and incremented the version from ${{ env.CURRENT_VERSION }} to ${{ env.NEXT_VERSION }}.

.github/workflows/links.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: lychee Link Checker
         id: lychee
         uses: lycheeverse/lychee-action@v1.5.0

.github/workflows/publish-snapshots.yml

@@ -0,0 +1,34 @@
+name: Publish snapshots to maven
+
+on:
+  push:
+    branches:
+      - main
+      - '2.x'
+
+jobs:
+  build-and-publish-snapshots:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'gradle'
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
+          aws-region: us-east-1
+      - name: publish snapshots to maven
+        run: |
+          export SONATYPE_USERNAME=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-username --query SecretString --output text)
+          export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
+          echo "::add-mask::$SONATYPE_USERNAME"
+          echo "::add-mask::$SONATYPE_PASSWORD"
+          ./gradlew --no-daemon publishPublishMavenPublicationToSnapshotsRepository

.github/workflows/release-drafter.yml

@@ -0,0 +1,44 @@
+name: Release drafter
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  draft-a-release:
+    name: Draft a release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - id: get_data
+        run: |
+          echo "approvers=$(cat .github/CODEOWNERS | grep @ | tr -d '* ' | sed 's/@/,/g' | sed 's/,//1')" >> $GITHUB_OUTPUT
+          echo "version=$(cat gradle.properties | grep "systemProp.version" | cut -d'=' -f2)" >> $GITHUB_OUTPUT
+      - uses: trstringer/manual-approval@v1
+        with:
+          secret: ${{ github.TOKEN }}
+          approvers: ${{ steps.get_data.outputs.approvers }}
+          minimum-approvals: 2
+          issue-title: 'Release opensearch-java : ${{ steps.get_data.outputs.version }}'
+          issue-body: "Please approve or deny the release of opensearch-java. **VERSION**: ${{ steps.get_data.outputs.version }} **TAG**: ${{ github.ref_name }}  **COMMIT**: ${{ github.sha }}"
+          exclude-workflow-initiator-as-approver: true
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'gradle'
+      - name: Build with Gradle
+        run: |
+          export VERSION=`cat gradle.properties | grep "systemProp.version" | tr -d " " | cut -d '=' -f2`
+          echo Building the version: $VERSION
+          ./gradlew --no-daemon publishPublishMavenPublicationToLocalRepoRepository && tar -C build -cvf artifacts.tar.gz repository
+      - name: Draft a release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          generate_release_notes: true
+          files: |
+            artifacts.tar.gz

.github/workflows/test-integration-unreleased.yml

@@ -18,40 +18,69 @@ jobs:
           - { opensearch_ref: '1.x', java: 11 }
           - { opensearch_ref: '2.x', java: 11 }
           - { opensearch_ref: '2.x', java: 17 }
-          - { opensearch_ref: '2.0', java: 11 }
+          - { opensearch_ref: '2.x', java: 21 }
           - { opensearch_ref: 'main', java: 11 }
           - { opensearch_ref: 'main', java: 17 }
+          - { opensearch_ref: 'main', java: 21 }
     steps:
       - name: Set up JDK ${{ matrix.entry.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.entry.java }}
+          distribution: 'temurin'
 
       - name: Checkout OpenSearch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: opensearch-project/OpenSearch
           ref: ${{ matrix.entry.opensearch_ref }}
           path: opensearch
 
+      - name: Get OpenSearch branch top
+        id: get-key
+        working-directory: opensearch
+        run: echo key=`git log -1 --format='%H'` >> $GITHUB_OUTPUT
+
+      - name: Restore cached build
+        id: cache-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: opensearch/distribution/archives/linux-tar/build/distributions
+          key: ${{ steps.get-key.outputs.key }}
+
       - name: Assemble OpenSearch
-        run: |
-          cd opensearch
-          ./gradlew assemble
+        if: steps.cache-restore.outputs.cache-hit != 'true'
+        working-directory: opensearch
+        run: ./gradlew :distribution:archives:linux-tar:assemble
 
-        # This step runs the docker image generated during gradle assemble in OpenSearch. It is tagged as opensearch:test.
-        # Reference: https://github.com/opensearch-project/OpenSearch/blob/2.0/distribution/docker/build.gradle#L190
-      - name: Run Docker Image
+      - name: Save cached build
+        if: steps.cache-restore.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          path: opensearch/distribution/archives/linux-tar/build/distributions
+          key: ${{ steps.get-key.outputs.key }}
+
+      - name: Run OpenSearch
+        working-directory: opensearch/distribution/archives/linux-tar/build/distributions
         run: |
-          docker run -p 9200:9200 -p 9600:9600 -d -e "discovery.type=single-node" -e "bootstrap.memory_lock=true" opensearch:test
-          sleep 90
+          tar xf opensearch-min-*
+          ./opensearch-*/bin/opensearch &
+          for attempt in {1..20}; do sleep 5; if curl -s localhost:9200; then echo '=====> ready'; break; fi; echo '=====> waiting...'; done
 
       - name: Checkout Java Client
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: opensearch-java
 
       - name: Run Integration Test
         run: |
           cd opensearch-java
           ./gradlew clean integrationTest -Dhttps=false
+
+      - name: Upload Reports
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-reports
+          path: opensearch-java/java-client/build/reports/
+          retention-days: 7

.github/workflows/test-integration.yml

@@ -12,27 +12,55 @@ jobs:
           - { opensearch_version: 1.0.1, java: 11 }
           - { opensearch_version: 1.1.0, java: 11 }
           - { opensearch_version: 1.2.4, java: 11 }
-          - { opensearch_version: 1.3.5, java: 11 }
+          - { opensearch_version: 1.3.13, java: 11 }
           - { opensearch_version: 2.0.1, java: 11 }
           - { opensearch_version: 2.1.0, java: 11 }
           - { opensearch_version: 2.2.1, java: 11 }
           - { opensearch_version: 2.3.0, java: 11 }
+          - { opensearch_version: 2.4.1, java: 11 }
+          - { opensearch_version: 2.5.0, java: 11 }
+          - { opensearch_version: 2.6.0, java: 11 }
+          - { opensearch_version: 2.7.0, java: 11 }
+          - { opensearch_version: 2.8.0, java: 11 }
+          - { opensearch_version: 2.9.0, java: 11 }
+          - { opensearch_version: 2.10.0, java: 11 }
+          - { opensearch_version: 2.11.1, java: 11 }
+          - { opensearch_version: 2.12.0, java: 11 }
+          - { opensearch_version: 2.13.0, java: 11 }
     steps:
+      - name: Checkout Java Client
+        uses: actions/checkout@v3
+
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.entry.java }}
-
-      - name: Checkout Branch
-        uses: actions/checkout@v2
+          distribution: 'temurin'
+          cache: 'gradle'
 
       - name: Run Docker
         run: |
+          echo "PASSWORD=admin" >> $GITHUB_ENV
           docker-compose --project-directory .ci/opensearch build --build-arg OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }}
           docker-compose --project-directory .ci/opensearch up -d
           sleep 60
+
+      - name: Sets password (new versions)
+        run: |
+          if [[ ${{ matrix.entry.opensearch_version }} =~ ^2.1[2-9]+.[0-9]+$ ]]; then
+              echo "PASSWORD=0_aD^min_0" >> $GITHUB_ENV
+          fi
+
       - name: Run Integration Test
-        run: ./gradlew clean integrationTest
+        run: ./gradlew clean integrationTest -Dpassword=${{ env.PASSWORD }}
+
+      - name: Upload Reports
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-reports
+          path: java-client/build/reports/
+          retention-days: 7
 
       - name: Stop Docker
         run: |