include tailLines flag on log requests

Author: ewilken

Sources/SwiftkubeClient/Client/GenericKubernetesClient.swift

@@ -259,13 +259,14 @@ internal extension GenericKubernetesClient {
 	///   - container: The name of the container.
 	///   - previous: Whether to request the logs of the previous instance of the container.
 	///   - timestamps: Whether to include timestamps on the log lines.
+	///   - tailLines: The number of log lines to load.
 	///
 	/// - Returns: The container logs as a single String.
 	/// - Throws: An error of type ``SwiftkubeClientError``.
-	func logs(in namespace: NamespaceSelector, name: String, container: String?, previous: Bool = false, timestamps: Bool = false) async throws -> String {
+	func logs(in namespace: NamespaceSelector, name: String, container: String?, previous: Bool = false, timestamps: Bool = false, tailLines: Int? = nil) async throws -> String {
 		let request = try makeRequest()
 			.in(namespace)
-			.toLogs(pod: name, container: container, previous: previous, timestamps: timestamps)
+			.toLogs(pod: name, container: container, previous: previous, timestamps: timestamps, tailLines: tailLines)
 			.subResource(.log)
 			.build()
 
@@ -424,6 +425,7 @@ public extension GenericKubernetesClient {
 	///   - name: The name of the Pod.
 	///   - container: The name of the container.
 	///   - timestamps: Whether to include timestamps on the log lines.
+	///   - tailLines: The number of log lines to load.
 	///   - retryStrategy: An instance of a ``RetryStrategy`` configuration to use.
 	///
 	/// - Returns: A ``SwiftkubeClientTask`` instance, representing a streaming connection to the API server.
@@ -432,9 +434,10 @@ public extension GenericKubernetesClient {
 		name: String,
 		container: String?,
 		timestamps: Bool = false,
+		tailLines: Int? = nil,
 		retryStrategy: RetryStrategy = RetryStrategy.never
 	) async throws -> SwiftkubeClientTask<String> {
-		let request = try makeRequest().in(namespace).toFollow(pod: name, container: container, timestamps: timestamps).build()
+		let request = try makeRequest().in(namespace).toFollow(pod: name, container: container, timestamps: timestamps, tailLines: tailLines).build()
 
 		return SwiftkubeClientTask(
 			client: httpClient,

Sources/SwiftkubeClient/Client/NamespacedGenericKubernetesClient+Pod.swift

@@ -64,6 +64,7 @@ public extension NamespacedGenericKubernetesClient where Resource == core.v1.Pod
 	///   - name: The name of the Pod.
 	///   - container: The name of the container.
 	///   - timestamps: Whether to include timestamps on the log lines.
+	///   - tailLines: The number of log lines to load.
 	///   - retryStrategy: An instance of a ``RetryStrategy`` configuration to use.
 	///
 	/// - Returns: A ``SwiftkubeClientTask`` instance, representing a streaming connection to the API server.
@@ -72,13 +73,15 @@ public extension NamespacedGenericKubernetesClient where Resource == core.v1.Pod
 		name: String,
 		container: String? = nil,
 		timestamps: Bool = false,
+		tailLines: Int? = nil,
 		retryStrategy: RetryStrategy = RetryStrategy.never
 	) async throws -> SwiftkubeClientTask<String> {
 		try await client.follow(
 			in: namespace ?? .namespace(config.namespace),
 			name: name,
 			container: container,
 			timestamps: timestamps,
+			tailLines: tailLines,
 			retryStrategy: retryStrategy
 		)
 	}
@@ -93,6 +96,7 @@ public extension NamespacedGenericKubernetesClient where Resource == core.v1.Pod
 	///   - container: The name of the container.
 	///   - previous: Whether to request the logs of the previous instance of the container.
 	///   - timestamps: Whether to include timestamps on the log lines.
+	///   - tailLines: The number of log lines to load.
 	///
 	/// - Returns: The container logs as a single String.
 	/// - Throws: An error of type ``SwiftkubeClientError``.
@@ -101,14 +105,16 @@ public extension NamespacedGenericKubernetesClient where Resource == core.v1.Pod
 		name: String,
 		container: String? = nil,
 		previous: Bool = false,
-		timestamps: Bool = false
+		timestamps: Bool = false,
+		tailLines: Int? = nil
 	) async throws -> String {
 		try await client.logs(
 			in: namespace ?? .namespace(config.namespace),
 			name: name,
 			container: container,
 			previous: previous,
-			timestamps: timestamps
+			timestamps: timestamps,
+			tailLines: tailLines
 		)
 	}
 }

Sources/SwiftkubeClient/Client/RequestBuilder.swift

@@ -50,11 +50,11 @@ internal protocol NamespaceStep {
 internal protocol MethodStep {
 	func toGet() -> GetStep
 	func toWatch() -> GetStep
-	func toFollow(pod: String, container: String?, timestamps: Bool) -> GetStep
+	func toFollow(pod: String, container: String?, timestamps: Bool, tailLines: Int?) -> GetStep
 	func toPost() -> PostStep
 	func toPut() -> PutStep
 	func toDelete() -> DeleteStep
-	func toLogs(pod: String, container: String?, previous: Bool, timestamps: Bool) -> GetStep
+	func toLogs(pod: String, container: String?, previous: Bool, timestamps: Bool, tailLines: Int?) -> GetStep
 }
 
 // MARK: - GetStep
@@ -133,6 +133,7 @@ internal class RequestBuilder {
 	var followFlag = false
 	var previousFlag = false
 	var timestampsFlag = false
+	var tailLinesFlag: Int?
 
 	init(config: KubernetesClientConfig, gvr: GroupVersionResource) {
 		self.config = config
@@ -196,23 +197,25 @@ extension RequestBuilder: MethodStep {
 
 	/// Set request method to  GET and notice the pod and container to follow for the pending request
 	/// - Returns:The builder instance as GetStep
-	func toFollow(pod: String, container: String?, timestamps: Bool = false) -> GetStep {
+	func toFollow(pod: String, container: String?, timestamps: Bool = false, tailLines: Int? = nil) -> GetStep {
 		method = .GET
 		resourceName = pod
 		containerName = container
 		subResourceType = .log
 		followFlag = true
 		timestampsFlag = timestamps
+		tailLinesFlag = tailLines
 		return self as GetStep
 	}
 
-	func toLogs(pod: String, container: String?, previous: Bool = false, timestamps: Bool = false) -> GetStep {
+	func toLogs(pod: String, container: String?, previous: Bool = false, timestamps: Bool = false, tailLines: Int? = nil) -> GetStep {
 		method = .GET
 		resourceName = pod
 		containerName = container
 		subResourceType = .log
 		previousFlag = previous
 		timestampsFlag = timestamps
+		tailLinesFlag = tailLines
 		return self as GetStep
 	}
 }
@@ -356,6 +359,10 @@ internal extension RequestBuilder {
 			add(queryItem: URLQueryItem(name: "timestamps", value: "true"))
 		}
 
+		if let tailLinesFlag {
+			add(queryItem: URLQueryItem(name: "tailLines", value: String(tailLinesFlag)))
+		}
+
 		if let container = containerName {
 			add(queryItem: URLQueryItem(name: "container", value: container))
 		}