elastic-enterprise-search 8.6.0 → 8.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.buildkite/certs/testnode.crt +17 -17
- data/.buildkite/certs/testnode.key +25 -25
- data/.buildkite/log-results.sh +2 -2
- data/.buildkite/pipeline.yml +2 -8
- data/.buildkite/run-client.sh +6 -6
- data/.buildkite/run-elasticsearch.sh +3 -7
- data/{.ci → .buildkite}/run-local.sh +2 -2
- data/.buildkite/run-tests.sh +3 -3
- data/.github/workflows/testing.yml +1 -1
- data/CONTRIBUTING.md +7 -8
- data/Rakefile +8 -2
- data/docs/guide/release_notes/87.asciidoc +13 -0
- data/docs/guide/release_notes/index.asciidoc +2 -0
- data/lib/elastic/app-search/api/search.rb +1 -1
- data/lib/elastic/enterprise-search/version.rb +1 -1
- data/spec/integration/app-search/api_logs_spec.rb +0 -8
- data/spec/spec_helper.rb +1 -1
- metadata +5 -30
- data/.ci/.env +0 -9
- data/.ci/certs/README.md +0 -50
- data/.ci/certs/ca.crt +0 -20
- data/.ci/certs/ca.key +0 -27
- data/.ci/certs/testnode.crt +0 -21
- data/.ci/certs/testnode.key +0 -27
- data/.ci/certs/testnode_no_san.crt +0 -19
- data/.ci/certs/testnode_no_san.key +0 -27
- data/.ci/docker-compose.yml +0 -166
- data/.ci/functions/cleanup.sh +0 -67
- data/.ci/functions/imports.sh +0 -60
- data/.ci/functions/wait-for-container.sh +0 -36
- data/.ci/jobs/defaults.yml +0 -73
- data/.ci/jobs/elastic+enterprise-search-ruby+7.17.yml +0 -12
- data/.ci/jobs/elastic+enterprise-search-ruby+8.3.yml +0 -12
- data/.ci/jobs/elastic+enterprise-search-ruby+8.4.yml +0 -12
- data/.ci/jobs/elastic+enterprise-search-ruby+8.5.yml +0 -12
- data/.ci/jobs/elastic+enterprise-search-ruby+main.yml +0 -12
- data/.ci/jobs/elastic+enterprise-search-ruby+pull-request.yml +0 -19
- data/.ci/run-elasticsearch.sh +0 -127
- data/.ci/run-enterprise-search.sh +0 -72
- data/.ci/run-kibana.sh +0 -22
- data/.ci/run-repository.sh +0 -50
- data/.ci/run-stack.sh +0 -1
- data/.ci/run-tests +0 -27
- data/.ci/test-matrix.yml +0 -15
@@ -1,72 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
#
|
3
|
-
# Launch one App Search node via the Docker image,
|
4
|
-
# to form a cluster suitable for running the REST API tests.
|
5
|
-
#
|
6
|
-
# Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
|
7
|
-
|
8
|
-
# Version 1.1.0
|
9
|
-
# - Initial version of the run-app-search.sh script
|
10
|
-
# - Refactored .ci version
|
11
|
-
|
12
|
-
script_path=$(dirname $(realpath -s $0))
|
13
|
-
source $script_path/functions/imports.sh
|
14
|
-
set -euo pipefail
|
15
|
-
|
16
|
-
CONTAINER_NAME=${CONTAINER_NAME-enterprise-search}
|
17
|
-
APP_SEARCH_SECRET_SESSION_KEY=${APP_SEARCH_SECRET_SESSION_KEY-int_test_secret}
|
18
|
-
|
19
|
-
echo -e "\033[34;1mINFO:\033[0m Take down node if called twice with the same arguments (DETACH=true) or on seperate terminals \033[0m"
|
20
|
-
cleanup_node $CONTAINER_NAME
|
21
|
-
|
22
|
-
http_port=3002
|
23
|
-
url=http://127.0.0.1:${http_port}
|
24
|
-
|
25
|
-
# Pull the container, retry on failures up to 5 times with
|
26
|
-
# short delays between each attempt. Fixes most transient network errors.
|
27
|
-
docker_pull_attempts=0
|
28
|
-
until [ "$docker_pull_attempts" -ge 5 ]
|
29
|
-
do
|
30
|
-
docker pull docker.elastic.co/enterprise-search/enterprise-search:"$STACK_VERSION" && break
|
31
|
-
docker_pull_attempts=$((docker_pull_attempts+1))
|
32
|
-
echo "Failed to pull image, retrying in 10 seconds (retry $docker_pull_attempts/5)..."
|
33
|
-
sleep 10
|
34
|
-
done
|
35
|
-
|
36
|
-
echo -e "\033[34;1mINFO:\033[0m Starting container $CONTAINER_NAME \033[0m"
|
37
|
-
set -x
|
38
|
-
docker run \
|
39
|
-
--name "$CONTAINER_NAME" \
|
40
|
-
--network "$network_name" \
|
41
|
-
--env "elasticsearch.host=$elasticsearch_url" \
|
42
|
-
--env "elasticsearch.username=elastic" \
|
43
|
-
--env "elasticsearch.password=$elastic_password" \
|
44
|
-
--env "ENT_SEARCH_DEFAULT_PASSWORD=$elastic_password" \
|
45
|
-
--env "secret_management.encryption_keys=[$APP_SEARCH_SECRET_SESSION_KEY]" \
|
46
|
-
--env "enterprise_search.listen_port=$http_port" \
|
47
|
-
--env "log_level=info" \
|
48
|
-
--env "hide_version_info=false" \
|
49
|
-
--env "worker.threads=2" \
|
50
|
-
--env "allow_es_settings_modification=true" \
|
51
|
-
--env "JAVA_OPTS=-Xms1g -Xmx2g" \
|
52
|
-
--env "elasticsearch.ssl.enabled=true" \
|
53
|
-
--env "elasticsearch.ssl.verify=true" \
|
54
|
-
--env "elasticsearch.ssl.certificate=/usr/share/app-search/config/certs/testnode.crt" \
|
55
|
-
--env "elasticsearch.ssl.certificate_authority=/usr/share/app-search/config/certs/ca.crt" \
|
56
|
-
--env "elasticsearch.ssl.key=/usr/share/app-search/config/certs/testnode.key" \
|
57
|
-
--env "ELASTICSEARCH_SEARCH_API=true" \
|
58
|
-
--volume $ssl_cert:/usr/share/app-search/config/certs/testnode.crt \
|
59
|
-
--volume $ssl_key:/usr/share/app-search/config/certs/testnode.key \
|
60
|
-
--volume $ssl_ca:/usr/share/app-search/config/certs/ca.crt \
|
61
|
-
--publish "$http_port":3002 \
|
62
|
-
--detach="$DETACH" \
|
63
|
-
--health-cmd="curl --insecure --fail ${url} || exit 1" \
|
64
|
-
--health-interval=30s \
|
65
|
-
--health-retries=50 \
|
66
|
-
--health-timeout=10s \
|
67
|
-
--rm \
|
68
|
-
docker.elastic.co/enterprise-search/enterprise-search:"$STACK_VERSION";
|
69
|
-
|
70
|
-
if wait_for_container "$CONTAINER_NAME" "$network_name"; then
|
71
|
-
echo -e "\033[32;1mSUCCESS:\033[0m Running on: ${url}\033[0m"
|
72
|
-
fi
|
data/.ci/run-kibana.sh
DELETED
@@ -1,22 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
|
3
|
-
script_path=$(dirname $(realpath -s $0))
|
4
|
-
source $script_path/functions/imports.sh
|
5
|
-
set -euo pipefail
|
6
|
-
|
7
|
-
docker run \
|
8
|
-
--name "kibana" \
|
9
|
-
--network "$network_name" \
|
10
|
-
--publish "5601:5601" \
|
11
|
-
--interactive \
|
12
|
-
--tty \
|
13
|
-
--rm \
|
14
|
-
--env "ENTERPRISESEARCH_HOST=http://localhost:3002" \
|
15
|
-
"docker.elastic.co/kibana/kibana:${STACK_VERSION}"
|
16
|
-
|
17
|
-
# --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt \
|
18
|
-
|
19
|
-
# --env "ELASTICSEARCH_HOSTS=${elasticsearch_url}" \
|
20
|
-
# --env "ELASTICSEARCH_USERNAME=enterprise_search" \
|
21
|
-
# --env "ELASTICSEARCH_PASSWORD=${elastic_password}" \
|
22
|
-
# --env "ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=${ssl_ca}" \
|
data/.ci/run-repository.sh
DELETED
@@ -1,50 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
#
|
3
|
-
# Called by entry point `run-test` use this script to add your repository specific test commands
|
4
|
-
#
|
5
|
-
# Once called Elasticsearch is up and running
|
6
|
-
#
|
7
|
-
# Its recommended to call `imports.sh` as defined here so that you get access to all variables defined there
|
8
|
-
#
|
9
|
-
# Any parameters that test-matrix.yml defines should be declared here with appropiate defaults
|
10
|
-
|
11
|
-
script_path=$(dirname $(realpath -s $0))
|
12
|
-
source $script_path/functions/imports.sh
|
13
|
-
set -euo pipefail
|
14
|
-
|
15
|
-
echo -e "\033[34;1mINFO:\033[0m VERSION: ${STACK_VERSION}\033[0m"
|
16
|
-
echo -e "\033[34;1mINFO:\033[0m TEST_SUITE: ${TEST_SUITE}\033[0m"
|
17
|
-
echo -e "\033[34;1mINFO:\033[0m RUBY_VERSION: ${RUBY_VERSION}\033[0m"
|
18
|
-
echo -e "\033[34;1mINFO:\033[0m RUNSCRIPTS: ${RUNSCRIPTS}\033[0m"
|
19
|
-
echo -e "\033[34;1mINFO:\033[0m URL: ${elasticsearch_url}\033[0m"
|
20
|
-
echo -e "\033[34;1mINFO:\033[0m SERVICE: ${SERVICE}\033[0m"
|
21
|
-
|
22
|
-
echo -e "\033[34;1mINFO:\033[0m pinging Elasticsearch ..\033[0m"
|
23
|
-
curl --insecure --fail $external_elasticsearch_url/_cluster/health?pretty
|
24
|
-
|
25
|
-
if [[ "$RUNSCRIPTS" = *"enterprise-search"* ]]; then
|
26
|
-
enterprise_search_url="http://localhost:3002"
|
27
|
-
echo -e "\033[34;1mINFO:\033[0m pinging Enterprise Search ..\033[0m"
|
28
|
-
curl -I --fail $enterprise_search_url
|
29
|
-
fi
|
30
|
-
|
31
|
-
echo -e "\033[32;1mSUCCESS:\033[0m successfully started the ${STACK_VERSION} stack.\033[0m"
|
32
|
-
|
33
|
-
echo -e "\033[32;1mBUILD: \033[31mRuby \e[0m container.\033[0m"
|
34
|
-
|
35
|
-
docker build \
|
36
|
-
--file .ci/Dockerfile \
|
37
|
-
--tag elastic/enterprise-search-ruby \
|
38
|
-
--build-arg RUBY_VERSION=${RUBY_VERSION} \
|
39
|
-
.
|
40
|
-
|
41
|
-
echo -e "\033[32;1mRUN: \033[31mRuby \e[0m container.\033[0m"
|
42
|
-
|
43
|
-
docker run \
|
44
|
-
--network ${network_name} \
|
45
|
-
--name enterprise-search-ruby \
|
46
|
-
--env "ELASTIC_ENTERPRISE_HOST=http://${CONTAINER_NAME}:3002" \
|
47
|
-
--rm \
|
48
|
-
--volume `pwd`:/code/enterprise-search-ruby \
|
49
|
-
elastic/enterprise-search-ruby \
|
50
|
-
rake spec:integration:${SERVICE}
|
data/.ci/run-stack.sh
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
STACK_VERSION=${STACK_VERSION} docker-compose up --remove-orphans
|
data/.ci/run-tests
DELETED
@@ -1,27 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
#
|
3
|
-
# Version 1.1
|
4
|
-
# - Moved to .ci folder and seperated out `run-repository.sh`
|
5
|
-
# - Add `$RUNSCRIPTS` env var for running Elasticsearch dependent products
|
6
|
-
export TEST_SUITE=platinum
|
7
|
-
export CONTAINER_NAME=enterprise-search
|
8
|
-
export RUNSCRIPTS=enterprise-search
|
9
|
-
|
10
|
-
script_path=$(dirname $(realpath -s $0))
|
11
|
-
source $script_path/functions/imports.sh
|
12
|
-
set -euo pipefail
|
13
|
-
|
14
|
-
echo -e "\033[1m>>>>> Start [$STACK_VERSION container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
|
15
|
-
DETACH=true bash .ci/run-elasticsearch.sh
|
16
|
-
|
17
|
-
if [[ -n "$RUNSCRIPTS" ]]; then
|
18
|
-
for RUNSCRIPT in ${RUNSCRIPTS//,/ } ; do
|
19
|
-
echo -e "\033[1m>>>>> Running run-$RUNSCRIPT.sh >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
|
20
|
-
CONTAINER_NAME=${RUNSCRIPT} \
|
21
|
-
DETACH=true \
|
22
|
-
bash .ci/run-${RUNSCRIPT}.sh
|
23
|
-
done
|
24
|
-
fi
|
25
|
-
|
26
|
-
echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
|
27
|
-
bash .ci/run-repository.sh
|