From 5bbc17be5caba7b7b71728f364e29c222ecebdaa Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Fri, 1 Nov 2019 16:25:44 -0700 Subject: [PATCH] Fix ssl config issue (#8187) * Fix ssl config issue (cherry picked from commit cacd481bff25c890e4130aee392569bae43b7e60) * Better fix * Actually return... --- extensions/big-data-cluster/src/bigDataCluster/utils.ts | 2 +- extensions/mssql/src/util/auth.ts | 2 +- extensions/notebook/src/common/utils.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/big-data-cluster/src/bigDataCluster/utils.ts b/extensions/big-data-cluster/src/bigDataCluster/utils.ts index c7df2e5ad9..7456df17a0 100644 --- a/extensions/big-data-cluster/src/bigDataCluster/utils.ts +++ b/extensions/big-data-cluster/src/bigDataCluster/utils.ts @@ -281,7 +281,7 @@ export const ignoreSslConfigName = 'ignoreSslVerification'; export function getIgnoreSslVerificationConfigSetting(): boolean { try { const config = vscode.workspace.getConfiguration(bdcConfigSectionName); - return config.get(ignoreSslConfigName) || true; + return config.get(ignoreSslConfigName, true); } catch (error) { console.error(`Unexpected error retrieving ${bdcConfigSectionName}.${ignoreSslConfigName} setting : ${error}`); } diff --git a/extensions/mssql/src/util/auth.ts b/extensions/mssql/src/util/auth.ts index e1d495331c..42c7266ea4 100644 --- a/extensions/mssql/src/util/auth.ts +++ b/extensions/mssql/src/util/auth.ts @@ -28,7 +28,7 @@ const ignoreSslConfigName = 'ignoreSslVerification'; export function getIgnoreSslVerificationConfigSetting(): boolean { try { const config = vscode.workspace.getConfiguration(bdcConfigSectionName); - return config.get(ignoreSslConfigName) || true; + return config.get(ignoreSslConfigName, true); } catch (error) { console.error(`Unexpected error retrieving ${bdcConfigSectionName}.${ignoreSslConfigName} setting : ${error}`); } diff --git a/extensions/notebook/src/common/utils.ts b/extensions/notebook/src/common/utils.ts index 1f34cfc46b..8e2c957556 100644 --- a/extensions/notebook/src/common/utils.ts +++ b/extensions/notebook/src/common/utils.ts @@ -256,7 +256,7 @@ const ignoreSslConfigName = 'ignoreSslVerification'; export function getIgnoreSslVerificationConfigSetting(): boolean { try { const config = vscode.workspace.getConfiguration(bdcConfigSectionName); - return config.get(ignoreSslConfigName) || true; + return config.get(ignoreSslConfigName, true); } catch (error) { console.error(`Unexpected error retrieving ${bdcConfigSectionName}.${ignoreSslConfigName} setting : ${error}`); }