Merge pull request #120 from Axway-API-Builder-Ext/elasticsearch-8

Adding support for Elasticsearch 8

Author: Chris Wiechmann

.github/workflows/plugin-fn-elasticsearch.yml

@@ -5,6 +5,8 @@ on:
   push:
     paths:
       - 'api-builder-plugin-fn-elasticsearch/**'
+    branches:
+      - 'master'
   pull_request:
     paths:
       - 'api-builder-plugin-fn-elasticsearch/**'
@@ -17,30 +19,105 @@ defaults:
     working-directory: api-builder-plugin-fn-elasticsearch
 
 jobs:
-  build:
+  unit-tests:
+    name: Unit tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
     steps:
     - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - name: npm install, build, and test
+    - name: Run unit tests
       env:
         CI: true
       run: |
         npm ci
         npm run build --if-present
-        npm test
+        npm run unit-test
+
+  integration-tests-es-v8:
+    name: Integration-tests ES V8
+    runs-on: ubuntu-latest
+    needs: unit-tests
+
+    services:
+      elasticsearch8:
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0
+        ports: 
+          - 9200:9200
+          - 9300:9300
+        env:
+          xpack.security.enabled: false
+          action.auto_create_index: '-apigw-*,+*'
+        options: >-
+          -e "discovery.type=single-node"
+          -e "xpack.security.enabled=false"
+          --health-cmd "curl -f http://localhost:9200"
+          --health-interval 30s
+          --health-timeout 2s
+          --health-retries 5
+          --health-start-period 30s
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js 14
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14'
+    - name: Run integration tests
+      env:
+        CI: true
+        ELASTICSEARCH_HOSTS: 'http://localhost:9200'
+      run: |
+        npm ci
+        npm run build --if-present
+        npm run integration-test
+
+  integration-tests-es-v7:
+    name: Integration-tests ES V7
+    runs-on: ubuntu-latest
+    needs: unit-tests
+
+    services:
+      elasticsearch7:
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
+        ports: 
+          - 9200:9200
+          - 9300:9300
+        env:
+          xpack.security.enabled: false
+          action.auto_create_index: '-apigw-*,+*'
+        options: >-
+          -e "discovery.type=single-node"
+          --health-cmd "curl -f http://localhost:9200"
+          --health-interval 30s
+          --health-timeout 2s
+          --health-retries 5
+          --health-start-period 30s
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js 14
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14'
+    - name: Run integration tests
+      env:
+        CI: true
+        ELASTICSEARCH_HOSTS: 'http://localhost:9200'
+      run: |
+        npm ci
+        npm run build --if-present
+        npm run integration-test
 
   publish-gpr:
     if: contains(github.event.release.tag_name, 'plugin-fn-elasticsearch')
     env:
       CI: true
-    needs: build
+    needs: [integration-tests-es-v7, integration-tests-es-v8]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -59,7 +136,7 @@ jobs:
   publish-npm:
     env:
       CI: true
-    needs: [build, publish-gpr]
+    needs: [integration-tests-es-v7, publish-gpr]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -73,4 +150,4 @@ jobs:
         run: |
           npm ci
           echo "//registry.npmjs.org/:_authToken=${{ secrets.npm_token }}" > ~/.npmrc
-          npm publish --access public
+          npm publish --access public

api-builder-plugin-fn-elasticsearch/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.0] 2022-02-28
+### Security
+- Updated @elastic/elasticsearch to version 8.0.0 to add support for Elasticsearch 8
+
 ## [2.1.2] 2022-02-02
 ### Security
 - Updated API-Builder runtime to solve security issue