R2DBC: Allow external credentials to be provided to Cloud SQL #775
Conversation
|
Kudos, SonarCloud Quality Gate passed! |
mpeddada1
changed the title
spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-r2dbc/pom.xml
Outdated
Show resolved
Hide resolved
...ure/src/main/java/com/google/cloud/spring/autoconfigure/sql/CredentialsPropertiesSetter.java
Show resolved
Hide resolved
| System.setProperty(CredentialFactory.CREDENTIAL_FACTORY_PROPERTY, | ||
| SqlCredentialFactory.class.getName()); | ||
| } catch (IOException ioe) { | ||
| logger.info("Error reading Cloud SQL credentials file.", ioe); |
There was a problem hiding this comment.
I think this failure should propagate back to the user. If the user provided custom credentials and they did not work, the application is not really expected to work. Unless falling back to default credentials is acceptable (it might be in some cases? but it's hard to assume).
There was a problem hiding this comment.
Modified this throw an IllegalArgumentException if a user provides an invalid credentials file.
| @@ -86,7 +80,7 @@ public void postProcessEnvironment( | |||
| .getPropertySources() | |||
| .addFirst(new MapPropertySource("CLOUD_SQL_DATA_SOURCE_URL", primaryMap)); | |||
|
|
|||
| setCredentials(sqlProperties, propertiesRetriever.getGcpProperties()); | |||
| CredentialsPropertiesSetter.setCredentials(sqlProperties, propertiesRetriever.getGcpProperties(), LOGGER); | |||
There was a problem hiding this comment.
No need to pass the logger; define a static logger in the CredentialsPropertiesSetter if it's needed. Per-class loggers are useful because end users can control logging verbosity per package/class if needed.
That is a good point. I think this idea was initially considered but was later dropped in favor of environment variables because the Postgres driver didn't allow arbitrary properties to be passed to the socket factory through the JDBC url. GoogleCloudPlatform/cloud-sql-jdbc-socket-factory#41. This discussion happened a while ago so the status may have changed. |
...ure/src/main/java/com/google/cloud/spring/autoconfigure/sql/CredentialsPropertiesSetter.java
Show resolved
Hide resolved
...ure/src/main/java/com/google/cloud/spring/autoconfigure/sql/CredentialsPropertiesSetter.java
Show resolved
Hide resolved
...toconfigure/src/main/java/com/google/cloud/spring/autoconfigure/sql/PropertiesRetriever.java
Outdated
Show resolved
Hide resolved
spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-r2dbc-sample/README.adoc
Outdated
Show resolved
Hide resolved
spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/README.adoc
Outdated
Show resolved
Hide resolved
spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/README.adoc
Outdated
Show resolved
Hide resolved
|
Kudos, SonarCloud Quality Gate passed! |
…CloudPlatform#775) R2DBC support for Cloud SQL: Set credentials system properties for credentials provided through spring.cloud.gcp.credentials and spring.cloud.gcp.sql.credentials. * Refactor credentials code into helper class that will be shared between the EnvironmentPostProcessors of JDBC and R2DBC.
For #205
Follow-up to #772
This PR sets the credentials system properties for credentials provided through
spring.cloud.gcp.credentialsandspring.cloud.gcp.sql.credentials. It moves all the credentials related logic fromCloudSqlEnvironmentPostProcessorinto a helper class that can be shared between the EnvironmentPostProcessors for JDBC and R2DBC support.