external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssl_by_default: remove stray PG10 check

pull/3101/head
Philip Dubé 2019-10-22 18:28:37 +00:00 committed by Philip Dubé
parent 2204a17dbd
commit 2a969fe4bb
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/regress/expected/ssl_by_default.out
View File

@ -3,22 +3,11 @@
-- To test this we will verify that SSL is set to ON for all machines, and we will make -- To test this we will verify that SSL is set to ON for all machines, and we will make
-- sure connections to workers use SSL by having it required in citus.conn_nodeinfo and -- sure connections to workers use SSL by having it required in citus.conn_nodeinfo and
-- lastly we will inspect the ssl state for connections to the workers -- lastly we will inspect the ssl state for connections to the workers
-- ssl can only be enabled by default on installations of postgres 10 and above that are -- ssl can only be enabled by default on installations that are OpenSSL-enabled.
-- OpenSSL-enabled.
SHOW server_version \gset
SHOW ssl_ciphers \gset SHOW ssl_ciphers \gset
WITH features AS ( SELECT :'ssl_ciphers' != 'none' AS hasssl;
SELECT hasssl
substring(:'server_version', '\d+')::int >= 10 AS version_ten_or_above, --------
:'ssl_ciphers' != 'none' AS hasssl
)
SELECT (
true
AND version_ten_or_above
AND hasssl
) AS ssl_by_default_supported FROM features;
ssl_by_default_supported
--------------------------
t t
(1 row) (1 row)

15
src/test/regress/sql/ssl_by_default.sql
View File

@ -5,20 +5,9 @@
-- sure connections to workers use SSL by having it required in citus.conn_nodeinfo and -- sure connections to workers use SSL by having it required in citus.conn_nodeinfo and
-- lastly we will inspect the ssl state for connections to the workers -- lastly we will inspect the ssl state for connections to the workers
-- ssl can only be enabled by default on installations of postgres 10 and above that are -- ssl can only be enabled by default on installations that are OpenSSL-enabled.
-- OpenSSL-enabled.
SHOW server_version \gset
SHOW ssl_ciphers \gset SHOW ssl_ciphers \gset
WITH features AS ( SELECT :'ssl_ciphers' != 'none' AS hasssl;
SELECT
substring(:'server_version', '\d+')::int >= 10 AS version_ten_or_above,
:'ssl_ciphers' != 'none' AS hasssl
)
SELECT (
true
AND version_ten_or_above
AND hasssl
) AS ssl_by_default_supported FROM features;
SHOW ssl; SHOW ssl;
SELECT run_command_on_workers($$ SELECT run_command_on_workers($$