Update ci shell scripts

This commit updates the ci shell scripts in line with the
changes that have been made to the PowerShell scripts
regarding

- RUST_BACKTRACE
- SSL certs used
- defaulting to default distribution in tests
- testing all features with cargo test

It also fixes an issue where there a differences between
macOS and linux (specifically, the centOS docker image used
in ci tests) regarding

- expected error messages for failed tests
- expected outcome when configuring the client with full
  and certificate validation

(cherry picked from commit 877719e)

Author: russcam

.ci/run-elasticsearch.sh

@@ -23,8 +23,8 @@ CLUSTER_NAME=${CLUSTER_NAME-${moniker}${suffix}}
 HTTP_PORT=${HTTP_PORT-9200}
 
 ELASTIC_PASSWORD=${ELASTIC_PASSWORD-changeme}
-SSL_CERT=${SSL_CERT-"${SCRIPT_PATH}/certs/testnode.crt"}
-SSL_KEY=${SSL_KEY-"${SCRIPT_PATH}/certs/testnode.key"}
+SSL_CERT=${SSL_CERT-"${SCRIPT_PATH}/certs/testnode_san.crt"}
+SSL_KEY=${SSL_KEY-"${SCRIPT_PATH}/certs/testnode_san.key"}
 SSL_CA=${SSL_CA-"${SCRIPT_PATH}/certs/ca.crt"}
 SSL_CA_PEM=${SSL_CA-"${SCRIPT_PATH}/certs/ca.pem"}
 

.ci/run-tests

@@ -6,8 +6,9 @@ if [[ -z $ELASTICSEARCH_VERSION ]]; then
 fi
 set -euxo pipefail
 
-TEST_SUITE=${TEST_SUITE-oss}
-NODE_NAME=instance
+TEST_SUITE=${TEST_SUITE-xpack}
+CARGO_TEST_FLAGS=${CARGO_TEST_FLAGS---all-features}
+NODE_NAME=es1
 
 elasticsearch_image=elasticsearch
 elasticsearch_url=https://elastic:changeme@${NODE_NAME}:9200
@@ -45,8 +46,12 @@ ELASTICSEARCH_VERSION=${elasticsearch_image}:${ELASTICSEARCH_VERSION} \
 
 echo -e "\033[1m>>>>> Build [elastic/elasticsearch-rs container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
 
-# TODO: move to stable once elasticsearch-rs compiles on stable
 RUST_VERSION=${RUST_VERSION-nightly}
+RUST_BACKTRACE=${RUST_BACKTRACE-}
+toolchain=""
+if [[ "${RUST_VERSION}" == "nightly" ]]; then
+  toolchain="+nightly"
+fi
 
 docker build --file .ci/DockerFile --tag elastic/elasticsearch-rs .
 
@@ -60,4 +65,4 @@ docker run \
   --name elasticsearch-rs \
   --rm \
   elastic/elasticsearch-rs \
-  cargo test
+  cargo ${toolchain} test "${CARGO_TEST_FLAGS}"

elasticsearch/Cargo.toml

@@ -36,6 +36,7 @@ failure = "0.1.5"
 futures = "0.3.1"
 http = "0.2"
 hyper = { version = "0.13", default-features = false, features = ["tcp", "stream"] }
+os_type = "2.2"
 sysinfo = "0.12.0"
 tokio = { version = "0.2.0", default-features = false, features = ["macros", "tcp", "time"] }
 

elasticsearch/tests/cert.rs

@@ -1,7 +1,10 @@
+extern crate os_type;
+
 pub mod common;
 use common::*;
 
 use elasticsearch::cert::{Certificate, CertificateValidation};
+use os_type::OSType;
 
 // TODO: These tests require a cluster configured with Security. Figure out best way to surface this e.g. test category, naming convention, etc.
 
@@ -13,7 +16,11 @@ fn expected_error_message() -> String {
     if cfg!(windows) {
         "terminated in a root certificate which is not trusted by the trust provider".to_string()
     } else {
-        "unable to get local issuer certificate".to_string()
+        let os = os_type::current_platform();
+        match os.os_type {
+            OSType::OSX => "The certificate was not trusted".to_string(),
+            _ => "unable to get local issuer certificate".to_string()
+        }
     }
 }
 
@@ -87,21 +94,32 @@ async fn full_certificate_validation() -> Result<(), failure::Error> {
         client::create_default_builder().cert_validation(CertificateValidation::Full(cert));
     let client = client::create(builder);
     let result = client.ping().send().await;
-    match result {
-        Ok(response) => Err(failure::err_msg(format!(
-            "Expected error but response was {}",
-            response.status_code()
-        ))),
-        Err(e) => {
-            let expected = "unable to get local issuer certificate";
-            let actual = e.to_string();
-            assert!(
-                actual.contains(expected),
-                "Expected error message to contain '{}' but was '{}'",
-                expected,
-                actual
-            );
-            Ok(())
+    let os_type = os_type::current_platform();
+    match os_type.os_type {
+        OSType::OSX => {
+            match result {
+                Ok(_) => Ok(()),
+                Err(e) => Err(failure::err_msg(e.to_string())),
+            }
+        },
+        _ => {
+            match result {
+                Ok(response) => Err(failure::err_msg(format!(
+                    "Expected error but response was {}",
+                    response.status_code()
+                ))),
+                Err(e) => {
+                    let expected = expected_error_message();
+                    let actual = e.to_string();
+                    assert!(
+                        actual.contains(&expected),
+                        "Expected error message to contain '{}' but was '{}'",
+                        expected,
+                        actual
+                    );
+                    Ok(())
+                }
+            }
         }
     }
 }
@@ -128,21 +146,32 @@ async fn certificate_certificate_validation() -> Result<(), failure::Error> {
         client::create_default_builder().cert_validation(CertificateValidation::Certificate(cert));
     let client = client::create(builder);
     let result = client.ping().send().await;
-    match result {
-        Ok(response) => Err(failure::err_msg(format!(
-            "Expected error but response was {}",
-            response.status_code()
-        ))),
-        Err(e) => {
-            let expected = "unable to get local issuer certificate";
-            let actual = e.to_string();
-            assert!(
-                actual.contains(expected),
-                "Expected error message to contain '{}' but was '{}'",
-                expected,
-                actual
-            );
-            Ok(())
+    let os_type = os_type::current_platform();
+    match os_type.os_type {
+        OSType::OSX => {
+            match result {
+                Ok(_) => Ok(()),
+                Err(e) => Err(failure::err_msg(e.to_string())),
+            }
+        },
+        _ => {
+            match result {
+                Ok(response) => Err(failure::err_msg(format!(
+                    "Expected error but response was {}",
+                    response.status_code()
+                ))),
+                Err(e) => {
+                    let expected = expected_error_message();
+                    let actual = e.to_string();
+                    assert!(
+                        actual.contains(&expected),
+                        "Expected error message to contain '{}' but was '{}'",
+                        expected,
+                        actual
+                    );
+                    Ok(())
+                }
+            }
         }
     }
 }