Merge #320

320: Burn deprecated stuff r=teozkr a=teozkr

## Description

Fixes #316 

## Review Checklist
- [ ] Code contains useful comments
- [ ] (Integration-)Test cases added (or not applicable)
- [ ] Documentation added (or not applicable)
- [ ] Changelog updated (or not applicable)


Co-authored-by: Teo Klestrup Röijezon <[email protected]>

Author: bors[bot]

Diff for: CHANGELOG.md

@@ -9,9 +9,11 @@ All notable changes to this project will be documented in this file.
 
 ### Removed
 - Chrono's time 0.1 compatibility ([#310]).
+- Deprecated pre-rework utilities ([#320]).
 
 [#310]: https://github.com/stackabletech/operator-rs/pull/310
 [#319]: https://github.com/stackabletech/operator-rs/pull/319
+[#320]: https://github.com/stackabletech/operator-rs/pull/320
 
 ## [0.10.0] - 2022-02-04
 

Diff for: src/cli.rs

@@ -109,9 +109,7 @@
 //!
 use crate::error;
 use crate::error::OperatorResult;
-#[allow(deprecated)]
-use crate::CustomResourceExt;
-use clap::{App, AppSettings, Arg, ArgMatches, Args};
+use clap::Args;
 use product_config::ProductConfigManager;
 use std::{
     ffi::OsStr,
@@ -251,119 +249,6 @@ fn resolve_path<'a>(
     })
 }
 
-const PRODUCT_CONFIG_ARG: &str = "product-config";
-
-/// Generates a clap [`Arg`] that can be used to accept the location of a product configuration file.
-///
-/// Meant to be handled by [`handle_productconfig_arg`].
-///
-/// See the module level documentation for a complete example.
-#[deprecated(note = "use ProductConfigPath (or Command) instead")]
-pub fn generate_productconfig_arg() -> Arg<'static> {
-    Arg::new(PRODUCT_CONFIG_ARG)
-        .short('p')
-        .long(PRODUCT_CONFIG_ARG)
-        .value_name("FILE")
-        .help("Provides the path to a product-config file")
-        .takes_value(true)
-}
-
-/// Handles the `product-config` CLI option.
-///
-/// See the module level documentation for a complete example.
-///
-/// # Arguments
-///
-/// * `default_locations`: These locations will be checked for the existence of a config file if the user doesn't provide one
-#[deprecated(note = "use ProductConfigPath (or Command) instead")]
-pub fn handle_productconfig_arg(
-    matches: &ArgMatches,
-    default_locations: Vec<&str>,
-) -> OperatorResult<String> {
-    Ok(resolve_path(
-        matches.value_of(PRODUCT_CONFIG_ARG).map(str::as_ref),
-        &default_locations,
-    )?
-    .to_str()
-    // ArgMatches::value_of and `str` both already validate UTF-8, so this should never be possible
-    .expect("product-config path must be UTF-8")
-    .to_owned())
-}
-
-/// This will generate a clap subcommand ([`App`]) that can be used for operations on CRDs.
-///
-/// Currently two arguments are supported:
-/// * `print`: This will print the schema to stdout
-/// * `save`: This will save the schema to a file
-///
-/// The resulting subcommand can be handled by the [`self::handle_crd_subcommand`] method.
-///
-/// See the module level documentation for a complete example.
-///
-/// # Arguments
-///
-/// * `name`: Name of the CRD
-///
-/// returns: App
-#[deprecated(note = "use Command instead")]
-#[allow(deprecated)]
-pub fn generate_crd_subcommand<T>() -> App<'static>
-where
-    T: CustomResourceExt,
-{
-    let kind = T::api_resource().kind;
-
-    App::new(&kind.to_lowercase())
-        .setting(AppSettings::ArgRequiredElseHelp)
-        .arg(
-            Arg::with_name("print")
-                .short('p')
-                .long("print")
-                .help("Will print the CRD schema in YAML format to stdout"),
-        )
-        .arg(
-            Arg::with_name("save")
-                .short('s')
-                .long("save")
-                .takes_value(true)
-                .value_name("FILE")
-                .conflicts_with("print")
-                .help("Will write the CRD schema in YAML format to the specified location"),
-        )
-}
-
-/// This will handle a subcommand generated by the [`self::generate_crd_subcommand`] method.
-///
-/// The CRD and the name of the subcommand will be identified by the `kind` of the generic parameter `T` being passed in.
-///
-/// See the module level documentation for a complete example.
-///
-/// # Arguments
-///
-/// * `matches`: The [`ArgMatches`] object which _might_ contain a match for our current CRD.
-///
-/// returns: A boolean wrapped in a result indicating whether the this method did handle the argument.
-///          If it returns `Ok(true)` the program should abort.
-#[deprecated(note = "use Command instead")]
-#[allow(deprecated)]
-pub fn handle_crd_subcommand<T>(matches: &ArgMatches) -> OperatorResult<bool>
-where
-    T: CustomResourceExt,
-{
-    if let Some(crd_match) = matches.subcommand_matches(T::api_resource().kind.to_lowercase()) {
-        if crd_match.is_present("print") {
-            T::print_yaml_schema()?;
-            return Ok(true);
-        }
-        if let Some(value) = crd_match.value_of("save") {
-            T::write_yaml_schema(value)?;
-            return Ok(true);
-        }
-    }
-
-    Ok(false)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

Diff for: src/client.rs

@@ -1,8 +1,5 @@
 use crate::error::{Error, OperatorResult};
-#[allow(deprecated)]
-use crate::finalizer;
 use crate::label_selector;
-use crate::pod_utils;
 
 use backoff::backoff::Backoff;
 use backoff::ExponentialBackoff;
@@ -341,37 +338,18 @@ impl Client {
 
     /// This deletes a resource _if it is not deleted already_.
     ///
-    /// It checks whether the resource is already deleted by looking at the `deletion_timestamp`
-    /// of the resource using the [`finalizer::has_deletion_stamp`] method.
-    /// If that is the case it'll return a `Ok(None)`.
-    ///
     /// In case the object is actually deleted or marked for deletion there are two possible
     /// return types.
     /// Which of the two are returned depends on the API being called.
     /// Take a look at the Kubernetes API reference.
     /// Some `delete` endpoints return the object and others return a `Status` object.
-    #[allow(deprecated)]
-    pub async fn delete<T>(&self, resource: &T) -> OperatorResult<Option<Either<T, Status>>>
+    pub async fn delete<T>(&self, resource: &T) -> OperatorResult<Either<T, Status>>
     where
         T: Clone + Debug + DeserializeOwned + Resource,
         <T as Resource>::DynamicType: Default,
     {
-        if finalizer::has_deletion_stamp(resource) {
-            trace!(
-                "Resource ([{}]) already has `deletion_timestamp`, not deleting",
-                pod_utils::get_log_name(resource)
-            );
-            Ok(None)
-        } else {
-            trace!(
-                "Resource ([{}]) does not have a `deletion_timestamp`, deleting now",
-                pod_utils::get_log_name(resource)
-            );
-            let api: Api<T> = self.get_api(resource.namespace().as_deref());
-            Ok(Some(
-                api.delete(&resource.name(), &self.delete_params).await?,
-            ))
-        }
+        let api: Api<T> = self.get_api(resource.namespace().as_deref());
+        Ok(api.delete(&resource.name(), &self.delete_params).await?)
     }
 
     /// This deletes a resource _if it is not deleted already_ and waits until the deletion is