Merge branch 'main' into enable-graalvm-tests

Author: hessjcg

.gitignore

@@ -11,6 +11,7 @@ target/
 **/.project
 **/.settings/
 **/.classpath
+.vscode/
 
 # direnv
 .envrc
@@ -72,3 +73,4 @@ artman-genfiles
 *.zip
 *.tar.gz
 *.rar
+.tools

.kokoro/check_coverage.sh

@@ -16,8 +16,23 @@
 # `-e` enables the script to automatically fail when a command fails
 set -e
 
-export CUR_COVER=$(cat core/target/site/jacoco/index.html | grep -o 'Total[^%]*' | sed 's/<.*>//; s/Total//')
-echo "Current Coverage is $CUR_COVER%"
+# Calculate total coverage, skipping the generated protobuf file.
+# The CSV file generated by Jacoco has the test coverage for each. We use AWK to process this CSV file.
+# here's what the AWK program means:
+#
+#     NR > 1 &&                                   Skip the first line, it only has field names
+#       $3 != "com.google.cloud.sql.core.mdx"     Skip any line for class in the protobuf generated package 'mdx'
+#     { covered += $6; total += $6+$5; }          For each line add a running sum of covered lines and total lines
+#     END { printf "%2.f", covered/total * 100}'  At the end, print out the coverage percentage, no decimals
+#
+
+CUR_COVER=$( awk -F,  \
+  'NR > 1 && $3 != "com.google.cloud.sql.core.mdx" { covered += $6; total += $6+$5; } END { printf "%2.f", covered/total * 100}' \
+  < "core/target/site/jacoco/jacoco.csv")
+
 if [ "$CUR_COVER" -lt 75  ]; then
+  echo "FAIL: Current Coverage is $CUR_COVER%, less than the required 75%"
   exit 1;
+else
+  echo "PASS: Current Coverage is $CUR_COVER%"
 fi

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.25.3](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/compare/v1.25.2...v1.25.3) (2025-08-12)
+
+
+### Bug Fixes
+
+* Use the -jre variant of Google Guava library for GraalVM compatability. ([#2187](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2187)) ([7fb819f](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/7fb819fb0d0856c337a8b7ec10ebce899ad496b3)), closes [#2178](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2178)
+
+
+### Dependencies
+
+* Update dependencies to latest. ([#2185](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2185)) ([163cdae](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/163cdaeda6f36cc2c0290aa86eed8a1224e3635c))
+
 ## [1.25.2](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/compare/v1.25.1...v1.25.2) (2025-07-14)
 
 

build.sh

@@ -30,13 +30,19 @@ function clean() {
 }
 
 ## build - Builds the project without running tests.
-function test() {
+function build() {
    mvn install -DskipTests=true
 }
 
 ## test - Runs local unit tests.
 function test() {
-  mvn install
+  if [[ "$(uname -s)" == "Darwin" ]]; then
+    echo "macOS detected. Setting up IP aliases for tests."
+    echo "You may be prompted for your password to run sudo."
+    sudo ifconfig lo0 alias 127.0.0.2 up
+    sudo ifconfig lo0 alias 127.0.0.3 up
+  fi
+  mvn -P coverage test
 }
 
 ## e2e - Runs end-to-end integration tests.
@@ -69,49 +75,63 @@ function lint() {
 }
 
 
+## deps - updates dependencies to the latest version
+function deps() {
+  mvn versions:use-latest-versions
+  find . -name 'pom.xml.versionsBackup' -print0 | xargs -0 rm -f
+}
+
+
 # write_e2e_env - Loads secrets from the gcloud project and writes
 #     them to target/e2e.env to run e2e tests.
 #
 function write_e2e_env(){
-  secret_vars=(MYSQL_CONNECTION_NAME
-      MYSQL_USER
-      MYSQL_PASS
-      MYSQL_DB
-      MYSQL_IAM_CONNECTION_NAME
-      MYSQL_USER_IAM_JAVA
-      POSTGRES_CONNECTION_NAME
-      POSTGRES_IAM_CONNECTION_NAME
-      POSTGRES_USER
-      POSTGRES_USER_IAM_JAVA
-      POSTGRES_PASS
-      POSTGRES_DB
-      POSTGRES_CAS_CONNECTION_NAME
-      POSTGRES_CAS_PASS
-      POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
-      POSTGRES_CUSTOMER_CAS_PASS
-      POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME
-      POSTGRES_CUSTOMER_CAS_PASS_INVALID_DOMAIN_NAME
-      SQLSERVER_CONNECTION_NAME
-      SQLSERVER_USER
-      SQLSERVER_PASS
-      SQLSERVER_DB
-      IMPERSONATED_USER
-      QUOTA_PROJECT
-      )
+  # Set the default to .envrc file if no argument is passed
+  outfile="${1:-.envrc}"
+  secret_vars=(
+    MYSQL_CONNECTION_NAME=MYSQL_CONNECTION_NAME
+    MYSQL_USER=MYSQL_USER
+    MYSQL_USER_IAM=MYSQL_USER_IAM_GO
+    MYSQL_PASS=MYSQL_PASS
+    MYSQL_DB=MYSQL_DB
+    MYSQL_MCP_CONNECTION_NAME=MYSQL_MCP_CONNECTION_NAME
+    MYSQL_MCP_PASS=MYSQL_MCP_PASS
+    POSTGRES_CONNECTION_NAME=POSTGRES_CONNECTION_NAME
+    POSTGRES_USER=POSTGRES_USER
+    POSTGRES_USER_IAM=POSTGRES_USER_IAM_GO
+    POSTGRES_PASS=POSTGRES_PASS
+    POSTGRES_DB=POSTGRES_DB
+    POSTGRES_CAS_CONNECTION_NAME=POSTGRES_CAS_CONNECTION_NAME
+    POSTGRES_CAS_PASS=POSTGRES_CAS_PASS
+    POSTGRES_CUSTOMER_CAS_CONNECTION_NAME=POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
+    POSTGRES_CUSTOMER_CAS_PASS=POSTGRES_CUSTOMER_CAS_PASS
+    POSTGRES_CUSTOMER_CAS_DOMAIN_NAME=POSTGRES_CUSTOMER_CAS_DOMAIN_NAME
+    POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME=POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME
+    POSTGRES_MCP_CONNECTION_NAME=POSTGRES_MCP_CONNECTION_NAME
+    POSTGRES_MCP_PASS=POSTGRES_MCP_PASS
+    SQLSERVER_CONNECTION_NAME=SQLSERVER_CONNECTION_NAME
+    SQLSERVER_USER=SQLSERVER_USER
+    SQLSERVER_PASS=SQLSERVER_PASS
+    SQLSERVER_DB=SQLSERVER_DB
+    QUOTA_PROJECT=QUOTA_PROJECT
+  )
 
   if [[ -z "${TEST_PROJECT:-}" ]] ; then
     echo "Set TEST_PROJECT environment variable to the project containing"
     echo "the e2e test suite secrets."
     exit 1
   fi
 
-  echo "Getting test secrets from $TEST_PROJECT into $1"
+  echo "Getting test secrets from $TEST_PROJECT into $outfile"
   {
-  for name in "${secret_vars[@]}" ; do
-    val=$(gcloud secrets versions access latest --project "$TEST_PROJECT" --secret="$name")
-    echo "export $name=\'$val\'"
+  for env_name in "${secret_vars[@]}" ; do
+    env_var_name="${env_name%%=*}"
+    secret_name="${env_name##*=}"
+    set -x
+    val=$(gcloud secrets versions access latest --project "$TEST_PROJECT" --secret="$secret_name")
+    echo "export $env_var_name='$val'"
   done
-  } > "$1"
+  } > "$outfile"
 
 }
 

core/pom.xml

@@ -23,10 +23,10 @@
   <parent>
     <groupId>com.google.cloud.sql</groupId>
     <artifactId>jdbc-socket-factory-parent</artifactId>
-    <version>1.25.3-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-parent:current} -->
+    <version>1.25.4-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-parent:current} -->
   </parent>
   <artifactId>jdbc-socket-factory-core</artifactId>
-  <version>1.25.3-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-core:current} -->
+  <version>1.25.4-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-core:current} -->
   <packaging>jar</packaging>
 
   <name>Cloud SQL Core Socket Factory (Core Library, don't depend on this directly)</name>
@@ -127,6 +127,11 @@
       <artifactId>google-oauth-client</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+
     <!-- com.google.cloud.sql.nativeimage.CloudSqlFeature needs the GraalVM
       dependencies for compilation. The provided-scope dependencies do not add
       additional dependencies to library users. -->
@@ -205,11 +210,53 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+    </dependency>
 
   </dependencies>
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.3.0</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.basedir}/target/generated-sources</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.os72</groupId>
+        <artifactId>protoc-jar-maven-plugin</artifactId>
+        <version>3.11.4</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <optimizeCodegen>false</optimizeCodegen>
+              <protocVersion>3.23.0</protocVersion>
+              <includeStdTypes>true</includeStdTypes>
+              <outputOptions></outputOptions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

core/src/main/java/com/google/cloud/sql/core/ConnectionConfig.java

@@ -54,6 +54,7 @@ public class ConnectionConfig {
   public static final List<IpType> DEFAULT_IP_TYPE_LIST =
       Arrays.asList(IpType.PUBLIC, IpType.PRIVATE);
   public static final String CLOUD_SQL_GOOGLE_CREDENTIALS_PATH = "cloudSqlGoogleCredentialsPath";
+  public static final String MDX_CLIENT_PROTOCOL_TYPE = "mdxClientProtocolType";
 
   private final ConnectorConfig connectorConfig;
   private final String cloudSqlInstance;
@@ -64,6 +65,7 @@ public class ConnectionConfig {
   private final AuthType authType;
   private final String unixSocketPathSuffix;
   private final String domainName;
+  private final String mdxClientProtocolType;
 
   /** Create a new ConnectionConfig from the well known JDBC Connection properties. */
   public static ConnectionConfig fromConnectionProperties(Properties props) {
@@ -116,6 +118,9 @@ public static ConnectionConfig fromConnectionProperties(Properties props, String
             ? RefreshStrategy.LAZY
             : RefreshStrategy.BACKGROUND;
 
+    final String mdxClientProtocolType =
+        props.getProperty(ConnectionConfig.MDX_CLIENT_PROTOCOL_TYPE);
+
     return new ConnectionConfig(
         csqlInstanceName,
         namedConnection,
@@ -133,7 +138,8 @@ public static ConnectionConfig fromConnectionProperties(Properties props, String
             .withAdminQuotaProject(adminQuotaProject)
             .withUniverseDomain(universeDomain)
             .withRefreshStrategy(refreshStrategy)
-            .build());
+            .build(),
+        mdxClientProtocolType);
   }
 
   /**
@@ -197,7 +203,8 @@ private ConnectionConfig(
       AuthType authType,
       String unixSocketPathSuffix,
       String domainName,
-      ConnectorConfig connectorConfig) {
+      ConnectorConfig connectorConfig,
+      String mdxClientProtocolType) {
     this.cloudSqlInstance = cloudSqlInstance;
     this.namedConnector = namedConnector;
     this.unixSocketPath = unixSocketPath;
@@ -206,6 +213,7 @@ private ConnectionConfig(
     this.connectorConfig = connectorConfig;
     this.authType = authType;
     this.domainName = domainName;
+    this.mdxClientProtocolType = mdxClientProtocolType;
   }
 
   /** Creates a new instance of the ConnectionConfig with an updated connectorConfig. */
@@ -218,7 +226,8 @@ public ConnectionConfig withConnectorConfig(ConnectorConfig config) {
         authType,
         unixSocketPathSuffix,
         domainName,
-        config);
+        config,
+        mdxClientProtocolType);
   }
 
   /** Creates a new instance of the ConnectionConfig with an updated cloudSqlInstance. */
@@ -231,7 +240,8 @@ public ConnectionConfig withCloudSqlInstance(String newCloudSqlInstance) {
         authType,
         unixSocketPathSuffix,
         domainName,
-        connectorConfig);
+        connectorConfig,
+        mdxClientProtocolType);
   }
 
   /** Creates a new instance of the ConnectionConfig with an updated cloudSqlInstance. */
@@ -244,7 +254,22 @@ public ConnectionConfig withDomainName(String domainName) {
         authType,
         unixSocketPathSuffix,
         domainName,
-        connectorConfig);
+        connectorConfig,
+        mdxClientProtocolType);
+  }
+
+  /** Creates a new instance of the ConnectionConfig with an updated clientProtocolType. */
+  public ConnectionConfig withMdxClientProtocolType(String mdxClientProtocolType) {
+    return new ConnectionConfig(
+        cloudSqlInstance,
+        namedConnector,
+        unixSocketPath,
+        ipTypes,
+        authType,
+        unixSocketPathSuffix,
+        domainName,
+        connectorConfig,
+        mdxClientProtocolType);
   }
 
   public String getNamedConnector() {
@@ -279,6 +304,10 @@ public String getDomainName() {
     return domainName;
   }
 
+  public String getMdxClientProtocolType() {
+    return mdxClientProtocolType;
+  }
+
   /** The builder for the ConnectionConfig. */
   public static class Builder {
 
@@ -290,6 +319,7 @@ public static class Builder {
     private ConnectorConfig connectorConfig = new ConnectorConfig.Builder().build();
     private AuthType authType = DEFAULT_AUTH_TYPE;
     private String domainName;
+    private String mdxClientProtocolType;
 
     /** Chained setter for CloudSqlInstance field. */
     public Builder withCloudSqlInstance(String cloudSqlInstance) {
@@ -345,6 +375,12 @@ public Builder withUnixSocketPathSuffix(String unixSocketPathSuffix) {
       return this;
     }
 
+    /** Chained setter for MdxClientProtocolType field. */
+    public Builder withMdxClientProtocolType(String mdxClientProtocolType) {
+      this.mdxClientProtocolType = mdxClientProtocolType;
+      return this;
+    }
+
     /** Builds a new instance of {@code ConnectionConfig}. */
     public ConnectionConfig build() {
       return new ConnectionConfig(
@@ -355,7 +391,8 @@ public ConnectionConfig build() {
           authType,
           unixSocketPathSuffix,
           domainName,
-          connectorConfig);
+          connectorConfig,
+          mdxClientProtocolType);
     }
   }
 }