Fix after upgrading in the boxer-issuer project (#27)

* Add the K8S -> HTTP status code conversion

* Fix formatting issues and compilation warnings

* Fix unit tests

* Fix unit tests

Author: s-vitaliy

Cargo.lock

@@ -28,6 +28,7 @@ schemars = "0.8.6"
 assert_matches = "1.5.0"
 test-context = "0.4.1"
 actix-web = "4.11.0"
+duration-string = { version = "0.5.2", features = ["serde"] }
 
 [dev-dependencies]
 serde_yml = "0.0.12"

Cargo.toml

@@ -0,0 +1 @@
+pub mod models;

src/configuration/mod.rs

@@ -0,0 +1 @@
+pub mod repository_settings;

src/configuration/models/mod.rs

@@ -0,0 +1,19 @@
+use crate::services::backends::kubernetes::kubernetes_resource_manager::ListenerConfig;
+use duration_string::DurationString;
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+pub struct RepositorySettings {
+    pub label_selector_key: String,
+    pub label_selector_value: String,
+    pub operation_timeout: DurationString,
+}
+impl Into<ListenerConfig> for &RepositorySettings {
+    fn into(self) -> ListenerConfig {
+        ListenerConfig {
+            label_selector_key: self.label_selector_key.clone(),
+            label_selector_value: self.label_selector_value.clone(),
+            operation_timeout: self.operation_timeout.into(),
+        }
+    }
+}

src/configuration/models/repository_settings.rs

@@ -2,4 +2,5 @@ pub mod http;
 pub mod services;
 
 // #[cfg(feature = "testing")]
+pub mod configuration;
 pub mod testing;

src/lib.rs

@@ -1,4 +1,4 @@
-use crate::services::backends::kubernetes::repositories::schema_repository::models::{
+use crate::services::backends::kubernetes::repositories::schema_repository::schema_document::{
     SchemaDocument, SchemaDocumentSpec,
 };
 use crate::testing::api_extensions::WaitForResource;

src/services/backends/kubernetes/kubernetes_resource_manager/spin_lock/tests.rs

@@ -2,37 +2,21 @@
 #[cfg(test)]
 mod tests;
 
-pub mod models;
+pub mod schema_document;
 mod test_reduced_schema;
 #[cfg(test)]
 mod test_schema;
 
 use crate::services::backends::kubernetes::kubernetes_resource_manager::status::Status;
-use crate::services::backends::kubernetes::repositories::schema_repository::models::{
+use crate::services::backends::kubernetes::repositories::schema_repository::schema_document::{
     SchemaDocument, SchemaDocumentSpec,
 };
-use crate::services::backends::kubernetes::repositories::{
-    KubernetesRepository, SoftDeleteResource, ToResource, TryFromResource,
-};
+use crate::services::backends::kubernetes::repositories::{KubernetesRepository, ToResource, TryFromResource};
 use crate::services::base::upsert_repository::UpsertRepositoryWithDelete;
 use cedar_policy::SchemaFragment;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta;
 use std::sync::Arc;
 
-impl SoftDeleteResource for SchemaDocument {
-    fn is_deleted(&self) -> bool {
-        !self.spec.active
-    }
-
-    fn set_deleted(&mut self) {
-        self.spec.active = false;
-    }
-
-    fn clear_managed_fields(&mut self) {
-        self.metadata.managed_fields = None;
-    }
-}
-
 impl ToResource<SchemaDocument> for SchemaFragment {
     fn to_resource(&self, object_meta: &ObjectMeta) -> Result<SchemaDocument, Status> {
         let serialized = self

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

@@ -1,4 +1,5 @@
 use crate::services::backends::kubernetes::kubernetes_resource_manager::UpdateLabels;
+use crate::services::backends::kubernetes::repositories::SoftDeleteResource;
 use anyhow::anyhow;
 use cedar_policy::SchemaFragment;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta;
@@ -38,20 +39,6 @@ impl TryInto<SchemaFragment> for SchemaDocumentSpec {
     }
 }
 
-impl TryFrom<SchemaFragment> for SchemaDocumentSpec {
-    type Error = anyhow::Error;
-
-    fn try_from(schema: SchemaFragment) -> Result<Self, Self::Error> {
-        let serialized = schema
-            .to_json_value()
-            .map_err(|err| anyhow!("Failed to convert schema to JSON string: {}", err))?;
-        Ok(SchemaDocumentSpec {
-            active: true,
-            schema: serde_json::to_string_pretty(&serialized)?,
-        })
-    }
-}
-
 impl Default for SchemaDocument {
     fn default() -> Self {
         SchemaDocument {
@@ -60,3 +47,17 @@ impl Default for SchemaDocument {
         }
     }
 }
+
+impl SoftDeleteResource for SchemaDocument {
+    fn is_deleted(&self) -> bool {
+        !self.spec.active
+    }
+
+    fn set_deleted(&mut self) {
+        self.spec.active = false;
+    }
+
+    fn clear_managed_fields(&mut self) {
+        self.metadata.managed_fields = None;
+    }
+}

…repositories/schema_repository/models.rs …ies/schema_repository/schema_document.rssrc/services/backends/kubernetes/repositories/schema_repository/models.rs renamed to src/services/backends/kubernetes/repositories/schema_repository/schema_document.rs src/services/backends/kubernetes/repositories/schema_repository/models.rs renamed to src/services/backends/kubernetes/repositories/schema_repository/schema_document.rs

@@ -73,9 +73,9 @@ async fn test_update_schema(ctx: &mut KubernetesSchemaRepositoryTest) {
         .upsert(name.to_string(), schema_fragment.clone())
         .await
         .expect("Failed to upsert schema");
-    // ctx.api
-    //     .wait_for_creation(&ObjectRef::new(name), DEFAULT_TEST_TIMEOUT)
-    //     .await;
+    ctx.api
+        .wait_for_creation(name.to_string(), ctx.namespace.to_string(), DEFAULT_TEST_TIMEOUT)
+        .await;
     let before = ctx.repository.get(name.to_string()).await.unwrap();
 
     // Act