From d6a17264b1f78680bf263f6dedbde07e3b761c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Przytu=C5=82a?= <wojciech.przytula@scylladb.com>
Date: Fri, 25 Nov 2022 12:32:41 +0100
Subject: [PATCH] Fixed yaml model (insecureSkipTlsVerify)

Field insecureSkipTlsVerify was incorrectly put in AuthInfo instead of
Datacenter.
---
 .../main/java/com/datastax/driver/core/Cluster.java    |  2 +-
 .../com/datastax/driver/core/ScyllaCloudAuthInfo.java  | 10 +---------
 .../datastax/driver/core/ScyllaCloudDatacenter.java    | 10 +++++++++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/driver-core/src/main/java/com/datastax/driver/core/Cluster.java b/driver-core/src/main/java/com/datastax/driver/core/Cluster.java
index d6c5489f0f7..1bb68ca5a34 100644
--- a/driver-core/src/main/java/com/datastax/driver/core/Cluster.java
+++ b/driver-core/src/main/java/com/datastax/driver/core/Cluster.java
@@ -1408,7 +1408,7 @@ protected Builder withScyllaCloudConnectionConfig(ScyllaCloudConnectionConfig co
                     new ScyllaCloudSniEndPointFactory(
                         proxyAddress, currentDatacenter.getNodeDomain()))
                 .withSSL(
-                    (config.getCurrentAuthInfo().isInsecureSkipTlsVerify()
+                    (config.getCurrentDatacenter().isInsecureSkipTlsVerify()
                         ? config.createBundle().getInsecureSSLOptions()
                         : config.createBundle().getSSLOptions()))
                 .withAuthProvider(
diff --git a/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudAuthInfo.java b/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudAuthInfo.java
index c9b1e7db66c..ddb3d794f9d 100644
--- a/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudAuthInfo.java
+++ b/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudAuthInfo.java
@@ -26,7 +26,6 @@ class ScyllaCloudAuthInfo {
   private final String clientKeyPath;
   private final String username;
   private final String password;
-  private final boolean insecureSkipTlsVerify;
 
   @JsonCreator
   public ScyllaCloudAuthInfo(
@@ -35,16 +34,13 @@ public ScyllaCloudAuthInfo(
       @JsonProperty(value = "clientKeyData") byte[] clientKeyData,
       @JsonProperty(value = "clientKeyPath") String clientKeyPath,
       @JsonProperty(value = "username") String username,
-      @JsonProperty(value = "password") String password,
-      @JsonProperty(value = "insecureSkipTlsVerify", defaultValue = "false")
-          boolean insecureSkipTlsVerify) {
+      @JsonProperty(value = "password") String password) {
     this.clientCertificateData = clientCertificateData;
     this.clientCertificatePath = clientCertificatePath;
     this.clientKeyData = clientKeyData;
     this.clientKeyPath = clientKeyPath;
     this.username = username;
     this.password = password;
-    this.insecureSkipTlsVerify = insecureSkipTlsVerify;
   }
 
   public void validate() {
@@ -96,8 +92,4 @@ public String getUsername() {
   public String getPassword() {
     return password;
   }
-
-  public boolean isInsecureSkipTlsVerify() {
-    return insecureSkipTlsVerify;
-  }
 }
diff --git a/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudDatacenter.java b/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudDatacenter.java
index f035830108c..20d76c155bc 100644
--- a/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudDatacenter.java
+++ b/driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudDatacenter.java
@@ -20,6 +20,7 @@ class ScyllaCloudDatacenter {
   private final String tlsServerName;
   private final String nodeDomain;
   private final String proxyURL;
+  private final boolean insecureSkipTlsVerify;
 
   // Full hostname has limit of 255 chars.
   // Host UUID takes 32 chars for hex digits and 4 dashes. Additional 1 is for separator dot before
@@ -33,13 +34,16 @@ public ScyllaCloudDatacenter(
       @JsonProperty(value = "server") String server,
       @JsonProperty(value = "tlsServerName") String tlsServerName,
       @JsonProperty(value = "nodeDomain") String nodeDomain,
-      @JsonProperty(value = "proxyURL") String proxyURL) {
+      @JsonProperty(value = "proxyURL") String proxyURL,
+      @JsonProperty(value = "insecureSkipTlsVerify", defaultValue = "false")
+          boolean insecureSkipTlsVerify) {
     this.certificateAuthorityPath = certificateAuthorityPath;
     this.certificateAuthorityData = certificateAuthorityData;
     this.server = server;
     this.tlsServerName = tlsServerName;
     this.nodeDomain = nodeDomain;
     this.proxyURL = proxyURL;
+    this.insecureSkipTlsVerify = insecureSkipTlsVerify;
   }
 
   public void validate() {
@@ -85,6 +89,10 @@ public String getProxyURL() {
     return proxyURL;
   }
 
+  public boolean isInsecureSkipTlsVerify() {
+    return insecureSkipTlsVerify;
+  }
+
   // Using parts relevant to hostnames as we're dealing with a part of hostname
   // RFC-1123 Section 2.1 and RFC-952 1.
   private void validateNodeDomain() {