Merge branch 'googleapis:main' into directpath-bound-token

Author: rockspore

google-cloud-storage/pom.xml

@@ -16,7 +16,7 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-storage</site.installationModule>
-    <pubsub-proto.version>1.118.1</pubsub-proto.version>
+    <pubsub-proto.version>1.119.0</pubsub-proto.version>
   </properties>
   <dependencies>
     <dependency>

google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java

@@ -69,6 +69,7 @@
 import com.google.cloud.storage.UnifiedOpts.ProjectId;
 import com.google.cloud.storage.UnifiedOpts.UserProject;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
@@ -130,6 +131,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -167,7 +169,7 @@ final class GrpcStorageImpl extends BaseService<StorageOptions>
 
   // workaround for https://github.com/googleapis/java-storage/issues/1736
   private final Opts<UserProject> defaultOpts;
-  @Deprecated private final ProjectId defaultProjectId;
+  @Deprecated private final Supplier<ProjectId> defaultProjectId;
 
   GrpcStorageImpl(
       GrpcStorageOptions options,
@@ -183,7 +185,7 @@ final class GrpcStorageImpl extends BaseService<StorageOptions>
     this.codecs = Conversions.grpc();
     this.retryAlgorithmManager = options.getRetryAlgorithmManager();
     this.syntaxDecoders = new SyntaxDecoders();
-    this.defaultProjectId = UnifiedOpts.projectId(options.getProjectId());
+    this.defaultProjectId = Suppliers.memoize(() -> UnifiedOpts.projectId(options.getProjectId()));
   }
 
   @Override
@@ -443,6 +445,7 @@ public Page<Bucket> list(BucketListOption... options) {
         opts.grpcMetadataMapper().apply(GrpcCallContext.createDefault());
     ListBucketsRequest request =
         defaultProjectId
+            .get()
             .listBuckets()
             .andThen(opts.listBucketsRequest())
             .apply(ListBucketsRequest.newBuilder())

google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java

@@ -5036,6 +5036,8 @@ default BlobWriteSession blobWriteSession(BlobInfo blobInfo, BlobWriteOption...
    * {@link Storage#delete(BlobId)}, however without the ability to change metadata fields for the
    * target object.
    *
+   * <p>This feature is currently only supported for HNS (Hierarchical Namespace) buckets.
+   *
    * @since 2.48.0
    */
   @TransportCompatibility({Transport.HTTP, Transport.GRPC})

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageOptionsTest.java

@@ -33,7 +33,6 @@
 import com.google.cloud.storage.it.runner.annotations.Parameterized.ParametersProvider;
 import com.google.cloud.storage.it.runner.annotations.SingleBackend;
 import com.google.common.collect.ImmutableList;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -73,12 +72,32 @@ public void clientShouldConstructCleanly_grpc() throws Exception {
   }
 
   @Test
-  @Ignore("waiting on conformation from the backend team if this should even be possible")
   public void clientShouldConstructCleanly_directPath() throws Exception {
     assumeTrue(
         "Unable to determine environment can access directPath", TestUtils.isOnComputeEngine());
     StorageOptions options =
-        StorageOptions.grpc().setCredentials(credentials).setAttemptDirectPath(true).build();
+        StorageOptions.grpc()
+            .setCredentials(credentials)
+            .setAttemptDirectPath(true)
+            .setEnableGrpcClientMetrics(false)
+            .build();
+    doTest(options);
+  }
+
+  @Test
+  public void lackOfProjectIdDoesNotPreventConstruction_http() throws Exception {
+    StorageOptions options = StorageOptions.http().setCredentials(credentials).build();
+    doTest(options);
+  }
+
+  @Test
+  public void lackOfProjectIdDoesNotPreventConstruction_grpc() throws Exception {
+    StorageOptions options =
+        StorageOptions.grpc()
+            .setCredentials(credentials)
+            .setAttemptDirectPath(false)
+            .setEnableGrpcClientMetrics(false)
+            .build();
     doTest(options);
   }
 

pom.xml

@@ -133,7 +133,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsub</artifactId>
-        <version>1.136.1</version>
+        <version>1.137.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>

samples/install-without-bom/pom.xml

@@ -30,12 +30,12 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.48.1</version>
+      <version>2.48.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage-control</artifactId>
-      <version>2.48.1</version>
+      <version>2.48.2</version>
     </dependency>
     <!-- [END storage_install_without_bom] -->
 
@@ -66,13 +66,13 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.136.1</version>
+      <version>1.137.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.48.1</version>
+      <version>2.48.2</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>

samples/snapshot/pom.xml

@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.136.1</version>
+      <version>1.137.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

samples/snippets/pom.xml

@@ -76,7 +76,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.136.1</version>
+      <version>1.137.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -93,7 +93,7 @@
       <!-- tests jars aren't in the bom, manually include the version here -->
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.48.1</version>
+      <version>2.48.2</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>