chore: Migrate CI to sonatype central portal #171
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1154,6 +1154,11 @@ private Map<Attribute, String> buildTelemetryAttributes(Map<String, Object> attr | |
| if (body instanceof BatchCheckRequest) { | ||
| BatchCheckRequest batchCheckRequest = (BatchCheckRequest) body; | ||
|
|
||
| if (!isNullOrWhitespace(batchCheckRequest.getAuthorizationModelId())) { | ||
| telemetryAttributes.put( | ||
| Attributes.FGA_CLIENT_REQUEST_MODEL_ID, batchCheckRequest.getAuthorizationModelId()); | ||
| } | ||
|
|
||
| if (batchCheckRequest.getChecks() != null) { | ||
| telemetryAttributes.put( | ||
| Attributes.FGA_CLIENT_REQUEST_BATCH_CHECK_SIZE, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -711,8 +711,23 @@ public CompletableFuture<ClientBatchCheckResponse> batchCheck( | |
|
|
||
| var override = new ConfigurationOverride().addHeaders(options); | ||
|
|
||
| Consumer<List<BatchCheckItem>> singleBatchCheckRequest = request -> call(() -> { | ||
| BatchCheckRequest body = new BatchCheckRequest().checks(request); | ||
| if (options.getConsistency() != null) { | ||
| body.consistency(options.getConsistency()); | ||
| } | ||
|
|
||
| // Set authorizationModelId from options if available; otherwise, use the default from configuration | ||
| String authorizationModelId = !isNullOrWhitespace(options.getAuthorizationModelId()) | ||
| ? options.getAuthorizationModelId() | ||
| : configuration.getAuthorizationModelId(); | ||
|
|
||
| if (!isNullOrWhitespace(authorizationModelId)) { | ||
| body.authorizationModelId(authorizationModelId); | ||
| } | ||
|
|
||
| return api.batchCheck(configuration.getStoreId(), body, override); | ||
| }) | ||
| .handleAsync((batchCheckResponseApiResponse, throwable) -> { | ||
| Map<String, BatchCheckSingleResult> response = | ||
| batchCheckResponseApiResponse.getData().getResult(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -137,8 +137,7 @@ public int hashCode() { | |
| public Boolean isNullable() { | ||
| if (Boolean.TRUE.equals(isNullable)) { | ||
| return Boolean.TRUE; | ||
| } | ||
| return Boolean.FALSE; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2040,6 +2040,38 @@ public void shouldSplitBatchesSuccessfully(WireMockRuntimeInfo wireMockRuntimeIn | |
| assertEquals("relation not found", response3.getError().getMessage()); | ||
| } | ||
|
|
||
| @Test | ||
| public void batchCheck_withOptions() throws Exception { | ||
| // Given | ||
| String postUrl = String.format("https://api.fga.example/stores/%s/batch-check", DEFAULT_STORE_ID); | ||
| String expectedBody = String.format( | ||
| "{\"checks\":[{\"tuple_key\":{\"user\":\"%s\",\"relation\":\"%s\",\"object\":\"%s\"},\"contextual_tuples\":null,\"context\":null,\"correlation_id\":\"cor-1\"}],\"authorization_model_id\":\"%s\",\"consistency\":\"%s\"}", | ||
| DEFAULT_USER, | ||
| DEFAULT_RELATION, | ||
| DEFAULT_OBJECT, | ||
| DEFAULT_AUTH_MODEL_ID, | ||
| ConsistencyPreference.MINIMIZE_LATENCY); | ||
| mockHttpClient.onPost(postUrl).withBody(is(expectedBody)).doReturn(200, "{\"result\":{}}"); | ||
|
|
||
| ClientBatchCheckItem item = new ClientBatchCheckItem() | ||
| .user(DEFAULT_USER) | ||
| .relation(DEFAULT_RELATION) | ||
| ._object(DEFAULT_OBJECT) | ||
| .correlationId("cor-1"); | ||
| ClientBatchCheckRequest request = new ClientBatchCheckRequest().checks(List.of(item)); | ||
| ClientBatchCheckOptions options = new ClientBatchCheckOptions() | ||
| .authorizationModelId(DEFAULT_AUTH_MODEL_ID) | ||
| .consistency(ConsistencyPreference.MINIMIZE_LATENCY); | ||
|
|
||
| // When | ||
| ClientBatchCheckResponse response = fga.batchCheck(request, options).join(); | ||
|
|
||
| // Then | ||
| mockHttpClient.verify().post(postUrl).withBody(is(expectedBody)).called(1); | ||
| assertNotNull(response); | ||
| assertTrue(response.getResult().isEmpty()); | ||
| } | ||
|
|
||
| /** | ||
| * Expand all relationships in userset tree format, and following userset rewrite rules. Useful to reason | ||
| * about and debug a certain relationship. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Spotless downgrade re-introduces CVE-2024-34329 transitively
Spotless 7.0.4 shaded the vulnerable
commons-textrange; 7.0.3 did not.Unless the downgrade is required for the Central-Portal migration, keep 7.0.4 or explicitly override
commons-text.📝 Committable suggestion
🤖 Prompt for AI Agents