Merge branch 'main' into PR #3928 to update

Author: lqiu96

google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClientImpl.java

@@ -53,7 +53,7 @@ protected com.google.iam.v1.Policy toPb(Policy policy) {
   }
 
   private static final PathTemplate PROJECT_NAME_TEMPLATE =
-      PathTemplate.create("projects/{project}");
+      PathTemplate.createWithoutUrlEncoding("projects/{project}");
   private final DatabaseAdminClient dbClient;
   private final String projectId;
   private final SpannerRpc rpc;

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -368,10 +368,12 @@ public GapicSpannerRpc(final SpannerOptions options) {
       boolean isEnableDirectAccess = options.isEnableDirectAccess();
       if (isEnableDirectAccess) {
         defaultChannelProviderBuilder.setAttemptDirectPath(true);
-        // This will let the credentials try to fetch a hard-bound access token if the runtime
-        // environment supports it.
-        defaultChannelProviderBuilder.setAllowHardBoundTokenTypes(
-            Collections.singletonList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS));
+        if (isEnableDirectPathBoundToken()) {
+          // This will let the credentials try to fetch a hard-bound access token if the runtime
+          // environment supports it.
+          defaultChannelProviderBuilder.setAllowHardBoundTokenTypes(
+              Collections.singletonList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS));
+        }
         defaultChannelProviderBuilder.setAttemptDirectPathXds();
       }
 
@@ -687,6 +689,10 @@ public static boolean isEnableDirectPathXdsEnv() {
     return Boolean.parseBoolean(System.getenv("GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"));
   }
 
+  public static boolean isEnableDirectPathBoundToken() {
+    return !Boolean.parseBoolean(System.getenv("GOOGLE_SPANNER_DISABLE_DIRECT_ACCESS_BOUND_TOKEN"));
+  }
+
   private static final RetrySettings ADMIN_REQUESTS_LIMIT_EXCEEDED_RETRY_SETTINGS =
       RetrySettings.newBuilder()
           .setInitialRetryDelayDuration(Duration.ofSeconds(5L))

google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java

@@ -296,6 +296,39 @@ public void createInstance() throws Exception {
     assertThat(op.get().getId().getName()).isEqualTo(INSTANCE_NAME);
   }
 
+  @Test
+  public void createInstanceWithOrgNameInProjectId() throws Exception {
+    String projectIdWithOrg = "my-org:my-project";
+    String instanceNameWithOrg = "projects/my-org:my-project/instances/my-instance";
+    String configNameWithOrg = "projects/my-org:my-project/instanceConfigs/my-config";
+
+    InstanceAdminClient universeClient =
+        new InstanceAdminClientImpl(projectIdWithOrg, rpc, dbClient);
+    com.google.spanner.admin.instance.v1.Instance instance =
+        com.google.spanner.admin.instance.v1.Instance.newBuilder()
+            .setConfig(configNameWithOrg)
+            .setName(instanceNameWithOrg)
+            .setNodeCount(1)
+            .setProcessingUnits(0)
+            .setEdition(com.google.spanner.admin.instance.v1.Instance.Edition.ENTERPRISE_PLUS)
+            .build();
+    OperationFuture<com.google.spanner.admin.instance.v1.Instance, CreateInstanceMetadata>
+        rawOperationFuture =
+            OperationFutureUtil.immediateOperationFuture(
+                "createInstance", instance, CreateInstanceMetadata.getDefaultInstance());
+    when(rpc.createInstance("projects/" + projectIdWithOrg, INSTANCE_ID, instance))
+        .thenReturn(rawOperationFuture);
+    OperationFuture<Instance, CreateInstanceMetadata> op =
+        universeClient.createInstance(
+            InstanceInfo.newBuilder(InstanceId.of(projectIdWithOrg, INSTANCE_ID))
+                .setInstanceConfigId(InstanceConfigId.of(projectIdWithOrg, CONFIG_ID))
+                .setEdition(com.google.spanner.admin.instance.v1.Instance.Edition.ENTERPRISE_PLUS)
+                .setNodeCount(1)
+                .build());
+    assertThat(op.isDone()).isTrue();
+    assertThat(op.get().getId().getName()).isEqualTo(instanceNameWithOrg);
+  }
+
   @Test
   public void testCreateInstanceWithProcessingUnits() throws Exception {
     OperationFuture<com.google.spanner.admin.instance.v1.Instance, CreateInstanceMetadata>