chore: migrate crd crate to operator-binary module

NickLarsenNZ · NickLarsenNZ · commit ba24940db2f0 · 2024-12-03T15:31:37.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml
diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml
@@ -9,10 +9,9 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-opa-crd = { path = "../crd" }
-
 anyhow.workspace = true
 clap.workspace = true
+derivative.workspace = true
 fnv.workspace = true
 futures.workspace = true
 indoc.workspace = true
diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
@@ -9,7 +9,7 @@ use product_config::{types::PropertyNameKind, ProductConfigManager};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_opa_crd::{
+use stackable_opa_operator::crd::{
     user_info_fetcher, Container, OpaCluster, OpaClusterStatus, OpaConfig, OpaRole, APP_NAME,
     DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT, OPERATOR_NAME,
 };
@@ -160,7 +160,9 @@ pub enum Error {
     NoName,
 
     #[snafu(display("internal operator failure"))]
-    InternalOperatorFailure { source: stackable_opa_crd::Error },
+    InternalOperatorFailure {
+        source: stackable_opa_operator::crd::Error,
+    },
 
     #[snafu(display("failed to calculate role service name"))]
     RoleServiceNameNotFound,
@@ -239,7 +241,9 @@ pub enum Error {
     },
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
-    FailedToResolveConfig { source: stackable_opa_crd::Error },
+    FailedToResolveConfig {
+        source: stackable_opa_operator::crd::Error,
+    },
 
     #[snafu(display("illegal container name"))]
     IllegalContainerName {
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
diff --git a/rust/operator-binary/src/crd/user_info_fetcher.rs b/rust/operator-binary/src/crd/user_info_fetcher.rs
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -1,7 +1,7 @@
 use crate::controller::{build_recommended_labels, APP_PORT};
 
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_opa_crd::{OpaCluster, OpaRole};
+use stackable_opa_operator::crd::{OpaCluster, OpaRole};
 use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     commons::product_image_selection::ResolvedProductImage,
diff --git a/rust/operator-binary/src/lib.rs b/rust/operator-binary/src/lib.rs
@@ -0,0 +1 @@
+pub mod crd;
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use clap::{crate_description, crate_version, Parser};
 use futures::StreamExt;
 use product_config::ProductConfigManager;
-use stackable_opa_crd::{OpaCluster, APP_NAME, OPERATOR_NAME};
+use stackable_opa_operator::crd::{OpaCluster, APP_NAME, OPERATOR_NAME};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
     client::{self, Client},
diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,5 +1,5 @@
 use snafu::{ResultExt, Snafu};
-use stackable_opa_crd::{OpaConfig, SERVER_GRACEFUL_SHUTDOWN_SAFETY_OVERHEAD};
+use stackable_opa_operator::crd::{OpaConfig, SERVER_GRACEFUL_SHUTDOWN_SAFETY_OVERHEAD};
 use stackable_operator::builder::pod::PodBuilder;
 
 #[derive(Debug, Snafu)]
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
@@ -1,5 +1,5 @@
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_opa_crd::{Container, OpaCluster};
+use stackable_opa_operator::crd::{Container, OpaCluster};
 use stackable_operator::product_logging::spec::LogLevel;
 use stackable_operator::{
     builder::configmap::ConfigMapBuilder,
diff --git a/rust/user-info-fetcher/Cargo.toml b/rust/user-info-fetcher/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-opa-crd = { path = "../crd" }
+stackable-opa-operator = { path = "../operator-binary" }
 
 axum.workspace = true
 base64.workspace = true
diff --git a/rust/user-info-fetcher/src/backend/keycloak.rs b/rust/user-info-fetcher/src/backend/keycloak.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use hyper::StatusCode;
 use serde::Deserialize;
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_opa_crd::user_info_fetcher as crd;
+use stackable_opa_operator::crd::user_info_fetcher as crd;
 use stackable_operator::commons::authentication::oidc;
 
 use crate::{http_error, utils::http::send_json_request, Credentials, UserInfo, UserInfoRequest};
diff --git a/rust/user-info-fetcher/src/backend/xfsc_aas.rs b/rust/user-info-fetcher/src/backend/xfsc_aas.rs
@@ -15,7 +15,7 @@ use std::collections::HashMap;
 use hyper::StatusCode;
 use serde::Deserialize;
 use snafu::{ResultExt, Snafu};
-use stackable_opa_crd::user_info_fetcher as crd;
+use stackable_opa_operator::crd::user_info_fetcher as crd;
 use url::Url;
 
 use crate::{http_error, utils::http::send_json_request, UserInfo, UserInfoRequest};
diff --git a/rust/user-info-fetcher/src/main.rs b/rust/user-info-fetcher/src/main.rs
@@ -12,7 +12,7 @@ use moka::future::Cache;
 use reqwest::ClientBuilder;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
-use stackable_opa_crd::user_info_fetcher as crd;
+use stackable_opa_operator::crd::user_info_fetcher as crd;
 use tokio::net::TcpListener;
 
 mod backend;
