Merge pull request #75 from DenktMit-eG/fix/licenses

Fix/licenses

Author: Gottox

Cargo.lock

@@ -9,15 +9,15 @@ authors = [
 ]
 repository = "https://github.com/DenktMit-eG/rustcloak-operator"
 readme = "README.md"
-license = "BSD-2-Clause"
+license = "MIT"
 edition = "2024"
 
 [workspace.dependencies]
 kube = { version = "1.1.0", default-features = false }
 k8s-openapi = { version = "0.25.0", features = ["latest", "schemars"] }
 clap = { version = "4.5.40", features = ["derive", "help", "std", "string"], default-features = false }
 serde = { version = "1.0.219", features = ["derive"] }
-keycloak-types = { git = "https://github.com/Gottox/keycloak-client.rs" }
+keycloak-types = { git = "https://github.com/Gottox/keycloak-client.rs", rev = "5314c46" }
 #schemars = { version = "0.9.0", features = ["chrono04", "either1"] }
 schemars = { version = "0.8.22", features = ["chrono", "either"] }
 

Cargo.toml

@@ -1,22 +1,19 @@
 Copyright (c) 2025, Enno Boland <mail@eboland.de>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -4,7 +4,7 @@ version.workspace = true
 authors.workspace = true
 repository.workspace = true
 readme.workspace = true
-license = "BSD-2-Clause"
+license = "MIT"
 edition.workspace = true
 
 [dependencies]

rustcloak-crd/Cargo.toml

@@ -26,9 +26,9 @@ either = { version = "1.15.0", features = ["serde"] }
 keycloak-crd = { git = "https://github.com/withlazers/keycloak-crd.git", branch = "rustcloak" }
 randstr = { git = "https://github.com/Gottox/randstr", branch = "main" }
 structured-logger = "1.0.4"
-case_style = "0.2.1"
+heck = "0.5"
 rustcloak-crd = { path = "../rustcloak-crd" }
-keycloak-client = { git = "https://github.com/Gottox/keycloak-client.rs" }
+keycloak-client = { git = "https://github.com/Gottox/keycloak-client.rs", rev = "5314c46" }
 #keycloak-client = { path = "../../keycloak-client.rs/keycloak-client" }
 shorter-bounds = "0.1.1"
 metrics = "0.24"

rustcloak-operator/Cargo.toml

@@ -4,7 +4,7 @@ use crate::app_id;
 use crate::error::Error;
 use crate::util::ApiExt;
 use crate::util::ApiFactory;
-use case_style::CaseStyle;
+use heck::ToLowerCamelCase;
 use either::Either;
 use k8s_openapi::NamespaceResourceScope;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::LabelSelector;
@@ -30,9 +30,9 @@ fn find_variants(
     annotations: &BTreeMap<String, String>,
     snake_case: &str,
 ) -> Option<String> {
-    let style = CaseStyle::from_snakecase(snake_case);
+    let camel_case = snake_case.to_lower_camel_case();
     let variants =
-        [snake_case, &style.to_camelcase()].map(|x| format!(app_id!("{}"), x));
+        [snake_case, &camel_case].map(|x| format!(app_id!("{}"), x));
 
     annotations
         .iter()

rustcloak-operator/src/controller/legacy/util.rs

@@ -11,5 +11,5 @@ edition.workspace = true
 clap = { workspace = true }
 rustcloak-crd = { path = "../rustcloak-crd" }
 serde_yaml = "0.9.34"
-crd2md = { git = "https://github.com/withlazers/crd2md.git" }
+crd2md = { git = "https://github.com/withlazers/crd2md.git", rev = "67776e4" }
 kube = { version = "1.1.0", default-features = false }