add unit-tests

Author: v1v

.github/actions/setup/action.yml

@@ -1,5 +1,5 @@
-name: 'Setup Integration Test Environment'
-description: 'Common setup steps for integration and secure integration tests'
+name: 'Setup Test Environment'
+description: 'Common setup steps for unit, integration and secure integration tests'
 
 inputs:
   elastic_stack_version:
@@ -9,6 +9,14 @@ inputs:
     description: 'Whether to use snapshot version'
     required: false
     default: 'false'
+  docker_env:
+    description: 'Docker environment file (e.g., dockerjdk21.env)'
+    required: false
+    default: ''
+  integration:
+    description: 'Enable integration testing'
+    required: false
+    default: 'false'
   secure_integration:
     description: 'Enable secure integration testing'
     required: false
@@ -35,42 +43,59 @@ runs:
       env:
         ELASTIC_STACK_VERSION: ${{ inputs.elastic_stack_version }}
         SNAPSHOT: ${{ inputs.snapshot }}
+        DOCKER_ENV: ${{ inputs.docker_env }}
+        INTEGRATION: ${{ inputs.integration }}
         SECURE_INTEGRATION: ${{ inputs.secure_integration }}
         ES_SSL_KEY_INVALID: ${{ inputs.es_ssl_key_invalid }}
         ES_SSL_SUPPORTED_PROTOCOLS: ${{ inputs.es_ssl_supported_protocols }}
       run: |
-        echo "INTEGRATION=true" >> $GITHUB_ENV
         echo "LOG_LEVEL=info" >> $GITHUB_ENV
         echo "ELASTIC_STACK_VERSION=${ELASTIC_STACK_VERSION}" >> $GITHUB_ENV
         
         if [ "${SNAPSHOT}" = "true" ]; then
           echo "SNAPSHOT=true" >> $GITHUB_ENV
         fi
-        
+
+        if [ -n "${DOCKER_ENV}" ]; then
+          echo "DOCKER_ENV=${DOCKER_ENV}" >> $GITHUB_ENV
+        fi
+
+        if [ "${INTEGRATION}" = "true" ]; then
+          echo "INTEGRATION=true" >> $GITHUB_ENV
+        fi
+
         if [ "${SECURE_INTEGRATION}" = "true" ]; then
           echo "SECURE_INTEGRATION=true" >> $GITHUB_ENV
         fi
-        
+
         if [ "${ES_SSL_KEY_INVALID}" = "true" ]; then
           echo "ES_SSL_KEY_INVALID=true" >> $GITHUB_ENV
         fi
-        
+
         if [ -n "${ES_SSL_SUPPORTED_PROTOCOLS}" ]; then
           echo "ES_SSL_SUPPORTED_PROTOCOLS=${ES_SSL_SUPPORTED_PROTOCOLS}" >> $GITHUB_ENV
         fi
 
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v3
 
+    - name: Bootstrap CI assets
+      shell: bash
+      run: |
+        mkdir -p .ci
+        curl -sL https://github.com/logstash-plugins/.ci/archive/1.x.tar.gz | \
+        sh -c 'if tar --version 2>/dev/null | grep -q "GNU tar"; then
+          TAR_KEEP="--skip-old-files"; TAR_WILDCARDS="--wildcards";
+        else
+          TAR_KEEP="-k"; TAR_WILDCARDS="";
+        fi; tar -xzvf - $TAR_KEEP --strip-components=1 -C .ci $TAR_WILDCARDS "*Dockerfile*" "*docker*" "*.sh" "*logstash-versions*"'
+
     - name: Run docker-setup.sh
       id: docker_setup
       shell: bash
       run: |
-        set -e
-        cd .ci
-        wget -q https://raw.githubusercontent.com/elastic/logstash/main/.ci/docker-setup.sh -O .ci/docker-setup.shhttps://raw.githubusercontent.com/logstash-plugins/.ci/refs/heads/1.x/docker-setup.sh || exit 1
-        chmod 755 docker-setup.sh
         bash .ci/docker-setup.sh
+        echo "exit_code=$?" >> $GITHUB_OUTPUT
       continue-on-error: true
 
     - name: Check if test should be skipped

.github/workflows/integration-tests.yml

@@ -34,9 +34,11 @@ jobs:
         with:
           elastic_stack_version: ${{ matrix.elastic_stack_version }}
           snapshot: ${{ matrix.snapshot }}
+          integration: true
 
       - name: Run integration tests
         if: steps.setup.outputs.skip != 'true'
-        run: .ci/docker-run.sh
+        run: |
+          bash .ci/docker-run.sh
 
       # NOTE: no cleanup needed when running on ephemeral runners

.github/workflows/secure-integration-tests.yml

@@ -37,6 +37,7 @@ jobs:
 
       - name: Run secure integration tests
         if: steps.setup.outputs.skip != 'true'
-        run: .ci/docker-run.sh
+        run: |
+          bash .ci/docker-run.sh
 
       # NOTE: no cleanup needed when running on ephemeral runners

.github/workflows/unit-tests.yml

@@ -0,0 +1,55 @@
+name: Unit Tests
+
+on:
+  push:
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  unit-tests:
+    name: Unit Test - ES ${{ matrix.elastic_stack_version }} ${{ matrix.snapshot && '(Snapshot)' || '' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        elastic_stack_version:
+          - "9.current"
+          - "9.previous"
+          - "8.current"
+          - "8.previous"
+          - "7.current"
+        docker_env: ["dockerjdk21.env"]
+        snapshot: [false]
+        exclude:
+          # 7.x doesn't support JDK 21, use default JDK
+          - elastic_stack_version: "7.current"
+            docker_env: "dockerjdk21.env"
+        include:
+          # 7.current with default JDK
+          - elastic_stack_version: "7.current"
+            docker_env: ""
+            snapshot: false
+          # Main snapshot with JDK 21
+          - elastic_stack_version: "main"
+            docker_env: "dockerjdk21.env"
+            snapshot: true
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Setup test environment
+        id: setup
+        uses: ./.github/actions/setup
+        with:
+          elastic_stack_version: ${{ matrix.elastic_stack_version }}
+          snapshot: ${{ matrix.snapshot || false }}
+          docker_env: ${{ matrix.docker_env || '' }}
+
+      - name: Run unit tests
+        if: steps.setup.outputs.skip != 'true'
+        run: bash .ci/docker-run.sh
+
+      # NOTE: no cleanup needed when running on ephemeral runners