Merge pull request #545 from cloudsufi/patch/plugin-1851

[PLUGIN-1851] Show correct DB name in error string

Author: psainics

cloudsql-mysql-plugin/src/e2e-test/resources/errorMessage.properties

@@ -12,7 +12,7 @@ errorMessageNumberOfSplits=Split-By Field Name must be specified if Number of Sp
 errorMessageBoundingQuery=Bounding Query must be specified if Number of Splits is not set to 1. Specify the Bounding Query.
 errorMessageInvalidSinkDatabase=Error encountered while configuring the stage: 'URLDecoder: Illegal hex characters in escape (%) pattern - For input string: "$^"'
 errorMessageInvalidTableName=Table 'Invalidtable' does not exist. Ensure table 'Invalidtable' is set correctly and 
-errorMessageConnectionName=Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to a public CloudSQL PostgreSQL instance.
+errorMessageConnectionName=Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to a public CloudSQL MySQL instance.
 validationSuccessMessage=No errors found.
 validationErrorMessage=COUNT ERROR found
 errorLogsMessageInvalidTableName=Spark program 'phase-1' failed with error: Errors were encountered during validation. \

cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java

@@ -55,7 +55,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
           failureCollector,
           cloudsqlMysqlActionConfig.instanceType,
-          cloudsqlMysqlActionConfig.connectionName);
+          cloudsqlMysqlActionConfig.connectionName,
+          CloudSQLUtil.CLOUDSQL_MYSQL);
     }
 
     super.configurePipeline(pipelineConfigurer);

cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java

@@ -74,7 +74,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlMysqlSinkConfig.connection.getInstanceType(),
-        cloudsqlMysqlSinkConfig.connection.getConnectionName());
+        cloudsqlMysqlSinkConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_MYSQL);
     }
 
     super.configurePipeline(pipelineConfigurer);

cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java

@@ -70,7 +70,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlMysqlSourceConfig.connection.getInstanceType(),
-        cloudsqlMysqlSourceConfig.connection.getConnectionName());
+        cloudsqlMysqlSourceConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_MYSQL);
     }
 
     super.configurePipeline(pipelineConfigurer);

cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java

@@ -55,7 +55,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
           failureCollector,
           cloudsqlPostgresqlActionConfig.instanceType,
-          cloudsqlPostgresqlActionConfig.connectionName);
+          cloudsqlPostgresqlActionConfig.connectionName,
+          CloudSQLUtil.CLOUDSQL_POSTGRESQL);
     }
 
     super.configurePipeline(pipelineConfigurer);

cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java

@@ -81,7 +81,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlPostgresqlSinkConfig.connection.getInstanceType(),
-        cloudsqlPostgresqlSinkConfig.connection.getConnectionName());
+        cloudsqlPostgresqlSinkConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_POSTGRESQL);
     }
 
     super.configurePipeline(pipelineConfigurer);

cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java

@@ -70,7 +70,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlPostgresqlSourceConfig.connection.getInstanceType(),
-        cloudsqlPostgresqlSourceConfig.connection.getConnectionName());
+        cloudsqlPostgresqlSourceConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_POSTGRESQL);
     }
 
     super.configurePipeline(pipelineConfigurer);

database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java

@@ -31,16 +31,20 @@ public class CloudSQLUtil {
   public static final String INSTANCE_TYPE = "instanceType";
   public static final String PUBLIC_INSTANCE = "public";
   public static final String PRIVATE_INSTANCE = "private";
+  public static final String CLOUDSQL_POSTGRESQL = "CloudSQL PostgreSQL";
+  public static final String CLOUDSQL_MYSQL = "CloudSQL MySQL";
+
 
   /**
    * Utility method to check the Connection Name format of a CloudSQL instance.
    *
    * @param failureCollector {@link FailureCollector} for the pipeline
    * @param instanceType CloudSQL instance type
    * @param connectionName Connection Name for the CloudSQL instance
+   * @param databaseType Type of CloudSQL instance- CloudSQL PostgreSQL, CLoudSQL MySQL
    */
   public static void checkConnectionName(
-    FailureCollector failureCollector, String instanceType, String connectionName) {
+    FailureCollector failureCollector, String instanceType, String connectionName, String databaseType) {
 
     if (PUBLIC_INSTANCE.equalsIgnoreCase(instanceType)) {
       Pattern connectionNamePattern =
@@ -50,16 +54,16 @@ public static void checkConnectionName(
       if (!matcher.matches()) {
         failureCollector
           .addFailure(
-            "Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to "
-              + "a public CloudSQL PostgreSQL instance.", null)
+            String.format("Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to "
+              + "a public %s instance.", databaseType), null)
           .withConfigProperty(CONNECTION_NAME);
       }
     } else {
       if (!InetAddresses.isInetAddress(connectionName)) {
         failureCollector
           .addFailure(
-            "Enter the internal IP address of the Compute Engine VM cloudsql proxy "
-              + "is running on, to connect to a private CloudSQL PostgreSQL instance.", null)
+            String.format("Enter the internal IP address of the Compute Engine VM cloudsql proxy "
+              + "is running on, to connect to a private %s instance.", databaseType), null)
           .withConfigProperty(CONNECTION_NAME);
       }
     }