From 7692a49d50d6e9486242995a36f0b485301f0514 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 17 Feb 2020 17:11:13 +0100 Subject: Rename variable to 'VESPA_TLS_HOSTNAME_VALIDATION_DISABLED' --- .../java/com/yahoo/vespa/security/tool/securityenv/OutputVariable.java | 2 +- security-tools/src/main/sh/vespa-curl-wrapper | 2 +- security-tools/src/test/resources/bash-output.txt | 2 +- security-tools/src/test/resources/csh-output.txt | 2 +- security-tools/src/test/resources/expected-help-output.txt | 2 +- security-tools/src/test/resources/no-security-output.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/OutputVariable.java b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/OutputVariable.java index ad694751ad2..9a90a145f30 100644 --- a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/OutputVariable.java +++ b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/OutputVariable.java @@ -11,7 +11,7 @@ enum OutputVariable { CA_CERTIFICATE("VESPA_TLS_CA_CERT", "Path to CA certificates file"), CERTIFICATE("VESPA_TLS_CERT", "Path to certificate file"), PRIVATE_KEY("VESPA_TLS_PRIVATE_KEY", "Path to private key file"), - DISABLE_HOSTNAME_VALIDATION("VESPA_TLS_DISABLE_HOSTNAME_VALIDATION", "Set to '1' if TLS hostname validation is disabled"); + DISABLE_HOSTNAME_VALIDATION("VESPA_TLS_HOSTNAME_VALIDATION_DISABLED", "Set to '1' if TLS hostname validation is disabled"); private final String variableName; private final String description; diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper index c2e97febad2..b4fd9224a8a 100755 --- a/security-tools/src/main/sh/vespa-curl-wrapper +++ b/security-tools/src/main/sh/vespa-curl-wrapper @@ -88,7 +88,7 @@ then CURL_PARAMETERS=("${CURL_PARAMETERS[@]/http:/https:}") fi -if [ -n "${VESPA_TLS_DISABLE_HOSTNAME_VALIDATION}" ] +if [ -n "${VESPA_TLS_HOSTNAME_VALIDATION_DISABLED}" ] then CURL_PARAMETERS=("--insecure" "${CURL_PARAMETERS[@]}") fi diff --git a/security-tools/src/test/resources/bash-output.txt b/security-tools/src/test/resources/bash-output.txt index a3a8b9e8e1f..182dc177d42 100644 --- a/security-tools/src/test/resources/bash-output.txt +++ b/security-tools/src/test/resources/bash-output.txt @@ -2,4 +2,4 @@ VESPA_TLS_ENABLED="1"; export VESPA_TLS_ENABLED; VESPA_TLS_CA_CERT="/path/to/cacerts"; export VESPA_TLS_CA_CERT; VESPA_TLS_CERT="/path/to/certificate"; export VESPA_TLS_CERT; VESPA_TLS_PRIVATE_KEY="/path/to/key"; export VESPA_TLS_PRIVATE_KEY; -VESPA_TLS_DISABLE_HOSTNAME_VALIDATION="1"; export VESPA_TLS_DISABLE_HOSTNAME_VALIDATION; +VESPA_TLS_HOSTNAME_VALIDATION_DISABLED="1"; export VESPA_TLS_HOSTNAME_VALIDATION_DISABLED; diff --git a/security-tools/src/test/resources/csh-output.txt b/security-tools/src/test/resources/csh-output.txt index 13027a64d71..2e6cd886c26 100644 --- a/security-tools/src/test/resources/csh-output.txt +++ b/security-tools/src/test/resources/csh-output.txt @@ -2,4 +2,4 @@ setenv VESPA_TLS_ENABLED "1"; setenv VESPA_TLS_CA_CERT "/path/to/cacerts"; setenv VESPA_TLS_CERT "/path/to/certificate"; setenv VESPA_TLS_PRIVATE_KEY "/path/to/key"; -setenv VESPA_TLS_DISABLE_HOSTNAME_VALIDATION "1"; +setenv VESPA_TLS_HOSTNAME_VALIDATION_DISABLED "1"; diff --git a/security-tools/src/test/resources/expected-help-output.txt b/security-tools/src/test/resources/expected-help-output.txt index fb0dfb1f2c8..33ad3b6d232 100644 --- a/security-tools/src/test/resources/expected-help-output.txt +++ b/security-tools/src/test/resources/expected-help-output.txt @@ -9,5 +9,5 @@ The output may include the following variables: - 'VESPA_TLS_CA_CERT': Path to CA certificates file - 'VESPA_TLS_CERT': Path to certificate file - 'VESPA_TLS_PRIVATE_KEY': Path to private key file - - 'VESPA_TLS_DISABLE_HOSTNAME_VALIDATION': Set to '1' if TLS hostname + - 'VESPA_TLS_HOSTNAME_VALIDATION_DISABLED': Set to '1' if TLS hostname validation is disabled diff --git a/security-tools/src/test/resources/no-security-output.txt b/security-tools/src/test/resources/no-security-output.txt index eaa9831caf8..257a2747ee2 100644 --- a/security-tools/src/test/resources/no-security-output.txt +++ b/security-tools/src/test/resources/no-security-output.txt @@ -2,4 +2,4 @@ unset VESPA_TLS_ENABLED; unset VESPA_TLS_CA_CERT; unset VESPA_TLS_CERT; unset VESPA_TLS_PRIVATE_KEY; -unset VESPA_TLS_DISABLE_HOSTNAME_VALIDATION; +unset VESPA_TLS_HOSTNAME_VALIDATION_DISABLED; -- cgit v1.2.3