Merge update for branch

Merge update for branch

Author: michaelraney

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

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

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

@@ -20,11 +20,6 @@
  * #L%
  */
 
-import com.amazonaws.SDKGlobalConfiguration;
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.cql.*;
-
-import software.aws.mcs.auth.SigV4AuthProvider;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import javax.net.ssl.SSLContext;
@@ -55,28 +50,16 @@ public static void main(String[] args) throws Exception {
 
  System.out.println("Using endpoints: " + contactPoints);
 
- String region = null;
- if (System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY) != null) {
- region = System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY);
- } else {
- region = System.getenv(SDKGlobalConfiguration.AWS_REGION_ENV_VAR);
- }
- if (region == null) {
- throw new IllegalStateException(
- "When specifying contact points you must specify a localdc. In this sample we use the AWS_REGION env variable, or aws.region system property value as localdc"
- );
- }
-
  // 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()
- .addContactPoints(contactPoints)
- .withAuthProvider(new SigV4AuthProvider())
- .withSslContext(SSLContext.getDefault())
- .withLocalDatacenter(region)
- .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.
@@ -89,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

@@ -4,7 +4,7 @@
  * #%L
  * AWS SigV4 Auth Java Driver 4.x Plugin
  * %%
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,20 +20,16 @@
  * #L%
  */
 
-import com.amazonaws.SDKGlobalConfiguration;
-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;
-
-import javax.net.ssl.SSLContext;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 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"};
 
@@ -56,18 +52,6 @@ public static void main(String[] args) throws Exception {
 
  System.out.println("Using endpoints: " + contactPoints);
 
- String region = null;
- if (System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY) != null) {
- region = System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY);
- } else {
- region = System.getenv(SDKGlobalConfiguration.AWS_REGION_ENV_VAR);
- }
- if (region == null) {
- throw new IllegalStateException(
- "When specifying contact points you must specify a localdc. In this sample we use the AWS_REGION env variable, or aws.region system property value as localdc"
- );
- }
-
  //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
@@ -81,7 +65,7 @@ public static void main(String[] args) throws Exception {
  try (CqlSession session = CqlSession.builder()
  .withConfigLoader(DriverConfigLoader.fromFile(file))
  .addContactPoints(contactPoints)
- .withLocalDatacenter(region)
+ .withLocalDatacenter("us-west-2")
  .build()) {
 
  // We use execute to send a query to Cassandra. This returns a ResultSet, which is essentially a collection