add workflow_dispatch to main build

https://ziglang.org/download/0.14.0/release-notes.html\#Incremental-Compilation

.envrc

@@ -1,8 +1,8 @@
 # vi: ft=sh
 # shellcheck shell=bash
 
-if ! has zvm_direnv_version || ! zvm_direnv_version 1.0.0; then
+if ! has zvm_direnv_version || ! zvm_direnv_version 2.0.0; then
-  source_url "https://git.lerch.org/lobo/zvm-direnv/raw/tag/1.0.0/direnvrc" "sha256-Gtddvcr6aJsrjKd53uChxA1reQmJgEBpmPUWmMdtDIQ="
+  source_url "https://git.lerch.org/lobo/zvm-direnv/raw/tag/2.0.0/direnvrc" "sha256-8Umzxj32hFU6G0a7Wrq0KTNDQ8XEuje2A3s2ljh/hFY="
 fi
 
-use zig 2024.11.0-mach
+use zig 0.14.0

.gitea/workflows/build.yaml

@@ -1,10 +1,9 @@
 name: AWS-Zig Build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
+  workflow_dispatch:
   push:
     branches:
-      - '*'
+      - 'master'
-      - '!zig-develop*'
 env:
   ACTIONS_RUNTIME_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   ACTIONS_RUNTIME_URL: ${{ env.GITHUB_SERVER_URL }}/api/actions_pipeline/
@@ -17,11 +16,11 @@ jobs:
     #   image: alpine:3.15.0
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Zig
-        uses: https://git.lerch.org/lobo/setup-zig@v3
+        uses: mlugg/setup-zig@v1.2.1
         with:
-          version: 0.13.0
+          version: 0.14.0
       - name: Run tests
         run: zig build test --verbose
       # Zig build scripts don't have the ability to import depenedencies directly

.gitea/workflows/zig-mach.yaml

@@ -1,11 +1,11 @@
 name: aws-zig mach nominated build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 12 * * *' # noon UTC, 4AM Pacific
   push:
     branches:
-      - 'zig-develop*'
+      - 'zig-mach'
 env:
   PKG_PREFIX: nominated-zig
 jobs:
@@ -22,9 +22,9 @@ jobs:
     #   image: alpine:3.15.0
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          ref: zig-develop
+          ref: zig-mach
       - name: Setup Zig
         uses: mlugg/setup-zig@v1.2.1
         with:

.gitea/workflows/zig-nightly.yaml

@@ -1,11 +1,11 @@
 name: aws-zig nightly build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
+  workflow_dispatch:
   schedule:
     - cron: '30 12 * * *' # 12:30 UTC, 4:30AM Pacific
   push:
     branches:
-      - 'zig-develop*'
+      - 'zig-develop'
 env:
   PKG_PREFIX: nightly-zig
 jobs:
@@ -22,11 +22,11 @@ jobs:
     #   image: alpine:3.15.0
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: zig-develop
       - name: Setup Zig
-        uses: https://git.lerch.org/lobo/setup-zig@v3
+        uses: mlugg/setup-zig@v1.2.1
         with:
           version: master
       - name: Run tests

.gitea/workflows/zig-previous.yaml

@@ -0,0 +1,84 @@
+name: AWS-Zig Build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'zig-0.13'
+env:
+  ACTIONS_RUNTIME_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  ACTIONS_RUNTIME_URL: ${{ env.GITHUB_SERVER_URL }}/api/actions_pipeline/
+jobs:
+  build-zig-amd64-host:
+    runs-on: ubuntu-latest
+    # Need to use the default container with node and all that, so we can
+    # use JS-based actions like actions/checkout@v3...
+    # container:
+    #   image: alpine:3.15.0
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          ref: zig-0.13
+      - name: Setup Zig
+        uses: mlugg/setup-zig@v1.2.1
+        with:
+          version: 0.13.0
+      - name: Run tests
+        run: zig build test --verbose
+      # Zig build scripts don't have the ability to import depenedencies directly
+      # (https://github.com/ziglang/zig/issues/18164). We can allow downstream
+      # build scripts to import aws with a few tweaks, but we can't @import("src/aws.zig")
+      # until we have our models built. So we have to have the build script
+      # basically modified, only during packaging, to allow this use case
+      #
+      # Zig package manager expects everything to be inside a directory in the archive,
+      # which it then strips out on download. So we need to shove everything inside a directory
+      # the way GitHub/Gitea does for repo archives
+      #
+      # Also, zig tar process doesn't handle gnu format for long names, nor does it seam to
+      # handle posix long name semantics cleanly either. ustar works. This
+      # should be using git archive, but we need our generated code to be part of it
+      - name: Package source code with generated models
+        run: |
+          sed -i 's#// UNCOMMENT AFTER MODEL GEN TO USE IN BUILD SCRIPTS //##' build.zig
+          tar -czf ${{ runner.temp }}/${{ github.sha }}-with-models.tar.gz \
+            --format ustar \
+            --exclude 'zig-*' \
+            *
+      # Something in this PR broke this transform. I don't mind removing it, but
+      # the PR attempts to handle situations with or without a prefix, but it
+      # doesn't. I have not yet determined what the problem is, though
+      # https://github.com/ziglang/zig/pull/19111/files
+      # --transform 's,^,${{ github.sha }}/,' *
+      # - name: Sign
+      #   id: sign
+      #   uses: https://git.lerch.org/lobo/action-hsm-sign@v1
+      #   with:
+      #     pin: ${{ secrets.HSM_USER_PIN }}
+      #     files: ???
+      #     public_key: 'https://emil.lerch.org/serverpublic.pem'
+      # - run: |
+      #     echo "Source 0 should be ./bar: ${{ steps.sign.outputs.SOURCE_0 }}"
+      # - run: |
+      #     echo "Signature 0 should be ./bar.sig: ${{ steps.sign.outputs.SIG_0 }}"
+      # - run: echo "URL of bar (0) is ${{ steps.sign.outputs.URL_0 }}"
+      # - run: |
+      #     echo "Source 1 should be ./foo: ${{ steps.sign.outputs.SOURCE_1 }}"
+      # - run: |
+      #     echo "Signature 1 should be ./foo.sig: ${{ steps.sign.outputs.SIG_1 }}"
+      # - run: echo "URL of foo (1) is ${{ steps.sign.outputs.URL_1 }}"
+      - name: Publish source code with generated models
+        run: |
+          curl --user ${{ github.actor }}:${{ secrets.PACKAGE_PUSH }} \
+            --upload-file ${{ runner.temp }}/${{ github.sha }}-with-models.tar.gz \
+            https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/${{ github.sha }}/${{ github.sha }}-with-models.tar.gz
+      - name: Build example
+        run: ( cd example && zig build ) # Make sure example builds
+      - name: Notify
+        uses: https://git.lerch.org/lobo/action-notify-ntfy@v2
+        if: always()
+        with:
+          host: ${{ secrets.NTFY_HOST }}
+          topic: ${{ secrets.NTFY_TOPIC }}
+          user: ${{ secrets.NTFY_USER }}
+          password: ${{ secrets.NTFY_PASSWORD }}

.github/workflows/build.yaml

@@ -1,30 +1,19 @@
-name: AWS-Zig Build
+name: Current zig version build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
   push:
     branches:
-      - '*'
+      - 'master'
-      - '!zig-develop*'
 jobs:
-  build-zig-0-12-0-amd64:
+  build-amd64:
     runs-on: ubuntu-latest
-    env:
-      ZIG_VERSION: 0.13.0
-      ARCH: x86_64
     if: ${{ github.env.GITEA_ACTIONS != 'true' }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      # ARCH is fine, but we can't substitute directly because zig
+      - name: Setup Zig
-      # uses x86_64 instead of amd64. They also use aarch64 instead of arm64.
+        uses: mlugg/setup-zig@v1.2.1
-      #
+        with:
-      # However, arm64/linux isn't quite fully tier 1 yet, so this is more of a
+          version: 0.14.0
-      # TODO: https://github.com/ziglang/zig/issues/2443
-      - name: Install zig
-        run: |
-          wget -q https://ziglang.org/download/${ZIG_VERSION}/zig-linux-${ARCH}-${ZIG_VERSION}.tar.xz
-          sudo tar x -C /usr/local -f zig-linux-${ARCH}-${ZIG_VERSION}.tar.xz
-          sudo ln -s /usr/local/zig-linux-${ARCH}-${ZIG_VERSION}/zig /usr/local/bin/zig
       - name: Run tests
         run: zig build test -Dbroken-windows --verbose # Github runners try to run the windows tests despite disabling foreign checks
       - name: Build example

.github/workflows/zig-mach.yaml

@@ -1,35 +1,19 @@
-name: aws-zig mach nominated build
+name: Latest mach nominated zig version build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
   push:
     branches:
-      - 'zig-develop*'
+      - 'zig-mach*'
 jobs:
   build-zig-mach-latest:
     runs-on: ubuntu-latest
-    # Need to use the default container with node and all that, so we can
-    # use JS-based actions like actions/checkout@v3...
-    # container:
-    #   image: alpine:3.15.0
-    env:
-      ZIG_VERSION: mach-latest
-      ARCH: x86_64
     if: ${{ github.env.GITEA_ACTIONS != 'true' }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      # ARCH is fine, but we can't substitute directly because zig
+      - name: Setup Zig
-      # uses x86_64 instead of amd64. They also use aarch64 instead of arm64.
+        uses: mlugg/setup-zig@v1.2.1
-      #
+        with:
-      # However, arm64/linux isn't quite fully tier 1 yet, so this is more of a
+          version: mach-latest
-      # TODO: https://github.com/ziglang/zig/issues/2443
-      - name: Install zig
-        run: |
-          apt-get update && apt-get install -y jq
-          file="$(curl -Osw '%{filename_effective}' "$(curl -s https://machengine.org/zig/index.json |jq -r '."'${ZIG_VERSION}'"."x86_64-linux".tarball')")"
-          sudo tar x -C /usr/local -f "${file}"
-          sudo ln -s /usr/local/"${file%%.tar.xz}"/zig /usr/local/bin/zig
-          zig version
       - name: Run tests
         run: zig build test -Dbroken-windows --verbose
       - name: Build example

.github/workflows/zig-nightly.yaml

@@ -1,5 +1,4 @@
-name: aws-zig nightly build
+name: Nightly zig version Build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
   push:
     branches:
@@ -7,29 +6,14 @@ on:
 jobs:
   build-zig-nightly:
     runs-on: ubuntu-latest
-    # Need to use the default container with node and all that, so we can
-    # use JS-based actions like actions/checkout@v3...
-    # container:
-    #   image: alpine:3.15.0
-    env:
-      ZIG_VERSION: master
-      ARCH: x86_64
     if: ${{ github.env.GITEA_ACTIONS != 'true' }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      # ARCH is fine, but we can't substitute directly because zig
+      - name: Setup Zig
-      # uses x86_64 instead of amd64. They also use aarch64 instead of arm64.
+        uses: mlugg/setup-zig@v1.2.1
-      #
+        with:
-      # However, arm64/linux isn't quite fully tier 1 yet, so this is more of a
+          version: master
-      # TODO: https://github.com/ziglang/zig/issues/2443
-      - name: Install zig
-        run: |
-          apt-get update && apt-get install -y jq
-          file="$(curl -Osw '%{filename_effective}' "$(curl -s https://ziglang.org/download/index.json |jq -r '."'${ZIG_VERSION}'"."x86_64-linux".tarball')")"
-          sudo tar x -C /usr/local -f "${file}"
-          sudo ln -s /usr/local/"${file%%.tar.xz}"/zig /usr/local/bin/zig
-          zig version
       - name: Run tests
         run: zig build test -Dbroken-windows --verbose
       - name: Build example

.github/workflows/zig-previous.yaml

@@ -0,0 +1,20 @@
+name: Previous zig version Build
+on:
+  push:
+    branches:
+      - 'zig-0.13'
+jobs:
+  build-amd64:
+    runs-on: ubuntu-latest
+    if: ${{ github.env.GITEA_ACTIONS != 'true' }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Setup Zig
+        uses: mlugg/setup-zig@v1.2.1
+        with:
+          version: 0.13.0
+      - name: Run tests
+        run: zig build test -Dbroken-windows --verbose # Github runners try to run the windows tests despite disabling foreign checks
+      - name: Build example
+        run: ( cd example && zig build ) # Make sure example builds

README.md

@@ -1,11 +1,11 @@
 AWS SDK for Zig
 ===============
 
-[Zig 0.13](https://ziglang.org/download/#release-0.13.0):
+[Zig 0.14](https://ziglang.org/download/#release-0.14.0):
 
-[![Build Status: Zig 0.13.0](https://git.lerch.org/lobo/aws-sdk-for-zig/actions/workflows/build.yaml/badge.svg)](https://git.lerch.org/lobo/aws-sdk-for-zig/actions?workflow=build.yaml&state=closed)
+[![Build Status: Zig 0.14.0](https://git.lerch.org/lobo/aws-sdk-for-zig/actions/workflows/build.yaml/badge.svg)](https://git.lerch.org/lobo/aws-sdk-for-zig/actions?workflow=build.yaml&state=closed)
 
-[Last Mach Nominated Zig Version](https://machengine.org/about/nominated-zig/):
+[Last Mach Nominated Zig Version](https://machengine.org/docs/nominated-zig/):
 
 [![Build Status: Mach nominated](https://git.lerch.org/lobo/aws-sdk-for-zig/actions/workflows/zig-mach.yaml/badge.svg)](https://git.lerch.org/lobo/aws-sdk-for-zig/actions?workflow=zig-mach.yaml&state=closed)
 
@@ -13,12 +13,13 @@ AWS SDK for Zig
 
 [![Build Status: Zig Nightly](https://git.lerch.org/lobo/aws-sdk-for-zig/actions/workflows/zig-nightly.yaml/badge.svg)](https://git.lerch.org/lobo/aws-sdk-for-zig/actions?workflow=zig-nightly.yaml&state=closed)
 
-**NOTE ON BUILD STATUS**: The nightly/mach nominated version of this currently
+[Zig 0.13](https://ziglang.org/download/#release-0.13.0):
-panics under CI, but I have not yet reproduced this panic. Running manually on
+
-multiple machines appears to be working properly
+[![Build Status: Zig 0.13.0](https://git.lerch.org/lobo/aws-sdk-for-zig/actions/workflows/zig-previous.yaml/badge.svg)](https://git.lerch.org/lobo/aws-sdk-for-zig/actions?workflow=zig-previous.yaml&state=closed)
+
 
 Current executable size for the demo is 980k after compiling with -Doptimize=ReleaseSmall
-in x86_linux, and will vary based on services used. Tested targets:
+in x86_64-linux, and will vary based on services used. Tested targets:
 
 * x86_64-linux
 * riscv64-linux
@@ -30,22 +31,38 @@ in x86_linux, and will vary based on services used. Tested targets:
 
 Tested targets are built, but not continuously tested, by CI.
 
-Zig-Develop Branch
+Branches
-------------------
+--------
 
-This branch is intended for use with the in-development version of Zig. This
+* **master**:      This branch tracks the latest released zig version
-starts with 0.12.0-dev.3180+83e578a18. This is aligned with [Mach Engine's Nominated
+* **zig-0.13**:    This branch tracks the previous released zig version (0.13 currently).
-Zig Versions](https://machengine.org/about/nominated-zig/). Nightly zig versions
+                   Support for the previous version is best effort, generally
-are difficult to keep up with and there is no special effort made there, build
+                   degrading over time. Fixes will generally appear in master, then
-status is FYI (and used as a canary for nominated zig versions).
+                   backported into the previous version.
+* **zig-mach**:    This branch tracks the latest mach nominated version. A separate
+                   branch is necessary as mach nominated is usually, but not always,
+                   more recent than the latest production zig. Support for the mach
+                   version is best effort.
+* **zig-develop**: This branch tracks zig nightly, and is used mainly as a canary
+                   for breaking changes that will need to be dealt with when
+                   a new mach nominated version or new zig release appear.
+                   Expect significant delays in any build failures.
+
+Other branches/tags exist but are unsupported
 
 Building
 --------
 
 `zig build` should work. It will build the code generation project, fetch model
 files from upstream AWS Go SDK v2, run the code generation, then build the main
-project with the generated code. Testing can be done with `zig test`.
+project with the generated code. Testing can be done with `zig build test`. Note that
+this command tests on all supported architectures, so for a faster testing
+process, use `zig build smoke-test` instead.
 
+To make development even faster, a build option is provided to avoid the use of
+LLVM. To use this, use the command `zig build -Dno-llvm smoke-test`. This
+can reduce build/test time 300%. Note, however, native code generation in zig
+is not yet complete, so you may see errors.
 
 Using
 -----
@@ -53,7 +70,8 @@ Using
 This is designed for use with the Zig package manager, and exposes a module
 called "aws". Set up `build.zig.zon` and add the dependency/module to your project
 as normal and the package manager should do its thing. A full example can be found
-in [/example](example/README.md).
+in [/example](example/build.zig.zon). This can also be used at build time in
+a downstream project's `build.zig`.
 
 Configuring the module and/or Running the demo
 ----------------------------------------------
@@ -61,8 +79,8 @@ Configuring the module and/or Running the demo
 This library mimics the aws c libraries for it's work, so it operates like most
 other 'AWS things'. [/src/main.zig](src/main.zig) gives you a handful of examples
 for working with services. For local testing or alternative endpoints, there's
-no real standard, so there is code to look for `AWS_ENDPOINT_URL` environment
+no real standard, so there is code to look for an environment variable
-variable that will supersede all other configuration.
+`AWS_ENDPOINT_URL` variable that will supersede all other configuration.
 
 Limitations
 -----------
@@ -83,13 +101,6 @@ TODO List:
 * Implement timeouts and other TODO's in the code
 * Add option to cache signature keys
 
-Services without TLS 1.3 support
---------------------------------
-
-All AWS services should support TLS 1.3 at this point, but there are many regions
-and several partitions, and not all of them have been tested, so your mileage
-may vary. If something doesn't work, please submit an issue to let others know.
-
 Dependency tree
 ---------------
 

build.zig

@@ -34,12 +34,12 @@ pub fn build(b: *Builder) !void {
         "no-llvm",
         "Disable LLVM",
     ) orelse false;
-
     const broken_windows = b.option(
         bool,
         "broken-windows",
         "Windows is broken in this environment (do not run Windows tests)",
     ) orelse false;
+    const no_bin = b.option(bool, "no-bin", "skip emitting binary") orelse false;
     // TODO: Embed the current git version in the code. We can do this
     // by looking for .git/HEAD (if it exists, follow the ref to /ref/heads/whatevs,
     // grab that commit, and use b.addOptions/exe.addOptions to generate the
@@ -67,17 +67,6 @@ pub fn build(b: *Builder) !void {
     const smithy_module = smithy_dep.module("smithy");
     exe.root_module.addImport("smithy", smithy_module); // not sure this should be here...
 
-    // Expose module to others
-    _ = b.addModule("aws", .{
-        .root_source_file = b.path("src/aws.zig"),
-        .imports = &.{.{ .name = "smithy", .module = smithy_module }},
-    });
-
-    // Expose module to others
-    _ = b.addModule("aws-signing", .{
-        .root_source_file = b.path("src/aws_signing.zig"),
-        .imports = &.{.{ .name = "smithy", .module = smithy_module }},
-    });
     // TODO: This does not work correctly due to https://github.com/ziglang/zig/issues/16354
     //
     // We are working here with kind of a weird dependency though. So we can do this
@@ -100,62 +89,73 @@ pub fn build(b: *Builder) !void {
     const run_step = b.step("run", "Run the app");
     run_step.dependOn(&run_cmd.step);
 
-    const gen_step = blk: {
+    const cg = b.step("gen", "Generate zig service code from smithy models");
-        const cg = b.step("gen", "Generate zig service code from smithy models");
 
-        const cg_exe = b.addExecutable(.{
+    const cg_exe = b.addExecutable(.{
-            .name = "codegen",
+        .name = "codegen",
-            .root_source_file = b.path("codegen/src/main.zig"),
+        .root_source_file = b.path("codegen/src/main.zig"),
-            // We need this generated for the host, not the real target
+        // We need this generated for the host, not the real target
-            .target = b.graph.host,
+        .target = b.graph.host,
-            .optimize = if (b.verbose) .Debug else .ReleaseSafe,
+        .optimize = if (b.verbose) .Debug else .ReleaseSafe,
-        });
+    });
-        cg_exe.use_llvm = !no_llvm;
+    cg_exe.root_module.addImport("smithy", smithy_module);
-        cg_exe.root_module.addImport("smithy", smithy_dep.module("smithy"));
+    var cg_cmd = b.addRunArtifact(cg_exe);
-        var cg_cmd = b.addRunArtifact(cg_exe);
+    cg_cmd.addArg("--models");
-        cg_cmd.addArg("--models");
+    cg_cmd.addArg(try std.fs.path.join(
-        const hash = hash_blk: {
+        b.allocator,
-            for (b.available_deps) |dep| {
+        &[_][]const u8{
-                const dep_name = dep.@"0";
+            try b.dependency("models", .{}).path("").getPath3(b, null).toString(b.allocator),
-                const dep_hash = dep.@"1";
+            models_subdir,
-                if (std.mem.eql(u8, dep_name, "models"))
+        },
-                    break :hash_blk dep_hash;
+    ));
-            }
+    cg_cmd.addArg("--output");
-            return error.DependencyNamedModelsNotFoundInBuildZigZon;
+    const cg_output_dir = cg_cmd.addOutputDirectoryArg("src/models");
-        };
+    if (b.verbose)
-        cg_cmd.addArg(try std.fs.path.join(
+        cg_cmd.addArg("--verbose");
-            b.allocator,
+    // cg_cmd.step.dependOn(&fetch_step.step);
-            &[_][]const u8{
+    // TODO: this should use zig_exe from std.Build
-                b.graph.global_cache_root.path.?,
+    // codegen should store a hash in a comment
-                "p",
+    // this would be hash of the exe that created the file
-                hash,
+    // concatenated with hash of input json. this would
-                models_subdir,
+    // allow skipping generated files. May not include hash
-            },
+    // of contents of output file as maybe we want to tweak
-        ));
+    // manually??
-        cg_cmd.addArg("--output");
+    //
-        cg_cmd.addDirectoryArg(b.path("src/models"));
+    // All the hashes can be in service_manifest.zig, which
-        if (b.verbose)
+    // could be fun to just parse and go nuts. Top of
-            cg_cmd.addArg("--verbose");
+    // file, generator exe hash. Each import has comment
-        // cg_cmd.step.dependOn(&fetch_step.step);
+    // with both input and output hash and we can decide
-        // TODO: this should use zig_exe from std.Build
+    // later about warning on manual changes...
-        // codegen should store a hash in a comment
-        // this would be hash of the exe that created the file
-        // concatenated with hash of input json. this would
-        // allow skipping generated files. May not include hash
-        // of contents of output file as maybe we want to tweak
-        // manually??
-        //
-        // All the hashes can be in service_manifest.zig, which
-        // could be fun to just parse and go nuts. Top of
-        // file, generator exe hash. Each import has comment
-        // with both input and output hash and we can decide
-        // later about warning on manual changes...
 
-        cg.dependOn(&cg_cmd.step);
+    cg.dependOn(&cg_cmd.step);
-        break :blk cg;
-    };
 
-    exe.step.dependOn(gen_step);
+    exe.step.dependOn(cg);
+
+    // This allows us to have each module depend on the
+    // generated service manifest.
+    const service_manifest_module = b.createModule(.{
+        .root_source_file = cg_output_dir.path(b, "service_manifest.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+    service_manifest_module.addImport("smithy", smithy_module);
+
+    exe.root_module.addImport("service_manifest", service_manifest_module);
+
+    // Expose module to others
+    _ = b.addModule("aws", .{
+        .root_source_file = b.path("src/aws.zig"),
+        .imports = &.{
+            .{ .name = "smithy", .module = smithy_module },
+            .{ .name = "service_manifest", .module = service_manifest_module },
+        },
+    });
+
+    // Expose module to others
+    _ = b.addModule("aws-signing", .{
+        .root_source_file = b.path("src/aws_signing.zig"),
+        .imports = &.{.{ .name = "smithy", .module = smithy_module }},
+    });
 
     // Similar to creating the run step earlier, this exposes a `test` step to
     // the `zig build --help` menu, providing a way for the user to request
@@ -185,8 +185,9 @@ pub fn build(b: *Builder) !void {
             .target = b.resolveTargetQuery(t),
             .optimize = optimize,
         });
-        unit_tests.root_module.addImport("smithy", smithy_dep.module("smithy"));
+        unit_tests.root_module.addImport("smithy", smithy_module);
-        unit_tests.step.dependOn(gen_step);
+        unit_tests.root_module.addImport("service_manifest", service_manifest_module);
+        unit_tests.step.dependOn(cg);
         unit_tests.use_llvm = !no_llvm;
 
         const run_unit_tests = b.addRunArtifact(unit_tests);
@@ -210,11 +211,16 @@ pub fn build(b: *Builder) !void {
         .optimize = optimize,
     });
     smoke_test.use_llvm = !no_llvm;
-    smoke_test.root_module.addImport("smithy", smithy_dep.module("smithy"));
+    smoke_test.root_module.addImport("smithy", smithy_module);
-    smoke_test.step.dependOn(gen_step);
+    smoke_test.root_module.addImport("service_manifest", service_manifest_module);
+    smoke_test.step.dependOn(cg);
 
     const run_smoke_test = b.addRunArtifact(smoke_test);
 
     smoke_test_step.dependOn(&run_smoke_test.step);
-    b.installArtifact(exe);
+    if (no_bin) {
+        b.getInstallStep().dependOn(&exe.step);
+    } else {
+        b.installArtifact(exe);
+    }
 }

build.zig.zon

@@ -1,18 +1,20 @@
 .{
-    .name = "aws",
+    .name = .aws,
     .version = "0.0.1",
+    .fingerprint = 0x1f26b7b27005bb49,
     .paths = .{
         "build.zig",
         "build.zig.zon",
         "src",
+        "codegen",
         "README.md",
         "LICENSE",
     },
 
     .dependencies = .{
         .smithy = .{
-            .url = "https://git.lerch.org/lobo/smithy/archive/3ed98751bc414e005af6ad185feb213d4366c0db.tar.gz",
+            .url = "https://git.lerch.org/lobo/smithy/archive/a4c6ec6dfe552c57bab601c7d99e8de02bbab1fe.tar.gz",
-            .hash = "12204a784751a4ad5ed6c8955ba91fcbc4a3cad6c5a7da38f39abf074ef801d13172",
+            .hash = "smithy-1.0.0-uAyBgS_MAgC4qgc9QaEy5Y5Nf7kv32buQZBYugqNQsAn",
         },
         .models = .{
             .url = "https://github.com/aws/aws-sdk-go-v2/archive/58cf6509525a12d64fd826da883bfdbacbd2f00e.tar.gz",

codegen/src/json.zig

@@ -4,7 +4,7 @@ const std = @import("std");
 pub fn serializeMap(map: anytype, key: []const u8, options: anytype, out_stream: anytype) !bool {
     if (@typeInfo(@TypeOf(map)) == .optional) {
         if (map == null)
-            return true
+            return false
         else
             return serializeMapInternal(map.?, key, options, out_stream);
     }
@@ -12,7 +12,23 @@ pub fn serializeMap(map: anytype, key: []const u8, options: anytype, out_stream:
 }
 
 fn serializeMapInternal(map: anytype, key: []const u8, options: anytype, out_stream: anytype) !bool {
-    if (map.len == 0) return true;
+    if (map.len == 0) {
+        var child_options = options;
+        if (child_options.whitespace) |*child_ws|
+            child_ws.indent_level += 1;
+
+        try out_stream.writeByte('"');
+        try out_stream.writeAll(key);
+        _ = try out_stream.write("\":");
+        if (options.whitespace) |ws| {
+            if (ws.separator) {
+                try out_stream.writeByte(' ');
+            }
+        }
+        try out_stream.writeByte('{');
+        try out_stream.writeByte('}');
+        return true;
+    }
     // TODO: Map might be [][]struct{key, value} rather than []struct{key, value}
     var child_options = options;
     if (child_options.whitespace) |*child_ws|

codegen/src/main.zig

@@ -435,7 +435,7 @@ fn generateServices(allocator: std.mem.Allocator, comptime _: []const u8, file:
 
 fn generateAdditionalTypes(allocator: std.mem.Allocator, file_state: FileGenerationState, writer: anytype) !void {
     // More types may be added during processing
-    while (file_state.additional_types_to_generate.popOrNull()) |t| {
+    while (file_state.additional_types_to_generate.pop()) |t| {
         if (file_state.additional_types_generated.getEntry(t.name) != null) continue;
         // std.log.info("\t\t{s}", .{t.name});
         var type_stack = std.ArrayList(*const smithy.ShapeInfo).init(allocator);

example/build.zig.zon

@@ -1,12 +1,13 @@
 .{
-    .name = "myapp",
+    .name = .myapp,
     .version = "0.0.1",
+    .fingerprint = 0x8798022a511224c5,
     .paths = .{""},
 
     .dependencies = .{
         .aws = .{
-            .url = "https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/e02fb699fc47f19d19cad99209bd480ca6963295/e02fb699fc47f19d19cad99209bd480ca6963295nominated-zig-with-models.tar.gz",
+            .url = "https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/30d46261b791a1a916e30e60814b39c7ee994a74/30d46261b791a1a916e30e60814b39c7ee994a74-with-models.tar.gz",
-            .hash = "1220fa9b39c985449936f0e3f02bbb6fdafa64435e502eb78fd47d457b96876b7968",
+            .hash = "aws-0.0.1-SbsFcLuV6gEkmY-mNp_x-V_GJ-zuJRqIljc4tAu60-g_",
         },
     },
 }

src/aws.zig

@@ -263,9 +263,9 @@ pub fn Request(comptime request_action: anytype) type {
         fn callJson(request: ActionRequest, options: Options) !FullResponseType {
             const target =
                 try std.fmt.allocPrint(options.client.allocator, "{s}.{s}", .{
-                Self.service_meta.name,
+                    Self.service_meta.name,
-                action.action_name,
+                    action.action_name,
-            });
+                });
             defer options.client.allocator.free(target);
 
             var buffer = std.ArrayList(u8).init(options.client.allocator);
@@ -326,11 +326,11 @@ pub fn Request(comptime request_action: anytype) type {
             // originally?
             const body =
                 try std.fmt.allocPrint(options.client.allocator, "Action={s}&Version={s}{s}{s}", .{
-                action.action_name,
+                    action.action_name,
-                Self.service_meta.version,
+                    Self.service_meta.version,
-                continuation,
+                    continuation,
-                buffer.items,
+                    buffer.items,
-            });
+                });
             defer options.client.allocator.free(body);
             return try Self.callAws(.{
                 .query = query,
@@ -739,20 +739,20 @@ pub fn Request(comptime request_action: anytype) type {
                 errdefer options.client.allocator.destroy(ptr);
                 @field(ptr.*, std.meta.fields(action.Response)[0].name) =
                     json.parse(response_types.RawResponse, &stream, parser_options) catch |e| {
-                    log.err(
+                        log.err(
-                        \\Call successful, but unexpected response from service.
+                            \\Call successful, but unexpected response from service.
-                        \\This could be the result of a bug or a stale set of code generated
+                            \\This could be the result of a bug or a stale set of code generated
-                        \\service models.
+                            \\service models.
-                        \\
+                            \\
-                        \\Model Type: {}
+                            \\Model Type: {}
-                        \\
+                            \\
-                        \\Response from server:
+                            \\Response from server:
-                        \\
+                            \\
-                        \\{s}
+                            \\{s}
-                        \\
+                            \\
-                    , .{ action.Response, data });
+                        , .{ action.Response, data });
-                    return e;
+                        return e;
-                };
+                    };
                 break :blk ptr;
             };
             return ParsedJsonData(response_types.NormalResponse){
@@ -777,8 +777,12 @@ fn coerceFromString(comptime T: type, val: []const u8) anyerror!T {
     // TODO: This is terrible...fix it
     switch (T) {
         bool => return std.ascii.eqlIgnoreCase(val, "true"),
-        i64 => return parseInt(T, val) catch |e| {
+        i64, i128 => return parseInt(T, val) catch |e| {
-            log.err("Invalid string representing i64: {s}", .{val});
+            log.err("Invalid string representing {s}: {s}", .{ @typeName(T), val });
+            return e;
+        },
+        f64, f128 => return std.fmt.parseFloat(T, val) catch |e| {
+            log.err("Invalid string representing {s}: {s}", .{ @typeName(T), val });
             return e;
         },
         else => return val,
@@ -932,14 +936,14 @@ fn ServerResponse(comptime action: anytype) type {
                 .{
                     .name = action.action_name ++ "Result",
                     .type = T,
-                    .default_value = null,
+                    .default_value_ptr = null,
                     .is_comptime = false,
                     .alignment = 0,
                 },
                 .{
                     .name = "ResponseMetadata",
                     .type = ResponseMetadata,
-                    .default_value = null,
+                    .default_value_ptr = null,
                     .is_comptime = false,
                     .alignment = 0,
                 },
@@ -955,7 +959,7 @@ fn ServerResponse(comptime action: anytype) type {
                 .{
                     .name = action.action_name ++ "Response",
                     .type = Result,
-                    .default_value = null,
+                    .default_value_ptr = null,
                     .is_comptime = false,
                     .alignment = 0,
                 },
@@ -1143,7 +1147,7 @@ fn addQueryArg(comptime ValueType: type, prefix: []const u8, key: []const u8, va
         },
         // if this is a pointer, we want to make sure it is more than just a string
         .pointer => |ptr| {
-            if (ptr.child == u8 or ptr.size != .Slice) {
+            if (ptr.child == u8 or ptr.size != .slice) {
                 // This is just a string
                 return try addBasicQueryArg(prefix, key, value, writer);
             }
@@ -1306,6 +1310,58 @@ test "custom serialization for map objects" {
     , buffer.items);
 }
 
+test "proper serialization for kms" {
+    // Github issue #8
+    // https://github.com/elerch/aws-sdk-for-zig/issues/8
+    const allocator = std.testing.allocator;
+    var buffer = std.ArrayList(u8).init(allocator);
+    defer buffer.deinit();
+    const req = services.kms.encrypt.Request{
+        .encryption_algorithm = "SYMMETRIC_DEFAULT",
+        // Since encryption_context is not null, we expect "{}" to be the value
+        // here, not "[]", because this is our special AWS map pattern
+        .encryption_context = &.{},
+        .key_id = "42",
+        .plaintext = "foo",
+        .dry_run = false,
+        .grant_tokens = &[_][]const u8{},
+    };
+    try json.stringify(req, .{ .whitespace = .{} }, buffer.writer());
+    try std.testing.expectEqualStrings(
+        \\{
+        \\    "KeyId": "42",
+        \\    "Plaintext": "foo",
+        \\    "EncryptionContext": {},
+        \\    "GrantTokens": [],
+        \\    "EncryptionAlgorithm": "SYMMETRIC_DEFAULT",
+        \\    "DryRun": false
+        \\}
+    , buffer.items);
+
+    var buffer_null = std.ArrayList(u8).init(allocator);
+    defer buffer_null.deinit();
+    const req_null = services.kms.encrypt.Request{
+        .encryption_algorithm = "SYMMETRIC_DEFAULT",
+        // Since encryption_context here *IS* null, we expect simply "null" to be the value
+        .encryption_context = null,
+        .key_id = "42",
+        .plaintext = "foo",
+        .dry_run = false,
+        .grant_tokens = &[_][]const u8{},
+    };
+    try json.stringify(req_null, .{ .whitespace = .{} }, buffer_null.writer());
+    try std.testing.expectEqualStrings(
+        \\{
+        \\    "KeyId": "42",
+        \\    "Plaintext": "foo",
+        \\    "EncryptionContext": null,
+        \\    "GrantTokens": [],
+        \\    "EncryptionAlgorithm": "SYMMETRIC_DEFAULT",
+        \\    "DryRun": false
+        \\}
+    , buffer_null.items);
+}
+
 test "REST Json v1 builds proper queries" {
     const allocator = std.testing.allocator;
     const svs = Services(.{.lambda}){};

src/aws_signing.zig

@@ -662,12 +662,12 @@ fn canonicalUri(allocator: std.mem.Allocator, path: []const u8, double_encode: b
     }
     defer allocator.free(encoded_once);
     var encoded_twice = try encodeUri(allocator, encoded_once);
+    defer allocator.free(encoded_twice);
     log.debug("encoded path (2): {s}", .{encoded_twice});
     if (std.mem.lastIndexOf(u8, encoded_twice, "?")) |i| {
-        _ = allocator.resize(encoded_twice, i);
+        return try allocator.dupe(u8, encoded_twice[0..i]);
-        return encoded_twice[0..i];
     }
-    return encoded_twice;
+    return try allocator.dupe(u8, encoded_twice);
 }
 
 fn encodeParamPart(allocator: std.mem.Allocator, path: []const u8) ![]const u8 {
@@ -936,6 +936,7 @@ fn canonicalHeaderValue(allocator: std.mem.Allocator, value: []const u8) ![]cons
     const in_quote = false;
     var start: usize = 0;
     const rc = try allocator.alloc(u8, value.len);
+    defer allocator.free(rc);
     var rc_inx: usize = 0;
     for (value, 0..) |c, i| {
         if (!started and !std.ascii.isWhitespace(c)) {
@@ -953,8 +954,7 @@ fn canonicalHeaderValue(allocator: std.mem.Allocator, value: []const u8) ![]cons
     // Trim end
     while (std.ascii.isWhitespace(rc[rc_inx - 1]))
         rc_inx -= 1;
-    _ = allocator.resize(rc, rc_inx);
+    return try allocator.dupe(u8, rc[0..rc_inx]);
-    return rc[0..rc_inx];
 }
 fn lessThan(context: void, lhs: std.http.Header, rhs: std.http.Header) bool {
     _ = context;
@@ -986,6 +986,7 @@ test "canonical uri" {
     const path = "/documents and settings/?foo=bar";
     const expected = "/documents%2520and%2520settings/";
     const actual = try canonicalUri(allocator, path, true);
+
     defer allocator.free(actual);
     try std.testing.expectEqualStrings(expected, actual);
 

src/json.zig

@@ -1723,7 +1723,7 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options:
             }
             inline for (structInfo.fields, 0..) |field, i| {
                 if (!fields_seen[i]) {
-                    if (field.default_value) |default_value_ptr| {
+                    if (field.default_value_ptr) |default_value_ptr| {
                         if (!field.is_comptime) {
                             const default_value = @as(*align(1) const field.type, @ptrCast(default_value_ptr)).*;
                             @field(r, field.name) = default_value;
@@ -1773,18 +1773,18 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options:
         .pointer => |ptrInfo| {
             const allocator = options.allocator orelse return error.AllocatorRequired;
             switch (ptrInfo.size) {
-                .One => {
+                .one => {
                     const r: T = try allocator.create(ptrInfo.child);
                     errdefer allocator.destroy(r);
                     r.* = try parseInternal(ptrInfo.child, token, tokens, options);
                     return r;
                 },
-                .Slice => {
+                .slice => {
                     switch (token) {
                         .ArrayBegin => {
                             var arraylist = std.ArrayList(ptrInfo.child).init(allocator);
                             errdefer {
-                                while (arraylist.popOrNull()) |v| {
+                                while (arraylist.pop()) |v| {
                                     parseFree(ptrInfo.child, v, options);
                                 }
                                 arraylist.deinit();
@@ -1829,7 +1829,7 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options:
                             if (value_type == null) return error.UnexpectedToken;
                             var arraylist = std.ArrayList(ptrInfo.child).init(allocator);
                             errdefer {
-                                while (arraylist.popOrNull()) |v| {
+                                while (arraylist.pop()) |v| {
                                     parseFree(ptrInfo.child, v, options);
                                 }
                                 arraylist.deinit();
@@ -1879,7 +1879,7 @@ fn isMapPattern(comptime T: type) bool {
     // Let's just double check before proceeding
     const ti = @typeInfo(T);
     if (ti != .pointer) return false;
-    if (ti.pointer.size != .Slice) return false;
+    if (ti.pointer.size != .slice) return false;
     const ti_child = @typeInfo(ti.pointer.child);
     if (ti_child != .@"struct") return false;
     if (ti_child.@"struct".fields.len != 2) return false;
@@ -1935,11 +1935,11 @@ pub fn parseFree(comptime T: type, value: T, options: ParseOptions) void {
         .pointer => |ptrInfo| {
             const allocator = options.allocator orelse unreachable;
             switch (ptrInfo.size) {
-                .One => {
+                .one => {
                     parseFree(ptrInfo.child, value.*, options);
                     allocator.destroy(value);
                 },
-                .Slice => {
+                .slice => {
                     for (value) |v| {
                         parseFree(ptrInfo.child, v, options);
                     }
@@ -2284,7 +2284,7 @@ pub const Parser = struct {
                         return;
                     }
 
-                    var value = p.stack.pop();
+                    var value = p.stack.pop().?;
                     try p.pushToParent(&value);
                 },
                 .String => |s| {
@@ -2350,7 +2350,7 @@ pub const Parser = struct {
                             return;
                         }
 
-                        var value = p.stack.pop();
+                        var value = p.stack.pop().?;
                         try p.pushToParent(&value);
                     },
                     .ObjectBegin => {
@@ -2922,7 +2922,7 @@ pub fn stringify(
         },
         .error_set => return stringify(@as([]const u8, @errorName(value)), options, out_stream),
         .pointer => |ptr_info| switch (ptr_info.size) {
-            .One => switch (@typeInfo(ptr_info.child)) {
+            .one => switch (@typeInfo(ptr_info.child)) {
                 .array => {
                     const Slice = []const std.meta.Elem(ptr_info.child);
                     return stringify(@as(Slice, value), options, out_stream);
@@ -2933,7 +2933,7 @@ pub fn stringify(
                 },
             },
             // TODO: .Many when there is a sentinel (waiting for https://github.com/ziglang/zig/pull/3972)
-            .Slice => {
+            .slice => {
                 if (ptr_info.child == u8 and options.string == .String and std.unicode.utf8ValidateSlice(value)) {
                     try out_stream.writeByte('\"');
                     var i: usize = 0;

src/servicemodel.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const service_list = @import("models/service_manifest.zig");
+const service_list = @import("service_manifest");
 const expectEqualStrings = std.testing.expectEqualStrings;
 
 pub fn Services(comptime service_imports: anytype) type {
@@ -12,7 +12,7 @@ pub fn Services(comptime service_imports: anytype) type {
         item.* = .{
             .name = @tagName(service_imports[i]),
             .type = @TypeOf(import_field),
-            .default_value = &import_field,
+            .default_value_ptr = &import_field,
             .is_comptime = false,
             .alignment = 0,
         };

src/url.zig

@@ -24,10 +24,11 @@ fn encodeStruct(
     comptime options: EncodingOptions,
 ) !bool {
     var rc = first;
+    var arena = std.heap.ArenaAllocator.init(allocator);
+    defer arena.deinit();
+    const arena_alloc = arena.allocator();
     inline for (@typeInfo(@TypeOf(obj)).@"struct".fields) |field| {
-        const field_name = try options.field_name_transformer(allocator, field.name);
+        const field_name = try options.field_name_transformer(arena_alloc, field.name);
-        defer if (options.field_name_transformer.* != defaultTransformer)
-            allocator.free(field_name);
         // @compileLog(@typeInfo(field.field_type).Pointer);
         rc = try encodeInternal(allocator, parent, field_name, rc, @field(obj, field.name), writer, options);
     }
@@ -50,7 +51,7 @@ pub fn encodeInternal(
         .optional => if (obj) |o| {
             rc = try encodeInternal(allocator, parent, field_name, first, o, writer, options);
         },
-        .pointer => |ti| if (ti.size == .One) {
+        .pointer => |ti| if (ti.size == .one) {
             rc = try encodeInternal(allocator, parent, field_name, first, obj.*, writer, options);
         } else {
             if (!first) _ = try writer.write("&");

src/xml.zig

@@ -653,7 +653,10 @@ fn dupeAndUnescape(alloc: Allocator, text: []const u8) ![]const u8 {
 
     // This error is not strictly true, but we need to match one of the items
     // from the error set provided by the other stdlib calls at the calling site
-    if (!alloc.resize(str, j)) return error.OutOfMemory;
+    if (!alloc.resize(str, j)) {
+        defer alloc.free(str);
+        return alloc.dupe(u8, str[0..j]) catch return error.OutOfMemory;
+    }
     return str[0..j];
 }
 

src/xml_shaper.zig

@@ -313,13 +313,13 @@ fn parseInternal(comptime T: type, element: *xml.Element, options: ParseOptions)
         .pointer => |ptr_info| {
             const allocator = options.allocator orelse return error.AllocatorRequired;
             switch (ptr_info.size) {
-                .One => {
+                .one => {
                     const r: T = try allocator.create(ptr_info.child);
                     errdefer allocator.free(r);
                     r.* = try parseInternal(ptr_info.child, element, options);
                     return r;
                 },
-                .Slice => {
+                .slice => {
                     // TODO: Detect and deal with arrays. This will require two
                     //       passes through the element children - one to
                     //       determine if it is an array, one to parse the elements
@@ -348,10 +348,10 @@ fn parseInternal(comptime T: type, element: *xml.Element, options: ParseOptions)
                     }
                     return try allocator.dupe(u8, element.children.items[0].CharData);
                 },
-                .Many => {
+                .many => {
                     return error.ManyPointerSizeNotImplemented;
                 },
-                .C => {
+                .c => {
                     return error.CPointerSizeNotImplemented;
                 },
             }