Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Certificate Validation option #449

Merged
merged 36 commits into from
Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
040552f
Added Tableau Connector to OpenSearch SQL
Nov 17, 2021
c8ddfb9
Merge pull request #1 from Bit-Quill/migrate-jdbc-tableau-connector
Nov 18, 2021
952ff01
Added CEILING and FLOOR functions
Nov 18, 2021
dd357bc
Merge pull request #2 from Bit-Quill/dialect-ceilfloor-AOS220
Nov 18, 2021
580e1af
Added IFNULL function
Nov 18, 2021
a4d2c0c
Added Kyle's fix for ADDDATE and SUBDATE with resulting 00:00:00 bein…
Nov 18, 2021
10aba05
Added MIN and MAX for two string arguments
Nov 18, 2021
5a90ca7
Merge pull request #3 from Bit-Quill/timestamp-issue
Nov 18, 2021
fa32866
Fixed return type for MID function redefenitions, part of AOS-202
Yury-Fridlyand Nov 19, 2021
b852f9d
Added CAST functions to convert to int or string as part of AOS-202
Yury-Fridlyand Nov 19, 2021
65437b2
Added HEXBINX and HEXBINY functions from the templace without any mod…
Yury-Fridlyand Nov 20, 2021
2e50a43
Fixed cast to use the OSSQL type
Yury-Fridlyand Nov 20, 2021
177d132
Added parenthesis to avoid opensearch-project/sql/issues/293
Yury-Fridlyand Nov 20, 2021
2355abf
Merge pull request #6 from Bit-Quill/dialect-strings-AOS-202-CAST
Yury-Fridlyand Nov 20, 2021
0df001a
Pulled from main from OpenSearch
Nov 22, 2021
8596513
Merge branch 'main' of github.com:Bit-Quill/opensearch-project-sql in…
Nov 22, 2021
f212e35
Modified Timestamp conversion formula
Nov 22, 2021
2df3f26
Merge pull request #8 from Bit-Quill/dialect-expr-logical-AOS205
Nov 23, 2021
7aaf59d
Merge pull request #5 from Bit-Quill/dialect-fix-MID-return-type-AOS-202
Yury-Fridlyand Nov 23, 2021
8d8fa1a
Merge pull request #7 from Bit-Quill/dialect-math.hexbin-AOS-195
Yury-Fridlyand Nov 23, 2021
385a41b
Added comment to TimestampType
Nov 23, 2021
26dbb7e
Updated Company Name accroding to the customer's request
Yury-Fridlyand Nov 23, 2021
3a5271e
Merge pull request #9 from Bit-Quill/update-vendor-AOS-231
Yury-Fridlyand Nov 24, 2021
4c63b64
Updated Vendor Name as well
Yury-Fridlyand Nov 24, 2021
edd2159
Merge pull request #10 from Bit-Quill/update-vendor-AOS-231-part-2
Yury-Fridlyand Nov 25, 2021
07cc2f1
Merge branch 'main' of github.com:opensearch-project/sql into main
Dec 14, 2021
534ddc9
Added TDVT test result and a readme file
Yury-Fridlyand Dec 25, 2021
f88c33b
Merge pull request #25 from Bit-Quill/upload-tdvt-results-AOS-260
Yury-Fridlyand Dec 28, 2021
b10646c
Merge pull request #26 from opensearch-project/main
Yury-Fridlyand Jan 5, 2022
076d068
Merge branch 'opensearch-project:main' into main
Yury-Fridlyand Feb 23, 2022
8b58136
Merge branch 'main' of github.com:opensearch-project/sql into main
Feb 25, 2022
16227d6
Added option for Hostname Verification for PBI connector
Feb 25, 2022
8543f9c
Changed Beta to false and updated screenshots on the readme files
Feb 25, 2022
3d9ffba
Bump connector version and add CHANGELOG
Feb 28, 2022
e12d2a9
Improved changelog message for 1.0.1 PBI connector
Feb 28, 2022
72dbb48
Updated PBIDS Handler for the connector
Yury-Fridlyand Feb 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions bi-connectors/PowerBIConnector/OpenSearchProject.pq
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file contains Data Connector logic
[Version = "1.0.0"]
[Version = "1.0.1"]
section OpenSearchProject;

// When set to true, additional trace information will be written out to the User log.
Expand Down Expand Up @@ -27,13 +27,18 @@ OpenSearchProjectType = type function (
Documentation.FieldCaption = "Use SSL",
Documentation.FieldDescription = "Use SSL",
Documentation.AllowedValues = { true, false }
]),
HostnameVerification as (type logical meta [
Documentation.FieldCaption = "Certificate validation",
Documentation.FieldDescription = "Certificate validation",
Documentation.AllowedValues = { true, false }
])
)
as table meta [
Documentation.Name = "OpenSearch Project"
];

OpenSearchProjectImpl = (Server as text, Port as number, UseSSL as logical) as table =>
OpenSearchProjectImpl = (Server as text, Port as number, UseSSL as logical, HostnameVerification as logical) as table =>
let
Credential = Extension.CurrentCredential(),
AuthenticationMode = Credential[AuthenticationKind],
Expand Down Expand Up @@ -76,7 +81,8 @@ OpenSearchProjectImpl = (Server as text, Port as number, UseSSL as logical) as t

ConnectionString = [
Driver = "OpenSearch SQL ODBC Driver",
Host = FinalServerString
Host = FinalServerString,
HostnameVerification = if HostnameVerification then 1 else 0
],

SQLGetInfo = Diagnostics.LogValue("SQLGetInfo_Options", [
Expand Down Expand Up @@ -185,9 +191,10 @@ OpenSearchProject = [
json = Json.Document(dataSourcePath),
Server = json[Server],
Port = json[Port],
UseSSL = json[UseSSL]
UseSSL = json[UseSSL],
HostnameVerification = json[HostnameVerification]
in
{ "OpenSearchProject.Contents", Server, Port, UseSSL },
{ "OpenSearchProject.Contents", Server, Port, UseSSL, HostnameVerification },

// Authentication modes
Authentication = [
Expand All @@ -206,10 +213,10 @@ OpenSearchProject = [
// PBIDS Handler
DSRHandlers = [
opensearchproject = [
GetDSR = (server, schema, object, optional options) => [ protocol = "opensearchproject-odbc", address = [ server = server, port = schema, useSSL = object ] ],
GetDSR = (Server, Port, UseSSL, HostnameVerification, optional Options) => [ protocol = "opensearchproject-odbc", address = [ server = Server, port = Port, useSSL = UseSSL, hostnameVerification = HostnameVerification ] ],
GetFormula = (dsr, optional options) => () =>
let
db = OpenSearchProject.Contents(dsr[address][server], dsr[address][port], dsr[address][useSSL])
db = OpenSearchProject.Contents(dsr[address][server], dsr[address][port], dsr[address][useSSL], dsr[address][hostnameVerification])
in
db,
GetFriendlyName = (dsr) => "OpenSearch Project"
Expand All @@ -224,7 +231,7 @@ OpenSearchProject = [

// Data Source UI publishing description
OpenSearchProject.Publish = [
Beta = true,
Beta = false,
Category = "Other",
ButtonText = { Extension.LoadString("ButtonTitle"), Extension.LoadString("ButtonHelp") },
LearnMoreUrl = "https://github.com/opensearch-project/sql/blob/main/bi-connectors/PowerBIConnector/docs/OpenSearchProject.md",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@

3. You will get a warning for using a third-party service. Click on **Continue**.

<img src="img/pbi_third_party_warning.png" width="500">
<img src="img/pbi_third_party_warning_amz.png" width="500">

4. Enter host and port values and select your preferred SSL option. Click on **OK**.
4. Enter host and port values and select your preferred SSL and Certificate validation options. Click on **OK**.

<img src="img/pbi_connection_string_options.png" width="500">
<img src="img/pbi_connection_string_options_amz.png" width="500">

5. Select authentication option. Enter credentials if required and click on **Connect**.

<img src="img/pbi_auth.png" width="500">
<img src="img/pbi_auth_amz.png" width="500">

6. Select required table. Data preview will be loaded.

Expand Down
11 changes: 11 additions & 0 deletions bi-connectors/PowerBIConnector/docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changelog
All notable changes to the connector will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.1] 2022-02-28
### Added
- Allow users to enable or disable validation for SSL certificate validation.
### Changed
- Changed beta to false
2 changes: 1 addition & 1 deletion bi-connectors/PowerBIConnector/docs/OpenSearchProject.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<img src="img/pbi_third_party_warning.png" width="500">

4. Enter host and port values and select your preferred SSL option. Click on **OK**.
4. Enter host and port values and select your preferred SSL and Certificate validation options. Click on **OK**.

<img src="img/pbi_connection_string_options.png" width="500">

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.