From bd56660683b560b8fc6ac694a99e22374eca67a5 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Thu, 12 Dec 2024 18:01:32 -0500 Subject: [PATCH] feat: fixes improper json when creating a project using a repository --- Sources/CliClient/GenerateJson.swift | 8 ++++++-- Tests/CliClientTests/CliClientTests.swift | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Sources/CliClient/GenerateJson.swift b/Sources/CliClient/GenerateJson.swift index 7e4b534..c7f50db 100644 --- a/Sources/CliClient/GenerateJson.swift +++ b/Sources/CliClient/GenerateJson.swift @@ -70,11 +70,15 @@ private struct TemplateRepo: Encodable { let template: Template init(repo: String, version: String?) { - self.template = .init(repo: repo, version: version ?? "main") + self.template = .init(repo: .init(url: repo, version: version ?? "main")) } struct Template: Encodable { - let repo: String + let repo: Repo + } + + struct Repo: Encodable { + let url: String let version: String } } diff --git a/Tests/CliClientTests/CliClientTests.swift b/Tests/CliClientTests/CliClientTests.swift index 8a6bbd4..75b6259 100644 --- a/Tests/CliClientTests/CliClientTests.swift +++ b/Tests/CliClientTests/CliClientTests.swift @@ -233,8 +233,10 @@ struct CliClientTests: TestCase { expectation: .success(""" { "template" : { - "repo" : "https://git.example.com/template.git", - "version" : "main" + "repo" : { + "url" : "https://git.example.com/template.git", + "version" : "main" + } } } """) @@ -250,8 +252,10 @@ struct CliClientTests: TestCase { expectation: .success(""" { "template" : { - "repo" : "https://git.example.com/template.git", - "version" : "v0.1.0" + "repo" : { + "url" : "https://git.example.com/template.git", + "version" : "v0.1.0" + } } } """)