Skip to content

fix: Remove URL encoding in project name #4188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
+34 −1
Merged

fix: Remove URL encoding in project name #4188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
33 changes: 33 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down