[Not for review- Testing pr] Merged branch

cloudbuild/cloudbuild.yaml

@@ -50,5 +50,5 @@ steps:
 timeout: 2400s
 
 options:
-  machineType: 'N1_HIGHCPU_32'
-
+  pool:
+    name: 'projects/cloud-dataproc-ci/locations/us-central1/workerPools/integ-test-connector-pool'

cloudbuild/presubmit.sh

@@ -13,19 +13,49 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 set -euxo pipefail
 
 readonly TEST_TYPE="${1:-unittest}"
 
 cd /hadoop-connectors
 
-# Run unit or integration tests and generate test coverage report
 if [[ $TEST_TYPE == unittest ]]; then
+  # Run unit tests and generate test coverage report
   ./mvnw -B -e -Pcoverage clean verify
 else
-  ./mvnw -B -e -Pintegration-test -Pcoverage clean verify
+  # This section handles all integration tests.
+
+  # Start with the base Maven arguments.
+  MVN_ARGS="-B -e -Pintegration-test -Pcoverage"
+
+  # If the zonal bucket name is passed from Cloud Build, add it as a system property.
+  # The Java test code should check for the presence of this property
+  # to decide whether to run the zonal bucket-specific tests.
+  if [[ -n "${GCS_ZONAL_TEST_BUCKET:-}" ]]; then
+    echo "Zonal test bucket '${GCS_ZONAL_TEST_BUCKET}' detected. Passing to Maven."
+    MVN_ARGS+=" -Dtest.gcs.zonal_test_bucket=${GCS_ZONAL_TEST_BUCKET}"
+  fi
+
+  # Execute the Maven command with any additional arguments.
+  # shellcheck disable=SC2086
+  ./mvnw ${MVN_ARGS} clean verify
 fi
 
 # Upload test coverage report to Codecov
 bash <(curl -s https://codecov.io/bash) -K -F "${TEST_TYPE}"
+
+#set -euxo pipefail
+#
+#readonly TEST_TYPE="${1:-unittest}"
+#
+#cd /hadoop-connectors
+#
+## Run unit or integration tests and generate test coverage report
+#if [[ $TEST_TYPE == unittest ]]; then
+#  ./mvnw -B -e -Pcoverage clean verify
+#else
+#  ./mvnw -B -e -Pintegration-test -Pcoverage clean verify
+#fi
+#
+## Upload test coverage report to Codecov
+#bash <(curl -s https://codecov.io/bash) -K -F "${TEST_TYPE}"

gcs/dependency-reduced-pom.xml

@@ -3,12 +3,12 @@
   <parent>
     <artifactId>bigdataoss-parent</artifactId>
     <groupId>com.google.cloud.bigdataoss</groupId>
-    <version>3.1.4-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gcs-connector</artifactId>
   <name>gcs-connector</name>
-  <version>3.1.4-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <description>An implementation of org.apache.hadoop.fs.FileSystem targeting Google Cloud Storage</description>
   <build>
     <plugins>
@@ -87,7 +87,6 @@
                   <include>io.grpc</include>
                   <include>io.opencensus</include>
                   <include>io.opentelemetry</include>
-                  <include>io.opentelemetry.api</include>
                   <include>io.opentelemetry.contrib</include>
                   <include>io.opentelemetry.semconv</include>
                   <include>io.perfmark</include>
@@ -376,7 +375,7 @@
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>gcsio</artifactId>
-      <version>3.1.4-SNAPSHOT</version>
+      <version>3.0.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

gcs/src/main/java/com/google/cloud/hadoop/fs/gcs/CustomFileRange.java

@@ -0,0 +1,42 @@
+package com.google.cloud.hadoop.fs.gcs;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import org.apache.hadoop.fs.FileRange;
+
+class CustomFileRange implements FileRange {
+  long offset;
+  int length;
+
+  CompletableFuture<ByteBuffer> data;
+
+  CustomFileRange(long offset, int length) {
+    this.offset = offset;
+    this.length = length;
+  }
+
+  @Override
+  public long getOffset() {
+    return offset;
+  }
+
+  @Override
+  public int getLength() {
+    return length;
+  }
+
+  @Override
+  public CompletableFuture<ByteBuffer> getData() {
+    return data;
+  }
+
+  @Override
+  public void setData(CompletableFuture<ByteBuffer> completableFuture) {
+    data = completableFuture;
+  }
+
+  @Override
+  public Object getReference() {
+    return null;
+  }
+}