Skip to content

fix: use StatusProto.fromThrowable for ApiException in test-proxy #2778

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

Open
PeteyPii wants to merge 5 commits into
base: main
Choose a base branch
from
+20 −58
Open

fix: use StatusProto.fromThrowable for ApiException in test-proxy #2778

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4baa72e
fix: use StatusProto.fromThrowable for ApiException in test-proxy
Feb 9, 2026
6ecc532
Merge branch 'main' into passthrough-errors
igorbernstein2 Feb 9, 2026
1b9021e
Merge branch 'main' into passthrough-errors
igorbernstein2 Feb 9, 2026
7d76aac
Use convertStatus to handle internal errors as well
Feb 9, 2026
0a978e5
Clean up newline
Feb 9, 2026
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
78 changes: 20 additions & 58 deletions test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/CbtTestProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,21 +284,13 @@ public void mutateRow(
return;
}

// TODO(developer): evaluate if we want to manually unpack the proto into a model, instead of
// using fromProto. Same for the other methods.
RowMutation mutation = RowMutation.fromProto(request.getRequest());
try {
// This response is empty.
client.dataClient().mutateRow(mutation);
} catch (ApiException e) {
responseObserver.onNext(
MutateRowResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
MutateRowResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -351,13 +343,7 @@ public void bulkMutateRows(
return;
} catch (ApiException e) {
responseObserver.onNext(
MutateRowsResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
MutateRowsResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -410,13 +396,7 @@ public void readRow(ReadRowRequest request, StreamObserver<RowResult> responseOb
}
} catch (ApiException e) {
responseObserver.onNext(
RowResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
RowResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -461,13 +441,7 @@ public void readRows(ReadRowsRequest request, StreamObserver<RowsResult> respons
resultBuilder.setStatus(com.google.rpc.Status.getDefaultInstance()).build());
} catch (ApiException e) {
responseObserver.onNext(
RowsResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
RowsResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -585,13 +559,7 @@ public void sampleRowKeys(
keyOffsets = client.dataClient().sampleRowKeys(tableId);
} catch (ApiException e) {
responseObserver.onNext(
SampleRowKeysResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
SampleRowKeysResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -631,13 +599,7 @@ public void checkAndMutateRow(
matched = client.dataClient().checkAndMutateRow(mutation);
} catch (ApiException e) {
responseObserver.onNext(
CheckAndMutateRowResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
CheckAndMutateRowResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -682,13 +644,7 @@ public void readModifyWriteRow(
}
} catch (ApiException e) {
responseObserver.onNext(
RowResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
RowResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -745,13 +701,7 @@ public void executeQuery(
return;
} catch (ApiException e) {
responseObserver.onNext(
ExecuteQueryResult.newBuilder()
.setStatus(
com.google.rpc.Status.newBuilder()
.setCode(e.getStatusCode().getCode().ordinal())
.setMessage(e.getMessage())
.build())
.build());
ExecuteQueryResult.newBuilder().setStatus(convertStatus(e)).build());
responseObserver.onCompleted();
return;
} catch (StatusRuntimeException e) {
Expand Down Expand Up @@ -845,6 +795,18 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder input) {
.build();
}

// Cleanly forwards server errors through the test proxy. Internal client errors
// are wrapped in an UNKNOWN status.
private static com.google.rpc.Status convertStatus(ApiException e) {
com.google.rpc.Status status = StatusProto.fromThrowable(e);
if (status != null) {
return status;
}

return com.google.rpc.Status.newBuilder().setCode(e.getStatusCode().getCode().ordinal()).setMessage(e.getMessage())
.build();
}

private CredentialsProvider getCredentialsProvider(String accessToken) {
if (accessToken.isEmpty()) {
return NoCredentialsProvider.create();
Expand Down