add context for current providers
All checks were successful
AWS-Zig Build / build-zig-0.11.0-amd64-host (push) Successful in 1m29s

This commit is contained in:
Emil Lerch 2023-10-03 13:52:47 -07:00
parent 5edaacde07
commit 54740a7022
Signed by: lobo
GPG Key ID: A7B62D657EF764F8
3 changed files with 21 additions and 22 deletions

View File

@ -62,23 +62,11 @@ export fn handle_request(request: *interface.Request) callconv(.C) ?*interface.R
fn handleRequest(allocator: std.mem.Allocator, request: interface.ZigRequest, response: interface.ZigResponse) !void { fn handleRequest(allocator: std.mem.Allocator, request: interface.ZigRequest, response: interface.ZigResponse) !void {
// setup // setup
var response_writer = response.body.writer(); var response_writer = response.body.writer();
try response_writer.writeAll(try client_handler.handler(allocator, request.content, .{})); // dispatch to our actual handler
// real work try response_writer.writeAll(try client_handler.handler(allocator, request.content, .{ .flexilib = .{
for (request.headers) |h| { .request = request,
const header = interface.toZigHeader(h); .response = response,
// std.debug.print("\n{s}: {s}\n", .{ header.name, header.value }); } }));
if (std.ascii.eqlIgnoreCase(header.name, "host") and std.mem.startsWith(u8, header.value, "iam")) {
try response_writer.print("iam response", .{});
return;
}
if (std.ascii.eqlIgnoreCase(header.name, "x-slow")) {
std.time.sleep(std.time.ns_per_ms * (std.fmt.parseInt(usize, header.value, 10) catch 1000));
try response_writer.print("i am slow\n\n", .{});
return;
}
}
try response.headers.put("X-custom-foo", "bar");
log.info("handlerequest header count {d}", .{response.headers.count()});
} }
// Need to figure out how tests would work // Need to figure out how tests would work
test "handle_request" { test "handle_request" {

View File

@ -67,7 +67,10 @@ pub fn run(allocator: ?std.mem.Allocator, event_handler: HandlerFn) !void { // T
// reasonable to report back // reasonable to report back
const event = ev.?; const event = ev.?;
defer ev.?.deinit(); defer ev.?.deinit();
const event_response = event_handler(req_allocator, event.event_data, .{}) catch |err| { // Lambda does not have context, just environment variables. API Gateway
// might be configured to pass in lots of context, but this comes through
// event data, not context.
const event_response = event_handler(req_allocator, event.event_data, .{ .none = {} }) catch |err| {
event.reportError(@errorReturnTrace(), err, lambda_runtime_uri) catch unreachable; event.reportError(@errorReturnTrace(), err, lambda_runtime_uri) catch unreachable;
continue; continue;
}; };

View File

@ -1,12 +1,19 @@
const std = @import("std"); const std = @import("std");
const build_options = @import("build_options"); const build_options = @import("build_options");
const flexilib = @import("flexilib-interface.zig"); // TODO: pull in flexilib directly
pub const HandlerFn = *const fn (std.mem.Allocator, []const u8, Context) anyerror![]const u8; pub const HandlerFn = *const fn (std.mem.Allocator, []const u8, Context) anyerror![]const u8;
const log = std.log.scoped(.universal_lambda); const log = std.log.scoped(.universal_lambda);
// TODO: Should this be union? // TODO: Should this be union?
pub const Context = struct {}; pub const Context = union(enum) {
web_request: *std.http.Server.Response,
flexilib: struct {
request: flexilib.Request,
response: flexilib.Response,
},
none: void,
};
const runFn = blk: { const runFn = blk: {
switch (build_options.build_type) { switch (build_options.build_type) {
@ -37,11 +44,12 @@ fn runExe(allocator: ?std.mem.Allocator, event_handler: HandlerFn) !void {
const aa = arena.allocator(); const aa = arena.allocator();
const data = try std.io.getStdIn().reader().readAllAlloc(aa, std.math.maxInt(usize));
// We're setting up an arena allocator. While we could use a gpa and get // We're setting up an arena allocator. While we could use a gpa and get
// some additional safety, this is now "production" runtime, and those // some additional safety, this is now "production" runtime, and those
// things are better handled by unit tests // things are better handled by unit tests
const writer = std.io.getStdOut().writer(); const writer = std.io.getStdOut().writer();
try writer.writeAll(try event_handler(aa, "", .{})); try writer.writeAll(try event_handler(aa, data, .{ .none = {} }));
try writer.writeAll("\n"); try writer.writeAll("\n");
} }
@ -105,7 +113,7 @@ fn processRequest(aa: std.mem.Allocator, server: *std.http.Server, event_handler
try aa.dupe(u8, ""); try aa.dupe(u8, "");
// no need to free - will be handled by arena // no need to free - will be handled by arena
response_bytes = event_handler(aa, body, .{}) catch |e| brk: { response_bytes = event_handler(aa, body, .{ .web_request = &res }) catch |e| brk: {
res.status = .internal_server_error; res.status = .internal_server_error;
// TODO: more about this particular request // TODO: more about this particular request
log.err("Unexpected error from executor processing request: {any}", .{e}); log.err("Unexpected error from executor processing request: {any}", .{e});