Skip to content

FIX: json printer #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Boomatang merged 1 commit into from
Jun 27, 2026
Merged

FIX: json printer #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changes/unreleased/Fixed-20260627-150100.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kind: Fixed
body: 'The json output was not valid, items would have an extra }. '
time: 2026-06-27T15:01:00.473603684+01:00
21 changes: 11 additions & 10 deletions src/get.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const table = @import("table.zig");
const utils = @import("utils.zig");

pub fn getMain(io: std.Io, gpa: std.mem.Allocator, iter: *std.process.Args.Iterator) !void {

var stdout_buf: [4096]u8 = undefined;
var stdout_writer = std.Io.File.stdout().writer(io, &stdout_buf);
const stdout = &stdout_writer.interface;
Expand Down Expand Up @@ -256,16 +255,18 @@ fn compareStrings(_: void, lhs: []const u8, rhs: []const u8) bool {
return std.mem.lessThan(u8, lhs, rhs);
}

fn getCrdList(io: std.Io, allocator: std.mem.Allocator) !std.ArrayList([]const u8) {
fn getCrdList(io: std.Io, gpa: std.mem.Allocator) !std.ArrayList([]const u8) {
const cmd = [_][]const u8{ "kubectl", "api-resources", "--verbs=list", "--namespaced", "-o", "name" };
const result = std.process.run(allocator, io, .{
const result = std.process.run(gpa, io, .{
.argv = &cmd,
}) catch |err| {
std.log.err("Failed to run kubectl: {}", .{err});
return err;
};
defer allocator.free(result.stdout);
defer allocator.free(result.stderr);
defer {
gpa.free(result.stdout);
gpa.free(result.stderr);
}

if (result.term.exited != 0) {
std.log.debug("stdout: {s}. stderr: {s}", .{ result.stdout, result.stderr });
Expand All @@ -274,17 +275,17 @@ fn getCrdList(io: std.Io, allocator: std.mem.Allocator) !std.ArrayList([]const u
var lines: std.ArrayList([]const u8) = .empty;
errdefer {
for (lines.items) |item| {
allocator.free(item);
gpa.free(item);
}
lines.deinit(allocator);
lines.deinit(gpa);
}

var iter = std.mem.splitScalar(u8, result.stdout, '\n');
while (iter.next()) |line| {
if (line.len > 0) {
const owned = try allocator.dupe(u8, line);
errdefer allocator.free(owned);
try lines.append(allocator, owned);
const owned = try gpa.dupe(u8, line);
errdefer gpa.free(owned);
try lines.append(gpa, owned);
}
}

Expand Down
78 changes: 39 additions & 39 deletions src/types.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,21 @@ pub const Metadata = struct {
resourceVersion: ?[]const u8 = null,
generation: ?u64 = null,

pub fn clone(self: @This(), allocator: std.mem.Allocator) !Metadata {
pub fn clone(self: @This(), gpa: std.mem.Allocator) !Metadata {
return .{
.name = try allocator.dupe(u8, self.name),
.namespace = try allocator.dupe(u8, self.namespace),
.creationTimestamp = try allocator.dupe(u8, self.creationTimestamp),
.resourceVersion = if (self.resourceVersion) |r| try allocator.dupe(u8, r) else null,
.name = try gpa.dupe(u8, self.name),
.namespace = try gpa.dupe(u8, self.namespace),
.creationTimestamp = try gpa.dupe(u8, self.creationTimestamp),
.resourceVersion = if (self.resourceVersion) |r| try gpa.dupe(u8, r) else null,
.generation = self.generation,
};
}

pub fn deinit(self: @This(), allocator: std.mem.Allocator) void {
allocator.free(self.namespace);
allocator.free(self.name);
allocator.free(self.creationTimestamp);
if (self.resourceVersion) |r| allocator.free(r);
pub fn deinit(self: @This(), gpa: std.mem.Allocator) void {
gpa.free(self.namespace);
gpa.free(self.name);
gpa.free(self.creationTimestamp);
if (self.resourceVersion) |r| gpa.free(r);
}
};

Expand All @@ -97,35 +97,35 @@ pub const Resource = struct {
apiVersion: []const u8,
metadata: Metadata,

pub fn toJson(self: @This(), allocator: std.mem.Allocator) ![]const u8 {
var buffer = try std.ArrayList(u8).initCapacity(allocator, 256);
defer buffer.deinit(allocator);
pub fn toJson(self: @This(), gpa: std.mem.Allocator) ![]const u8 {
var buffer = try std.ArrayList(u8).initCapacity(gpa, 256);
defer buffer.deinit(gpa);

const initial_string = try std.fmt.allocPrint(allocator, "{{\"kind\": \"{s}\", \"apiVersion\": \"{s}\", \"name\": \"{s}\", \"namespace\": \"{s}\", \"creationTimestamp\": \"{s}\"", .{
const initial_string = try std.fmt.allocPrint(gpa, "{{\"kind\": \"{s}\", \"apiVersion\": \"{s}\", \"name\": \"{s}\", \"namespace\": \"{s}\", \"creationTimestamp\": \"{s}\"", .{
self.kind,
self.apiVersion,
self.metadata.name,
self.metadata.namespace,
self.metadata.creationTimestamp,
});
try buffer.appendSlice(allocator, initial_string);
defer allocator.free(initial_string);
try buffer.appendSlice(gpa, initial_string);
defer gpa.free(initial_string);

if (self.metadata.resourceVersion) |version| {
const resource_version = try std.fmt.allocPrint(allocator, ", \"resourceVersion\": \"{s}\"", .{version});
defer allocator.free(resource_version);
try buffer.appendSlice(allocator, resource_version);
const resource_version = try std.fmt.allocPrint(gpa, ", \"resourceVersion\": \"{s}\"", .{version});
defer gpa.free(resource_version);
try buffer.appendSlice(gpa, resource_version);
}

if (self.metadata.generation) |generation| {
const generation_str = try std.fmt.allocPrint(allocator, ", \"generation\": {}", .{generation});
defer allocator.free(generation_str);
try buffer.appendSlice(allocator, generation_str);
const generation_str = try std.fmt.allocPrint(gpa, ", \"generation\": {}", .{generation});
defer gpa.free(generation_str);
try buffer.appendSlice(gpa, generation_str);
}

try buffer.appendSlice(allocator, "}}");
try buffer.append(gpa, '}');

return try allocator.dupe(u8, buffer.items);
return try gpa.dupe(u8, buffer.items);
}

pub fn clone(self: @This(), allocator: std.mem.Allocator) !Resource {
Expand All @@ -146,39 +146,39 @@ pub const Resource = struct {
pub const ResourceList = struct {
items: []Resource,

pub fn toJson(self: @This(), allocator: std.mem.Allocator) ![]const u8 {
var buffer = try std.ArrayList(u8).initCapacity(allocator, 256);
defer buffer.deinit(allocator);
pub fn toJson(self: @This(), gpa: std.mem.Allocator) ![]const u8 {
var buffer = try std.ArrayList(u8).initCapacity(gpa, 256);
defer buffer.deinit(gpa);

try buffer.append(allocator, '[');
try buffer.append(gpa, '[');
for (self.items, 0..) |item, i| {
const text = try item.toJson(allocator);
defer allocator.free(text);
const text = try item.toJson(gpa);
defer gpa.free(text);

try buffer.appendSlice(allocator, text);
try buffer.appendSlice(gpa, text);
if (i < self.items.len - 1) {
try buffer.append(allocator, ',');
try buffer.append(gpa, ',');
}
}
try buffer.append(allocator, ']');
try buffer.append(gpa, ']');

return try allocator.dupe(u8, buffer.items);
return try gpa.dupe(u8, buffer.items);
}

pub fn clone(self: @This(), allocator: std.mem.Allocator) !ResourceList {
var new_items = try allocator.alloc(Resource, self.items.len);
pub fn clone(self: @This(), gpa: std.mem.Allocator) !ResourceList {
var new_items = try gpa.alloc(Resource, self.items.len);

// On error, deinit any items that were already initialized and free the array.
var initialized: usize = 0;
errdefer {
// deinitialize only the items that were constructed so far
for (new_items[0..initialized]) |it| it.deinit(allocator);
allocator.free(new_items);
for (new_items[0..initialized]) |it| it.deinit(gpa);
gpa.free(new_items);
}

// Clone each item; increment `initialized` after a successful clone.
for (self.items, 0..) |item, i| {
new_items[i] = try item.clone(allocator);
new_items[i] = try item.clone(gpa);
initialized += 1;
}

Expand Down
Loading