Skip to content

fix(triggers): fix agent triggers OpenAPI overlays, numeric fields, and SDK patches #1331

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
copybara-service merged 1 commit into from
Oct 16, 2026
Merged

fix(triggers): fix agent triggers OpenAPI overlays, numeric fields, and SDK patches #1331

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
37 changes: 31 additions & 6 deletions src/main/java/com/google/genai/gaos/hooks/SDKHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ private SDKHooks() {
public static void initialize(com.google.genai.gaos.utils.Hooks hooks) {
hooks.registerBeforeRequest(
(context, request) -> {
HttpRequest.Builder builder = null;
if (context.securitySource().isPresent()) {
HasSecurity hasSecurity = context.securitySource().get().getSecurity();
if (hasSecurity instanceof Security) {
Security security = (Security) hasSecurity;
HttpRequest.Builder builder = request.toBuilder();
builder = request.toBuilder();

if (security.defaultHeaders().isPresent()) {
for (Map.Entry<String, String> entry : security.defaultHeaders().get().entrySet()) {
Expand All @@ -53,21 +54,33 @@ public static void initialize(com.google.genai.gaos.utils.Hooks hooks) {
} else if (security.accessToken().isPresent()) {
builder.setHeader("Authorization", "Bearer " + security.accessToken().get());
}
return builder.build();
}
}
return request;
if (context.sdkConfiguration() != null
&& context.sdkConfiguration().globals != null
&& !request.headers().firstValue("x-goog-user-project").isPresent()) {
java.util.Optional<String> userProject =
context.sdkConfiguration().globals.getParam("header", "x-goog-user-project");
if (userProject.isPresent()) {
if (builder == null) {
builder = request.toBuilder();
}
builder.setHeader("x-goog-user-project", userProject.get());
}
}
return builder != null ? builder.build() : request;
});
}

public static void initialize(com.google.genai.gaos.utils.AsyncHooks asyncHooks) {
asyncHooks.registerBeforeRequest(
(context, request) -> {
HttpRequest.Builder builder = null;
if (context.securitySource().isPresent()) {
HasSecurity hasSecurity = context.securitySource().get().getSecurity();
if (hasSecurity instanceof Security) {
Security security = (Security) hasSecurity;
HttpRequest.Builder builder = request.toBuilder();
builder = request.toBuilder();

if (security.defaultHeaders().isPresent()) {
for (Map.Entry<String, String> entry : security.defaultHeaders().get().entrySet()) {
Expand All @@ -79,10 +92,22 @@ public static void initialize(com.google.genai.gaos.utils.AsyncHooks asyncHooks)
} else if (security.accessToken().isPresent()) {
builder.setHeader("Authorization", "Bearer " + security.accessToken().get());
}
return CompletableFuture.completedFuture(builder.build());
}
}
return CompletableFuture.completedFuture(request);
if (context.sdkConfiguration() != null
&& context.sdkConfiguration().globals != null
&& !request.headers().firstValue("x-goog-user-project").isPresent()) {
java.util.Optional<String> userProject =
context.sdkConfiguration().globals.getParam("header", "x-goog-user-project");
if (userProject.isPresent()) {
if (builder == null) {
builder = request.toBuilder();
}
builder.setHeader("x-goog-user-project", userProject.get());
}
}
return CompletableFuture.completedFuture(
builder != null ? builder.build() : request);
});
}

Expand Down
52 changes: 46 additions & 6 deletions ...google/genai/gaos/hooks/SDKHooksTest.java → ...google/genai/gaos/hooks/SdkHooksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;

import com.google.genai.gaos.SDKConfiguration;
import com.google.genai.gaos.SecuritySource;
import com.google.genai.gaos.models.shared.Security;
import com.google.genai.gaos.utils.AsyncHooks;
Expand All @@ -32,11 +33,11 @@
import org.junit.jupiter.api.Test;

/**
* Tests for {@link SDKHooks} to verify that request authorization headers
* (x-goog-api-key, Authorization, defaultHeaders) are properly configured
* and not accidentally cleared during SDK regeneration.
* Tests for {@link SDKHooks} to verify that request authorization headers (x-goog-api-key,
* Authorization, defaultHeaders) are properly configured and not accidentally cleared during SDK
* regeneration.
*/
public final class SDKHooksTest {
public final class SdkHooksTest {

private static final String API_KEY = "test-api-key-12345";
private static final String ACCESS_TOKEN = "test-access-token-abcde";
Expand Down Expand Up @@ -80,7 +81,8 @@ public void testSyncHookSetsAuthorizationHeader() throws Exception {
HttpRequest request = createBaseRequest();

HttpRequest modified = hooks.beforeRequest(context, request);
assertEquals("Bearer " + ACCESS_TOKEN, modified.headers().firstValue("Authorization").orElse(null));
assertEquals(
"Bearer " + ACCESS_TOKEN, modified.headers().firstValue("Authorization").orElse(null));
}

@Test
Expand Down Expand Up @@ -124,7 +126,8 @@ public void testAsyncHookSetsAuthorizationHeader() throws Exception {
HttpRequest request = createBaseRequest();

HttpRequest modified = asyncHooks.beforeRequest(context, request).get();
assertEquals("Bearer " + ACCESS_TOKEN, modified.headers().firstValue("Authorization").orElse(null));
assertEquals(
"Bearer " + ACCESS_TOKEN, modified.headers().firstValue("Authorization").orElse(null));
}

@Test
Expand Down Expand Up @@ -154,4 +157,41 @@ public void testHookWithoutSecurityPassesRequestThrough() throws Exception {
HttpRequest modified = hooks.beforeRequest(context, request);
assertSame(request, modified);
}

@Test
public void testSyncAndAsyncHooksPropagateUserProjectFromGlobals() throws Exception {
Hooks hooks = new Hooks();
SDKHooks.initialize(hooks);
AsyncHooks asyncHooks = new AsyncHooks();
SDKHooks.initialize(asyncHooks);

SDKConfiguration config = new SDKConfiguration();
config.globals.putParam("header", "x-goog-user-project", "my-quota-project");
Hook.BeforeRequestContext context =
new Hook.BeforeRequestContextImpl(
config,
"https://generativelanguage.googleapis.com",
"createInteraction",
Optional.empty(),
Optional.empty());

HttpRequest request = createBaseRequest();
HttpRequest syncModified = hooks.beforeRequest(context, request);
assertEquals(
"my-quota-project", syncModified.headers().firstValue("x-goog-user-project").orElse(null));

HttpRequest asyncModified = asyncHooks.beforeRequest(context, request).get();
assertEquals(
"my-quota-project", asyncModified.headers().firstValue("x-goog-user-project").orElse(null));

// Existing x-goog-user-project header on the request should not be overwritten.
HttpRequest presetRequest =
request.toBuilder().setHeader("x-goog-user-project", "override-project").build();
HttpRequest syncPreset = hooks.beforeRequest(context, presetRequest);
assertEquals(
"override-project", syncPreset.headers().firstValue("x-goog-user-project").orElse(null));
HttpRequest asyncPreset = asyncHooks.beforeRequest(context, presetRequest).get();
assertEquals(
"override-project", asyncPreset.headers().firstValue("x-goog-user-project").orElse(null));
}
}
Loading