RavenDB-21271 Kafka ETL: The usage of plain certificate in Kafka conn…

…ection string options results in connection error
ml054 · Nov 6, 2023 · 2bf5602 · 2bf5602
1 parent 33e27d0
commit 2bf5602
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Raven.Studio/typescript/models/database/settings/connectionStringKafkaEtlModel.ts b/src/Raven.Studio/typescript/models/database/settings/connectionStringKafkaEtlModel.ts
@@ -7,9 +7,14 @@ import accessManager = require("common/shell/accessManager");
 import jsonUtil = require("common/jsonUtil");
 
 class connectionOptionModel {
+
+    static multiLineKeys: string[] = ["ssl.keystore.key", "ssl.keystore.certificate.chain", "ssl.truststore.certificates", "ssl.key.pem", "ssl.certificate.pem", "ssl.ca.pem"]; 
+
     key = ko.observable<string>();
     value = ko.observable<string>();
 
+    multiLine: KnockoutComputed<boolean>;
+
     isValidKeyValue = ko.observable<boolean>();
 
     validationGroup: KnockoutObservable<any>;
@@ -25,6 +30,8 @@ class connectionOptionModel {
             this.key,
             this.value,
         ], false, jsonUtil.newLineNormalizingHashFunction);
+
+        this.multiLine = ko.pureComputed(() => connectionOptionModel.multiLineKeys.includes(this.key()));
     }
 
     private initValidation() {

diff --git a/src/Raven.Studio/wwwroot/App/views/database/settings/connectionStringKafka.html b/src/Raven.Studio/wwwroot/App/views/database/settings/connectionStringKafka.html
@@ -27,7 +27,9 @@
         <div data-bind="foreach: connectionOptions">
             <div class="flex-horizontal margin-bottom-xs">
                 <input class="form-control margin-right-sm" placeholder="Option key" data-bind="textInput: key" />
-                <input class="form-control margin-right-sm" placeholder="Option value" data-bind="textInput: value" />
+                <input class="form-control margin-right-sm" placeholder="Option value" data-bind="textInput: value, visible: !multiLine()" />
+                <textarea class="form-control margin-right-sm" placeholder="Option value" data-bind="textInput: value, visible: multiLine">
+                </textarea>
                 <a title="Remove this connection option" href="#" class="btn" data-bind="click: $parent.removeConnectionOption.bind($parent, $data)">
                     <i class="icon-trash"></i>
                 </a>