move LicenseInfoOwned to types module (#2430)

* move LicenseInfoOwned to types module

* ha

* aa

changelog.d/+change-type-hierarchy.internal.md

@@ -0,0 +1 @@
+Move LicenseInfoOwned to another module

mirrord/cli/src/operator.rs

@@ -9,8 +9,9 @@ use mirrord_config::{
 use mirrord_kube::api::kubernetes::create_kube_api;
 use mirrord_operator::{
     client::{OperatorApiError, OperatorOperation},
-    crd::{LicenseInfoOwned, MirrordOperatorCrd, MirrordOperatorSpec, OPERATOR_STATUS_NAME},
+    crd::{MirrordOperatorCrd, MirrordOperatorSpec, OPERATOR_STATUS_NAME},
     setup::{LicenseType, Operator, OperatorNamespace, OperatorSetup, SetupOptions},
+    types::LicenseInfoOwned,
 };
 use mirrord_progress::{Progress, ProgressTracker};
 use prettytable::{row, Table};

mirrord/operator/src/crd.rs

@@ -1,10 +1,10 @@
-use chrono::NaiveDate;
 use kube::CustomResource;
 use mirrord_config::target::{Target, TargetConfig};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use self::label_selector::LabelSelector;
+use crate::types::LicenseInfoOwned;
 
 pub mod label_selector;
 
@@ -140,17 +140,6 @@ pub struct Session {
 )]
 pub struct SessionSpec;
 
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct LicenseInfoOwned {
-    pub name: String,
-    pub organization: String,
-    pub expire_at: NaiveDate,
-    /// Fingerprint of the operator license.
-    pub fingerprint: Option<String>,
-    /// Subscription id encoded in the operator license extension.
-    pub subscription_id: Option<String>,
-}
-
 #[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize, JsonSchema)]
 pub enum OperatorFeatures {
     ProxyApi,

mirrord/operator/src/lib.rs

@@ -8,6 +8,9 @@ pub mod client;
 #[cfg(feature = "crd")]
 pub mod crd;
 
-/// Operator Setup functinality
+/// Operator Setup functionality
 #[cfg(feature = "setup")]
 pub mod setup;
+
+/// Types used in the operator that don't require any special dependencies
+pub mod types;

mirrord/operator/src/types.rs

@@ -0,0 +1,14 @@
+use chrono::NaiveDate;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+pub struct LicenseInfoOwned {
+    pub name: String,
+    pub organization: String,
+    pub expire_at: NaiveDate,
+    /// Fingerprint of the operator license.
+    pub fingerprint: Option<String>,
+    /// Subscription id encoded in the operator license extension.
+    pub subscription_id: Option<String>,
+}