Merge pull request #18 from michaelraney/master

Update default behavior for configuration

Author: dchenbec

pom.xml

@@ -228,7 +228,10 @@
  <!-- Generally, consumers of the shaded JAR
  will already have the driver if they want
  the plugin -->
- <excludes>com.datastax.oss</excludes>
+ <excludes>
+ <exclude>com.datastax.oss</exclude>
+ <exclude>com.fasterxml.jackson.core</exclude>
+ </excludes>
  </artifactSet>
  </configuration>
  <executions>

src/main/java/software/aws/mcs/auth/SigV4AuthProvider.java

@@ -130,7 +130,7 @@ public String getPath() {
  * Unused for this plugin.
  */
  public SigV4AuthProvider(DriverContext driverContext) {
- this(driverContext.getConfig().getDefaultProfile().getString(REGION_OPTION));
+ this(driverContext.getConfig().getDefaultProfile().getString(REGION_OPTION, null));
  }
 
  /**

src/test/java/software/aws/mcs/auth/TestSigV4.java

@@ -55,11 +55,11 @@ public static void main(String[] args) throws Exception {
  // This class is thread-safe, you should create a single instance (per target Cassandra cluster), and share
  // it throughout your application.
  try (CqlSession session = CqlSession.builder()
- .addContactPoints(contactPoints)
- .withAuthProvider(new SigV4AuthProvider())
- .withSslContext(SSLContext.getDefault())
- .withLocalDatacenter("us-west-2")
- .build()) {
+  .addContactPoints(contactPoints)
+  .withAuthProvider(new SigV4AuthProvider())
+  .withSslContext(SSLContext.getDefault())
+  .withLocalDatacenter("us-west-2")
+  .build()) {
 
  // We use execute to send a query to Cassandra. This returns a ResultSet, which is essentially a collection
  // of Row objects.
@@ -72,4 +72,4 @@ public static void main(String[] args) throws Exception {
  System.out.printf("Cassandra version is: %s%n", releaseVersion);
  }
  }
-}
+}

src/test/java/software/aws/mcs/auth/TestSigV4Config.java

@@ -0,0 +1,82 @@
+package software.aws.mcs.auth;
+
+/*-
+ * #%L
+ * AWS SigV4 Auth Java Driver 4.x Plugin
+ * %%
+ * Copyright (C) 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.util.ArrayList;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+
+public class TestSigV4Config {
+ static String[] DEFAULT_CONTACT_POINTS = {"127.0.0.1:9042"};
+
+ public static void main(String[] args) throws Exception {
+ String[] contactPointsRaw = DEFAULT_CONTACT_POINTS;
+
+ if (args.length == 1) {
+ contactPointsRaw = args[0].split(",");
+ } else if (args.length > 1) {
+ System.out.println("Usage: TestSigV4 [<contact points, comma separated, 'IP:port' format>]");
+ System.exit(-1);
+ }
+
+ ArrayList<InetSocketAddress> contactPoints = new ArrayList<>(contactPointsRaw.length);
+
+ for (int i = 0; i < contactPointsRaw.length; i++) {
+ String[] parts = contactPointsRaw[i].split(":");
+ contactPoints.add(InetSocketAddress.createUnresolved(parts[0], Integer.parseInt(parts[1])));
+ }
+
+ System.out.println("Using endpoints: " + contactPoints);
+
+ //By default the reference.conf is loaded by the driver which contains all defaults.
+ //You can override this by providing reference.conf on the classpath
+ //to isolate test you can load conf with a custom name
+ URL url = TestSigV4Config.class.getClassLoader().getResource("keyspaces-reference.conf");
+
+ File file = new File(url.toURI());
+ // The CqlSession object is the main entry point of the driver.
+ // It holds the known state of the actual Cassandra cluster (notably the Metadata).
+ // This class is thread-safe, you should create a single instance (per target Cassandra cluster), and share
+ // it throughout your application.
+ try (CqlSession session = CqlSession.builder()
+ .withConfigLoader(DriverConfigLoader.fromFile(file))
+ .addContactPoints(contactPoints)
+ .withLocalDatacenter("us-west-2")
+ .build()) {
+
+ // We use execute to send a query to Cassandra. This returns a ResultSet, which is essentially a collection
+ // of Row objects.
+ ResultSet rs = session.execute("select release_version from system.local");
+ // Extract the first row (which is the only one in this case).
+ Row row = rs.one();
+
+ // Extract the value of the first (and only) column from the row.
+ String releaseVersion = row.getString("release_version");
+ System.out.printf("Cassandra version is: %s%n", releaseVersion);
+ }
+ }
+}

src/test/resources/keyspaces-reference.conf

@@ -0,0 +1,13 @@
+datastax-java-driver {
+ advanced {
+ reconnect-on-init=true
+
+ auth-provider {
+ class = software.aws.mcs.auth.SigV4AuthProvider
+ }
+ ssl-engine-factory {
+ class = DefaultSslEngineFactory
+ hostname-validation = false
+ }
+ }
+}