Skip to content

Commit 237362c

Browse files
authored
Improve logging (#59)
* Improve logging Part of #44 Improve the * Fix unit tests * Fix unit tests
1 parent 7dc7362 commit 237362c

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/services/backends/kubernetes/kubernetes_resource_manager/status/not_found_details.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ use std::fmt::{Display, Formatter};
55
pub struct NotFoundDetails {
66
pub name: String,
77
pub namespace: Option<String>,
8+
pub resource_type: String,
89
}
910

1011
impl NotFoundDetails {
11-
pub fn new(name: String, namespace: Option<String>) -> Self {
12-
NotFoundDetails { name, namespace }
12+
pub fn new(name: String, namespace: Option<String>, resource_type: String) -> Self {
13+
NotFoundDetails {
14+
name,
15+
namespace,
16+
resource_type,
17+
}
1318
}
1419
}
1520

@@ -18,8 +23,8 @@ impl Display for NotFoundDetails {
1823
let namespace = self.namespace.as_deref().unwrap_or("unknown");
1924
write!(
2025
f,
21-
"Resource name: '{}', namespace '{}' not found",
22-
self.name, namespace
26+
"Resource of kind '{}' with name: '{}', namespace '{}' not found",
27+
self.resource_type, self.name, namespace
2328
)
2429
}
2530
}
@@ -32,6 +37,7 @@ where
3237
NotFoundDetails {
3338
name: object_ref.name.clone(),
3439
namespace: object_ref.namespace.clone(),
40+
resource_type: R::kind(&object_ref.dyntype).to_string(),
3541
}
3642
}
3743
}

src/services/backends/kubernetes/repositories/schema_repository/tests.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,14 @@ async fn test_delete_schema(ctx: &mut KubernetesSchemaRepositoryTest) {
130130
let after = ctx.repository.get(name.to_string()).await;
131131

132132
// Assert
133-
assert_matches!(after.unwrap_err(), Deleted(NotFoundDetails { name: _, namespace: _ }));
133+
assert_matches!(
134+
after.unwrap_err(),
135+
Deleted(NotFoundDetails {
136+
name: _,
137+
namespace: _,
138+
resource_type: rt,
139+
}) if rt == "SchemaDocument"
140+
);
134141
}
135142

136143
#[test_context(KubernetesSchemaRepositoryTest)]

0 commit comments

Comments
 (0)