Merge pull request #124 from icann/dev

Release 0.0.22

Author: anewton1998

Cargo.lock

@@ -8,7 +8,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.0.21"
+version = "0.0.22"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/icann/icann-rdap"
@@ -69,9 +69,6 @@ futures-util = "0.3"
 # macros to get the git version
 git-version = "0.3"
 
-# lazy static initilization
-lazy_static = "1.4"
-
 # headers (http headers)
 headers = "0.4"
 
@@ -89,7 +86,7 @@ jsonpath-rust = "=0.5.0"
 jsonpath_lib = "0.3.0"
 
 # internationalized domain names for applications
-idna = "0.5"
+idna = "1.0"
 
 # for use prefixmap
 ipnet = { version = "2.9", features = ["json"] }
@@ -151,3 +148,8 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # url
 url = "2.5"
+
+
+[profile.release]
+codegen-units = 1
+lto = true

Cargo.toml

@@ -10,8 +10,8 @@ An RDAP Command Line Interface client.
 
 [dependencies]
 
-icann-rdap-client = { version = "0.0.21", path = "../icann-rdap-client" }
-icann-rdap-common = { version = "0.0.21", path = "../icann-rdap-common" }
+icann-rdap-client = { version = "0.0.22", path = "../icann-rdap-client" }
+icann-rdap-common = { version = "0.0.22", path = "../icann-rdap-common" }
 
 anyhow.workspace = true
 clap.workspace = true
@@ -20,7 +20,6 @@ const_format.workspace = true
 directories.workspace = true
 dotenv.workspace = true
 hickory-client.workspace = true
-lazy_static.workspace = true
 minus.workspace = true
 pct-str.workspace = true
 prefix-trie.workspace = true

icann-rdap-cli/Cargo.toml

@@ -1,9 +1,10 @@
 use std::process::{ExitCode, Termination};
 
-use icann_rdap_cli::rt::exec::TestExecutionError;
-use icann_rdap_client::iana::IanaResponseError;
-use icann_rdap_client::RdapClientError;
-use thiserror::Error;
+use {
+    icann_rdap_cli::rt::exec::TestExecutionError,
+    icann_rdap_client::{iana::IanaResponseError, RdapClientError},
+    thiserror::Error,
+};
 
 #[derive(Debug, Error)]
 pub enum RdapTestError {
@@ -43,31 +44,31 @@ impl Termination for RdapTestError {
     fn report(self) -> std::process::ExitCode {
         let exit_code: u8 = match self {
             // Success
-            RdapTestError::Success => 0,
-            RdapTestError::TestsCompletedExecutionErrors => 1,
-            RdapTestError::TestsCompletedWarningsFound => 2,
-            RdapTestError::TestsCompletedErrorsFound => 3,
+            Self::Success => 0,
+            Self::TestsCompletedExecutionErrors => 1,
+            Self::TestsCompletedWarningsFound => 2,
+            Self::TestsCompletedErrorsFound => 3,
 
             // Internal Errors
-            RdapTestError::Termimad(_) => 10,
+            Self::Termimad(_) => 10,
 
             // I/O Errors
-            RdapTestError::IoError(_) => 40,
-            RdapTestError::TestExecutionError(_) => 40,
+            Self::IoError(_) => 40,
+            Self::TestExecutionError(_) => 40,
 
             // RDAP Errors
-            RdapTestError::Json(_) => 100,
-            RdapTestError::Iana(_) => 101,
-            RdapTestError::InvalidBootstrap => 102,
-            RdapTestError::BootstrapNotFound => 103,
-            RdapTestError::NoRegistrarFound => 104,
-            RdapTestError::NoRegistryFound => 105,
+            Self::Json(_) => 100,
+            Self::Iana(_) => 101,
+            Self::InvalidBootstrap => 102,
+            Self::BootstrapNotFound => 103,
+            Self::NoRegistrarFound => 104,
+            Self::NoRegistryFound => 105,
 
             // User Errors
-            RdapTestError::UnknownOutputType => 200,
+            Self::UnknownOutputType => 200,
 
             // RDAP Client Errrors
-            RdapTestError::RdapClient(e) => match e {
+            Self::RdapClient(e) => match e {
                 // I/O Errors
                 RdapClientError::Client(_) => 42,
                 RdapClientError::IoError(_) => 43,

icann-rdap-cli/src/bin/rdap-test/error.rs

@@ -1,28 +1,29 @@
-use std::io::stdout;
-use std::str::FromStr;
-
-use clap::builder::styling::AnsiColor;
-use clap::builder::Styles;
-use error::RdapTestError;
-use icann_rdap_cli::dirs;
-use icann_rdap_cli::dirs::fcbs::FileCacheBootstrapStore;
-use icann_rdap_cli::rt::exec::execute_tests;
-use icann_rdap_cli::rt::exec::ExtensionGroup;
-use icann_rdap_cli::rt::exec::TestOptions;
-use icann_rdap_cli::rt::results::RunOutcome;
-use icann_rdap_cli::rt::results::TestResults;
-use icann_rdap_client::http::ClientConfig;
-use icann_rdap_client::md::MdOptions;
-use icann_rdap_client::rdap::QueryType;
-use icann_rdap_common::check::traverse_checks;
-use icann_rdap_common::check::CheckClass;
-use termimad::crossterm::style::Color::*;
-use termimad::Alignment;
-use termimad::MadSkin;
-use tracing_subscriber::filter::LevelFilter;
-
-use clap::{Parser, ValueEnum};
-use icann_rdap_common::VERSION;
+use std::{io::stdout, str::FromStr};
+
+#[cfg(debug_assertions)]
+use tracing::warn;
+use {
+    clap::builder::{styling::AnsiColor, Styles},
+    error::RdapTestError,
+    icann_rdap_cli::{
+        dirs,
+        dirs::fcbs::FileCacheBootstrapStore,
+        rt::{
+            exec::{execute_tests, ExtensionGroup, TestOptions},
+            results::{RunOutcome, TestResults},
+        },
+    },
+    icann_rdap_client::{http::ClientConfig, md::MdOptions, rdap::QueryType},
+    icann_rdap_common::check::{traverse_checks, CheckClass},
+    termimad::{crossterm::style::Color::*, Alignment, MadSkin},
+    tracing::info,
+    tracing_subscriber::filter::LevelFilter,
+};
+
+use {
+    clap::{Parser, ValueEnum},
+    icann_rdap_common::VERSION,
+};
 
 pub mod error;
 
@@ -350,12 +351,12 @@ enum LogLevel {
 impl From<&LogLevel> for LevelFilter {
     fn from(log_level: &LogLevel) -> Self {
         match log_level {
-            LogLevel::Off => LevelFilter::OFF,
-            LogLevel::Error => LevelFilter::ERROR,
-            LogLevel::Warn => LevelFilter::WARN,
-            LogLevel::Info => LevelFilter::INFO,
-            LogLevel::Debug => LevelFilter::DEBUG,
-            LogLevel::Trace => LevelFilter::TRACE,
+            LogLevel::Off => Self::OFF,
+            LogLevel::Error => Self::ERROR,
+            LogLevel::Warn => Self::WARN,
+            LogLevel::Info => Self::INFO,
+            LogLevel::Debug => Self::DEBUG,
+            LogLevel::Trace => Self::TRACE,
         }
     }
 }
@@ -381,6 +382,11 @@ pub async fn wrapped_main() -> Result<(), RdapTestError> {
         .with_writer(std::io::stderr)
         .init();
 
+    info!("ICANN RDAP {} Testing Tool", VERSION);
+
+    #[cfg(debug_assertions)]
+    warn!("This is a development build of this software.");
+
     let query_type = QueryType::from_str(&cli.query_value)?;
 
     let check_classes = if cli.check_type.is_empty() {

icann-rdap-cli/src/bin/rdap-test/main.rs

@@ -1,14 +1,14 @@
-use crate::error::RdapCliError;
-use icann_rdap_cli::dirs::fcbs::FileCacheBootstrapStore;
-use icann_rdap_client::http::Client;
-use icann_rdap_client::iana::BootstrapStore;
-use icann_rdap_client::iana::PreferredUrl;
-use icann_rdap_client::{
-    iana::{fetch_bootstrap, qtype_to_bootstrap_url},
-    rdap::QueryType,
+use {
+    crate::error::RdapCliError,
+    icann_rdap_cli::dirs::fcbs::FileCacheBootstrapStore,
+    icann_rdap_client::{
+        http::Client,
+        iana::{fetch_bootstrap, qtype_to_bootstrap_url, BootstrapStore, PreferredUrl},
+        rdap::QueryType,
+    },
+    icann_rdap_common::iana::IanaRegistryType,
+    tracing::debug,
 };
-use icann_rdap_common::iana::IanaRegistryType;
-use tracing::debug;
 
 /// Defines the type of bootstrapping to use.
 pub(crate) enum BootstrapType {

icann-rdap-cli/src/bin/rdap/bootstrap.rs

@@ -1,9 +1,11 @@
 use std::process::{ExitCode, Termination};
 
-use icann_rdap_client::iana::IanaResponseError;
-use icann_rdap_client::RdapClientError;
-use minus::MinusError;
-use thiserror::Error;
+use {
+    icann_rdap_client::{iana::IanaResponseError, RdapClientError},
+    minus::MinusError,
+    thiserror::Error,
+    tracing::error,
+};
 
 #[derive(Debug, Error)]
 pub enum RdapCliError {
@@ -35,35 +37,44 @@ pub enum RdapCliError {
     NoRegistryFound,
 }
 
-impl Termination for RdapCliError {
-    fn report(self) -> std::process::ExitCode {
-        let exit_code: u8 = match self {
+impl RdapCliError {
+    pub(crate) fn exit_code(&self) -> u8 {
+        match self {
             // Success
-            RdapCliError::Success => 0,
+            Self::Success => 0,
 
             // Internal Errors
-            RdapCliError::Termimad(_) => 10,
-            RdapCliError::Minus(_) => 11,
+            Self::Termimad(_) => 10,
+            Self::Minus(_) => 11,
 
             // I/O Errors
-            RdapCliError::IoError(_) => 40,
+            Self::IoError(_) => 40,
 
             // RDAP Errors
-            RdapCliError::Json(_) => 100,
-            RdapCliError::Iana(_) => 101,
-            RdapCliError::InvalidBootstrap => 102,
-            RdapCliError::BootstrapNotFound => 103,
-            RdapCliError::NoRegistrarFound => 104,
-            RdapCliError::NoRegistryFound => 105,
+            Self::Json(_) => 100,
+            Self::Iana(_) => 101,
+            Self::InvalidBootstrap => 102,
+            Self::BootstrapNotFound => 103,
+            Self::NoRegistrarFound => 104,
+            Self::NoRegistryFound => 105,
 
             // User Errors
-            RdapCliError::UnknownOutputType => 200,
-            RdapCliError::ErrorOnChecks => 201,
+            Self::UnknownOutputType => 200,
+            Self::ErrorOnChecks => 201,
 
             // RDAP Client Errrors
-            RdapCliError::RdapClient(e) => match e {
+            Self::RdapClient(e) => match e {
                 // I/O Errors
-                RdapClientError::Client(_) => 42,
+                RdapClientError::Client(ce) => {
+                    if ce.is_builder() {
+                        match ce.url() {
+                            Some(url) if url.scheme() == "http" => 202,
+                            _ => 42,
+                        }
+                    } else {
+                        42
+                    }
+                }
                 RdapClientError::IoError(_) => 43,
 
                 // RDAP Server Errors
@@ -85,7 +96,13 @@ impl Termination for RdapCliError {
                 RdapClientError::Poison => 250,
                 // _ => 255,
             },
-        };
+        }
+    }
+}
+
+impl Termination for RdapCliError {
+    fn report(self) -> std::process::ExitCode {
+        let exit_code = self.exit_code();
         ExitCode::from(exit_code)
     }
 }