Fix/1176

.ci/Dockerfile

@@ -34,7 +34,4 @@ RUN composer install
 
 COPY . .
 
-# Updating elasticsearch submodule
-RUN git submodule update --init --recursive
-
 CMD ["bash", ".ci/yaml-tests.sh"]

.ci/functions/imports.sh

@@ -26,10 +26,11 @@ if [[ -z $es_node_name ]]; then
   export es_node_name=instance
   export elastic_password=changeme
   export elasticsearch_image=elasticsearch
-  export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
+  export elasticsearch_scheme="https"
   if [[ $TEST_SUITE != "platinum" ]]; then
-    export elasticsearch_url=http://${es_node_name}:9200
+    export elasticsearch_scheme="http"
   fi
+  export elasticsearch_url=${elasticsearch_scheme}://elastic:${elastic_password}@${es_node_name}:9200
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
   export elasticsearch_container="${elasticsearch_image}:${STACK_VERSION}"
 

.ci/jobs/elastic+elasticsearch-php+7.x.yml → .ci/jobs/elastic+elasticsearch-php+6.8.x.yml

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+elasticsearch-php+7.x
-    display-name: 'elastic / elasticsearch-php # 7.x'
-    description: Testing the elasticsearch-php 7.x branch.
+    name: elastic+elasticsearch-php+6.8.x
+    display-name: 'elastic / elasticsearch-php # 6.8.x'
+    description: Testing the elasticsearch-php 6.8.x branch.
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/7.x
+        default: refs/heads/6.8.x
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)
     triggers:

.ci/jobs/elastic+elasticsearch-php+7.10.yml → .ci/jobs/elastic+elasticsearch-php+7.15.yml

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+elasticsearch-php+7.10
-    display-name: 'elastic / elasticsearch-php # 7.10'
-    description: Testing the elasticsearch-php 7.10 branch.
+    name: elastic+elasticsearch-php+7.15
+    display-name: 'elastic / elasticsearch-php # 7.15'
+    description: Testing the elasticsearch-php 7.15 branch.
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/7.10
+        default: refs/heads/7.15
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)
     triggers:

.ci/jobs/elastic+elasticsearch-php+7.9.yml → .ci/jobs/elastic+elasticsearch-php+7.16.yml

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+elasticsearch-php+7.9
-    display-name: 'elastic / elasticsearch-php # 7.9'
-    description: Testing the elasticsearch-php 7.9 branch.
+    name: elastic+elasticsearch-php+7.16
+    display-name: 'elastic / elasticsearch-php # 7.16'
+    description: Testing the elasticsearch-php 7.16 branch.
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/7.9
+        default: refs/heads/7.16
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)
     triggers:

.ci/jobs/elastic+elasticsearch-php+pull-request.yml

@@ -17,3 +17,4 @@
         github-hooks: true
         status-context: clients-ci
         cancel-builds-on-update: true
+    publishers: []

.ci/make.sh

@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------- #
+#
+# Skeleton for common build entry script for all elastic
+# clients. Needs to be adapted to individual client usage.
+#
+# Must be called: ./.ci/make.sh <target> <params>
+#
+# Version: 1.1.0
+#
+# 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
+#
+# ------------------------------------------------------- #
+
+# ------------------------------------------------------- #
+# Bootstrap
+# ------------------------------------------------------- #
+
+script_path=$(dirname "$(realpath -s "$0")")
+repo=$(realpath "$script_path/../")
+
+# shellcheck disable=SC1090
+CMD=$1
+TASK=$1
+TASK_ARGS=()
+VERSION=$2
+STACK_VERSION=$VERSION
+set -euo pipefail
+
+product="elastic/elasticsearch-php"
+output_folder=".ci/output"
+codegen_folder=".ci/output"
+OUTPUT_DIR="$repo/${output_folder}"
+REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
+mkdir -p "$OUTPUT_DIR"
+
+echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
+echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
+echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m"
+
+# ------------------------------------------------------- #
+# Parse Command
+# ------------------------------------------------------- #
+
+case $CMD in
+    clean)
+        echo -e "\033[36;1mTARGET: clean workspace $output_folder\033[0m"
+        rm -rfv "$output_folder"
+        echo -e "\033[32;1mTARGET: clean - done.\033[0m"
+        exit 0
+        ;;
+    assemble)
+        if [ -v $VERSION ]; then
+            echo -e "\033[31;1mTARGET: assemble -> missing version parameter\033[0m"
+            exit 1
+        fi
+        echo -e "\033[36;1mTARGET: assemble artefact $VERSION\033[0m"
+        TASK=release
+        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"
+        TASK=codegen
+        # VERSION is BRANCH here for now
+        TASK_ARGS=("$VERSION" "$codegen_folder")
+        ;;
+    docsgen)
+        if [ -v $VERSION ]; then
+            echo -e "\033[31;1mTARGET: docsgen -> missing version parameter\033[0m"
+            exit 1
+        fi
+        echo -e "\033[36;1mTARGET: generate docs for $VERSION\033[0m"
+        TASK=codegen
+        # VERSION is BRANCH here for now
+        TASK_ARGS=("$VERSION" "$codegen_folder")
+        ;;
+    examplesgen)
+        echo -e "\033[36;1mTARGET: generate examples\033[0m"
+        TASK=codegen
+        # VERSION is BRANCH here for now
+        TASK_ARGS=("$VERSION" "$codegen_folder")
+        ;;
+    bump)
+        if [ -v $VERSION ]; then
+            echo -e "\033[31;1mTARGET: bump -> missing version parameter\033[0m"
+            exit 1
+        fi
+        echo -e "\033[36;1mTARGET: bump to version $VERSION\033[0m"
+        TASK=bump
+        # VERSION is BRANCH here for now
+        TASK_ARGS=("$VERSION")
+        ;;
+    *)
+        echo -e "\nUsage:\n\t $CMD is not supported right now\n"
+        exit 1
+esac
+
+
+# ------------------------------------------------------- #
+# Build Container
+# ------------------------------------------------------- #
+
+#echo -e "\033[34;1mINFO: building $product container\033[0m"
+
+#docker build --file .ci/Dockerfile --tag ${product} \
+#  --build-arg USER_ID="$(id -u)" \
+#  --build-arg GROUP_ID="$(id -g)" .
+
+
+# ------------------------------------------------------- #
+# Run the Container
+# ------------------------------------------------------- #
+
+#echo -e "\033[34;1mINFO: running $product container\033[0m"
+
+#docker run \
+# --env "DOTNET_VERSION" \
+# --name test-runner \
+# --volume $REPO_BINDING \
+# --rm \
+# $product \
+# /bin/bash -c "./build.sh $TASK ${TASK_ARGS[*]} && chown -R $(id -u):$(id -g) ."
+
+# ------------------------------------------------------- #
+# Post Command tasks & checks
+# ------------------------------------------------------- #
+
+if [[ "$CMD" == "assemble" ]]; then
+    echo -e "\033[34;1mINFO: copy artefacts\033[0m"
+    rsync -ar --exclude=.ci --exclude=.git --filter=':- .gitignore' "$PWD" "${output_folder}/."
+
+    if compgen -G ".ci/output/*" > /dev/null; then
+        cd $repo/.ci/output && tar -czf elasticsearch-php-$VERSION.tar.gz * && cd -
+        rm -Rf "${repo}/.ci/output/elasticsearch-php"
+        echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m"
+		exit 0
+    else
+		echo -e "\033[31;1mTARGET: assemble failed, empty workspace!\033[0m"
+		exit 1
+	fi
+fi
+
+if [[ "$CMD" == "bump" ]]; then
+    echo "TODO"
+fi
+
+if [[ "$CMD" == "codegen" ]]; then
+    echo "TODO"
+fi
+
+if [[ "$CMD" == "docsgen" ]]; then
+    echo "TODO"
+fi
+
+if [[ "$CMD" == "examplesgen" ]]; then
+    echo "TODO"
+fi

.ci/run-elasticsearch.sh

@@ -7,7 +7,7 @@
 # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
-# Version 1.3.0
+# Version 1.6.0
 # - Initial version of the run-elasticsearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
@@ -17,6 +17,9 @@
 # - Added 5 retries on docker pull for fixing transient network errors
 # - Added flags to make local CCR configurations work
 # - Added action.destructive_requires_name=false as the default will be true in v8
+# - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing
+# - Moved ELASTIC_PASSWORD and xpack.security.enabled to the base arguments for "Security On by default"
+# - Use https only when TEST_SUITE is "platinum", when "free" use http
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -30,6 +33,8 @@ cluster_name=${moniker}${suffix}
 
 declare -a volumes
 environment=($(cat <<-END
+  --env ELASTIC_PASSWORD=$elastic_password
+  --env xpack.security.enabled=false
   --env node.name=$es_node_name
   --env cluster.name=$cluster_name
   --env cluster.initial_master_nodes=$master_node_name
@@ -40,13 +45,14 @@ environment=($(cat <<-END
   --env path.repo=/tmp
   --env repositories.url.allowed_urls=http://snapshot.test*
   --env action.destructive_requires_name=false
+  --env ingest.geoip.downloader.enabled=false
+  --env cluster.deprecation_indexing.enabled=false
 END
 ))
 if [[ "$TEST_SUITE" == "platinum" ]]; then
   environment+=($(cat <<-END
-    --env ELASTIC_PASSWORD=$elastic_password
-    --env xpack.license.self_generated.type=trial
     --env xpack.security.enabled=true
+    --env xpack.license.self_generated.type=trial
     --env xpack.security.http.ssl.enabled=true
     --env xpack.security.http.ssl.verification_mode=certificate
     --env xpack.security.http.ssl.key=certs/testnode.key
@@ -65,6 +71,11 @@ END
     --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt
 END
 ))
+else
+  environment+=($(cat <<-END
+    --env xpack.security.http.ssl.enabled=false
+END
+))
 fi
 
 cert_validation_flags=""

.ci/test-matrix.yml

@@ -1,7 +1,7 @@
 ---
 STACK_VERSION:
-  - 7.x-SNAPSHOT
-  
+  - 8.0.0-SNAPSHOT
+
 PHP_VERSION:
   - 8.0-cli
   - 7.4-cli

.ci/yaml-tests.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Download the YAML test from Elasticsearch artifacts
+# Checkout the YAML test from Elasticsearch tag
 php util/RestSpecRunner.php
 
 # Generate the YAML tests for PHPUnit

.gitattributes

@@ -1,15 +1,15 @@
 # Files to exclude when creating archive
-/tests export-ignore
+/.ci export-ignore
 /.github export-ignore
-/.gitmodules export-ignore
+/tests export-ignore
+/util export-ignore
+/.gitattributes export-ignore
 /.gitignore export-ignore
+/.gitmodules export-ignore
 /.php_cs export-ignore
-/.travis.yml export-ignore
-/.phpstan-src.neon export-ignore
-/.phpstan-src-71.neon export-ignore
-/.phpstan-tests.neon export-ignore
-/phpunit-integration.xml export-ignore
-/phpunit.xml export-ignore
+/phpstan.neon export-ignore
+/phpunit-integration-tests.xml export-ignore
+/phpunit-yaml-free-tests.xml export-ignore
+/phpunit-yaml-platinum-tests.xml export-ignore
+/phpunit.xml.dist export-ignore
 /ruleset.xml export-ignore
-/travis export-ignore
-/util export-ignore

.github/check-license-headers.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+# Check that source code files in this repo have the appropriate license
+# header.
+
+if [ "$TRACE" != "" ]; then
+    export PS4='${BASH_SOURCE}:${LINENO}: ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+    set -o xtrace
+fi
+set -o errexit
+set -o pipefail
+
+TOP=$(cd "$(dirname "$0")/.." >/dev/null && pwd)
+
+NLINES1=$(($(wc -l .github/license-header.txt | awk '{print $1}')+1))
+NLINES2=$((NLINES1 + 1))
+
+function check_license_header {
+    local f
+    f=$1
+
+    if ! diff -w .github/license-header.txt <(head -$NLINES2 "$f" | tail -$NLINES1) >/dev/null; then
+        echo "check-license-headers: error: '$f' does not have required license header, see 'diff -w .github/license-header.txt <(head -$NLINES2 $f | tail -$NLINES1)'"
+        return 1
+    else
+        return 0
+    fi
+}
+
+
+cd "$TOP"
+nErrors=0
+for f in $(git ls-files | grep '\.php$'); do
+    if ! check_license_header $f; then
+        nErrors=$((nErrors+1))
+    fi
+done
+
+if [[ $nErrors -eq 0 ]]; then
+    exit 0
+else
+    exit 1
+fi