Skip to content
This repository was archived by the owner on Dec 21, 2021. It is now read-only.

Commit caa5f79

Browse files
committed
Changed used error type for missing uid to be in line with what Lars uses in the operator framework (which in turn is copied from the kubernetes client crate).
1 parent b7b92c9 commit caa5f79

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/provider/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ pub enum StackableError {
4343
"The following config maps were specified in a pod but not found: {missing_config_maps:?}"
4444
)]
4545
MissingConfigMapsError { missing_config_maps: Vec<String> },
46-
#[error("An object received from Kubernetes didn't contain a required field: {field_name}")]
47-
IllegalKubeObject { field_name: String },
46+
#[error("Object is missing key: {key}")]
47+
MissingObjectKey { key: &'static str },
4848
}

src/provider/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use log::{debug, error};
1414

1515
use crate::provider::error::StackableError;
1616
use crate::provider::error::StackableError::{
17-
CrdMissing, IllegalKubeObject, KubeError, PodValidationError,
17+
CrdMissing, KubeError, MissingObjectKey, PodValidationError,
1818
};
1919
use crate::provider::repository::package::Package;
2020
use crate::provider::states::downloading::Downloading;
@@ -164,8 +164,8 @@ impl Provider for StackableProvider {
164164
let service_uid = if let Some(uid) = pod.as_kube_pod().metadata.uid.as_ref() {
165165
uid.to_string()
166166
} else {
167-
return Err(anyhow::Error::new(IllegalKubeObject {
168-
field_name: "uid".to_string(),
167+
return Err(anyhow::Error::new(MissingObjectKey {
168+
key: ".metadata.uid",
169169
}));
170170
};
171171
let parcel_directory = self.parcel_directory.clone();

0 commit comments

Comments
 (0)