Fixing no_ssl_lib_init and removing keyspace

Author: Michael Fero

cpp-driver/gtests/src/unit/tests/test_cloud_secure_connect_config.cpp

@@ -130,8 +130,6 @@ class CloudSecureConnectionConfigTest : public HttpTest {
     writer.String(host.c_str());
     writer.Key("port");
     writer.Int(port);
-    writer.Key("keyspace");
-    writer.String("database_as_a_service");
     writer.EndObject();
   }
 
@@ -175,7 +173,6 @@ TEST_F(CloudSecureConnectionConfigTest, CredsV1) {
   EXPECT_EQ("Constellation", cloud_config.password());
   EXPECT_EQ("cloud.datastax.com", cloud_config.host());
   EXPECT_EQ(1443, cloud_config.port());
-  EXPECT_EQ("database_as_a_service", cloud_config.keyspace());
   EXPECT_EQ(ca_cert(), cloud_config.ca_cert());
   EXPECT_EQ(cert(), cloud_config.cert());
   EXPECT_EQ(key(), cloud_config.key());
@@ -195,8 +192,6 @@ TEST_F(CloudSecureConnectionConfigTest, CredsV1WithoutCreds) {
   writer.String("bigdata.datastax.com");
   writer.Key("port");
   writer.Int(2443);
-  writer.Key("keyspace");
-  writer.String("datastax");
   writer.EndObject();
   create_zip_file(buffer.GetString());
 
@@ -205,7 +200,6 @@ TEST_F(CloudSecureConnectionConfigTest, CredsV1WithoutCreds) {
   EXPECT_EQ("", cloud_config.password());
   EXPECT_EQ("bigdata.datastax.com", cloud_config.host());
   EXPECT_EQ(2443, cloud_config.port());
-  EXPECT_EQ("datastax", cloud_config.keyspace());
   EXPECT_EQ(ca_cert(), cloud_config.ca_cert());
   EXPECT_EQ(cert(), cloud_config.cert());
   EXPECT_EQ(key(), cloud_config.key());
@@ -227,8 +221,6 @@ TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1ConfigMissingHost) {
   writer.String("Constellation");
   writer.Key("port");
   writer.Int(1443);
-  writer.Key("keyspace");
-  writer.String("database_as_a_service");
   writer.EndObject();
   create_zip_file(buffer.GetString());
 
@@ -247,28 +239,6 @@ TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1ConfigMissingPort) {
   writer.String("Constellation");
   writer.Key("host");
   writer.String("cloud.datastax.com");
-  writer.Key("keyspace");
-  writer.String("database_as_a_service");
-  writer.EndObject();
-  create_zip_file(buffer.GetString());
-
-  EXPECT_FALSE(config.load(creds_zip_file()));
-}
-
-TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1ConfigMissingKeyspace) {
-  CloudSecureConnectionConfig config;
-
-  StringBuffer buffer;
-  Writer<StringBuffer> writer(buffer);
-  writer.StartObject();
-  writer.Key("username");
-  writer.String("DataStax");
-  writer.Key("password");
-  writer.String("Constellation");
-  writer.Key("host");
-  writer.String("cloud.datastax.com");
-  writer.Key("port");
-  writer.Int(1443);
   writer.EndObject();
   create_zip_file(buffer.GetString());
 

cpp-driver/src/cloud_secure_connection_config.cpp

@@ -266,13 +266,8 @@ bool CloudSecureConnectionConfig::load(const String& filename, Config* config /*
     LOG_ERROR(CLOUD_ERROR "Missing port");
     return false;
   }
-  if (!document.HasMember("keyspace") || !document["keyspace"].IsString()) {
-    LOG_ERROR(CLOUD_ERROR "Missing keyspace");
-    return false;
-  }
   host_ = document["host"].GetString();
   port_ = document["port"].GetInt();
-  keyspace_ = document["keyspace"].GetString();
 
   if (!zip_file.read_contents(CERTIFICATE_AUTHORITY_FILE, &ca_cert_)) {
     LOG_ERROR(CLOUD_ERROR "Missing certificate authority file %s", CERTIFICATE_AUTHORITY_FILE);

cpp-driver/src/cloud_secure_connection_config.hpp

@@ -34,7 +34,6 @@ class CloudSecureConnectionConfig {
   const String& password() const { return password_; }
   const String& host() const { return host_; }
   int port() const { return port_; }
-  const String& keyspace() const { return keyspace_; }
 
   const String& ca_cert() const { return ca_cert_; }
   const String& cert() const { return cert_; }
@@ -46,7 +45,6 @@ class CloudSecureConnectionConfig {
   String password_;
   String host_;
   int port_;
-  String keyspace_;
   String ca_cert_;
   String cert_;
   String key_;

cpp-driver/src/cluster_config.cpp

@@ -492,7 +492,8 @@ CassError cass_cluster_set_cloud_secure_connection_bundle_n(CassCluster* cluster
 
 CassError cass_cluster_set_cloud_secure_connection_bundle_no_ssl_lib_init(CassCluster* cluster,
                                                                           const char* path) {
-  return cass_cluster_set_cloud_secure_connection_bundle_n(cluster, path, SAFE_STRLEN(path));
+  return cass_cluster_set_cloud_secure_connection_bundle_no_ssl_lib_init_n(cluster, path,
+                                                                           SAFE_STRLEN(path));
 }
 
 CassError cass_cluster_set_cloud_secure_connection_bundle_no_ssl_lib_init_n(CassCluster* cluster,