Skip to content

Commit d7cedc6

Browse files
mazdakmazdak
committed
Fixed tests for Compose plugin
1 parent 969ecb3 commit d7cedc6

File tree

9 files changed

+143
-86
lines changed

9 files changed

+143
-86
lines changed

‎Plugins/container-compose/Package.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,5 @@ let package = Package(
6666
],
6767
path: "Tests/ComposeTests"
6868
),
69-
.testTarget(
70-
name: "ComposeCLITests",
71-
dependencies: [
72-
.product(name: "ContainerClient", package: "container"),
73-
.product(name: "Logging", package: "swift-log"),
74-
],
75-
path: "Tests/CLITests",
76-
resources: [
77-
.copy("Resources")
78-
]
79-
),
8069
]
8170
)

‎Plugins/container-compose/Sources/Core/Models/ComposeFile.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public struct ComposeVolume: Codable {
201201

202202
// MARK: - Helper Types
203203

204-
public enum StringOrList: Codable {
204+
public enum StringOrList: Codable, Equatable {
205205
case string(String)
206206
case list([String])
207207

‎Plugins/container-compose/Sources/Core/Orchestrator/ProjectConverter.swift‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,23 @@ public struct ProjectConverter {
333333
let healthCheck: HealthCheck? = {
334334
guard let hc = service.healthcheck, !(hc.disable ?? false) else { return nil }
335335

336+
// Get the test command
337+
var testCommand = hc.test?.asArray ?? []
338+
339+
// Handle special cases
340+
if !testCommand.isEmpty {
341+
if testCommand[0] == "NONE" {
342+
// NONE means no health check
343+
return nil
344+
} else if testCommand[0] == "CMD-SHELL" && testCommand.count > 1 {
345+
// Convert CMD-SHELL to shell command
346+
let shellCommand = testCommand[1...].joined(separator: " ")
347+
testCommand = ["/bin/sh", "-c", shellCommand]
348+
}
349+
}
350+
336351
return HealthCheck(
337-
test: hc.test?.asArray ?? [],
352+
test: testCommand,
338353
interval: parseTimeInterval(hc.interval),
339354
timeout: parseTimeInterval(hc.timeout),
340355
retries: hc.retries,

‎Plugins/container-compose/Sources/Core/Parser/ComposeParser.swift‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public struct ComposeParser {
4040
var composeFiles: [ComposeFile] = []
4141

4242
for url in urls {
43-
let file = try parse(from: url)
43+
let file = try parseWithoutValidation(from: url)
4444
composeFiles.append(file)
4545
log.info("Loaded compose file: \(url.lastPathComponent)")
4646
}
@@ -52,6 +52,9 @@ public struct ComposeParser {
5252
log.info("Merged \(urls.count) compose files")
5353
}
5454

55+
// Validate only the final merged result
56+
try validate(merged)
57+
5558
return merged
5659
}
5760

@@ -68,6 +71,53 @@ public struct ComposeParser {
6871
return try parse(from: data)
6972
}
7073

74+
/// Parse compose file from data without validation (for internal use)
75+
private func parseWithoutValidation(from url: URL) throws -> ComposeFile {
76+
guard FileManager.default.fileExists(atPath: url.path) else {
77+
throw ContainerizationError(
78+
.notFound,
79+
message: "Compose file not found at path: \(url.path)"
80+
)
81+
}
82+
83+
let data = try Data(contentsOf: url)
84+
return try parseWithoutValidation(from: data)
85+
}
86+
87+
/// Parse compose file from data without validation
88+
private func parseWithoutValidation(from data: Data) throws -> ComposeFile {
89+
guard let yamlString = String(data: data, encoding: .utf8) else {
90+
throw ContainerizationError(
91+
.invalidArgument,
92+
message: "Unable to decode compose file as UTF-8"
93+
)
94+
}
95+
96+
do {
97+
// Decode directly without intermediate dump/reload
98+
let decoder = YAMLDecoder()
99+
100+
// First try to decode directly (no interpolation needed)
101+
if !yamlString.contains("$") {
102+
return try decoder.decode(ComposeFile.self, from: data)
103+
}
104+
105+
// If we have variables to interpolate, we need to process the YAML
106+
// But let's do it more intelligently by working with the string directly
107+
let interpolatedYaml = try interpolateYamlString(yamlString)
108+
let interpolatedData = interpolatedYaml.data(using: .utf8)!
109+
110+
return try decoder.decode(ComposeFile.self, from: interpolatedData)
111+
} catch let error as DecodingError {
112+
throw ContainerizationError(
113+
.invalidArgument,
114+
message: "Failed to parse compose file: \(describeDecodingError(error))"
115+
)
116+
} catch {
117+
throw error
118+
}
119+
}
120+
71121
/// Parse compose file from data
72122
public func parse(from data: Data) throws -> ComposeFile {
73123
guard let yamlString = String(data: data, encoding: .utf8) else {

‎Plugins/container-compose/Tests/ComposeTests/ComposeParserTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import ContainerizationError
2020
import Logging
2121
import Yams
2222

23-
@testable import ContainerCompose
23+
@testable import ComposeCore
2424

2525
struct ComposeParserTests {
2626
let log = Logger(label: "test")

‎Plugins/container-compose/Tests/ComposeTests/DependencyResolverTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Foundation
1818
import Testing
1919
import ContainerizationError
2020

21-
@testable import ContainerCompose
21+
@testable import ComposeCore
2222

2323
struct DependencyResolverTests {
2424

‎Plugins/container-compose/Tests/ComposeTests/HealthCheckTests.swift‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@
1414
// limitations under the License.
1515
//===----------------------------------------------------------------------===//
1616

17-
import XCTest
18-
import ContainerCompose
17+
import Testing
18+
import ComposeCore
1919
import ContainerizationError
20-
@testable import ContainerCompose
20+
import Logging
21+
import Foundation
22+
@testable import ComposeCore
2123

22-
final class HealthCheckTests: XCTestCase {
23-
func testHealthCheckParsing() throws {
24+
struct HealthCheckTests {
25+
let log = Logger(label: "test")
26+
@Test func testHealthCheckParsing() throws {
2427
let yaml = """
2528
version: '3'
2629
services:
@@ -34,20 +37,20 @@ final class HealthCheckTests: XCTestCase {
3437
start_period: 40s
3538
"""
3639

37-
let parser = ComposeParser(log: .test)
40+
let parser = ComposeParser(log: log)
3841
let composeFile = try parser.parse(from: yaml.data(using: .utf8)!)
3942

40-
XCTAssertNotNil(composeFile.services["web"]?.healthcheck)
43+
#expect(composeFile.services["web"]?.healthcheck != nil)
4144
let healthcheck = composeFile.services["web"]!.healthcheck!
4245

43-
XCTAssertEqual(healthcheck.test, .list(["CMD", "curl", "-f", "http://localhost"]))
44-
XCTAssertEqual(healthcheck.interval, "30s")
45-
XCTAssertEqual(healthcheck.timeout, "10s")
46-
XCTAssertEqual(healthcheck.retries, 3)
47-
XCTAssertEqual(healthcheck.startPeriod, "40s")
46+
#expect(healthcheck.test == .list(["CMD", "curl", "-f", "http://localhost"]))
47+
#expect(healthcheck.interval == "30s")
48+
#expect(healthcheck.timeout == "10s")
49+
#expect(healthcheck.retries == 3)
50+
#expect(healthcheck.startPeriod == "40s")
4851
}
4952

50-
func testHealthCheckStringFormat() throws {
53+
@Test func testHealthCheckStringFormat() throws {
5154
let yaml = """
5255
version: '3'
5356
services:
@@ -57,14 +60,14 @@ final class HealthCheckTests: XCTestCase {
5760
test: "curl -f http://localhost || exit 1"
5861
"""
5962

60-
let parser = ComposeParser(log: .test)
63+
let parser = ComposeParser(log: log)
6164
let composeFile = try parser.parse(from: yaml.data(using: .utf8)!)
6265

6366
let healthcheck = composeFile.services["app"]!.healthcheck!
64-
XCTAssertEqual(healthcheck.test, .string("curl -f http://localhost || exit 1"))
67+
#expect(healthcheck.test == .string("curl -f http://localhost || exit 1"))
6568
}
6669

67-
func testHealthCheckDisabled() throws {
70+
@Test func testHealthCheckDisabled() throws {
6871
let yaml = """
6972
version: '3'
7073
services:
@@ -74,14 +77,14 @@ final class HealthCheckTests: XCTestCase {
7477
disable: true
7578
"""
7679

77-
let parser = ComposeParser(log: .test)
80+
let parser = ComposeParser(log: log)
7881
let composeFile = try parser.parse(from: yaml.data(using: .utf8)!)
7982

8083
let healthcheck = composeFile.services["db"]!.healthcheck!
81-
XCTAssertTrue(healthcheck.disable ?? false)
84+
#expect(healthcheck.disable ?? false)
8285
}
8386

84-
func testProjectConverterHealthCheck() throws {
87+
@Test func testProjectConverterHealthCheck() throws {
8588
let yaml = """
8689
version: '3'
8790
services:
@@ -95,28 +98,27 @@ final class HealthCheckTests: XCTestCase {
9598
start_period: 10s
9699
"""
97100

98-
let parser = ComposeParser(log: .test)
101+
let parser = ComposeParser(log: log)
99102
let composeFile = try parser.parse(from: yaml.data(using: .utf8)!)
100103

101-
let converter = ProjectConverter(log: .test)
104+
let converter = ProjectConverter(log: log)
102105
let project = try converter.convert(
103106
composeFile: composeFile,
104-
projectName: "test",
105-
workingDirectory: URL(fileURLWithPath: "/tmp")
107+
projectName: "test"
106108
)
107109

108110
let service = project.services["web"]!
109-
XCTAssertNotNil(service.healthCheck)
111+
#expect(service.healthCheck != nil)
110112

111113
let healthCheck = service.healthCheck!
112-
XCTAssertEqual(healthCheck.test, ["CMD", "wget", "-q", "--spider", "http://localhost"])
113-
XCTAssertEqual(healthCheck.interval, 30)
114-
XCTAssertEqual(healthCheck.timeout, 5)
115-
XCTAssertEqual(healthCheck.retries, 3)
116-
XCTAssertEqual(healthCheck.startPeriod, 10)
114+
#expect(healthCheck.test == ["CMD", "wget", "-q", "--spider", "http://localhost"])
115+
#expect(healthCheck.interval == 30)
116+
#expect(healthCheck.timeout == 5)
117+
#expect(healthCheck.retries == 3)
118+
#expect(healthCheck.startPeriod == 10)
117119
}
118120

119-
func testHealthCheckWithShellFormat() throws {
121+
@Test func testHealthCheckWithShellFormat() throws {
120122
let yaml = """
121123
version: '3'
122124
services:
@@ -127,22 +129,21 @@ final class HealthCheckTests: XCTestCase {
127129
interval: 10s
128130
"""
129131

130-
let parser = ComposeParser(log: .test)
132+
let parser = ComposeParser(log: log)
131133
let composeFile = try parser.parse(from: yaml.data(using: .utf8)!)
132134

133-
let converter = ProjectConverter(log: .test)
135+
let converter = ProjectConverter(log: log)
134136
let project = try converter.convert(
135137
composeFile: composeFile,
136-
projectName: "test",
137-
workingDirectory: URL(fileURLWithPath: "/tmp")
138+
projectName: "test"
138139
)
139140

140141
let healthCheck = project.services["api"]!.healthCheck!
141142
// CMD-SHELL should be converted to shell command
142-
XCTAssertEqual(healthCheck.test, ["/bin/sh", "-c", "curl -f http://localhost:3000/health || exit 1"])
143+
#expect(healthCheck.test == ["/bin/sh", "-c", "curl -f http://localhost:3000/health || exit 1"])
143144
}
144145

145-
func testHealthCheckNoneDisabled() throws {
146+
@Test func testHealthCheckNoneDisabled() throws {
146147
let yaml = """
147148
version: '3'
148149
services:
@@ -152,17 +153,16 @@ final class HealthCheckTests: XCTestCase {
152153
test: ["NONE"]
153154
"""
154155

155-
let parser = ComposeParser(log: .test)
156+
let parser = ComposeParser(log: log)
156157
let composeFile = try parser.parse(from: yaml.data(using: .utf8)!)
157158

158-
let converter = ProjectConverter(log: .test)
159+
let converter = ProjectConverter(log: log)
159160
let project = try converter.convert(
160161
composeFile: composeFile,
161-
projectName: "test",
162-
workingDirectory: URL(fileURLWithPath: "/tmp")
162+
projectName: "test"
163163
)
164164

165165
// NONE should result in no health check
166-
XCTAssertNil(project.services["worker"]!.healthCheck)
166+
#expect(project.services["worker"]!.healthCheck == nil)
167167
}
168168
}

‎Plugins/container-compose/Tests/ComposeTests/ProjectConverterTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Foundation
1818
import Testing
1919
import Logging
2020

21-
@testable import ContainerCompose
21+
@testable import ComposeCore
2222

2323
struct ProjectConverterTests {
2424
let log = Logger(label: "test")

0 commit comments

Comments
 (0)