From f21ce40186c984c3fe4bcca0a5be5057c5e9a4d7 Mon Sep 17 00:00:00 2001
From: Emil Lerch <emil@lerch.org>
Date: Thu, 12 Aug 2021 17:51:07 -0700
Subject: [PATCH] include proper service name and use it

---
 codegen/src/main.zig |  3 +++
 src/aws.zig          | 20 +++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/codegen/src/main.zig b/codegen/src/main.zig
index be6c02f..5d0e6db 100644
--- a/codegen/src/main.zig
+++ b/codegen/src/main.zig
@@ -85,6 +85,7 @@ fn generateServices(allocator: *std.mem.Allocator, comptime _: []const u8, file:
     for (services.items) |service| {
         var sdk_id: []const u8 = undefined;
         var version: []const u8 = service.shape.service.version;
+        var name: []const u8 = service.name;
         var arn_namespace: []const u8 = undefined;
         var sigv4_name: []const u8 = undefined;
         var endpoint_prefix: []const u8 = undefined;
@@ -114,6 +115,7 @@ fn generateServices(allocator: *std.mem.Allocator, comptime _: []const u8, file:
         try writer.print("pub const arn_namespace: []const u8 = \"{s}\";\n", .{arn_namespace});
         try writer.print("pub const endpoint_prefix: []const u8 = \"{s}\";\n", .{endpoint_prefix});
         try writer.print("pub const sigv4_name: []const u8 = \"{s}\";\n", .{sigv4_name});
+        try writer.print("pub const name: []const u8 = \"{s}\";\n", .{name});
         // TODO: This really should just be ".whatevs". We're fully qualifying here, which isn't typical
         try writer.print("pub const aws_protocol: smithy.AwsProtocol = smithy.{s};\n\n", .{aws_protocol});
         _ = try writer.write("pub const service_metadata : struct {\n");
@@ -122,6 +124,7 @@ fn generateServices(allocator: *std.mem.Allocator, comptime _: []const u8, file:
         try writer.print("    arn_namespace: []const u8 = \"{s}\",\n", .{arn_namespace});
         try writer.print("    endpoint_prefix: []const u8 = \"{s}\",\n", .{endpoint_prefix});
         try writer.print("    sigv4_name: []const u8 = \"{s}\",\n", .{sigv4_name});
+        try writer.print("    name: []const u8 = \"{s}\",\n", .{name});
         // TODO: This really should just be ".whatevs". We're fully qualifying here, which isn't typical
         try writer.print("    aws_protocol: smithy.AwsProtocol = smithy.{s},\n", .{aws_protocol});
         _ = try writer.write("} = .{};\n");
diff --git a/src/aws.zig b/src/aws.zig
index 2752ec5..52ee81f 100644
--- a/src/aws.zig
+++ b/src/aws.zig
@@ -72,19 +72,9 @@ pub const Aws = struct {
 
     /// Calls using one of the json protocols (rest_json_1, json_1_0, json_1_1
     fn callJson(self: Self, comptime request: anytype, comptime service_meta: anytype, action: anytype, options: Options) !FullResponse(request) {
-        // Target might be a problem. The smithy docs differ fairly significantly
-        // from the REST API examples. Here I'm following the REST API examples
-        // as they have not yet led me astray. Whether they're consistent
-        // across other services is another matter...
-        var version = try self.allocator.alloc(u8, service_meta.version.len);
-        defer self.allocator.free(version);
-        const replacements = std.mem.replace(u8, service_meta.version, "-", "", version);
-        // Resize the version, otherwise the junk at the end will mess with allocPrint
-        version = try self.allocator.resize(version, version.len - replacements);
         const target =
-            try std.fmt.allocPrint(self.allocator, "{s}_{s}.{s}", .{
-            service_meta.sdk_id,
-            version,
+            try std.fmt.allocPrint(self.allocator, "{s}.{s}", .{
+            service_meta.name,
             action.action_name,
         });
         defer self.allocator.free(target);
@@ -96,7 +86,11 @@ pub const Aws = struct {
         // can guarantee we don't need the memory after this call completes,
         // so we'll use an arena allocator to whack everything.
         // TODO: Determine if sending in null values is ok, or if we need another
-        //       tweak to the stringify function to exclude
+        //       tweak to the stringify function to exclude. According to the
+        //       smithy spec, "A null value MAY be provided or omitted
+        //       for a boxed member with no observable difference." But we're
+        //       seeing a lot of differences here between spec and reality
+        //
         var nameAllocator = std.heap.ArenaAllocator.init(self.allocator);
         defer nameAllocator.deinit();
         try json.stringify(request, .{ .whitespace = .{}, .allocator = &nameAllocator.allocator, .nameTransform = pascalTransformer }, buffer.writer());