sync workflows from master branch to zig-mach branch

.gitea/workflows/build.yaml

@@ -1,10 +1,8 @@
 name: AWS-Zig Build
-run-name: ${{ github.actor }} building AWS Zig SDK
 on:
   push:
     branches:
-      - '*'
-      - '!zig-develop*'
+      - 'master'
 env:
   ACTIONS_RUNTIME_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   ACTIONS_RUNTIME_URL: ${{ env.GITHUB_SERVER_URL }}/api/actions_pipeline/
@@ -17,11 +15,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 }}

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|

src/aws.zig

@@ -1306,6 +1306,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}){};