Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/tdf-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
mkleene committed May 24, 2024
2 parents 229d477 + af51404 commit 9edea3e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CODEOWNERS

* @opentdf/java-sdk
* @opentdf/java-sdk @opentdf/architecture

## High Security Area

Expand Down
1 change: 1 addition & 0 deletions sdk/src/main/java/io/opentdf/platform/sdk/KASClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,4 @@ private synchronized AccessServiceGrpc.AccessServiceBlockingStub getStub(String
return stubs.get(url);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, Re
// not going to bother making a real request with real crypto, just make sure that
// we have the right headers
}

assertThat(kasDPoPHeader.get()).isNotNull();
assertThat(kasAuthHeader.get()).isEqualTo("DPoP hereisthetoken");
} finally {
Expand Down

0 comments on commit 9edea3e

Please sign in to comment.