Simplifying integration test configuration

Author: davidrabinowitz

spark-bigquery-connector-common/src/test/java/com/google/cloud/spark/bigquery/acceptance/AcceptanceTestConstants.java

@@ -15,16 +15,17 @@
  */
 package com.google.cloud.spark.bigquery.acceptance;
 
+import com.google.cloud.ServiceOptions;
 import com.google.common.base.Preconditions;
+import java.util.Optional;
 
 public class AcceptanceTestConstants {
 
   public static final String REGION = "us-west1";
   public static final String DATAPROC_ENDPOINT = REGION + "-dataproc.googleapis.com:443";
   public static final String PROJECT_ID =
-      Preconditions.checkNotNull(
-          System.getenv("GOOGLE_CLOUD_PROJECT"),
-          "Please set the 'GOOGLE_CLOUD_PROJECT' environment variable");
+      Optional.ofNullable(System.getenv("GOOGLE_CLOUD_PROJECT"))
+          .orElse(ServiceOptions.getDefaultProjectId());
   public static final String SERVERLESS_NETWORK_URI =
       Preconditions.checkNotNull(
           System.getenv("SERVERLESS_NETWORK_URI"),

spark-bigquery-connector-common/src/test/java/com/google/cloud/spark/bigquery/integration/TestConstants.java

@@ -32,6 +32,7 @@
 import static org.apache.spark.sql.types.DataTypes.StringType;
 import static org.apache.spark.sql.types.DataTypes.TimestampType;
 
+import com.google.cloud.ServiceOptions;
 import com.google.cloud.spark.bigquery.integration.model.ColumnOrderTestClass;
 import com.google.cloud.spark.bigquery.integration.model.NumStruct;
 import com.google.cloud.spark.bigquery.integration.model.StringStruct;
@@ -43,6 +44,7 @@
 import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -73,9 +75,8 @@ public class TestConstants {
       "bigquery-public-data.wikipedia.pageviews_2021";
   static final long SHAKESPEARE_TABLE_NUM_ROWS = 164656L;
   static final String PROJECT_ID =
-      Preconditions.checkNotNull(
-          System.getenv("GOOGLE_CLOUD_PROJECT"),
-          "Please set the GOOGLE_CLOUD_PROJECT env variable");
+      Optional.ofNullable(System.getenv("GOOGLE_CLOUD_PROJECT"))
+          .orElse(ServiceOptions.getDefaultProjectId());
   static final String TEMPORARY_GCS_BUCKET_ENV_VARIABLE = "TEMPORARY_GCS_BUCKET";
   static final String BIGLAKE_CONNECTION_ID_ENV_VARIABLE = "BIGLAKE_CONNECTION_ID";
   static final String TEMPORARY_GCS_BUCKET =