diff --git a/bi-connectors/PowerBIConnector/OpenSearchProject.pq b/bi-connectors/PowerBIConnector/OpenSearchProject.pq index a8d45eebe4..b3f65ddc99 100644 --- a/bi-connectors/PowerBIConnector/OpenSearchProject.pq +++ b/bi-connectors/PowerBIConnector/OpenSearchProject.pq @@ -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. @@ -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], @@ -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", [ @@ -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 = [ @@ -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" @@ -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", diff --git a/bi-connectors/PowerBIConnector/docs/AmazonOpenSearchService.md b/bi-connectors/PowerBIConnector/docs/AmazonOpenSearchService.md index 9670a43e30..d6498a683c 100644 --- a/bi-connectors/PowerBIConnector/docs/AmazonOpenSearchService.md +++ b/bi-connectors/PowerBIConnector/docs/AmazonOpenSearchService.md @@ -29,15 +29,15 @@ 3. You will get a warning for using a third-party service. Click on **Continue**. - + -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**. - + 5. Select authentication option. Enter credentials if required and click on **Connect**. - + 6. Select required table. Data preview will be loaded. diff --git a/bi-connectors/PowerBIConnector/docs/CHANGELOG.md b/bi-connectors/PowerBIConnector/docs/CHANGELOG.md new file mode 100644 index 0000000000..080208c4e7 --- /dev/null +++ b/bi-connectors/PowerBIConnector/docs/CHANGELOG.md @@ -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 diff --git a/bi-connectors/PowerBIConnector/docs/OpenSearchProject.md b/bi-connectors/PowerBIConnector/docs/OpenSearchProject.md index 59a11ef883..966c55a7e4 100644 --- a/bi-connectors/PowerBIConnector/docs/OpenSearchProject.md +++ b/bi-connectors/PowerBIConnector/docs/OpenSearchProject.md @@ -31,7 +31,7 @@ -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**. diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_auth_amz.png b/bi-connectors/PowerBIConnector/docs/img/pbi_auth_amz.png new file mode 100644 index 0000000000..3c63ed27a2 Binary files /dev/null and b/bi-connectors/PowerBIConnector/docs/img/pbi_auth_amz.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options.png b/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options.png index f0ac23b726..b7bf7f3ce1 100644 Binary files a/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options.png and b/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options_amz.png b/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options_amz.png new file mode 100644 index 0000000000..aff8ddc984 Binary files /dev/null and b/bi-connectors/PowerBIConnector/docs/img/pbi_connection_string_options_amz.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_error_driver_not_installed.png b/bi-connectors/PowerBIConnector/docs/img/pbi_error_driver_not_installed.png index b5059bc0b4..76f5da35fb 100644 Binary files a/bi-connectors/PowerBIConnector/docs/img/pbi_error_driver_not_installed.png and b/bi-connectors/PowerBIConnector/docs/img/pbi_error_driver_not_installed.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector.png b/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector.png index 880cfc2e55..33188b97a3 100644 Binary files a/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector.png and b/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector_amz.png b/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector_amz.png index 997100bdfe..25677e12c7 100644 Binary files a/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector_amz.png and b/bi-connectors/PowerBIConnector/docs/img/pbi_select_connector_amz.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning.png b/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning.png index 792c110b8c..f05502ad57 100644 Binary files a/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning.png and b/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning.png differ diff --git a/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning_amz.png b/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning_amz.png new file mode 100644 index 0000000000..48a11a86f0 Binary files /dev/null and b/bi-connectors/PowerBIConnector/docs/img/pbi_third_party_warning_amz.png differ