Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove resolve-ip dependency for integration-tests (#9065) 

* Remove resolve-ip dependency for integration-tests

* use host hostname and fallback to dscacheutil

* better shell script comparisons
This commit is contained in:
Suneet Saldanha 2019-12-19 14:53:36 -08:00 committed by Jonathan Wei
parent 256b8f69b6
commit 176bc8fd97
9 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration-tests/README.md
View File

@ -36,7 +36,8 @@ Integration Testing Using Docker
For running integration tests using docker there are 2 approaches. For running integration tests using docker there are 2 approaches.
If your platform supports docker natively, you can simply set `DOCKER_IP` If your platform supports docker natively, you can simply set `DOCKER_IP`
environment variable to localhost and skip to [Running tests](#running-tests) section. environment variable to localhost and skip to [Running tests](#running-tests) section. Ensure that you have
at least 4GiB of memory allocated to the docker engine (This can be set under Preferences > Advanced).
``` ```
export DOCKER_IP=127.0.0.1 export DOCKER_IP=127.0.0.1

4
integration-tests/docker/tls/generate-expired-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
cat <<EOT > expired_csr.conf cat <<EOT > expired_csr.conf
[req] [req]

4
integration-tests/docker/tls/generate-good-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
cat <<EOT > csr.conf cat <<EOT > csr.conf
[req] [req]

4
integration-tests/docker/tls/generate-incorrect-hostname-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
# Generate a client cert with an incorrect hostname for testing # Generate a client cert with an incorrect hostname for testing
cat <<EOT > invalid_hostname_csr.conf cat <<EOT > invalid_hostname_csr.conf

6
integration-tests/docker/tls/generate-invalid-intermediate-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
cat <<EOT > invalid_ca_intermediate.conf cat <<EOT > invalid_ca_intermediate.conf
[req] [req]
@ -89,4 +91,4 @@ cat invalid_ca_intermediate.pem >> invalid_ca_client.pem
# Create a Java keystore containing the generated certificate # Create a Java keystore containing the generated certificate
openssl pkcs12 -export -in invalid_ca_client.pem -inkey invalid_ca_client.key -out invalid_ca_client.p12 -name invalid_ca_client -CAfile invalid_ca_intermediate.pem -caname druid-it-root -password pass:druid123 openssl pkcs12 -export -in invalid_ca_client.pem -inkey invalid_ca_client.key -out invalid_ca_client.p12 -name invalid_ca_client -CAfile invalid_ca_intermediate.pem -caname druid-it-root -password pass:druid123
keytool -importkeystore -srckeystore invalid_ca_client.p12 -srcstoretype PKCS12 -destkeystore invalid_ca_client.jks -deststoretype JKS -srcstorepass druid123 -deststorepass druid123 keytool -importkeystore -srckeystore invalid_ca_client.p12 -srcstoretype PKCS12 -destkeystore invalid_ca_client.jks -deststoretype JKS -srcstorepass druid123 -deststorepass druid123

4
integration-tests/docker/tls/generate-to-be-revoked-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
# Generate a client cert that will be revoked # Generate a client cert that will be revoked
cat <<EOT > revoked_csr.conf cat <<EOT > revoked_csr.conf

4
integration-tests/docker/tls/generate-untrusted-root-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
cat <<EOT > csr_another_root.conf cat <<EOT > csr_another_root.conf
[req] [req]

6
integration-tests/docker/tls/generate-valid-intermediate-client-cert.sh
View File

@ -15,7 +15,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export DOCKER_HOST_IP=$(resolveip -s $HOSTNAME) tls_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# shellcheck source=set-docker-host-ip.sh
source "$tls_dir/set-docker-host-ip.sh"
cat <<EOT > ca_intermediate.conf cat <<EOT > ca_intermediate.conf
[req] [req]
@ -89,4 +91,4 @@ cat ca_intermediate.pem >> intermediate_ca_client.pem
# Create a Java keystore containing the generated certificate # Create a Java keystore containing the generated certificate
openssl pkcs12 -export -in intermediate_ca_client.pem -inkey intermediate_ca_client.key -out intermediate_ca_client.p12 -name intermediate_ca_client -CAfile ca_intermediate.pem -caname druid-it-root -password pass:druid123 openssl pkcs12 -export -in intermediate_ca_client.pem -inkey intermediate_ca_client.key -out intermediate_ca_client.p12 -name intermediate_ca_client -CAfile ca_intermediate.pem -caname druid-it-root -password pass:druid123
keytool -importkeystore -srckeystore intermediate_ca_client.p12 -srcstoretype PKCS12 -destkeystore intermediate_ca_client.jks -deststoretype JKS -srcstorepass druid123 -deststorepass druid123 keytool -importkeystore -srckeystore intermediate_ca_client.p12 -srcstoretype PKCS12 -destkeystore intermediate_ca_client.jks -deststoretype JKS -srcstorepass druid123 -deststorepass druid123

29
integration-tests/docker/tls/set-docker-host-ip.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/bash -eu
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
DOCKER_HOST_IP="$(host "$(hostname)" | perl -nle '/has address (.*)/ && print $1')"
if [ -z "$DOCKER_HOST_IP" ]; then
# Mac specific way to get host ip
DOCKER_HOST_IP="$(dscacheutil -q host -a name "$(HOSTNAME)" | perl -nle '/ip_address: (.*)/ && print $1')"
fi
if [ -z "$DOCKER_HOST_IP" ]; then
>&2 echo "Could not set docker host IP - integration tests can not run"
exit 1
fi
export DOCKER_HOST_IP