lobo/aws-sdk-for-zig
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix path not added on override

Browse Source
This commit is contained in:
Emil Lerch 2023-08-27 23:18:15 -07:00
parent c39fc940b9
commit 1b2b51be88
Signed by: lobo
GPG Key ID: A7B62D657EF764F8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aws_http.zig
View File

@ -268,7 +268,7 @@ fn endpointForRequest(allocator: std.mem.Allocator, service: []const u8, request
const environment_override = endpoint_override orelse try getEnvironmentVariable(allocator, "AWS_ENDPOINT_URL"); const environment_override = endpoint_override orelse try getEnvironmentVariable(allocator, "AWS_ENDPOINT_URL");
if (environment_override) |override| { if (environment_override) |override| {
const uri = try allocator.dupe(u8, override); const uri = try allocator.dupe(u8, override);
return endPointFromUri(allocator, uri); return endPointFromUri(allocator, uri, request.path);
} }
// Fallback to us-east-1 if global endpoint does not exist. // Fallback to us-east-1 if global endpoint does not exist.
const realregion = if (std.mem.eql(u8, options.region, "aws-global")) "us-east-1" else options.region; const realregion = if (std.mem.eql(u8, options.region, "aws-global")) "us-east-1" else options.region;
@ -359,7 +359,7 @@ fn s3BucketFromPath(path: []const u8) []const u8 {
/// ///
/// allocator: Will be used only to construct the EndPoint struct /// allocator: Will be used only to construct the EndPoint struct
/// uri: string constructed in such a way that deallocation is needed /// uri: string constructed in such a way that deallocation is needed
fn endPointFromUri(allocator: std.mem.Allocator, uri: []const u8) !EndPoint { fn endPointFromUri(allocator: std.mem.Allocator, uri: []const u8, path: []const u8) !EndPoint {
var scheme: []const u8 = ""; var scheme: []const u8 = "";
var host: []const u8 = ""; var host: []const u8 = "";
var port: u16 = 443; var port: u16 = 443;
@ -401,7 +401,7 @@ fn endPointFromUri(allocator: std.mem.Allocator, uri: []const u8) !EndPoint {
.scheme = scheme, .scheme = scheme,
.allocator = allocator, .allocator = allocator,
.port = port, .port = port,
.path = try allocator.dupe(u8, "/"), .path = try allocator.dupe(u8, path),
}; };
} }