Merge branch 'main' into fix/cache-clear-method-add

Author: pquentin

.buildkite/pipeline.yml

@@ -7,8 +7,8 @@ steps:
     env:
       PHP_VERSION: "{{ matrix.php }}"
       TEST_SUITE: "{{ matrix.suite }}"
-      STACK_VERSION: 9.0.0-SNAPSHOT
-      BRANCH_CLIENT_TESTS: 9.0
+      STACK_VERSION: 9.3.0-SNAPSHOT
+      BRANCH_CLIENT_TESTS: 9.2
     matrix:
       setup:
         suite:

.github/CODEOWNERS

@@ -11,20 +11,21 @@
 #
 # Targets:
 # ---------------------------
-# assemble <VERSION> : build client artefacts with version
-# bump     <VERSION> : bump client internals to version
-# codegen  <VERSION> : generate endpoints
-# docsgen  <VERSION> : generate documentation
-# examplegen         : generate the doc examples
-# clean              : clean workspace
+# assemble <VERSION>   : build client artefacts with version
+# bump     <VERSION>   : bump client internals to version
+# bumpmatrix <VERSION> : bump stack version in test matrix to version
+# codegen  <VERSION>   : generate endpoints
+# docsgen  <VERSION>   : generate documentation
+# examplegen           : generate the doc examples
+# clean                : clean workspace
 #
 # ------------------------------------------------------- #
 
 # ------------------------------------------------------- #
 # Bootstrap
 # ------------------------------------------------------- #
 
-script_path=$(dirname "$(realpath -s "$0")")
+script_path=$(dirname "$(realpath "$0")")
 repo=$(realpath "$script_path/../")
 
 # shellcheck disable=SC1090
@@ -68,11 +69,8 @@ case $CMD in
         TASK_ARGS=("$VERSION" "$output_folder")
         ;;
     codegen)
-        if [ -v $VERSION ]; then
-            echo -e "\033[31;1mTARGET: codegen -> missing version parameter\033[0m"
-            exit 1
-        fi
-        echo -e "\033[36;1mTARGET: codegen API v$VERSION\033[0m"
+        VERSION=$(git rev-parse --abbrev-ref HEAD)
+        echo -e "\033[36;1mTARGET: codegen API $VERSION\033[0m"
         TASK=codegen
         # VERSION is BRANCH here for now
         TASK_ARGS=("$VERSION" "$codegen_folder")
@@ -103,7 +101,16 @@ case $CMD in
         # VERSION is BRANCH here for now
         TASK_ARGS=("$VERSION")
         ;;
-    *)
+    bumpmatrix)
+        if [ -v $VERSION ]; then
+            echo -e "\033[31;1mTARGET: bumpmatrix -> missing version parameter\033[0m"
+            exit 1
+        fi
+        echo -e "\033[36;1mTARGET: bump stack in test matrix to version $VERSION\033[0m"
+        TASK=bumpmatrix
+        TASK_ARGS=("$VERSION")
+        ;;
+   *)
         echo -e "\nUsage:\n\t $CMD is not supported right now\n"
         exit 1
 esac
@@ -113,12 +120,13 @@ esac
 # Build Container
 # ------------------------------------------------------- #
 
-#echo -e "\033[34;1mINFO: building $product container\033[0m"
-
-#docker build --file .github/Dockerfile --tag ${product} \
-#  --build-arg USER_ID="$(id -u)" \
-#  --build-arg GROUP_ID="$(id -g)" .
+build_container() {
+    echo -e "\033[34;1mINFO: building $product container\033[0m"
 
+    docker build --file $repo/.buildkite/Dockerfile --tag ${product} \
+      --build-arg USER_ID="$(id -u)" \
+      --build-arg GROUP_ID="$(id -g)" .
+}
 
 # ------------------------------------------------------- #
 # Run the Container
@@ -173,8 +181,32 @@ if [[ "$CMD" == "bump" ]]; then
     sed -i "s/es-version: \[[0-9]\+\.[0-9]\+\.\?[0-9]\?-SNAPSHOT\]/es-version: \[$MINOR_VERSION-SNAPSHOT\]/" $repo/.github/workflows/test.yml
 fi
 
+if [[ "$CMD" == "bumpmatrix" ]]; then
+  TEST_FILES=".buildkite/pipeline.yml .github/workflows/test.yml .github/workflows/integration_test.yml .github/workflows/yaml_test.yml"
+  for TEST_FILE in $TEST_FILES; do
+      sed -E -i.bak 's/[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT/'$VERSION'/g' ${TEST_FILE}
+      rm ${TEST_FILE}.bak
+  done
+  exit 0
+fi
+
 if [[ "$CMD" == "codegen" ]]; then
-    echo "TODO"
+    BRANCH=$VERSION
+    if [[ "$BRANCH" == "main" ]]; then
+        ES_VERSION="main"
+    else
+        ES_VERSION=$(curl -L -s https://artifacts-snapshot.elastic.co/elasticsearch/latest/$BRANCH.json | jq -r ".version")
+    fi
+    build_container
+    docker run \
+      --rm -v $repo:/code/elasticsearch-php \
+      $product \
+      /bin/bash -x -c "cd /code && mkdir codegen && \
+      git clone https://$CLIENTS_GITHUB_TOKEN@github.com/elastic/elastic-client-generator-php.git && \
+      cd /code/elastic-client-generator-php && composer install && \
+      bin/elasticsearch9.php $ES_VERSION $BRANCH /code/codegen config/elasticsearch9.json && \
+      cp /code/codegen/Elastic/Elasticsearch/Endpoints/* /code/elasticsearch-php/src/Endpoints/ && \
+      cp /code/codegen/Elastic/Elasticsearch/Traits/* /code/elasticsearch-php/src/Traits/"
 fi
 
 if [[ "$CMD" == "docsgen" ]]; then
@@ -183,4 +215,4 @@ fi
 
 if [[ "$CMD" == "examplesgen" ]]; then
     echo "TODO"
-fi
+fi

.github/make.sh

@@ -16,4 +16,4 @@ jobs:
       deployments: write
       id-token: write
       contents: read
-      pull-requests: read
+      pull-requests: write

.github/workflows/docs-build.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         php-version: [8.1, 8.2, 8.3, 8.4]
         os: [ubuntu-latest]
-        es-version: [9.0.0-SNAPSHOT]
+        es-version: [9.3.0-SNAPSHOT]
 
     steps:
     - name: Checkout
@@ -42,7 +42,7 @@ jobs:
 
     - name: Run Elasticsearch using start-local
       run: |
-        curl -fsSL https://elastic.co/start-local | sh -s -- -v ${{ matrix.es-version }} -esonly
+        curl -fsSL https://elastic.co/start-local | sh -s -- -v ${{ matrix.es-version }} --esonly
 
     - name: Integration tests
       run: |

.github/workflows/integration_test.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         php-version: [8.1, 8.2, 8.3, 8.4]
         os: [ubuntu-latest]
-        es-version: [9.0.0-SNAPSHOT]
+        es-version: [9.3.0-SNAPSHOT]
 
     steps:
     - name: Checkout

.github/workflows/test.yml

@@ -11,9 +11,9 @@ jobs:
       matrix:
         php-version: [8.1, 8.2, 8.3, 8.4]
         os: [ubuntu-latest]
-        es-version: [9.0.0-SNAPSHOT]
+        es-version: [9.3.0-SNAPSHOT]
         test-suite: [stack]
-        branch-client-tests: ["9.0"]
+        branch-client-tests: ["main"]
 
     steps:
     - name: Checkout
@@ -27,7 +27,7 @@ jobs:
         coverage: none
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-   
+
     - name: Get composer cache directory
       id: composercache
       run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
@@ -44,7 +44,7 @@ jobs:
 
     - name: Run Elasticsearch using start-local
       run: |
-        curl -fsSL https://elastic.co/start-local | sh -s -- -v ${{ matrix.es-version }} -esonly
+        curl -fsSL https://elastic.co/start-local | sh -s -- -v ${{ matrix.es-version }} --esonly
 
     - name: Build PHPUnit tests
       run: |

.github/workflows/yaml_test.yml

@@ -1,3 +1,12 @@
+## Release 9.2.0
+
+- Updated the APIs to Elasticsearch [9.2.0](https://www.elastic.co/docs/release-notes/elasticsearch#elasticsearch-9.2.0-release-notes)
+- Added the ES|QL query builder [#1462](https://github.com/elastic/elasticsearch-php/pull/1462)
+
+## Release 9.1.0
+
+- Updated the APIs to Elasticsearch [9.1.0](https://www.elastic.co/docs/release-notes/elasticsearch#elasticsearch-9.1.0-release-notes)
+
 ## Release 9.0.0
 
 - **Use of PHP 8.1+:** Starting from 9.0.0 the `elasticsearch-php` client requires PHP 8.1+.

CHANGELOG.md

@@ -0,0 +1 @@
+See: https://www.elastic.co/community/codeofconduct

CODE_OF_CONDUCT.md

@@ -0,0 +1,2 @@
+Elasticsearch PHP Client
+Copyright 2021 Elasticsearch B.V.