Skip to content

PLUGIN-1851 -CloudSQL MySQL Incorrect source and sink plugin name #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dheeraj-kholia-cs wants to merge 4 commits into from
Closed

PLUGIN-1851 -CloudSQL MySQL Incorrect source and sink plugin name #21

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9be379
PLUGIN-1851
dheeraj-kholia-cs Jan 24, 2025
99009fc
PLUGIN-1851
dheeraj-kholia-cs Jan 27, 2025
1ec50e8
Used string literal instead of enum
dheeraj-kholia-cs Jan 27, 2025
beaf72b
refactored code
dheeraj-kholia-cs Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
CloudSQLUtil.checkConnectionName(
failureCollector,
cloudsqlMysqlActionConfig.instanceType,
cloudsqlMysqlActionConfig.connectionName);
cloudsqlMysqlActionConfig.connectionName,
CloudSQLUtil.CLOUDSQL_MYSQL);
}

super.configurePipeline(pipelineConfigurer);
Expand Down
3 changes: 2 additions & 1 deletion cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion ...resql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
CloudSQLUtil.checkConnectionName(
failureCollector,
cloudsqlPostgresqlActionConfig.instanceType,
cloudsqlPostgresqlActionConfig.connectionName);
cloudsqlPostgresqlActionConfig.connectionName,
CloudSQLUtil.CLOUDSQL_POSTGRESQL);
}

super.configurePipeline(pipelineConfigurer);
Expand Down
3 changes: 2 additions & 1 deletion ...tgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion ...resql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
13 changes: 8 additions & 5 deletions database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ 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.
Expand All @@ -40,7 +43,7 @@ public class CloudSQLUtil {
* @param connectionName Connection Name for the CloudSQL instance
*/
public static void checkConnectionName(
FailureCollector failureCollector, String instanceType, String connectionName) {
FailureCollector failureCollector, String instanceType, String connectionName, String dbType) {

if (PUBLIC_INSTANCE.equalsIgnoreCase(instanceType)) {
Pattern connectionNamePattern =
Expand All @@ -50,16 +53,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.", dbType), 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.", dbType), null)
.withConfigProperty(CONNECTION_NAME);
}
}
Expand Down