Added new method to get keyfile

Author: Ilanji Rajamanickam

build.gradle

@@ -17,7 +17,7 @@ project.ext {
     avroVersion = '1.8.1'
     debeziumVersion = '0.6.1'
     googleCloudVersion = '1.79.0'
-    googleAuthVersion = '0.10.0'
+    googleAuthVersion = '0.9.0'
     googleCloudGsonVersion = '2.8.5'
     ioConfluentVersion = '5.3.1'
     junitVersion = '4.12'

kcbq-connector/src/main/java/com/wepay/kafka/connect/bigquery/BigQuerySinkConnector.java

@@ -91,7 +91,7 @@ private BigQuery getBigQuery() {
       return testBigQuery;
     }
     String projectName = config.getString(config.PROJECT_CONFIG);
-    String key = config.getString(config.KEYFILE_CONFIG);
+    String key = config.getKeyFile();
     String keySource = config.getString(config.KEY_SOURCE_CONFIG);
     return new BigQueryHelper().setKeySource(keySource).connect(projectName, key);
   }

kcbq-connector/src/main/java/com/wepay/kafka/connect/bigquery/BigQuerySinkTask.java

@@ -262,7 +262,7 @@ private BigQuery getBigQuery() {
       return testBigQuery;
     }
     String projectName = config.getString(config.PROJECT_CONFIG);
-    String keyFile = config.getString(config.KEYFILE_CONFIG);
+    String keyFile = config.getKeyFile();
     String keySource = config.getString(config.KEY_SOURCE_CONFIG);
     return new BigQueryHelper().setKeySource(keySource).connect(projectName, keyFile);
   }
@@ -299,7 +299,7 @@ private Storage getGcs() {
       return testGcs;
     }
     String projectName = config.getString(config.PROJECT_CONFIG);
-    String key = config.getString(config.KEYFILE_CONFIG);
+    String key = config.getKeyFile();
     String keySource = config.getString(config.KEY_SOURCE_CONFIG);
     return new GCSBuilder(projectName).setKey(key).setKeySource(keySource).build();
 

kcbq-connector/src/main/java/com/wepay/kafka/connect/bigquery/config/BigQuerySinkConfig.java

@@ -406,6 +406,13 @@ protected static Map.Entry<String, String> parseMapping(String mapping, String n
     }
   }
 
+  /**
+   * Returns the keyfile
+   */
+  public String getKeyFile() {
+    return getPassword(KEYFILE_CONFIG).value();
+  }
+
   /**
    * Parses a config map, which must be provided as a list of Strings of the form
    * '&lt;key&gt;=&lt;value&gt;' into a Map. Locates that list, splits its key and value pairs, and

kcbq-connector/src/test/java/com/wepay/kafka/connect/bigquery/SinkPropertiesFactory.java

@@ -63,7 +63,7 @@ public void testProperties(BigQuerySinkConfig config) {
     config.getList(config.TOPICS_TO_TABLES_CONFIG);
     config.getList(config.DATASETS_CONFIG);
 
-    config.getPassword(config.KEYFILE_CONFIG);
+    config.getKeyFile();
     config.getString(config.PROJECT_CONFIG);
 
     config.getBoolean(config.SANITIZE_TOPICS_CONFIG);