Fix issue 127 Support Google Cloud Postgres VCAP_SERVICES (#210)

* Changed mvnw to gradlew

* Changed to build to run tests

* Included additional tag for postgres

* detect "postgres" in the tags
* detect credentials.uri, in addition to credentials.jdbcUrl
* detect credentials.Username and credentials.Password

---------

Co-authored-by: pvtl-pre <>

Author: anthonydahanne

README.adoc

@@ -324,7 +324,7 @@ io.pivotal.cfenv.spring.boot.CfEnvProcessor=com.example.MyCoolServiceCfEnvProces
 Clone the repo and type
 
 ----
-$ ./mvnw clean install
+$ ./gradlew clean build
 ----
 
 which will run the tests as well.

java-cfenv-jdbc/src/main/java/io/pivotal/cfenv/jdbc/PostgresqlJdbcUrlCreator.java

@@ -30,12 +30,13 @@ public class PostgresqlJdbcUrlCreator extends AbstractJdbcUrlCreator {
 
 	public static final String POSTGRESQL_TAG = "postgresql";
 
+	public static final String POSTGRES_JDBC_TAG = "postgres";
 	public static final String POSTGRESQL_LABEL = "postgresql";
 
 	@Override
 	public boolean isDatabaseService(CfService cfService) {
 		if (jdbcUrlMatchesScheme(cfService, POSTGRESQL_SCHEME, POSTGRES_JDBC_SCHEME)
-				|| cfService.existsByTagIgnoreCase(POSTGRESQL_TAG)
+				|| cfService.existsByTagIgnoreCase(POSTGRESQL_TAG, POSTGRES_JDBC_TAG)
 				|| cfService.existsByLabelStartsWith(POSTGRESQL_LABEL)
 				|| cfService.existsByUriSchemeStartsWith(POSTGRESQL_SCHEME, POSTGRES_JDBC_SCHEME)
 				|| cfService.existsByCredentialsContainsUriField(POSTGRESQL_SCHEME, POSTGRES_JDBC_SCHEME)) {

java-cfenv-jdbc/src/test/java/io/pivotal/cfenv/jdbc/PostgresqlJdbcTests.java

@@ -78,6 +78,32 @@ public void postgresqlServiceCreationAlternate() {
 				"No unique database service matching by name [postgresql.*] was found.  Matching service names are [postgresql-1, postgresql-2]");
 	}
 
+	@Test
+	public void postgresqlServiceCreationGoogleCloud() {
+		String name1 = "database-1";
+		String name2 = "database-2";
+
+		mockVcapServices(getServicesPayload(
+				getPostgresqlServicePayloadGoogleCloudSql("postgresql-1", hostname, port, username, password, name1),
+				getPostgresqlServicePayloadGoogleCloudSql("postgresql-2", hostname, port, username, password, name2)));
+
+		CfJdbcEnv cfJdbcEnv = new CfJdbcEnv();
+		CfJdbcService cfJdbcService = cfJdbcEnv.findJdbcServiceByName("postgresql-1");
+		assertThat(cfJdbcService.getUsername()).isEqualTo(username);
+		assertThat(cfJdbcService.getPassword()).isEqualTo(password);
+		assertThat(cfJdbcService.getDriverClassName())
+				.isEqualTo("org.postgresql.Driver");
+
+		assertThat(cfJdbcService.getJdbcUrl()).isEqualTo(
+				"jdbc:postgresql://10.20.30.40/database-1?user=myuser&password=mypass&sslmode=require&sslcert=REDACTED&sslkey=REDACTED&sslrootcert=REDACTED"
+		);
+
+		assertThatThrownBy(() -> {
+			cfJdbcEnv.findJdbcServiceByName("postgresql.*");
+		}).isInstanceOf(IllegalArgumentException.class).hasMessage(
+				"No unique database service matching by name [postgresql.*] was found.  Matching service names are [postgresql-1, postgresql-2]");
+	}
+
 	@Test
 	public void postgresqlWithSpecialCharsServiceCreation() {
 		String userWithSpecialChars = "u%u:u+";
@@ -191,6 +217,13 @@ private String getPostgresqlServicePayloadAlternate(String serviceName,
 				hostname, port, user, password, name);
 	}
 
+	private String getPostgresqlServicePayloadGoogleCloudSql(String serviceName,
+															 String hostname, int port,
+															 String user, String password, String name) {
+		return getTemplatedPayload("test-postgresql-info-google-cloudsql.json", serviceName,
+				hostname, port, user, password, name);
+	}
+
 	private String getPostgresqlServicePayloadNoLabelNoTags(String serviceName,
 			String hostname, int port,
 			String user, String password, String name) {

java-cfenv-jdbc/src/test/resources/io/pivotal/cfenv/jdbc/test-postgresql-info-google-cloudsql.json

@@ -0,0 +1,19 @@
+{
+  "name": "$serviceName",
+  "credentials": {
+    "CaCert": "REDACTED",
+    "ClientCert": "REDACTED",
+    "ClientKey": "REDACTED",
+    "UriPrefix": "jdbc:",
+    "Username": "$user",
+    "Password": "$password",
+    "instance_name": "INSTANCE_NAME",
+    "uri": "jdbc:postgres://$user:$password@$hostname/$name?sslmode=require&sslcert=REDACTED&sslkey=REDACTED&sslrootcert=REDACTED"
+  },
+  "label": "google-cloudsql-postgres",
+  "tags": [
+    "gcp",
+    "cloudsql",
+    "postgres"
+  ]
+}

java-cfenv/src/main/java/io/pivotal/cfenv/core/CfCredentials.java

@@ -32,7 +32,7 @@ public class CfCredentials {
 
 	private UriInfo uriInfo;
 
-	private Map<String, String> derivedCredentials = new HashMap<>();
+	private final Map<String, String> derivedCredentials = new HashMap<>();
 
 	public CfCredentials(Map<String, Object> credentialsData) {
 		this.credentialsData = credentialsData;
@@ -98,7 +98,7 @@ public String getName() {
 	 * @return value of the username, null if not found.
 	 */
 	public String getUsername() {
-		String username = getString("username", "user");
+		String username = getString("username", "user", "Username");
 		if (username != null) {
 			return username;
 		}
@@ -112,7 +112,7 @@ public String getUsername() {
 	 * @return value of the password, null if not found.
 	 */
 	public String getPassword() {
-		String password = getString("password");
+		String password = getString("password", "Password");
 		if (password != null) {
 			return password;
 		}
@@ -162,9 +162,11 @@ public UriInfo getUriInfo(String uriScheme) {
 			String username = getUsername();
 			String password = getPassword();
 			String databaseName = getName();
-			uriInfo = new UriInfo(uriScheme, hostname, Integer.valueOf(port), username,
+			uriInfo = new UriInfo(uriScheme, hostname, Integer.parseInt(port), username,
 					password, databaseName);
 		} else {
+			//	in the case the CF instance returned a URI starting with jdbc://, we need to remove it
+			uri = uri.startsWith("jdbc:") ? uri.split("jdbc:")[1] : uri;
 			uriInfo = new UriInfo(uri);
 		}
 		return uriInfo;