Merge pull request #150 from mwringe/validate_hostname

Merged by openshift-bot

deployer/scripts/hawkular.sh

@@ -205,6 +205,7 @@ EOF
        route_params="${route_params} --ca-cert=${secret_dir}/hawkular-metrics-ca.cert"
      fi
   fi
+  # this may return an error code if the route already exists, this is to be expect with a refresh and is why we have the || true here
   oc create route reencrypt hawkular-metrics ${route_params} || true
  
   if [ "${use_persistent_storage}" = true ]; then

deployer/scripts/preflight.sh

@@ -27,6 +27,20 @@ function validate_master_accessible() {
   return 1
 }
 
+function validate_hostname() {
+  #The route will only accept RFC 952 based hostnames
+  if [[ $hawkular_metrics_hostname =~ ^[a-zA-Z][a-zA-Z0-9.-]?+[a-zA-Z0-9]$ ]]; then
+    echo "The HAWKULAR_METRICS_HOSTNAME value is deemed acceptable."
+    return 0  
+  else 
+    echo "The HAWKULAR_METRICS_HOSTNAME value must be a valid hostname (RFC 952)"
+    echo "The value which was specified is invalid:"
+    echo "  $hawkular_metrics_hostname"
+    echo "Hostnames must start with a letter, may only contain letters, numbers, '.' and '-'."
+    return 1
+  fi
+}
+
 function cert_should_have_names() {
   local file="$1"; shift
   local output name cn san sans found count
@@ -112,7 +126,7 @@ function validate_preflight() {
 
   local success=()
   local failure=()
-  for func in validate_master_accessible validate_deployer_secret; do
+  for func in validate_master_accessible validate_hostname validate_deployer_secret; do
     func_output="$($func 2>&1)" && \
       success+=("$func: $func_output") || \
       failure+=("$func: "$'\n'"$func_output")

hack/tests/ci_test_every_pr.sh

@@ -38,7 +38,7 @@ TEST_PERF=${TEST_PERF:-false}
 for lib in "${OS_ROOT}"/hack/{util.sh,text.sh} \
            "${OS_ROOT}"/hack/lib/*.sh "${OS_ROOT}"/hack/lib/**/*.sh
 do source "$lib"; done
-os::log::install_errexit
+os::log::stacktrace::install
 
 os::util::environment::setup_time_vars