From 536dbeb5cbc2cbf2bbf264607de70290b0256c26 Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 19 Apr 2024 15:08:50 +0200 Subject: [PATCH 01/25] add decisionLogging field to OpaCluster CRD --- deploy/helm/opa-operator/crds/crds.yaml | 20 ++++++++++ rust/crd/src/lib.rs | 29 +++++++++++++- rust/operator-binary/src/controller.rs | 50 ++++++++++++------------- 3 files changed, 73 insertions(+), 26 deletions(-) diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml index 100f31bf..3c81824d 100644 --- a/deploy/helm/opa-operator/crds/crds.yaml +++ b/deploy/helm/opa-operator/crds/crds.yaml @@ -716,6 +716,16 @@ spec: type: array type: object type: object + decisionLogging: + default: + console: null + description: Decision Logging configuration. + properties: + console: + description: Wether or not to print decision logging to the console. + nullable: true + type: boolean + type: object gracefulShutdownTimeout: description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details. nullable: true @@ -4142,6 +4152,16 @@ spec: type: array type: object type: object + decisionLogging: + default: + console: null + description: Decision Logging configuration. + properties: + console: + description: Wether or not to print decision logging to the console. + nullable: true + type: boolean + type: object gracefulShutdownTimeout: description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details. nullable: true diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index e212f01a..df7a8df6 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -30,7 +30,7 @@ pub mod user_info_fetcher; pub const APP_NAME: &str = "opa"; pub const OPERATOR_NAME: &str = "opa.stackable.tech"; -pub const CONFIG_FILE: &str = "config.yaml"; +pub const CONFIG_FILE: &str = "config.json"; pub const DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_minutes_unchecked(2); /// Safety puffer to guarantee the graceful shutdown works every time. @@ -171,6 +171,27 @@ pub enum Container { Opa, } +#[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)] +#[fragment_attrs( + derive( + Clone, + Debug, + Default, + Deserialize, + Merge, + JsonSchema, + PartialEq, + Serialize + ), + serde(rename_all = "camelCase"), + schemars(description = "Decision Logging configuration.") +)] +pub struct DecisionLogging { + /// Wether or not to print decision logging to the console. + #[serde(default)] + pub console: bool, +} + #[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)] #[fragment_attrs( derive( @@ -192,6 +213,9 @@ pub struct OpaConfig { #[fragment_attrs(serde(default))] pub logging: Logging, + #[fragment_attrs(serde(default))] + pub decision_logging: DecisionLogging, + #[fragment_attrs(serde(default))] pub affinity: StackableAffinity, @@ -204,6 +228,9 @@ impl OpaConfig { fn default_config() -> OpaConfigFragment { OpaConfigFragment { logging: product_logging::spec::default_logging(), + decision_logging: DecisionLoggingFragment { + console: Some(false), + }, resources: ResourcesFragment { cpu: CpuLimitsFragment { min: Some(Quantity("250m".to_owned())), diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 813cf915..51853a0d 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -71,7 +71,7 @@ use crate::{ pub const OPA_CONTROLLER_NAME: &str = "opacluster"; -pub const CONFIG_FILE: &str = "config.yaml"; +pub const CONFIG_FILE: &str = "config.json"; pub const APP_PORT: u16 = 8081; pub const APP_PORT_NAME: &str = "http"; pub const METRICS_PORT_NAME: &str = "metrics"; @@ -572,7 +572,7 @@ fn build_server_rolegroup_config_map( cm_builder .metadata(metadata) - .add_data(CONFIG_FILE, build_config_file()); + .add_data(CONFIG_FILE, build_config_file(merged_config)); if let Some(user_info) = &opa.spec.cluster_config.user_info { cm_builder.add_data( @@ -910,28 +910,28 @@ pub fn error_policy(_obj: Arc, _error: &Error, _ctx: Arc) -> Ac Action::requeue(*Duration::from_secs(5)) } -fn build_config_file() -> &'static str { - // We currently do not activate decision logging like - // decision_logs: - // console: true - // This will log decisions to the console, but also sends an extra `decision_id` field in the - // API JSON response. This currently leads to our Java authorizers (Druid, Trino) failing to - // deserialize the JSON object since they only expect to have a `result` field returned. - // see https://github.com/stackabletech/opa-operator/issues/422 - " -services: - - name: stackable - url: http://localhost:3030/opa/v1 - -bundles: - stackable: - service: stackable - resource: opa/bundle.tar.gz - persist: true - polling: - min_delay_seconds: 10 - max_delay_seconds: 20 -" +fn build_config_file(config: &OpaConfig) -> String { + serde_json::to_string_pretty(&json!({ + "services": [{ + "name": "stackable", + "url": "http://localhost:3030/opa/v1", + },], + "bundles": { + "stackable": { + "service": "stackable", + "resource": "opa/bundle.tar.gz", + "persist": true, + "polling": { + "min_delay_seconds": 10, + "max_delay_seconds": 20, + }, + } + }, + "decision_logs": { + "console": config.decision_logging.console, + } + })) + .unwrap() } fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> String { @@ -965,7 +965,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S {COMMON_BASH_TRAP_FUNCTIONS} {remove_vector_shutdown_file_command} prepare_signal_handlers - /stackable/opa/opa run -s -a 0.0.0.0:{APP_PORT} -c {CONFIG_DIR}/config.yaml -l {opa_log_level} --shutdown-grace-period {shutdown_grace_period_s} --disable-telemetry{logging_redirects} & + /stackable/opa/opa run -s -a 0.0.0.0:{APP_PORT} -c {CONFIG_DIR}/{CONFIG_FILE} -l {opa_log_level} --shutdown-grace-period {shutdown_grace_period_s} --disable-telemetry{logging_redirects} & wait_for_termination $! {create_vector_shutdown_file_command} ", From 72ee9fe46b31594ebb472dd3f1c01c03ecaf7ef3 Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 19 Apr 2024 15:15:57 +0200 Subject: [PATCH 02/25] typo fix --- deploy/helm/opa-operator/crds/crds.yaml | 4 ++-- rust/crd/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml index 3c81824d..50128a4b 100644 --- a/deploy/helm/opa-operator/crds/crds.yaml +++ b/deploy/helm/opa-operator/crds/crds.yaml @@ -722,7 +722,7 @@ spec: description: Decision Logging configuration. properties: console: - description: Wether or not to print decision logging to the console. + description: Whether or not to print decision logging to the console. nullable: true type: boolean type: object @@ -4158,7 +4158,7 @@ spec: description: Decision Logging configuration. properties: console: - description: Wether or not to print decision logging to the console. + description: Whether or not to print decision logging to the console. nullable: true type: boolean type: object diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index df7a8df6..5ea858db 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -187,7 +187,7 @@ pub enum Container { schemars(description = "Decision Logging configuration.") )] pub struct DecisionLogging { - /// Wether or not to print decision logging to the console. + /// Whether or not to print decision logging to the console. #[serde(default)] pub console: bool, } From abb3f06276b736687edae7aaf7f132d64102329f Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 22 Apr 2024 14:00:53 +0200 Subject: [PATCH 03/25] add decision logging test to logging integration test --- scripts/run-tests | 2 +- .../kuttl/logging/02-install-opa.yaml.j2 | 3 ++ .../opa-vector-aggregator-values.yaml.j2 | 10 ++++- .../kuttl/logging/test_log_aggregation.py | 42 +++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/scripts/run-tests b/scripts/run-tests index 3768dec1..0d03b672 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: filetype=python syntax=python tabstop=4 expandtab import argparse diff --git a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 index bd1e8372..99874bd9 100644 --- a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 @@ -28,6 +28,9 @@ spec: clusterConfig: vectorAggregatorConfigMapName: opa-vector-aggregator-discovery servers: + config: + decisionLogging: + console: true roleGroups: automatic-log-config: config: diff --git a/tests/templates/kuttl/logging/opa-vector-aggregator-values.yaml.j2 b/tests/templates/kuttl/logging/opa-vector-aggregator-values.yaml.j2 index 5bb70ed7..5891b281 100644 --- a/tests/templates/kuttl/logging/opa-vector-aggregator-values.yaml.j2 +++ b/tests/templates/kuttl/logging/opa-vector-aggregator-values.yaml.j2 @@ -20,12 +20,20 @@ customConfig: type: vector version: "2" transforms: + filteredAutomaticLogConfigServerOpaDecision: + type: filter + inputs: [vector] + condition: >- + starts_with(string!(.pod), "test-opa-server-automatic-log-config") && + .container == "opa" && + .logger == "decision" filteredAutomaticLogConfigServerOpa: type: filter inputs: [vector] condition: >- starts_with(string!(.pod), "test-opa-server-automatic-log-config") && - .container == "opa" + .container == "opa" && + .logger != "decision" filteredAutomaticLogConfigServerBundleBuilder: type: filter inputs: [vector] diff --git a/tests/templates/kuttl/logging/test_log_aggregation.py b/tests/templates/kuttl/logging/test_log_aggregation.py index b5d50dc5..85b4abda 100755 --- a/tests/templates/kuttl/logging/test_log_aggregation.py +++ b/tests/templates/kuttl/logging/test_log_aggregation.py @@ -1,6 +1,46 @@ #!/usr/bin/env python3 import requests +def send_opa_decision_request(): + response = requests.post( + 'http://test-opa:8081/v1/data/test/world' + ) + + assert response.status_code == 200, \ + 'Cannot access the API of the opa cluster.' + +def check_decision_events(): + response = requests.post( + 'http://opa-vector-aggregator:8686/graphql', + json={ + 'query': """ + { + transforms(filter: {componentId: {equals: \"filteredAutomaticLogConfigServerOpaDecision\"}}) { + nodes { + componentId + metrics { + sentEventsTotal { + sentEventsTotal + } + } + } + } + } + """ + } + ) + + assert response.status_code == 200, \ + 'Cannot access the API of the vector aggregator.' + + result = response.json() + + sentEvents = result['data']['transforms']['nodes'][0]['metrics']['sentEventsTotal'] + componentId = result['data']['transforms']['nodes'][0]['componentId'] + + assert sentEvents is not None and \ + sentEvents['sentEventsTotal'] > 0, \ + f'No events were sent in "{componentId}".' def check_sent_events(): response = requests.post( @@ -44,5 +84,7 @@ def check_sent_events(): if __name__ == '__main__': + send_opa_decision_request() + check_decision_events() check_sent_events() print('Test successful!') From d50398f11f6fab49b3d8fcd98a7bc6d832d4fa5c Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 22 Apr 2024 16:14:00 +0200 Subject: [PATCH 04/25] revert python version change for local testing --- scripts/run-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests b/scripts/run-tests index 0d03b672..3768dec1 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # vim: filetype=python syntax=python tabstop=4 expandtab import argparse From e7e95ed7439f5933c0682be9b4d2955feee68e13 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 22 Apr 2024 16:41:33 +0200 Subject: [PATCH 05/25] Allow to enable decision logs only for console or file --- deploy/helm/opa-operator/crds/crds.yaml | 10 +++++ rust/crd/src/lib.rs | 5 ++- rust/operator-binary/src/controller.rs | 43 +++++++++++++------ .../kuttl/logging/02-install-opa.yaml.j2 | 3 +- 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml index 50128a4b..e9e59478 100644 --- a/deploy/helm/opa-operator/crds/crds.yaml +++ b/deploy/helm/opa-operator/crds/crds.yaml @@ -718,6 +718,7 @@ spec: type: object decisionLogging: default: + file: null console: null description: Decision Logging configuration. properties: @@ -725,6 +726,10 @@ spec: description: Whether or not to print decision logging to the console. nullable: true type: boolean + file: + description: Whether or not to print decision logging to files collected by Vector agent. + nullable: true + type: boolean type: object gracefulShutdownTimeout: description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details. @@ -4154,6 +4159,7 @@ spec: type: object decisionLogging: default: + file: null console: null description: Decision Logging configuration. properties: @@ -4161,6 +4167,10 @@ spec: description: Whether or not to print decision logging to the console. nullable: true type: boolean + file: + description: Whether or not to print decision logging to files collected by Vector agent. + nullable: true + type: boolean type: object gracefulShutdownTimeout: description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details. diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 5ea858db..7db84643 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -187,8 +187,10 @@ pub enum Container { schemars(description = "Decision Logging configuration.") )] pub struct DecisionLogging { + /// Whether or not to print decision logging to files collected by Vector agent. + pub file: bool, + /// Whether or not to print decision logging to the console. - #[serde(default)] pub console: bool, } @@ -229,6 +231,7 @@ impl OpaConfig { OpaConfigFragment { logging: product_logging::spec::default_logging(), decision_logging: DecisionLoggingFragment { + file: Some(true), console: Some(false), }, resources: ResourcesFragment { diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 51853a0d..98dbc339 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -927,8 +927,11 @@ fn build_config_file(config: &OpaConfig) -> String { }, } }, + // FIXME: We should only write this whole struct when we want decision logs "decision_logs": { - "console": config.decision_logging.console, + // Either one can enable the decision logs, the entrypoint takes care of filtering which target get decision + // logs + "console": config.decision_logging.console || config.decision_logging.file, } })) .unwrap() @@ -936,7 +939,7 @@ fn build_config_file(config: &OpaConfig) -> String { fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> String { let mut opa_log_level = OpaLogLevel::Info; - let mut console_logging_off = false; + let mut console_logging_enabled = true; if let Some(ContainerLogConfig { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), @@ -956,10 +959,35 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S level: Some(log_level), }) = log_config.console { - console_logging_off = log_level == LogLevel::NONE + console_logging_enabled = log_level != LogLevel::NONE } } + let decision_logs_to_stdout = merged_config.decision_logging.console; + let decision_logs_to_file = merged_config.decision_logging.file; + + // Redirects matter! + // We need to watch out, that the following "$!" call returns the PID of the main (opa-bundle-builder) process, + // and not some utility (e.g. multilog or tee) process. + // See https://stackoverflow.com/a/8048493 + + // *Technically*, we would also need to calculate `file_logging_enabled` and take that into account. However, this + // is a very nice edge-case and would make things more complicated and error-prone. + let logging_redirects = if console_logging_enabled { + match (decision_logs_to_file, decision_logs_to_stdout) { + (true, true) => format!(" &> >(tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))"), + (true, false) => format!(" &> >(tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}) | grep -v '\"decision_id\":\"')"), + (false, true) => format!(" &> >(tee >(grep -v '\"decision_id\":\"' &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name})))"), + // Normally in this case OPA should *not* be instructed to even write decision logs, so we *should* be able + // to just forward them. However, we still filter them just to be safe. + (false, false) => format!(" &> >(grep -v '\"decision_id\":\"' | tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))"), + } + } else if decision_logs_to_file { + format!(" &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name})") + } else { + format!(" &> >(grep -v '\"decision_id\":\"' &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))") + }; + // TODO: Think about adding --shutdown-wait-period, as suggested by https://github.com/open-policy-agent/opa/issues/2764 formatdoc! {" {COMMON_BASH_TRAP_FUNCTIONS} @@ -974,15 +1002,6 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S create_vector_shutdown_file_command = create_vector_shutdown_file_command(STACKABLE_LOG_DIR), shutdown_grace_period_s = merged_config.graceful_shutdown_timeout.unwrap_or(DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT).as_secs(), - // Redirects matter! - // We need to watch out, that the following "$!" call returns the PID of the main (opa-bundle-builder) process, - // and not some utility (e.g. multilog or tee) process. - // See https://stackoverflow.com/a/8048493 - logging_redirects = if console_logging_off { - format!(" &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name})") - } else { - format!(" &> >(tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))") - }, } } diff --git a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 index 99874bd9..bbd48528 100644 --- a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 @@ -30,7 +30,8 @@ spec: servers: config: decisionLogging: - console: true + console: false + file: true roleGroups: automatic-log-config: config: From f52ef64c1fbb746878030bd6b6de30f0023a08bf Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 2 May 2024 10:48:59 +0200 Subject: [PATCH 06/25] decision logging set through logging configuration, build opa cluster config with struct --- rust/crd/src/lib.rs | 30 ----- rust/operator-binary/src/controller.rs | 166 +++++++++++++++++-------- 2 files changed, 113 insertions(+), 83 deletions(-) diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 7db84643..c777e190 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -171,29 +171,6 @@ pub enum Container { Opa, } -#[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)] -#[fragment_attrs( - derive( - Clone, - Debug, - Default, - Deserialize, - Merge, - JsonSchema, - PartialEq, - Serialize - ), - serde(rename_all = "camelCase"), - schemars(description = "Decision Logging configuration.") -)] -pub struct DecisionLogging { - /// Whether or not to print decision logging to files collected by Vector agent. - pub file: bool, - - /// Whether or not to print decision logging to the console. - pub console: bool, -} - #[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)] #[fragment_attrs( derive( @@ -215,9 +192,6 @@ pub struct OpaConfig { #[fragment_attrs(serde(default))] pub logging: Logging, - #[fragment_attrs(serde(default))] - pub decision_logging: DecisionLogging, - #[fragment_attrs(serde(default))] pub affinity: StackableAffinity, @@ -230,10 +204,6 @@ impl OpaConfig { fn default_config() -> OpaConfigFragment { OpaConfigFragment { logging: product_logging::spec::default_logging(), - decision_logging: DecisionLoggingFragment { - file: Some(true), - console: Some(false), - }, resources: ResourcesFragment { cpu: CpuLimitsFragment { min: Some(Quantity("250m".to_owned())), diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 98dbc339..3f218caa 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -6,6 +6,7 @@ use std::{ use indoc::formatdoc; use product_config::{types::PropertyNameKind, ProductConfigManager}; +use serde::{Deserialize, Serialize}; use serde_json::json; use snafu::{OptionExt, ResultExt, Snafu}; use stackable_opa_crd::{ @@ -64,8 +65,7 @@ use crate::{ discovery::{self, build_discovery_configmaps}, operations::graceful_shutdown::add_graceful_shutdown_config, product_logging::{ - extend_role_group_config_map, resolve_vector_aggregator_address, BundleBuilderLogLevel, - OpaLogLevel, + extend_role_group_config_map, resolve_vector_aggregator_address, BundleBuilderLogLevel }, }; @@ -266,6 +266,65 @@ impl ReconcilerError for Error { } } +#[derive(Serialize, Deserialize)] +pub struct OpaClusterConfigFile { + services: Vec, + bundles: OpaClusterBundle, + #[serde(skip_serializing_if = "Option::is_none")] + decision_logs: Option +} + +impl OpaClusterConfigFile { + pub fn new(decision_logging: Option) -> Self { + Self { + services: vec![OpaClusterConfigService { + name: String::from("stackable"), url: String::from("http://localhost:3030/opa/v1") + }], + bundles: OpaClusterBundle { + stackable: OpaClusterBundleConfig { + service: String::from("stackable"), + resource: String::from("opa/bundle.tar.gz"), + persist: true, + polling: OpaClusterBundleConfigPolling { + min_delay_seconds: 10, + max_delay_seconds: 20 + } + }}, + decision_logs: decision_logging, + } + } +} + +#[derive(Serialize, Deserialize)] +struct OpaClusterConfigService { + name: String, + url: String, +} + +#[derive(Serialize, Deserialize)] +struct OpaClusterBundle { + stackable: OpaClusterBundleConfig, +} + +#[derive(Serialize, Deserialize)] +struct OpaClusterBundleConfig { + service: String, + resource: String, + persist: bool, + polling: OpaClusterBundleConfigPolling, +} + +#[derive(Serialize, Deserialize)] +struct OpaClusterBundleConfigPolling { + min_delay_seconds: i32, + max_delay_seconds: i32, +} + +#[derive(Serialize, Deserialize)] +pub struct OpaClusterConfigDecisionLog { + console: bool, +} + pub async fn reconcile_opa(opa: Arc, ctx: Arc) -> Result { tracing::info!("Starting reconcile"); let opa_ref = ObjectRef::from_obj(opa.as_ref()); @@ -910,90 +969,90 @@ pub fn error_policy(_obj: Arc, _error: &Error, _ctx: Arc) -> Ac Action::requeue(*Duration::from_secs(5)) } -fn build_config_file(config: &OpaConfig) -> String { - serde_json::to_string_pretty(&json!({ - "services": [{ - "name": "stackable", - "url": "http://localhost:3030/opa/v1", - },], - "bundles": { - "stackable": { - "service": "stackable", - "resource": "opa/bundle.tar.gz", - "persist": true, - "polling": { - "min_delay_seconds": 10, - "max_delay_seconds": 20, - }, - } - }, - // FIXME: We should only write this whole struct when we want decision logs - "decision_logs": { - // Either one can enable the decision logs, the entrypoint takes care of filtering which target get decision - // logs - "console": config.decision_logging.console || config.decision_logging.file, +fn build_config_file(merged_config: &OpaConfig) -> String { + let mut decision_logging_enabled = false; + + if let Some(ContainerLogConfig { + choice: Some(ContainerLogConfigChoice::Automatic(log_config)), + }) = merged_config.logging.containers.get(&Container::Opa) + { + // Retrieve the file log level for OPA and convert to OPA log levels + if let Some(config) = log_config.loggers.get("decision") + { + decision_logging_enabled = config.level != LogLevel::NONE; } - })) - .unwrap() + } + + let decision_logging; + + if decision_logging_enabled { + decision_logging = Some(OpaClusterConfigDecisionLog {console: true}); + } else { + decision_logging = None; + } + + let config = OpaClusterConfigFile::new(decision_logging); + + serde_json::to_string_pretty(&json!(config)).unwrap() } fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> String { - let mut opa_log_level = OpaLogLevel::Info; - let mut console_logging_enabled = true; + let mut file_log_level = LogLevel::INFO; + let mut console_log_level = LogLevel::INFO; + let mut server_log_level = LogLevel::INFO; + let mut decision_log_level = LogLevel::NONE; if let Some(ContainerLogConfig { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), }) = merged_config.logging.containers.get(&Container::Opa) { - // Retrieve the file log level for OPA and convert to OPA log levels + // Retrieve the file log level for OPA if let Some(AppenderConfig { level: Some(log_level), }) = log_config.file { - opa_log_level = OpaLogLevel::from(log_level); + file_log_level = log_level; } - // We need to check if the console logging is deactivated (NONE) - // This will result in not using `tee` later on in the start command + // Retrieve the console log level for OPA if let Some(AppenderConfig { level: Some(log_level), }) = log_config.console { - console_logging_enabled = log_level != LogLevel::NONE + console_log_level = log_level; + } + + // Retrieve the decision log level for OPA. If not set, keep the defined default above of LogLevel::NONE + if let Some(config) = log_config.loggers.get("decision") { + decision_log_level = config.level } - } - let decision_logs_to_stdout = merged_config.decision_logging.console; - let decision_logs_to_file = merged_config.decision_logging.file; + // Retrieve the server log level for OPA. If not set, set it to the ROOT log level + match log_config.loggers.get("server") { + Some(config) => server_log_level = config.level, + None => server_log_level = log_config.root_log_level(), + } + } // Redirects matter! // We need to watch out, that the following "$!" call returns the PID of the main (opa-bundle-builder) process, // and not some utility (e.g. multilog or tee) process. // See https://stackoverflow.com/a/8048493 - // *Technically*, we would also need to calculate `file_logging_enabled` and take that into account. However, this - // is a very nice edge-case and would make things more complicated and error-prone. - let logging_redirects = if console_logging_enabled { - match (decision_logs_to_file, decision_logs_to_stdout) { - (true, true) => format!(" &> >(tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))"), - (true, false) => format!(" &> >(tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}) | grep -v '\"decision_id\":\"')"), - (false, true) => format!(" &> >(tee >(grep -v '\"decision_id\":\"' &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name})))"), - // Normally in this case OPA should *not* be instructed to even write decision logs, so we *should* be able - // to just forward them. However, we still filter them just to be safe. - (false, false) => format!(" &> >(grep -v '\"decision_id\":\"' | tee >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))"), - } - } else if decision_logs_to_file { - format!(" &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name})") - } else { - format!(" &> >(grep -v '\"decision_id\":\"' &> >(/stackable/multilog s{OPA_ROLLING_LOG_FILE_SIZE_BYTES} n{OPA_ROLLING_LOG_FILES} {STACKABLE_LOG_DIR}/{container_name}))") - }; + let logging_redirects = format!( + "&> >(process-logs --file-log-level {file} --console-log-level {console} --decision-log-level {decision} --server-log-level {server} --opa-rolling-log-file-size-bytes {OPA_ROLLING_LOG_FILE_SIZE_BYTES} --opa-rolling-log-files {OPA_ROLLING_LOG_FILES} --stackable-log-dir {STACKABLE_LOG_DIR} --container-name {container_name})", + file = file_log_level.to_vector_literal(), + console = console_log_level.to_vector_literal(), + decision = decision_log_level.to_vector_literal(), + server = server_log_level.to_vector_literal() + ); // TODO: Think about adding --shutdown-wait-period, as suggested by https://github.com/open-policy-agent/opa/issues/2764 formatdoc! {" {COMMON_BASH_TRAP_FUNCTIONS} {remove_vector_shutdown_file_command} prepare_signal_handlers - /stackable/opa/opa run -s -a 0.0.0.0:{APP_PORT} -c {CONFIG_DIR}/{CONFIG_FILE} -l {opa_log_level} --shutdown-grace-period {shutdown_grace_period_s} --disable-telemetry{logging_redirects} & + /stackable/opa/opa run -s -a 0.0.0.0:{APP_PORT} -c {CONFIG_DIR}/{CONFIG_FILE} -l {opa_log_level} --shutdown-grace-period {shutdown_grace_period_s} --disable-telemetry {logging_redirects} & wait_for_termination $! {create_vector_shutdown_file_command} ", @@ -1002,6 +1061,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S create_vector_shutdown_file_command = create_vector_shutdown_file_command(STACKABLE_LOG_DIR), shutdown_grace_period_s = merged_config.graceful_shutdown_timeout.unwrap_or(DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT).as_secs(), + opa_log_level = file_log_level.to_vector_literal() } } From 82ca86f7b691186c964aee20d9b138304070b1d6 Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 2 May 2024 10:50:40 +0200 Subject: [PATCH 07/25] revert crd changes --- deploy/helm/opa-operator/crds/crds.yaml | 30 ------------------------- 1 file changed, 30 deletions(-) diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml index e9e59478..100f31bf 100644 --- a/deploy/helm/opa-operator/crds/crds.yaml +++ b/deploy/helm/opa-operator/crds/crds.yaml @@ -716,21 +716,6 @@ spec: type: array type: object type: object - decisionLogging: - default: - file: null - console: null - description: Decision Logging configuration. - properties: - console: - description: Whether or not to print decision logging to the console. - nullable: true - type: boolean - file: - description: Whether or not to print decision logging to files collected by Vector agent. - nullable: true - type: boolean - type: object gracefulShutdownTimeout: description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details. nullable: true @@ -4157,21 +4142,6 @@ spec: type: array type: object type: object - decisionLogging: - default: - file: null - console: null - description: Decision Logging configuration. - properties: - console: - description: Whether or not to print decision logging to the console. - nullable: true - type: boolean - file: - description: Whether or not to print decision logging to files collected by Vector agent. - nullable: true - type: boolean - type: object gracefulShutdownTimeout: description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details. nullable: true From 59875213a4ec6ea54c22539511e772803343cc40 Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 2 May 2024 11:14:58 +0200 Subject: [PATCH 08/25] cargo-fmt formatting --- rust/operator-binary/src/controller.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 3f218caa..8ac01fc3 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -65,7 +65,7 @@ use crate::{ discovery::{self, build_discovery_configmaps}, operations::graceful_shutdown::add_graceful_shutdown_config, product_logging::{ - extend_role_group_config_map, resolve_vector_aggregator_address, BundleBuilderLogLevel + extend_role_group_config_map, resolve_vector_aggregator_address, BundleBuilderLogLevel, }, }; @@ -271,14 +271,15 @@ pub struct OpaClusterConfigFile { services: Vec, bundles: OpaClusterBundle, #[serde(skip_serializing_if = "Option::is_none")] - decision_logs: Option + decision_logs: Option, } impl OpaClusterConfigFile { pub fn new(decision_logging: Option) -> Self { Self { - services: vec![OpaClusterConfigService { - name: String::from("stackable"), url: String::from("http://localhost:3030/opa/v1") + services: vec![OpaClusterConfigService { + name: String::from("stackable"), + url: String::from("http://localhost:3030/opa/v1"), }], bundles: OpaClusterBundle { stackable: OpaClusterBundleConfig { @@ -287,9 +288,10 @@ impl OpaClusterConfigFile { persist: true, polling: OpaClusterBundleConfigPolling { min_delay_seconds: 10, - max_delay_seconds: 20 - } - }}, + max_delay_seconds: 20, + }, + }, + }, decision_logs: decision_logging, } } @@ -977,8 +979,7 @@ fn build_config_file(merged_config: &OpaConfig) -> String { }) = merged_config.logging.containers.get(&Container::Opa) { // Retrieve the file log level for OPA and convert to OPA log levels - if let Some(config) = log_config.loggers.get("decision") - { + if let Some(config) = log_config.loggers.get("decision") { decision_logging_enabled = config.level != LogLevel::NONE; } } @@ -986,7 +987,7 @@ fn build_config_file(merged_config: &OpaConfig) -> String { let decision_logging; if decision_logging_enabled { - decision_logging = Some(OpaClusterConfigDecisionLog {console: true}); + decision_logging = Some(OpaClusterConfigDecisionLog { console: true }); } else { decision_logging = None; } From 9551693dcc418e3dac5672f5d0710354e197f61d Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 3 May 2024 13:55:42 +0200 Subject: [PATCH 09/25] remove some comments --- rust/operator-binary/src/controller.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 8ac01fc3..c74a9a0b 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -978,7 +978,6 @@ fn build_config_file(merged_config: &OpaConfig) -> String { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), }) = merged_config.logging.containers.get(&Container::Opa) { - // Retrieve the file log level for OPA and convert to OPA log levels if let Some(config) = log_config.loggers.get("decision") { decision_logging_enabled = config.level != LogLevel::NONE; } @@ -1007,7 +1006,6 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S choice: Some(ContainerLogConfigChoice::Automatic(log_config)), }) = merged_config.logging.containers.get(&Container::Opa) { - // Retrieve the file log level for OPA if let Some(AppenderConfig { level: Some(log_level), }) = log_config.file @@ -1015,7 +1013,6 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S file_log_level = log_level; } - // Retrieve the console log level for OPA if let Some(AppenderConfig { level: Some(log_level), }) = log_config.console @@ -1023,7 +1020,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S console_log_level = log_level; } - // Retrieve the decision log level for OPA. If not set, keep the defined default above of LogLevel::NONE + // Retrieve the decision log level for OPA. If not set, keep the defined default of LogLevel::NONE if let Some(config) = log_config.loggers.get("decision") { decision_log_level = config.level } From 8d776ddee0d84257593ee092b2322fa45d3049ea Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 24 May 2024 08:07:44 +0200 Subject: [PATCH 10/25] code improvements and tests --- rust/crd/src/lib.rs | 2 - rust/operator-binary/src/controller.rs | 120 +++++++++++++++--- .../kuttl/logging/test_log_aggregation.py | 34 ----- 3 files changed, 101 insertions(+), 55 deletions(-) diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 0ed1c3bf..5fef5959 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -30,8 +30,6 @@ pub mod user_info_fetcher; pub const APP_NAME: &str = "opa"; pub const OPERATOR_NAME: &str = "opa.stackable.tech"; -pub const CONFIG_FILE: &str = "config.json"; - pub const DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_minutes_unchecked(2); /// Safety puffer to guarantee the graceful shutdown works every time. pub const SERVER_GRACEFUL_SHUTDOWN_SAFETY_OVERHEAD: Duration = Duration::from_secs(5); diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 15ec6df3..2f445d8f 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -97,6 +97,13 @@ const USER_INFO_FETCHER_CREDENTIALS_DIR: &str = "/stackable/credentials"; const DOCKER_IMAGE_BASE_NAME: &str = "opa"; +// logging defaults +const DECISION_LOGGING_ENABLED: bool = false; +const FILE_LOG_LEVEL: LogLevel = LogLevel::INFO; +const CONSOLE_LOG_LEVEL: LogLevel = LogLevel::INFO; +const SERVER_LOG_LEVEL: LogLevel = LogLevel::INFO; +const DECISION_LOG_LEVEL: LogLevel = LogLevel::NONE; + // bundle builder: ~ 5 MB x 2 // these sizes are needed both for the single file (for multilog, in bytes) as well as the total (for the EmptyDir) const OPA_ROLLING_BUNDLE_BUILDER_LOG_FILE_SIZE_MB: u32 = 5; @@ -280,6 +287,26 @@ impl ReconcilerError for Error { } } +trait OpaLogLevel { + fn to_opa_literal(&self) -> String; +} + +impl OpaLogLevel for LogLevel { + // based on https://www.openpolicyagent.org/docs/latest/cli/#options-10 opa has only log levels {debug,info,error} + fn to_opa_literal(&self) -> String { + match self { + LogLevel::TRACE => "debug", + LogLevel::DEBUG => "debug", + LogLevel::INFO => "info", + LogLevel::WARN => "error", + LogLevel::ERROR => "error", + LogLevel::FATAL => "error", + LogLevel::NONE => "error", + } + .into() + } +} + #[derive(Serialize, Deserialize)] pub struct OpaClusterConfigFile { services: Vec, @@ -986,7 +1013,7 @@ pub fn error_policy(_obj: Arc, _error: &Error, _ctx: Arc) -> Ac } fn build_config_file(merged_config: &OpaConfig) -> String { - let mut decision_logging_enabled = false; + let mut decision_logging_enabled = DECISION_LOGGING_ENABLED; if let Some(ContainerLogConfig { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), @@ -997,24 +1024,24 @@ fn build_config_file(merged_config: &OpaConfig) -> String { } } - let decision_logging; - - if decision_logging_enabled { - decision_logging = Some(OpaClusterConfigDecisionLog { console: true }); + let decision_logging = if decision_logging_enabled { + Some(OpaClusterConfigDecisionLog { console: true }) } else { - decision_logging = None; - } + None + }; let config = OpaClusterConfigFile::new(decision_logging); + // The unwrap() shouldn't panic under any circumstances because Rusts type checker takes care of the OpaClusterConfigFile + // and serde + serde_json therefore serialize/deserialize a valid struct serde_json::to_string_pretty(&json!(config)).unwrap() } fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> String { - let mut file_log_level = LogLevel::INFO; - let mut console_log_level = LogLevel::INFO; - let mut server_log_level = LogLevel::INFO; - let mut decision_log_level = LogLevel::NONE; + let mut file_log_level = FILE_LOG_LEVEL; + let mut console_log_level = CONSOLE_LOG_LEVEL; + let mut server_log_level = SERVER_LOG_LEVEL; + let mut decision_log_level = DECISION_LOG_LEVEL; if let Some(ContainerLogConfig { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), @@ -1034,12 +1061,14 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S console_log_level = log_level; } - // Retrieve the decision log level for OPA. If not set, keep the defined default of LogLevel::NONE + // Retrieve the decision log level for OPA. If not set, keep the defined default of LogLevel::NONE. + // This is because, if decision logs are not explicitly set to something different than LogLevel::NONE, + // the decision logs should remain disabled and not set to ROOT log level automatically. if let Some(config) = log_config.loggers.get("decision") { decision_log_level = config.level } - // Retrieve the server log level for OPA. If not set, set it to the ROOT log level + // Retrieve the server log level for OPA. If not set, set it to the ROOT log level. match log_config.loggers.get("server") { Some(config) => server_log_level = config.level, None => server_log_level = log_config.root_log_level(), @@ -1053,10 +1082,10 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S let logging_redirects = format!( "&> >(process-logs --file-log-level {file} --console-log-level {console} --decision-log-level {decision} --server-log-level {server} --opa-rolling-log-file-size-bytes {OPA_ROLLING_LOG_FILE_SIZE_BYTES} --opa-rolling-log-files {OPA_ROLLING_LOG_FILES} --stackable-log-dir {STACKABLE_LOG_DIR} --container-name {container_name})", - file = file_log_level.to_vector_literal(), - console = console_log_level.to_vector_literal(), - decision = decision_log_level.to_vector_literal(), - server = server_log_level.to_vector_literal() + file = file_log_level.to_opa_literal(), + console = console_log_level.to_opa_literal(), + decision = decision_log_level.to_opa_literal(), + server = server_log_level.to_opa_literal() ); // TODO: Think about adding --shutdown-wait-period, as suggested by https://github.com/open-policy-agent/opa/issues/2764 @@ -1064,7 +1093,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S {COMMON_BASH_TRAP_FUNCTIONS} {remove_vector_shutdown_file_command} prepare_signal_handlers - /stackable/opa/opa run -s -a 0.0.0.0:{APP_PORT} -c {CONFIG_DIR}/{CONFIG_FILE} -l {opa_log_level} --shutdown-grace-period {shutdown_grace_period_s} --disable-telemetry {logging_redirects} & + opa run -s -a 0.0.0.0:{APP_PORT} -c {CONFIG_DIR}/{CONFIG_FILE} -l {opa_log_level} --shutdown-grace-period {shutdown_grace_period_s} --disable-telemetry {logging_redirects} & wait_for_termination $! {create_vector_shutdown_file_command} ", @@ -1073,7 +1102,39 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S create_vector_shutdown_file_command = create_vector_shutdown_file_command(STACKABLE_LOG_DIR), shutdown_grace_period_s = merged_config.graceful_shutdown_timeout.unwrap_or(DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT).as_secs(), - opa_log_level = file_log_level.to_vector_literal() + opa_log_level = get_most_expressive_log_level(&[console_log_level, file_log_level]).unwrap_or(LogLevel::INFO).to_opa_literal() + } +} + +fn get_most_expressive_log_level(log_levels: &[LogLevel]) -> Option { + let mut log_levels_mapped: Vec = Vec::new(); + + for log_level in log_levels.iter() { + match log_level { + LogLevel::TRACE => log_levels_mapped.push(6), + LogLevel::DEBUG => log_levels_mapped.push(5), + LogLevel::INFO => log_levels_mapped.push(4), + LogLevel::WARN => log_levels_mapped.push(3), + LogLevel::ERROR => log_levels_mapped.push(2), + LogLevel::FATAL => log_levels_mapped.push(1), + LogLevel::NONE => log_levels_mapped.push(0), + } + } + + let max_value = log_levels_mapped.iter().max(); + + match max_value { + Some(max) => match max { + 6 => Some(LogLevel::TRACE), + 5 => Some(LogLevel::DEBUG), + 4 => Some(LogLevel::INFO), + 3 => Some(LogLevel::WARN), + 2 => Some(LogLevel::ERROR), + 1 => Some(LogLevel::FATAL), + 0 => Some(LogLevel::NONE), + _ => None, + }, + None => None, } } @@ -1192,3 +1253,24 @@ pub fn build_recommended_labels<'a, T>( role_group, } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_get_most_expressive_log_level() { + let log_level = get_most_expressive_log_level(&[]); + assert!(log_level.is_none()); + + let log_level = get_most_expressive_log_level(&[LogLevel::ERROR]); + assert_eq!(log_level.unwrap(), LogLevel::ERROR); + + let log_level = get_most_expressive_log_level(&[LogLevel::INFO, LogLevel::ERROR]); + assert_eq!(log_level.unwrap(), LogLevel::INFO); + + let log_level = + get_most_expressive_log_level(&[LogLevel::INFO, LogLevel::INFO, LogLevel::NONE]); + assert_eq!(log_level.unwrap(), LogLevel::INFO); + } +} diff --git a/tests/templates/kuttl/logging/test_log_aggregation.py b/tests/templates/kuttl/logging/test_log_aggregation.py index 85b4abda..6eb3ab31 100755 --- a/tests/templates/kuttl/logging/test_log_aggregation.py +++ b/tests/templates/kuttl/logging/test_log_aggregation.py @@ -8,39 +8,6 @@ def send_opa_decision_request(): assert response.status_code == 200, \ 'Cannot access the API of the opa cluster.' - -def check_decision_events(): - response = requests.post( - 'http://opa-vector-aggregator:8686/graphql', - json={ - 'query': """ - { - transforms(filter: {componentId: {equals: \"filteredAutomaticLogConfigServerOpaDecision\"}}) { - nodes { - componentId - metrics { - sentEventsTotal { - sentEventsTotal - } - } - } - } - } - """ - } - ) - - assert response.status_code == 200, \ - 'Cannot access the API of the vector aggregator.' - - result = response.json() - - sentEvents = result['data']['transforms']['nodes'][0]['metrics']['sentEventsTotal'] - componentId = result['data']['transforms']['nodes'][0]['componentId'] - - assert sentEvents is not None and \ - sentEvents['sentEventsTotal'] > 0, \ - f'No events were sent in "{componentId}".' def check_sent_events(): response = requests.post( @@ -85,6 +52,5 @@ def check_sent_events(): if __name__ == '__main__': send_opa_decision_request() - check_decision_events() check_sent_events() print('Test successful!') From 480e9056785a01232cb659ad3a07514ed8df4a21 Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 24 May 2024 15:38:43 +0200 Subject: [PATCH 11/25] add integration test for decision logs --- .../kuttl/logging/02-install-opa.yaml.j2 | 9 +++--- .../logging/03-install-opa-test-runner.yaml | 29 ++++++++++++++++++- tests/templates/kuttl/logging/04-assert.yaml | 3 ++ .../logging/04-test-log-aggregation.yaml | 2 ++ .../kuttl/logging/test_log_aggregation.py | 3 ++ .../kuttl/logging/test_log_aggregation.sh | 11 +++++++ 6 files changed, 51 insertions(+), 6 deletions(-) create mode 100755 tests/templates/kuttl/logging/test_log_aggregation.sh diff --git a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 index bbd48528..95933f27 100644 --- a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 @@ -28,10 +28,6 @@ spec: clusterConfig: vectorAggregatorConfigMapName: opa-vector-aggregator-discovery servers: - config: - decisionLogging: - console: false - file: true roleGroups: automatic-log-config: config: @@ -40,9 +36,12 @@ spec: containers: opa: console: - level: INFO + level: ERROR file: level: INFO + loggers: + decision: + level: INFO bundle-builder: console: level: NONE diff --git a/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml b/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml index bf6e9705..ceb81bff 100644 --- a/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml +++ b/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml @@ -1,4 +1,30 @@ --- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: logging-role +rules: + - apiGroups: [""] + resources: ["services", "pods", "pods/log"] + verbs: ["get", "list"] +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: logging-sa +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: logging-rb +subjects: + - kind: ServiceAccount + name: logging-sa +roleRef: + kind: Role + name: logging-role + apiGroup: rbac.authorization.k8s.io +--- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -15,8 +41,9 @@ spec: labels: app: opa-test-runner spec: + serviceAccountName: logging-sa containers: - name: opa-test-runner image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev stdin: true - tty: true + tty: true \ No newline at end of file diff --git a/tests/templates/kuttl/logging/04-assert.yaml b/tests/templates/kuttl/logging/04-assert.yaml index 832744f9..bcd21d25 100644 --- a/tests/templates/kuttl/logging/04-assert.yaml +++ b/tests/templates/kuttl/logging/04-assert.yaml @@ -5,3 +5,6 @@ commands: - script: >- kubectl exec --namespace=$NAMESPACE opa-test-runner-0 -- python /tmp/test_log_aggregation.py -n $NAMESPACE + - script: >- + kubectl exec --namespace=$NAMESPACE opa-test-runner-0 -- + sh /tmp/test_log_aggregation.sh \ No newline at end of file diff --git a/tests/templates/kuttl/logging/04-test-log-aggregation.yaml b/tests/templates/kuttl/logging/04-test-log-aggregation.yaml index 47aec431..00d1f776 100644 --- a/tests/templates/kuttl/logging/04-test-log-aggregation.yaml +++ b/tests/templates/kuttl/logging/04-test-log-aggregation.yaml @@ -4,3 +4,5 @@ kind: TestStep commands: - script: | kubectl cp ./test_log_aggregation.py $NAMESPACE/opa-test-runner-0:/tmp + - script: | + kubectl cp ./test_log_aggregation.sh $NAMESPACE/opa-test-runner-0:/tmp \ No newline at end of file diff --git a/tests/templates/kuttl/logging/test_log_aggregation.py b/tests/templates/kuttl/logging/test_log_aggregation.py index 6eb3ab31..3ed838f0 100755 --- a/tests/templates/kuttl/logging/test_log_aggregation.py +++ b/tests/templates/kuttl/logging/test_log_aggregation.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 import requests +import time + def send_opa_decision_request(): response = requests.post( @@ -52,5 +54,6 @@ def check_sent_events(): if __name__ == '__main__': send_opa_decision_request() + time.sleep(10) check_sent_events() print('Test successful!') diff --git a/tests/templates/kuttl/logging/test_log_aggregation.sh b/tests/templates/kuttl/logging/test_log_aggregation.sh new file mode 100755 index 00000000..cd6f5577 --- /dev/null +++ b/tests/templates/kuttl/logging/test_log_aggregation.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +DECISION_LOGS=$(kubectl logs service/test-opa -c opa | grep "decision_id"); + +if [ -n "$DECISION_LOGS" ]; +then + echo "Error: Decision logs printed to console"; + exit 1; +fi + +echo "Test successful!"; \ No newline at end of file From 2bda1b06aadd5fcbfb8bd96b87d02c9101a3a732 Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 24 May 2024 15:45:46 +0200 Subject: [PATCH 12/25] yamllint fixes --- tests/templates/kuttl/logging/03-install-opa-test-runner.yaml | 3 ++- tests/templates/kuttl/logging/04-assert.yaml | 3 ++- tests/templates/kuttl/logging/04-test-log-aggregation.yaml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml b/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml index ceb81bff..77981b76 100644 --- a/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml +++ b/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml @@ -46,4 +46,5 @@ spec: - name: opa-test-runner image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev stdin: true - tty: true \ No newline at end of file + tty: true + \ No newline at end of file diff --git a/tests/templates/kuttl/logging/04-assert.yaml b/tests/templates/kuttl/logging/04-assert.yaml index bcd21d25..158f3c2b 100644 --- a/tests/templates/kuttl/logging/04-assert.yaml +++ b/tests/templates/kuttl/logging/04-assert.yaml @@ -7,4 +7,5 @@ commands: python /tmp/test_log_aggregation.py -n $NAMESPACE - script: >- kubectl exec --namespace=$NAMESPACE opa-test-runner-0 -- - sh /tmp/test_log_aggregation.sh \ No newline at end of file + sh /tmp/test_log_aggregation.sh + \ No newline at end of file diff --git a/tests/templates/kuttl/logging/04-test-log-aggregation.yaml b/tests/templates/kuttl/logging/04-test-log-aggregation.yaml index 00d1f776..208d869e 100644 --- a/tests/templates/kuttl/logging/04-test-log-aggregation.yaml +++ b/tests/templates/kuttl/logging/04-test-log-aggregation.yaml @@ -5,4 +5,5 @@ commands: - script: | kubectl cp ./test_log_aggregation.py $NAMESPACE/opa-test-runner-0:/tmp - script: | - kubectl cp ./test_log_aggregation.sh $NAMESPACE/opa-test-runner-0:/tmp \ No newline at end of file + kubectl cp ./test_log_aggregation.sh $NAMESPACE/opa-test-runner-0:/tmp + \ No newline at end of file From 9b7977b92980214e28886b371830cd7e21e7a1fd Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 24 May 2024 15:50:40 +0200 Subject: [PATCH 13/25] yamllint fixes --- tests/templates/kuttl/logging/03-install-opa-test-runner.yaml | 1 - tests/templates/kuttl/logging/04-assert.yaml | 1 - tests/templates/kuttl/logging/04-test-log-aggregation.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml b/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml index 77981b76..ab1c2975 100644 --- a/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml +++ b/tests/templates/kuttl/logging/03-install-opa-test-runner.yaml @@ -47,4 +47,3 @@ spec: image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev stdin: true tty: true - \ No newline at end of file diff --git a/tests/templates/kuttl/logging/04-assert.yaml b/tests/templates/kuttl/logging/04-assert.yaml index 158f3c2b..b7a33ca3 100644 --- a/tests/templates/kuttl/logging/04-assert.yaml +++ b/tests/templates/kuttl/logging/04-assert.yaml @@ -8,4 +8,3 @@ commands: - script: >- kubectl exec --namespace=$NAMESPACE opa-test-runner-0 -- sh /tmp/test_log_aggregation.sh - \ No newline at end of file diff --git a/tests/templates/kuttl/logging/04-test-log-aggregation.yaml b/tests/templates/kuttl/logging/04-test-log-aggregation.yaml index 208d869e..b22466a6 100644 --- a/tests/templates/kuttl/logging/04-test-log-aggregation.yaml +++ b/tests/templates/kuttl/logging/04-test-log-aggregation.yaml @@ -6,4 +6,3 @@ commands: kubectl cp ./test_log_aggregation.py $NAMESPACE/opa-test-runner-0:/tmp - script: | kubectl cp ./test_log_aggregation.sh $NAMESPACE/opa-test-runner-0:/tmp - \ No newline at end of file From 5a27884c91f2aa37b56946c84173149c6214cde2 Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 27 May 2024 10:21:15 +0200 Subject: [PATCH 14/25] add documentation --- .../opa/pages/usage-guide/logging.adoc | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/docs/modules/opa/pages/usage-guide/logging.adoc b/docs/modules/opa/pages/usage-guide/logging.adoc index c1c71f7f..a9c5f017 100644 --- a/docs/modules/opa/pages/usage-guide/logging.adoc +++ b/docs/modules/opa/pages/usage-guide/logging.adoc @@ -1,4 +1,6 @@ -= Log aggregation += Logging + +== Log aggregation The logs can be forwarded to a Vector log aggregator by providing a discovery ConfigMap for the aggregator and by enabling the log agent: @@ -22,7 +24,34 @@ spec: The Stackable operator for OPA only supports automatic log configuration due to the lack of customization for the OPA logging. -Furthermore, the only customization possible for console output for the `opa` and `bundle-builder` containers is `NONE`. This deactivates console logging. Other log levels for console logging in these containers will be overwritten by the file log level. +Furthermore, the only customization possible for console output for the `bundle-builder` container is `NONE`. This deactivates console logging. Other log levels for console logging in this containers will be overwritten by the file log level. + +== Decision logging + +The decision logging for OPA can be enabled by setting the log level of the decision logger to any other level than `NONE`: + +[source,yaml] +---- +spec: + clusterConfig: + vectorAggregatorConfigMapName: vector-aggregator-discovery + servers: + config: + logging: + enableVectorAgent: true + containers: + opa: + console: + level: NONE + file: + level: INFO + loggers: + decision: + level: INFO +---- + +Please note that the decision logs would still be filtered by the log level set for the console and file appenders. Therefore, the configuration above would result in decision logs being present on file but not on console. + Further information on how to configure logging, can be found in xref:concepts:logging.adoc[]. From 8dab63eb64abf2ffd72120cd3906ed102fb8471e Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 27 May 2024 10:53:45 +0200 Subject: [PATCH 15/25] some documentation changes --- docs/modules/opa/pages/usage-guide/logging.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/opa/pages/usage-guide/logging.adoc b/docs/modules/opa/pages/usage-guide/logging.adoc index a9c5f017..b4e342d3 100644 --- a/docs/modules/opa/pages/usage-guide/logging.adoc +++ b/docs/modules/opa/pages/usage-guide/logging.adoc @@ -24,11 +24,11 @@ spec: The Stackable operator for OPA only supports automatic log configuration due to the lack of customization for the OPA logging. -Furthermore, the only customization possible for console output for the `bundle-builder` container is `NONE`. This deactivates console logging. Other log levels for console logging in this containers will be overwritten by the file log level. +Furthermore, the only customization possible for console output for the `bundle-builder` container is `NONE`. This deactivates console logging. Other log levels for console logging in this container will be overwritten by the file log level. == Decision logging -The decision logging for OPA can be enabled by setting the log level of the decision logger to any other level than `NONE`: +The decision logging for OPA can be enabled by setting the log level of the decision logger to any other level than `NONE`, as shown by example here: [source,yaml] ---- From 95de302dc0b850f077e491821cc259cfc465f73c Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 27 May 2024 13:25:01 +0200 Subject: [PATCH 16/25] renaming and replacing ordering function --- rust/operator-binary/src/controller.rs | 74 ++++---------------------- 1 file changed, 11 insertions(+), 63 deletions(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 2f445d8f..9880a33a 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -98,11 +98,11 @@ const USER_INFO_FETCHER_CREDENTIALS_DIR: &str = "/stackable/credentials"; const DOCKER_IMAGE_BASE_NAME: &str = "opa"; // logging defaults -const DECISION_LOGGING_ENABLED: bool = false; -const FILE_LOG_LEVEL: LogLevel = LogLevel::INFO; -const CONSOLE_LOG_LEVEL: LogLevel = LogLevel::INFO; -const SERVER_LOG_LEVEL: LogLevel = LogLevel::INFO; -const DECISION_LOG_LEVEL: LogLevel = LogLevel::NONE; +const DEFAULT_DECISION_LOGGING_ENABLED: bool = false; +const DEFAULT_FILE_LOG_LEVEL: LogLevel = LogLevel::INFO; +const DEFAULT_CONSOLE_LOG_LEVEL: LogLevel = LogLevel::INFO; +const DEFAULT_SERVER_LOG_LEVEL: LogLevel = LogLevel::INFO; +const DEFAULT_DECISION_LOG_LEVEL: LogLevel = LogLevel::NONE; // bundle builder: ~ 5 MB x 2 // these sizes are needed both for the single file (for multilog, in bytes) as well as the total (for the EmptyDir) @@ -1013,7 +1013,7 @@ pub fn error_policy(_obj: Arc, _error: &Error, _ctx: Arc) -> Ac } fn build_config_file(merged_config: &OpaConfig) -> String { - let mut decision_logging_enabled = DECISION_LOGGING_ENABLED; + let mut decision_logging_enabled = DEFAULT_DECISION_LOGGING_ENABLED; if let Some(ContainerLogConfig { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), @@ -1038,10 +1038,10 @@ fn build_config_file(merged_config: &OpaConfig) -> String { } fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> String { - let mut file_log_level = FILE_LOG_LEVEL; - let mut console_log_level = CONSOLE_LOG_LEVEL; - let mut server_log_level = SERVER_LOG_LEVEL; - let mut decision_log_level = DECISION_LOG_LEVEL; + let mut file_log_level = DEFAULT_FILE_LOG_LEVEL; + let mut console_log_level = DEFAULT_CONSOLE_LOG_LEVEL; + let mut server_log_level = DEFAULT_SERVER_LOG_LEVEL; + let mut decision_log_level = DEFAULT_DECISION_LOG_LEVEL; if let Some(ContainerLogConfig { choice: Some(ContainerLogConfigChoice::Automatic(log_config)), @@ -1102,39 +1102,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S create_vector_shutdown_file_command = create_vector_shutdown_file_command(STACKABLE_LOG_DIR), shutdown_grace_period_s = merged_config.graceful_shutdown_timeout.unwrap_or(DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT).as_secs(), - opa_log_level = get_most_expressive_log_level(&[console_log_level, file_log_level]).unwrap_or(LogLevel::INFO).to_opa_literal() - } -} - -fn get_most_expressive_log_level(log_levels: &[LogLevel]) -> Option { - let mut log_levels_mapped: Vec = Vec::new(); - - for log_level in log_levels.iter() { - match log_level { - LogLevel::TRACE => log_levels_mapped.push(6), - LogLevel::DEBUG => log_levels_mapped.push(5), - LogLevel::INFO => log_levels_mapped.push(4), - LogLevel::WARN => log_levels_mapped.push(3), - LogLevel::ERROR => log_levels_mapped.push(2), - LogLevel::FATAL => log_levels_mapped.push(1), - LogLevel::NONE => log_levels_mapped.push(0), - } - } - - let max_value = log_levels_mapped.iter().max(); - - match max_value { - Some(max) => match max { - 6 => Some(LogLevel::TRACE), - 5 => Some(LogLevel::DEBUG), - 4 => Some(LogLevel::INFO), - 3 => Some(LogLevel::WARN), - 2 => Some(LogLevel::ERROR), - 1 => Some(LogLevel::FATAL), - 0 => Some(LogLevel::NONE), - _ => None, - }, - None => None, + opa_log_level = vec![console_log_level, file_log_level].iter().min().unwrap_or(&LogLevel::INFO).to_opa_literal() } } @@ -1254,23 +1222,3 @@ pub fn build_recommended_labels<'a, T>( } } -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn test_get_most_expressive_log_level() { - let log_level = get_most_expressive_log_level(&[]); - assert!(log_level.is_none()); - - let log_level = get_most_expressive_log_level(&[LogLevel::ERROR]); - assert_eq!(log_level.unwrap(), LogLevel::ERROR); - - let log_level = get_most_expressive_log_level(&[LogLevel::INFO, LogLevel::ERROR]); - assert_eq!(log_level.unwrap(), LogLevel::INFO); - - let log_level = - get_most_expressive_log_level(&[LogLevel::INFO, LogLevel::INFO, LogLevel::NONE]); - assert_eq!(log_level.unwrap(), LogLevel::INFO); - } -} From f0a1a9f5adbea2a6cef1c73aa53c74de1b4638e6 Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 27 May 2024 13:27:41 +0200 Subject: [PATCH 17/25] clippy change --- rust/operator-binary/src/controller.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 9880a33a..a52a2e45 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -1102,7 +1102,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S create_vector_shutdown_file_command = create_vector_shutdown_file_command(STACKABLE_LOG_DIR), shutdown_grace_period_s = merged_config.graceful_shutdown_timeout.unwrap_or(DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT).as_secs(), - opa_log_level = vec![console_log_level, file_log_level].iter().min().unwrap_or(&LogLevel::INFO).to_opa_literal() + opa_log_level = [console_log_level, file_log_level].iter().min().unwrap_or(&LogLevel::INFO).to_opa_literal() } } From a63a550379ee550d2d684789b7b74b64400e9f0a Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 27 May 2024 13:28:45 +0200 Subject: [PATCH 18/25] cargofmt --- rust/operator-binary/src/controller.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index a52a2e45..c1f7cd9b 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -1221,4 +1221,3 @@ pub fn build_recommended_labels<'a, T>( role_group, } } - From 6c4e2d2682b4b891f69362d60c0a5303c4a9e8a8 Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 27 May 2024 15:57:09 +0200 Subject: [PATCH 19/25] replace log level conversion --- CHANGELOG.md | 6 + Cargo.lock | 218 +- Cargo.nix | 2877 ++++++++++++------------ Cargo.toml | 2 +- crate-hashes.json | 6 +- rust/operator-binary/src/controller.rs | 20 - 6 files changed, 1588 insertions(+), 1541 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07715224..2ab228da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added + +- Support enabling decision logs ([#555]). + +[#555]: https://github.com/stackabletech/opa-operator/pull/555 + ## [24.3.0] - 2024-03-20 ### Added diff --git a/Cargo.lock b/Cargo.lock index f2590b11..383df100 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,9 +111,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" @@ -157,7 +157,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -168,9 +168,15 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -308,9 +314,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" dependencies = [ "chrono", "git2", @@ -336,9 +342,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", @@ -383,7 +389,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -395,7 +401,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -466,9 +472,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -484,9 +490,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -500,9 +506,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -510,27 +516,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.61", + "strsim", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -541,7 +547,7 @@ checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -593,9 +599,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -623,9 +629,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -781,7 +787,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -863,15 +869,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap", "slab", @@ -986,9 +992,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", @@ -1034,9 +1040,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" dependencies = [ "bytes", "futures-channel", @@ -1109,9 +1115,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1286,7 +1292,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1325,9 +1331,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -1343,9 +1349,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -1355,9 +1361,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -1404,9 +1410,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -1531,7 +1537,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1643,9 +1649,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1711,7 +1717,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1742,7 +1748,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1771,9 +1777,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -1997,9 +2003,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.5" +version = "0.23.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e" +checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" dependencies = [ "log", "once_cell", @@ -2041,9 +2047,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -2052,9 +2058,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" @@ -2073,9 +2079,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -2086,14 +2092,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2143,9 +2149,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -2162,24 +2168,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2294,11 +2300,11 @@ dependencies = [ [[package]] name = "snafu" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +checksum = "418b8136fec49956eba89be7da2847ec1909df92a9ae4178b5ff0ff092c8d95e" dependencies = [ - "snafu-derive 0.8.2", + "snafu-derive 0.8.3", ] [[package]] @@ -2326,14 +2332,14 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +checksum = "1a4812a669da00d17d8266a0439eddcacbc88b17f732f927e52eeb9d196f7fb5" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2360,7 +2366,7 @@ dependencies = [ "semver", "serde", "serde_json", - "snafu 0.8.2", + "snafu 0.8.3", "stackable-operator", "strum", "tracing", @@ -2381,7 +2387,7 @@ dependencies = [ "semver", "serde", "serde_json", - "snafu 0.8.2", + "snafu 0.8.3", "stackable-opa-crd", "stackable-operator", "strum", @@ -2403,7 +2409,7 @@ dependencies = [ "semver", "serde", "serde_json", - "snafu 0.8.2", + "snafu 0.8.3", "stackable-opa-crd", "stackable-operator", "tokio", @@ -2413,8 +2419,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.67.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#9ba3ab1ea4164ba9946d7febdfae5911decc0f4b" +version = "0.68.0" +source = "git+https://github.com/stackabletech/operator-rs.git?branch=main#4127d8dc6e235f27d60e8402e44fee4159ce4085" dependencies = [ "chrono", "clap", @@ -2437,7 +2443,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "snafu 0.8.2", + "snafu 0.8.3", "stackable-operator-derive", "strum", "tokio", @@ -2450,20 +2456,14 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#9ba3ab1ea4164ba9946d7febdfae5911decc0f4b" +source = "git+https://github.com/stackabletech/operator-rs.git?branch=main#4127d8dc6e235f27d60e8402e44fee4159ce4085" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -2489,7 +2489,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2511,9 +2511,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2573,22 +2573,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2665,7 +2665,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2782,7 +2782,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2992,7 +2992,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3026,7 +3026,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3260,11 +3260,11 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/Cargo.nix b/Cargo.nix index c3a094f7..5c6a0439 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -137,9 +137,9 @@ rec { }; "ahash" = rec { crateName = "ahash"; - version = "0.8.6"; + version = "0.8.11"; edition = "2018"; - sha256 = "0yn9i8nc6mmv28ig9w3dga571q09vg9f1f650mi5z8phx42r6hli"; + sha256 = "04chdfkls5xmhp1d48gnjsmglbqibizs3bpbj6rsj604m10si7g8"; authors = [ "Tom Kaitchuck " ]; @@ -158,7 +158,7 @@ rec { packageId = "once_cell"; usesDefaultFeatures = false; target = { target, features }: (!(("arm" == target."arch" or null) && ("none" == target."os" or null))); - features = [ "unstable" "alloc" ]; + features = [ "alloc" ]; } { name = "zerocopy"; @@ -186,9 +186,9 @@ rec { }; "aho-corasick" = rec { crateName = "aho-corasick"; - version = "1.1.2"; + version = "1.1.3"; edition = "2021"; - sha256 = "1w510wnixvlgimkx1zjbvlxh6xps2vjgfqgwf5a6adlbjp5rv5mj"; + sha256 = "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f"; libName = "aho_corasick"; authors = [ "Andrew Gallant " @@ -207,13 +207,13 @@ rec { "perf-literal" = [ "dep:memchr" ]; "std" = [ "memchr?/std" ]; }; - resolvedDefaultFeatures = [ "default" "perf-literal" "std" ]; + resolvedDefaultFeatures = [ "perf-literal" "std" ]; }; "allocator-api2" = rec { crateName = "allocator-api2"; - version = "0.2.16"; + version = "0.2.18"; edition = "2018"; - sha256 = "1iayppgq4wqbfbfcqmsbwgamj0s65012sskfvyx07pxavk3gyhh9"; + sha256 = "0kr6lfnxvnj164j1x38g97qjlhb7akppqzvgfs0697140ixbav2w"; authors = [ "Zakarum " ]; @@ -297,9 +297,9 @@ rec { }; "anstyle" = rec { crateName = "anstyle"; - version = "1.0.4"; + version = "1.0.7"; edition = "2021"; - sha256 = "11yxw02b6parn29s757z96rgiqbn8qy0fk9a3p3bhczm85dhfybh"; + sha256 = "06qxmrba0xbhv07jpdvrdrhw1hjlb9icj88bqvlnissz9bqgr383"; features = { "default" = [ "std" ]; }; @@ -307,9 +307,9 @@ rec { }; "anstyle-parse" = rec { crateName = "anstyle-parse"; - version = "0.2.3"; + version = "0.2.4"; edition = "2021"; - sha256 = "134jhzrz89labrdwxxnjxqjdg06qvaflj1wkfnmyapwyldfwcnn7"; + sha256 = "1m121pa4plpcb4g7xali2kv9njmgb3713q3fxf60b4jd0fli2fn0"; dependencies = [ { name = "utf8parse"; @@ -326,9 +326,9 @@ rec { }; "anstyle-query" = rec { crateName = "anstyle-query"; - version = "1.0.1"; + version = "1.0.3"; edition = "2021"; - sha256 = "0j37b7j95ivcpavhp8sssapqamw2zmdna2c21x01h94dygqii8x3"; + sha256 = "1x9pyl231rry5g45dvkdb2sfnl2dx2f4qd9a5v3ml8kr9ryr0k56"; dependencies = [ { name = "windows-sys"; @@ -341,9 +341,9 @@ rec { }; "anstyle-wincon" = rec { crateName = "anstyle-wincon"; - version = "3.0.2"; + version = "3.0.3"; edition = "2021"; - sha256 = "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w"; + sha256 = "06gv2vbj4hvwb8fxqjmvabp5kx2w01cjgh86pd98y1mpzr4q98v1"; dependencies = [ { name = "anstyle"; @@ -357,28 +357,136 @@ rec { } ]; + }; + "anyhow" = rec { + crateName = "anyhow"; + version = "1.0.83"; + edition = "2018"; + sha256 = "1wzm0i8jlmxpcfkmrqnmcpi00ca4g2kg6zfdm4cvbqnwpcnb7g95"; + authors = [ + "David Tolnay " + ]; + features = { + "backtrace" = [ "dep:backtrace" ]; + "default" = [ "std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "async-broadcast" = rec { + crateName = "async-broadcast"; + version = "0.7.0"; + edition = "2018"; + sha256 = "1nybg8i495m380rr7xj7z2xigdpf1b7qcb9vg04ry6vlmahm52r5"; + authors = [ + "Stjepan Glavina " + "Yoshua Wuyts " + "Zeeshan Ali Khan " + ]; + dependencies = [ + { + name = "event-listener"; + packageId = "event-listener 5.3.0"; + } + { + name = "event-listener-strategy"; + packageId = "event-listener-strategy 0.5.2"; + } + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + }; "async-lock" = rec { crateName = "async-lock"; - version = "2.8.0"; - edition = "2018"; - sha256 = "0asq5xdzgp3d5m82y5rg7a0k9q0g95jy6mgc7ivl334x7qlp4wi8"; + version = "3.3.0"; + edition = "2021"; + sha256 = "0yxflkfw46rad4lv86f59b5z555dlfmg1riz1n8830rgi0qb8d6h"; authors = [ "Stjepan Glavina " ]; dependencies = [ { name = "event-listener"; - packageId = "event-listener"; + packageId = "event-listener 4.0.3"; + usesDefaultFeatures = false; + } + { + name = "event-listener-strategy"; + packageId = "event-listener-strategy 0.4.0"; + usesDefaultFeatures = false; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "event-listener/std" "event-listener-strategy/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "async-stream" = rec { + crateName = "async-stream"; + version = "0.3.5"; + edition = "2018"; + sha256 = "0l8sjq1rylkb1ak0pdyjn83b3k6x36j22myngl4sqqgg7whdsmnd"; + authors = [ + "Carl Lerche " + ]; + dependencies = [ + { + name = "async-stream-impl"; + packageId = "async-stream-impl"; + } + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + + }; + "async-stream-impl" = rec { + crateName = "async-stream-impl"; + version = "0.3.5"; + edition = "2018"; + sha256 = "14q179j4y8p2z1d0ic6aqgy9fhwz8p9cai1ia8kpw4bw7q12mrhn"; + procMacro = true; + authors = [ + "Carl Lerche " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.61"; + features = [ "full" "visit-mut" ]; } ]; }; "async-trait" = rec { crateName = "async-trait"; - version = "0.1.74"; + version = "0.1.80"; edition = "2021"; - sha256 = "1ydhbsqjqqa6bxbv0kgys2wq2vi3jpwjy57dk162ajwppgqkfrd6"; + sha256 = "1jip2xkv8l67bbg6jrz3b1sdb7api77vy38wrjl7sfkmya3j1yn6"; procMacro = true; authors = [ "David Tolnay " @@ -394,7 +502,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" "visit-mut" ]; } ]; @@ -402,9 +510,9 @@ rec { }; "autocfg" = rec { crateName = "autocfg"; - version = "1.1.0"; + version = "1.3.0"; edition = "2015"; - sha256 = "1ylp3cb47ylzabimazvbz9ms6ap784zhb6syaz6c1jqpmcmq0s6l"; + sha256 = "1c3njkfzpil03k92q0mij5y1pkhhfr4j3bf0h53bgl2vs85lsjqc"; authors = [ "Josh Stone " ]; @@ -412,9 +520,9 @@ rec { }; "axum" = rec { crateName = "axum"; - version = "0.6.20"; + version = "0.7.5"; edition = "2021"; - sha256 = "1gynqkg3dcy1zd7il69h8a3zax86v6qq5zpawqyn87mr6979x0iv"; + sha256 = "1kyb7pzgn60crl9wyq7dhciv40sxdr1mbqx2r4s7g9j253qrlv1s"; dependencies = [ { name = "async-trait"; @@ -424,10 +532,6 @@ rec { name = "axum-core"; packageId = "axum-core"; } - { - name = "bitflags"; - packageId = "bitflags 1.3.2"; - } { name = "bytes"; packageId = "bytes"; @@ -446,10 +550,20 @@ rec { name = "http-body"; packageId = "http-body"; } + { + name = "http-body-util"; + packageId = "http-body-util"; + } { name = "hyper"; packageId = "hyper"; - features = [ "stream" ]; + optional = true; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + optional = true; + features = [ "tokio" "server" ]; } { name = "itoa"; @@ -497,7 +611,7 @@ rec { } { name = "sync_wrapper"; - packageId = "sync_wrapper"; + packageId = "sync_wrapper 1.0.1"; } { name = "tokio"; @@ -520,6 +634,12 @@ rec { name = "tower-service"; packageId = "tower-service"; } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + } ]; buildDependencies = [ { @@ -553,30 +673,33 @@ rec { rename = "tower"; features = [ "util" "timeout" "limit" "load-shed" "steer" "filter" ]; } + { + name = "tracing"; + packageId = "tracing"; + } ]; features = { "__private_docs" = [ "tower/full" "dep:tower-http" ]; - "default" = [ "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" ]; + "default" = [ "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ]; "form" = [ "dep:serde_urlencoded" ]; - "headers" = [ "dep:headers" ]; - "http1" = [ "hyper/http1" ]; - "http2" = [ "hyper/http2" ]; + "http1" = [ "dep:hyper" "hyper?/http1" "hyper-util?/http1" ]; + "http2" = [ "dep:hyper" "hyper?/http2" "hyper-util?/http2" ]; "json" = [ "dep:serde_json" "dep:serde_path_to_error" ]; "macros" = [ "dep:axum-macros" ]; "multipart" = [ "dep:multer" ]; "query" = [ "dep:serde_urlencoded" ]; - "tokio" = [ "dep:tokio" "hyper/server" "hyper/tcp" "hyper/runtime" "tower/make" ]; + "tokio" = [ "dep:hyper-util" "dep:tokio" "tokio/net" "tokio/rt" "tower/make" "tokio/macros" ]; "tower-log" = [ "tower/log" ]; "tracing" = [ "dep:tracing" "axum-core/tracing" ]; - "ws" = [ "tokio" "dep:tokio-tungstenite" "dep:sha1" "dep:base64" ]; + "ws" = [ "dep:hyper" "tokio" "dep:tokio-tungstenite" "dep:sha1" "dep:base64" ]; }; - resolvedDefaultFeatures = [ "default" "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" ]; + resolvedDefaultFeatures = [ "default" "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ]; }; "axum-core" = rec { crateName = "axum-core"; - version = "0.3.4"; + version = "0.4.3"; edition = "2021"; - sha256 = "0b1d9nkqb8znaba4qqzxzc968qwj4ybn4vgpyz9lz4a7l9vsb7vm"; + sha256 = "1qx28wg4j6qdcdrisqwyaavlzc0zvbsrcwa99zf9456lfbyn6p51"; dependencies = [ { name = "async-trait"; @@ -600,10 +723,22 @@ rec { name = "http-body"; packageId = "http-body"; } + { + name = "http-body-util"; + packageId = "http-body-util"; + } { name = "mime"; packageId = "mime"; } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "sync_wrapper"; + packageId = "sync_wrapper 0.1.2"; + } { name = "tower-layer"; packageId = "tower-layer"; @@ -612,6 +747,12 @@ rec { name = "tower-service"; packageId = "tower-service"; } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + } ]; buildDependencies = [ { @@ -631,6 +772,7 @@ rec { "__private_docs" = [ "dep:tower-http" ]; "tracing" = [ "dep:tracing" ]; }; + resolvedDefaultFeatures = [ "tracing" ]; }; "backoff" = rec { crateName = "backoff"; @@ -668,9 +810,9 @@ rec { }; "backtrace" = rec { crateName = "backtrace"; - version = "0.3.69"; - edition = "2018"; - sha256 = "0dsq23dhw4pfndkx2nsa1ml2g31idm7ss7ljxp8d57avygivg290"; + version = "0.3.71"; + edition = "2021"; + sha256 = "17bgd7pbjb9gc8q47qwsg2lmy9i62x3bsjmmnjrwh5z8s805ic16"; authors = [ "The Rust Project Developers" ]; @@ -702,7 +844,7 @@ rec { packageId = "object"; usesDefaultFeatures = false; target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env" or null) && (!("uwp" == target."vendor" or null)))); - features = [ "read_core" "elf" "macho" "pe" "unaligned" "archive" ]; + features = [ "read_core" "elf" "macho" "pe" "xcoff" "unaligned" "archive" ]; } { name = "rustc-demangle"; @@ -727,11 +869,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "base64" = rec { + "base64 0.21.7" = rec { crateName = "base64"; - version = "0.21.5"; + version = "0.21.7"; edition = "2018"; - sha256 = "1y8x2xs9nszj5ix7gg4ycn5a6wy7ca74zxwqri3bdqzdjha6lqrm"; + sha256 = "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx"; authors = [ "Alice Maz " "Marshall Pierce " @@ -742,6 +884,20 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; + "base64 0.22.1" = rec { + crateName = "base64"; + version = "0.22.1"; + edition = "2018"; + sha256 = "1imqzgh7bxcikp5vx3shqvw9j09g9ly0xr0jma0q66i52r7jbcvj"; + authors = [ + "Marshall Pierce " + ]; + features = { + "default" = [ "std" ]; + "std" = [ "alloc" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + }; "bit-set" = rec { crateName = "bit-set"; version = "0.5.3"; @@ -794,11 +950,11 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "bitflags 2.4.1" = rec { + "bitflags 2.5.0" = rec { crateName = "bitflags"; - version = "2.4.1"; + version = "2.5.0"; edition = "2021"; - sha256 = "01ryy3kd671b0ll4bhdvhsz67vwz1lz53fz504injrd7wpv64xrj"; + sha256 = "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"; authors = [ "The Rust Project Developers" ]; @@ -830,18 +986,13 @@ rec { }; "built" = rec { crateName = "built"; - version = "0.6.1"; + version = "0.7.2"; edition = "2021"; - sha256 = "16l8070i2g0cqijsbzkrnvy58lplplimc19i4cc688rcggf4r75r"; + sha256 = "05igfjr1hxcha6j7pz8jx1w825gdiqdbiyl0bs5pmf2n2arbvgs1"; authors = [ "Lukas Lueg " ]; dependencies = [ - { - name = "cargo-lock"; - packageId = "cargo-lock"; - usesDefaultFeatures = false; - } { name = "chrono"; packageId = "chrono"; @@ -857,7 +1008,9 @@ rec { } ]; features = { + "cargo-lock" = [ "dep:cargo-lock" ]; "chrono" = [ "dep:chrono" ]; + "dependency-tree" = [ "cargo-lock/dependency-tree" ]; "git2" = [ "dep:git2" ]; "semver" = [ "dep:semver" ]; }; @@ -865,31 +1018,18 @@ rec { }; "bumpalo" = rec { crateName = "bumpalo"; - version = "3.14.0"; + version = "3.16.0"; edition = "2021"; - sha256 = "1v4arnv9kwk54v5d0qqpv4vyw2sgr660nk0w3apzixi1cm3yfc3z"; + sha256 = "0b015qb4knwanbdlp1x48pkb4pm57b8gidbhhhxr900q2wb6fabr"; authors = [ "Nick Fitzgerald " ]; features = { "allocator-api2" = [ "dep:allocator-api2" ]; + "serde" = [ "dep:serde" ]; }; resolvedDefaultFeatures = [ "default" ]; }; - "bytecount" = rec { - crateName = "bytecount"; - version = "0.6.7"; - edition = "2018"; - sha256 = "019j3basq13gzmasbqqlhf4076231aw1v63lbyp27ikgs4sz1rg1"; - authors = [ - "Andre Bogus " - "Joshua Landau " - ]; - features = { - "generic-simd" = [ "packed_simd" ]; - "packed_simd" = [ "dep:packed_simd" ]; - }; - }; "byteorder" = rec { crateName = "byteorder"; version = "1.5.0"; @@ -905,9 +1045,9 @@ rec { }; "bytes" = rec { crateName = "bytes"; - version = "1.5.0"; + version = "1.6.0"; edition = "2018"; - sha256 = "08w2i8ac912l8vlvkv3q51cd4gr09pwlg3sjsjffcizlrb0i5gd2"; + sha256 = "1jf2awc1fywpk15m6pxay3wqcg65ararg9xi4b08vnszwiyy2kai"; authors = [ "Carl Lerche " "Sean McArthur " @@ -918,128 +1058,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "camino" = rec { - crateName = "camino"; - version = "1.1.6"; - edition = "2018"; - sha256 = "171vzfyrm2jmajd70q1m774297y028kadgm7cfw4kxc8lfsr57n5"; - authors = [ - "Without Boats " - "Ashley Williams " - "Steve Klabnik " - "Rain " - ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - features = [ "derive" ]; - } - ]; - features = { - "proptest" = [ "dep:proptest" ]; - "proptest1" = [ "proptest" ]; - "serde" = [ "dep:serde" ]; - "serde1" = [ "serde" ]; - }; - resolvedDefaultFeatures = [ "serde" "serde1" ]; - }; - "cargo-lock" = rec { - crateName = "cargo-lock"; - version = "9.0.0"; - edition = "2021"; - crateBin = []; - sha256 = "0wmczs13psr8p9mc51w4r4pm900dbpbpipp87knlkd7gg19nf771"; - authors = [ - "Tony Arcieri " - ]; - dependencies = [ - { - name = "semver"; - packageId = "semver"; - features = [ "serde" ]; - } - { - name = "serde"; - packageId = "serde"; - features = [ "serde_derive" ]; - } - { - name = "toml"; - packageId = "toml"; - } - { - name = "url"; - packageId = "url"; - } - ]; - features = { - "cli" = [ "gumdrop" "dependency-tree" ]; - "dependency-tree" = [ "petgraph" ]; - "gumdrop" = [ "dep:gumdrop" ]; - "petgraph" = [ "dep:petgraph" ]; - }; - }; - "cargo-platform" = rec { - crateName = "cargo-platform"; - version = "0.1.5"; - edition = "2021"; - sha256 = "1zsr2jn1daih745hicgpxd8pdbgblj59whzv57wvshh12jrkfip3"; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - } - ]; - - }; - "cargo_metadata" = rec { - crateName = "cargo_metadata"; - version = "0.14.2"; - edition = "2018"; - sha256 = "1yl1y40vby9cas4dlfc44szrbl4m4z3pahv3p6ckdqp8ksfv1jsa"; - authors = [ - "Oliver Schneider " - ]; - dependencies = [ - { - name = "camino"; - packageId = "camino"; - features = [ "serde1" ]; - } - { - name = "cargo-platform"; - packageId = "cargo-platform"; - } - { - name = "semver"; - packageId = "semver"; - features = [ "serde" ]; - } - { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; - } - { - name = "serde_json"; - packageId = "serde_json"; - features = [ "unbounded_depth" ]; - } - ]; - features = { - "builder" = [ "derive_builder" ]; - "derive_builder" = [ "dep:derive_builder" ]; - }; - resolvedDefaultFeatures = [ "default" ]; - }; "cc" = rec { crateName = "cc"; - version = "1.0.83"; + version = "1.0.97"; edition = "2018"; - crateBin = []; - sha256 = "1l643zidlb5iy1dskc5ggqs4wqa29a02f44piczqc8zcnsq4y5zi"; + sha256 = "1d6rv3nk5q6lrr3mf7lifqpjr44slylsz3pw6pmn2k2cv1bm76h9"; authors = [ "Alex Crichton " ]; @@ -1048,19 +1071,28 @@ rec { name = "jobserver"; packageId = "jobserver"; optional = true; + usesDefaultFeatures = false; } { name = "libc"; packageId = "libc"; + optional = true; usesDefaultFeatures = false; target = { target, features }: (target."unix" or false); } + { + name = "once_cell"; + packageId = "once_cell"; + optional = true; + } ]; features = { "jobserver" = [ "dep:jobserver" ]; - "parallel" = [ "jobserver" ]; + "libc" = [ "dep:libc" ]; + "once_cell" = [ "dep:once_cell" ]; + "parallel" = [ "libc" "jobserver" "once_cell" ]; }; - resolvedDefaultFeatures = [ "jobserver" "parallel" ]; + resolvedDefaultFeatures = [ "jobserver" "libc" "once_cell" "parallel" ]; }; "cfg-if" = rec { crateName = "cfg-if"; @@ -1078,9 +1110,9 @@ rec { }; "chrono" = rec { crateName = "chrono"; - version = "0.4.31"; + version = "0.4.38"; edition = "2021"; - sha256 = "0f6vg67pipm8cziad2yms6a639pssnvysk1m05dd9crymmdnhb3z"; + sha256 = "009l8vc5p8750vn02z30mblg4pv2qhkbfizhfwmzc6vpy5nr67x2"; dependencies = [ { name = "android-tzdata"; @@ -1108,7 +1140,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.48.5"; + packageId = "windows-targets 0.52.5"; optional = true; target = { target, features }: (target."windows" or false); } @@ -1116,21 +1148,26 @@ rec { features = { "android-tzdata" = [ "dep:android-tzdata" ]; "arbitrary" = [ "dep:arbitrary" ]; - "clock" = [ "std" "winapi" "iana-time-zone" "android-tzdata" ]; + "clock" = [ "winapi" "iana-time-zone" "android-tzdata" "now" ]; "default" = [ "clock" "std" "oldtime" "wasmbind" ]; "iana-time-zone" = [ "dep:iana-time-zone" ]; "js-sys" = [ "dep:js-sys" ]; + "now" = [ "std" ]; "pure-rust-locales" = [ "dep:pure-rust-locales" ]; - "rkyv" = [ "dep:rkyv" ]; - "rustc-serialize" = [ "dep:rustc-serialize" ]; + "rkyv" = [ "dep:rkyv" "rkyv/size_32" ]; + "rkyv-16" = [ "dep:rkyv" "rkyv?/size_16" ]; + "rkyv-32" = [ "dep:rkyv" "rkyv?/size_32" ]; + "rkyv-64" = [ "dep:rkyv" "rkyv?/size_64" ]; + "rkyv-validation" = [ "rkyv?/validation" ]; "serde" = [ "dep:serde" ]; - "unstable-locales" = [ "pure-rust-locales" "alloc" ]; + "std" = [ "alloc" ]; + "unstable-locales" = [ "pure-rust-locales" ]; "wasm-bindgen" = [ "dep:wasm-bindgen" ]; "wasmbind" = [ "wasm-bindgen" "js-sys" ]; "winapi" = [ "windows-targets" ]; "windows-targets" = [ "dep:windows-targets" ]; }; - resolvedDefaultFeatures = [ "alloc" "android-tzdata" "clock" "iana-time-zone" "serde" "std" "winapi" "windows-targets" ]; + resolvedDefaultFeatures = [ "alloc" "android-tzdata" "clock" "iana-time-zone" "now" "serde" "std" "winapi" "windows-targets" ]; }; "clap" = rec { crateName = "clap"; @@ -1232,7 +1269,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -1251,11 +1288,35 @@ rec { }; "colorchoice" = rec { crateName = "colorchoice"; - version = "1.0.0"; + version = "1.0.1"; edition = "2021"; - sha256 = "1ix7w85kwvyybwi2jdkl3yva2r2bvdcc3ka2grjfzfgrapqimgxc"; + sha256 = "08h4jsrd2j5k6lp1b9v5p1f1g7cmyzm4djsvb3ydywdb4hmqashb"; }; + "concurrent-queue" = rec { + crateName = "concurrent-queue"; + version = "2.5.0"; + edition = "2021"; + sha256 = "0wrr3mzq2ijdkxwndhf79k952cp4zkz35ray8hvsxl96xrx1k82c"; + authors = [ + "Stjepan Glavina " + "Taiki Endo " + "John Nunley " + ]; + dependencies = [ + { + name = "crossbeam-utils"; + packageId = "crossbeam-utils"; + usesDefaultFeatures = false; + } + ]; + features = { + "default" = [ "std" ]; + "loom" = [ "dep:loom" ]; + "portable-atomic" = [ "dep:portable-atomic" ]; + }; + resolvedDefaultFeatures = [ "std" ]; + }; "const_format" = rec { crateName = "const_format"; version = "0.2.32"; @@ -1365,9 +1426,9 @@ rec { }; "cpufeatures" = rec { crateName = "cpufeatures"; - version = "0.2.11"; + version = "0.2.12"; edition = "2018"; - sha256 = "1l0gzsyy576n017g9bf0vkv5hhg9cpz1h1libxyfdlzcgbh0yhnf"; + sha256 = "012m7rrak4girqlii3jnqwrr73gv1i980q4wra5yyyhvzwk5xzjk"; authors = [ "RustCrypto Developers" ]; @@ -1397,58 +1458,33 @@ rec { }; "crossbeam-channel" = rec { crateName = "crossbeam-channel"; - version = "0.5.8"; - edition = "2018"; - sha256 = "004jz4wxp9k26z657i7rsh9s7586dklx2c5aqf1n3w1dgzvjng53"; + version = "0.5.12"; + edition = "2021"; + sha256 = "159gp30clv2ci3r473659ii04pjznspb3g9gwkhj2lavkhmb0gdb"; dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } { name = "crossbeam-utils"; packageId = "crossbeam-utils"; - optional = true; usesDefaultFeatures = false; } ]; features = { - "crossbeam-utils" = [ "dep:crossbeam-utils" ]; "default" = [ "std" ]; "std" = [ "crossbeam-utils/std" ]; }; - resolvedDefaultFeatures = [ "crossbeam-utils" "default" "std" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; "crossbeam-epoch" = rec { crateName = "crossbeam-epoch"; - version = "0.9.15"; - edition = "2018"; - sha256 = "1ixwc3cq816wb8rlh3ix4jnybqbyyq4l61nwlx0mfm3ck0s148df"; + version = "0.9.18"; + edition = "2021"; + sha256 = "03j2np8llwf376m3fxqx859mgp9f83hj1w34153c7a9c7i5ar0jv"; dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } { name = "crossbeam-utils"; packageId = "crossbeam-utils"; usesDefaultFeatures = false; } - { - name = "memoffset"; - packageId = "memoffset"; - } - { - name = "scopeguard"; - packageId = "scopeguard"; - usesDefaultFeatures = false; - } - ]; - buildDependencies = [ - { - name = "autocfg"; - packageId = "autocfg"; - } ]; features = { "default" = [ "std" ]; @@ -1461,15 +1497,9 @@ rec { }; "crossbeam-utils" = rec { crateName = "crossbeam-utils"; - version = "0.8.16"; - edition = "2018"; - sha256 = "153j0gikblz7n7qdvdi8pslhi008s1yp9cmny6vw07ad7pbb48js"; - dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } - ]; + version = "0.8.19"; + edition = "2021"; + sha256 = "0iakrb1b8fjqrag7wphl94d10irhbh2fw1g444xslsywqyn3p3i4"; features = { "default" = [ "std" ]; "loom" = [ "dep:loom" ]; @@ -1502,9 +1532,9 @@ rec { }; "darling" = rec { crateName = "darling"; - version = "0.20.3"; + version = "0.20.8"; edition = "2018"; - sha256 = "0pjwwadwgnvvgn5qm3glpv7hjl7siaqqpw6cvh2mdar7lr6xj282"; + sha256 = "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl"; authors = [ "Ted Driggs " ]; @@ -1527,9 +1557,9 @@ rec { }; "darling_core" = rec { crateName = "darling_core"; - version = "0.20.3"; + version = "0.20.8"; edition = "2018"; - sha256 = "08g6afi3z9jgcqx7g41s1mzr6q3dj2z56vz7v1bv6941h51k8zhp"; + sha256 = "03x7s149p06xfwcq0lgkk4yxh6jf7jckny18nzp1yyk87b1g2b4w"; authors = [ "Ted Driggs " ]; @@ -1557,7 +1587,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" "extra-traits" ]; } ]; @@ -1569,9 +1599,9 @@ rec { }; "darling_macro" = rec { crateName = "darling_macro"; - version = "0.20.3"; + version = "0.20.8"; edition = "2018"; - sha256 = "1mg2k1f0v33s271lpn4m5mxcfjqnmg61bf77svb44cyngay9nsl3"; + sha256 = "0gwkz0cjfy3fgcc1zmm7azzhj5qpja34s0cklcria4l38sjyss56"; procMacro = true; authors = [ "Ted Driggs " @@ -1587,7 +1617,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; } ]; @@ -1613,7 +1643,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" "visit-mut" ]; } ]; @@ -1731,9 +1761,9 @@ rec { }; "dyn-clone" = rec { crateName = "dyn-clone"; - version = "1.0.16"; + version = "1.0.17"; edition = "2018"; - sha256 = "0pa9kas6a241pbx0q82ipwi4f7m7wwyzkkc725caky24gl4j4nsl"; + sha256 = "09cig7dgg6jnqa10p4233nd8wllbjf4ffsw7wj0m4lwa5w3z0vhd"; authors = [ "David Tolnay " ]; @@ -1741,9 +1771,9 @@ rec { }; "either" = rec { crateName = "either"; - version = "1.9.0"; + version = "1.11.0"; edition = "2018"; - sha256 = "01qy3anr7jal5lpc20791vxrw0nl6vksb5j7x56q2fycgcyy8sm2"; + sha256 = "18l0cwyw18syl8b52syv6balql8mnwfyhihjqqllx5pms93iqz54"; authors = [ "bluss" ]; @@ -1755,9 +1785,9 @@ rec { }; "encoding_rs" = rec { crateName = "encoding_rs"; - version = "0.8.33"; + version = "0.8.34"; edition = "2018"; - sha256 = "1qa5k4a0ipdrxq4xg9amms9r9pnnfn7nfh2i9m3mw0ka563b6s3j"; + sha256 = "0nagpi1rjqdpvakymwmnlxzq908ncg868lml5b70n08bm82fjpdl"; authors = [ "Henri Sivonen " ]; @@ -1768,11 +1798,11 @@ rec { } ]; features = { + "any_all_workaround" = [ "dep:any_all_workaround" ]; "default" = [ "alloc" ]; "fast-legacy-encode" = [ "fast-hangul-encode" "fast-hanja-encode" "fast-kanji-encode" "fast-gb-hanzi-encode" "fast-big5-hanzi-encode" ]; - "packed_simd" = [ "dep:packed_simd" ]; "serde" = [ "dep:serde" ]; - "simd-accel" = [ "packed_simd" "packed_simd/into_bits" ]; + "simd-accel" = [ "any_all_workaround" ]; }; resolvedDefaultFeatures = [ "alloc" "default" ]; }; @@ -1809,68 +1839,156 @@ rec { ]; dependencies = [ { - name = "libc"; - packageId = "libc"; + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: ("hermit" == target."os" or null); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: ("wasi" == target."os" or null); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: (target."unix" or false); + } + { + name = "windows-sys"; + packageId = "windows-sys 0.52.0"; + target = { target, features }: (target."windows" or false); + features = [ "Win32_Foundation" "Win32_System_Diagnostics_Debug" ]; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "libc/std" ]; + }; + resolvedDefaultFeatures = [ "std" ]; + }; + "event-listener 4.0.3" = rec { + crateName = "event-listener"; + version = "4.0.3"; + edition = "2021"; + sha256 = "0vk4smw1vf871vi76af1zn7w69jg3zmpjddpby2qq91bkg21bck7"; + authors = [ + "Stjepan Glavina " + ]; + dependencies = [ + { + name = "concurrent-queue"; + packageId = "concurrent-queue"; + usesDefaultFeatures = false; + } + { + name = "parking"; + packageId = "parking"; + optional = true; + target = { target, features }: (!(builtins.elem "wasm" target."family")); + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + features = { + "default" = [ "std" ]; + "parking" = [ "dep:parking" ]; + "portable-atomic" = [ "portable-atomic-util" "portable_atomic_crate" ]; + "portable-atomic-util" = [ "dep:portable-atomic-util" ]; + "portable_atomic_crate" = [ "dep:portable_atomic_crate" ]; + "std" = [ "concurrent-queue/std" "parking" ]; + }; + resolvedDefaultFeatures = [ "parking" "std" ]; + }; + "event-listener 5.3.0" = rec { + crateName = "event-listener"; + version = "5.3.0"; + edition = "2021"; + sha256 = "091a6bgxzjnycqa10l2sqwzzy0j9vpw7a1w0nbglqlqkraw496bd"; + authors = [ + "Stjepan Glavina " + ]; + dependencies = [ + { + name = "concurrent-queue"; + packageId = "concurrent-queue"; usesDefaultFeatures = false; - target = { target, features }: ("hermit" == target."os" or null); } { - name = "libc"; - packageId = "libc"; - usesDefaultFeatures = false; - target = { target, features }: ("wasi" == target."os" or null); + name = "parking"; + packageId = "parking"; + optional = true; + target = { target, features }: (!(builtins.elem "wasm" target."family")); } { - name = "libc"; - packageId = "libc"; + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + features = { + "default" = [ "std" ]; + "loom" = [ "concurrent-queue/loom" "parking?/loom" "dep:loom" ]; + "parking" = [ "dep:parking" ]; + "portable-atomic" = [ "portable-atomic-util" "portable_atomic_crate" ]; + "portable-atomic-util" = [ "dep:portable-atomic-util" ]; + "portable_atomic_crate" = [ "dep:portable_atomic_crate" ]; + "std" = [ "concurrent-queue/std" "parking" ]; + }; + resolvedDefaultFeatures = [ "default" "parking" "std" ]; + }; + "event-listener-strategy 0.4.0" = rec { + crateName = "event-listener-strategy"; + version = "0.4.0"; + edition = "2018"; + sha256 = "1lwprdjqp2ibbxhgm9khw7s7y7k4xiqj5i5yprqiks6mnrq4v3lm"; + authors = [ + "John Nunley " + ]; + dependencies = [ + { + name = "event-listener"; + packageId = "event-listener 4.0.3"; usesDefaultFeatures = false; - target = { target, features }: (target."unix" or false); } { - name = "windows-sys"; - packageId = "windows-sys 0.52.0"; - target = { target, features }: (target."windows" or false); - features = [ "Win32_Foundation" "Win32_System_Diagnostics_Debug" ]; + name = "pin-project-lite"; + packageId = "pin-project-lite"; } ]; features = { "default" = [ "std" ]; - "std" = [ "libc/std" ]; + "std" = [ "event-listener/std" ]; }; resolvedDefaultFeatures = [ "std" ]; }; - "error-chain" = rec { - crateName = "error-chain"; - version = "0.12.4"; - edition = "2015"; - sha256 = "1z6y5isg0il93jp287sv7pn10i4wrkik2cpyk376wl61rawhcbrd"; + "event-listener-strategy 0.5.2" = rec { + crateName = "event-listener-strategy"; + version = "0.5.2"; + edition = "2021"; + sha256 = "18f5ri227khkayhv3ndv7yl4rnasgwksl2jhwgafcxzr7324s88g"; authors = [ - "Brian Anderson " - "Paul Colomiets " - "Colin Kiegel " - "Yamakaky " - "Andrew Gauger " + "John Nunley " ]; - buildDependencies = [ + dependencies = [ { - name = "version_check"; - packageId = "version_check"; + name = "event-listener"; + packageId = "event-listener 5.3.0"; + usesDefaultFeatures = false; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; } ]; features = { - "backtrace" = [ "dep:backtrace" ]; - "default" = [ "backtrace" "example_generated" ]; + "default" = [ "std" ]; + "std" = [ "event-listener/std" ]; }; - }; - "event-listener" = rec { - crateName = "event-listener"; - version = "2.5.3"; - edition = "2018"; - sha256 = "1q4w3pndc518crld6zsqvvpy9lkzwahp2zgza9kbzmmqh9gif1h2"; - authors = [ - "Stjepan Glavina " - ]; - + resolvedDefaultFeatures = [ "default" "std" ]; }; "fancy-regex" = rec { crateName = "fancy-regex"; @@ -1906,9 +2024,9 @@ rec { }; "fastrand" = rec { crateName = "fastrand"; - version = "2.0.1"; + version = "2.1.0"; edition = "2018"; - sha256 = "19flpv5zbzpf0rk4x77z4zf25in0brg8l7m304d3yrf47qvwxjr5"; + sha256 = "06p5d0rxq7by260m4ym9ial0bwgi0v42lrvhl6nm2g7h0h2m3h4z"; authors = [ "Stjepan Glavina " ]; @@ -1995,11 +2113,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "use_std" "with-deprecated" ]; }; - "futures 0.3.29" = rec { + "futures 0.3.30" = rec { crateName = "futures"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "0dak2ilpcmyjrb1j54fzy9hlw6vd10vqljq9gd59pbrq9dqr00ns"; + sha256 = "1c04g14bccmprwsvx2j9m2blhwrynq7vhl151lsvcv4gi0b6jp34"; dependencies = [ { name = "futures-channel"; @@ -2058,9 +2176,9 @@ rec { }; "futures-channel" = rec { crateName = "futures-channel"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "1jxsifvrbqzdadk0svbax71cba5d3qg3wgjq8i160mxmd1kdckgz"; + sha256 = "0y6b7xxqdjm9hlcjpakcg41qfl7lihf6gavk8fyqijsxhvbzgj7a"; dependencies = [ { name = "futures-core"; @@ -2085,9 +2203,9 @@ rec { }; "futures-core" = rec { crateName = "futures-core"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "1308bpj0g36nhx2y6bl4mm6f1gnh9xyvvw2q2wpdgnb6dv3247gb"; + sha256 = "07aslayrn3lbggj54kci0ishmd1pr367fp7iks7adia1p05miinz"; features = { "default" = [ "std" ]; "portable-atomic" = [ "dep:portable-atomic" ]; @@ -2097,9 +2215,9 @@ rec { }; "futures-executor" = rec { crateName = "futures-executor"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "1g4pjni0sw28djx6mlcfz584abm2lpifz86cmng0kkxh7mlvhkqg"; + sha256 = "07dh08gs9vfll2h36kq32q9xd86xm6lyl9xikmmwlkqnmrrgqxm5"; dependencies = [ { name = "futures-core"; @@ -2127,9 +2245,9 @@ rec { }; "futures-io" = rec { crateName = "futures-io"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "1ajsljgny3zfxwahba9byjzclrgvm1ypakca8z854k2w7cb4mwwb"; + sha256 = "1hgh25isvsr4ybibywhr4dpys8mjnscw4wfxxwca70cn1gi26im4"; features = { "default" = [ "std" ]; }; @@ -2137,9 +2255,9 @@ rec { }; "futures-macro" = rec { crateName = "futures-macro"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "1nwd18i8kvpkdfwm045hddjli0n96zi7pn6f99zi9c74j7ym7cak"; + sha256 = "1b49qh9d402y8nka4q6wvvj0c88qq91wbr192mdn5h54nzs0qxc7"; procMacro = true; dependencies = [ { @@ -2152,7 +2270,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -2160,9 +2278,9 @@ rec { }; "futures-sink" = rec { crateName = "futures-sink"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "05q8jykqddxzp8nwf00wjk5m5mqi546d7i8hsxma7hiqxrw36vg3"; + sha256 = "1dag8xyyaya8n8mh8smx7x6w2dpmafg2din145v973a3hw7f1f4z"; features = { "default" = [ "std" ]; "std" = [ "alloc" ]; @@ -2171,9 +2289,9 @@ rec { }; "futures-task" = rec { crateName = "futures-task"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "1qmsss8rb5ppql4qvd4r70h9gpfcpd0bg2b3qilxrnhdkc397lgg"; + sha256 = "013h1724454hj8qczp8vvs10qfiqrxr937qsrv6rhii68ahlzn1q"; features = { "default" = [ "std" ]; "std" = [ "alloc" ]; @@ -2182,9 +2300,9 @@ rec { }; "futures-util" = rec { crateName = "futures-util"; - version = "0.3.29"; + version = "0.3.30"; edition = "2018"; - sha256 = "0141rkqh0psj4h8x8lgsl1p29dhqr7z2wcixkcbs60z74kb2d5d1"; + sha256 = "0j0xqhcir1zf2dcbpd421kgw6wvsk0rpxflylcysn1rlp3g02r1x"; dependencies = [ { name = "futures"; @@ -2301,9 +2419,9 @@ rec { }; "getrandom" = rec { crateName = "getrandom"; - version = "0.2.11"; + version = "0.2.15"; edition = "2018"; - sha256 = "03q7120cc2kn7ry013i67zmjl2g9q73h1ks5z08hq5v9syz0d47y"; + sha256 = "1mzlnrb3dgyd1fb84gvw10pyr8wdqdl4ry4sr64i1s8an66pqmn4"; authors = [ "The Rand Project Developers" ]; @@ -2354,9 +2472,9 @@ rec { }; "git2" = rec { crateName = "git2"; - version = "0.17.2"; + version = "0.18.3"; edition = "2018"; - sha256 = "0i00kg3yizh7mn6hnj3yz3hpniisidlavifgy8n3cnm9gim9v63v"; + sha256 = "0w7gcq6v9kdlh0vcv27xrk09c1bhkarqhnp52pvnnximzrxnlbi3"; authors = [ "Josh Triplett " "Alex Crichton " @@ -2364,7 +2482,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags 2.5.0"; } { name = "libc"; @@ -2407,9 +2525,9 @@ rec { }; "h2" = rec { crateName = "h2"; - version = "0.3.22"; - edition = "2018"; - sha256 = "0y41jlflvw8niifdirgng67zdmic62cjf5m2z69hzrpn5qr50qjd"; + version = "0.4.4"; + edition = "2021"; + sha256 = "0sc0ymhiqp4hbz39d405cjbga77wnz2pprbgyc498xs58hlwfvl1"; authors = [ "Carl Lerche " "Sean McArthur " @@ -2480,9 +2598,9 @@ rec { }; "hashbrown" = rec { crateName = "hashbrown"; - version = "0.14.3"; + version = "0.14.5"; edition = "2021"; - sha256 = "012nywlg0lj9kwanh69my5x67vjlfmzfi9a0rq4qvis2j8fil3r9"; + sha256 = "1wa1vy1xs3mp11bn3z9dv0jricgr6a2j0zkf1g19yz3vw4il89z5"; authors = [ "Amanieu d'Antras " ]; @@ -2540,9 +2658,9 @@ rec { }; "hermit-abi" = rec { crateName = "hermit-abi"; - version = "0.3.3"; + version = "0.3.9"; edition = "2021"; - sha256 = "1dyc8qsjh876n74a3rcz8h43s27nj1sypdhsn2ms61bd3b47wzyp"; + sha256 = "092hxjbjnq5fmz66grd9plxd0sh6ssg5fhgwwwqbrzgzkjwdycfj"; authors = [ "Stefan Lankes" ]; @@ -2556,27 +2674,27 @@ rec { }; "home" = rec { crateName = "home"; - version = "0.5.5"; - edition = "2018"; - sha256 = "1nqx1krijvpd03d96avsdyknd12h8hs3xhxwgqghf8v9xxzc4i2l"; + version = "0.5.9"; + edition = "2021"; + sha256 = "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3"; authors = [ "Brian Anderson " ]; dependencies = [ { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); - features = [ "Win32_Foundation" "Win32_UI_Shell" ]; + features = [ "Win32_Foundation" "Win32_UI_Shell" "Win32_System_Com" ]; } ]; }; "http" = rec { crateName = "http"; - version = "0.2.11"; + version = "1.1.0"; edition = "2018"; - sha256 = "1fwz3mhh86h5kfnr5767jlx9agpdggclq7xsqx930fflzakb2iw9"; + sha256 = "0n426lmcxas6h75c2cp25m933pswlrfjz10v91vc62vib2sdvf91"; authors = [ "Alex Crichton " "Carl Lerche " @@ -2596,13 +2714,38 @@ rec { packageId = "itoa"; } ]; - + features = { + "default" = [ "std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; }; "http-body" = rec { crateName = "http-body"; - version = "0.4.5"; + version = "1.0.0"; + edition = "2018"; + sha256 = "0hyn8n3iadrbwq8y0p1rl1275s4nm49bllw5wji29g4aa3dqbb0w"; + authors = [ + "Carl Lerche " + "Lucio Franco " + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "http"; + packageId = "http"; + } + ]; + + }; + "http-body-util" = rec { + crateName = "http-body-util"; + version = "0.1.1"; edition = "2018"; - sha256 = "1l967qwwlvhp198xdrnc0p5d7jwfcp6q2lm510j6zqw4s4b8zwym"; + sha256 = "07agldas2qgcfc05ckiarlmf9vzragbda823nqhrqrc6mjrghx84"; authors = [ "Carl Lerche " "Lucio Franco " @@ -2613,10 +2756,18 @@ rec { name = "bytes"; packageId = "bytes"; } + { + name = "futures-core"; + packageId = "futures-core"; + } { name = "http"; packageId = "http"; } + { + name = "http-body"; + packageId = "http-body"; + } { name = "pin-project-lite"; packageId = "pin-project-lite"; @@ -2624,14 +2775,6 @@ rec { ]; }; - "http-range-header" = rec { - crateName = "http-range-header"; - version = "0.3.1"; - edition = "2018"; - sha256 = "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d"; - features = { - }; - }; "httparse" = rec { crateName = "httparse"; version = "1.8.0"; @@ -2657,9 +2800,9 @@ rec { }; "hyper" = rec { crateName = "hyper"; - version = "0.14.27"; - edition = "2018"; - sha256 = "0s2l74p3harvjgb0bvaxlxgxq71vpfrzv0cqz2p9w8d8akbczcgz"; + version = "1.3.1"; + edition = "2021"; + sha256 = "0va9pjqshsr8zc07m9h4j2821hsmd9lw9j416yisjqh8gp8msmzy"; authors = [ "Sean McArthur " ]; @@ -2671,15 +2814,12 @@ rec { { name = "futures-channel"; packageId = "futures-channel"; - } - { - name = "futures-core"; - packageId = "futures-core"; - usesDefaultFeatures = false; + optional = true; } { name = "futures-util"; packageId = "futures-util"; + optional = true; usesDefaultFeatures = false; } { @@ -2698,75 +2838,74 @@ rec { { name = "httparse"; packageId = "httparse"; + optional = true; } { name = "httpdate"; packageId = "httpdate"; + optional = true; } { name = "itoa"; packageId = "itoa"; + optional = true; } { name = "pin-project-lite"; packageId = "pin-project-lite"; + optional = true; } { - name = "socket2"; - packageId = "socket2 0.4.10"; + name = "smallvec"; + packageId = "smallvec"; optional = true; - features = [ "all" ]; + features = [ "const_generics" "const_new" ]; } { name = "tokio"; packageId = "tokio"; features = [ "sync" ]; } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - usesDefaultFeatures = false; - features = [ "std" ]; - } { name = "want"; packageId = "want"; + optional = true; } ]; devDependencies = [ + { + name = "futures-channel"; + packageId = "futures-channel"; + features = [ "sink" ]; + } { name = "futures-util"; packageId = "futures-util"; usesDefaultFeatures = false; - features = [ "alloc" ]; + features = [ "alloc" "sink" ]; } { name = "tokio"; packageId = "tokio"; - features = [ "fs" "macros" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ]; + features = [ "fs" "macros" "net" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ]; } ]; features = { - "ffi" = [ "libc" ]; - "full" = [ "client" "http1" "http2" "server" "stream" "runtime" ]; - "h2" = [ "dep:h2" ]; - "http2" = [ "h2" ]; - "libc" = [ "dep:libc" ]; - "runtime" = [ "tcp" "tokio/rt" "tokio/time" ]; - "socket2" = [ "dep:socket2" ]; - "tcp" = [ "socket2" "tokio/net" "tokio/rt" "tokio/time" ]; + "client" = [ "dep:want" "dep:pin-project-lite" "dep:smallvec" ]; + "ffi" = [ "dep:libc" "dep:http-body-util" "futures-util?/alloc" ]; + "full" = [ "client" "http1" "http2" "server" ]; + "http1" = [ "dep:futures-channel" "dep:futures-util" "dep:httparse" "dep:itoa" ]; + "http2" = [ "dep:futures-channel" "dep:futures-util" "dep:h2" ]; + "server" = [ "dep:httpdate" "dep:pin-project-lite" "dep:smallvec" ]; + "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "client" "default" "h2" "http1" "http2" "runtime" "server" "socket2" "stream" "tcp" ]; + resolvedDefaultFeatures = [ "client" "default" "http1" "http2" "server" ]; }; "hyper-rustls" = rec { crateName = "hyper-rustls"; - version = "0.24.2"; + version = "0.27.1"; edition = "2021"; - sha256 = "1475j4a2nczz4aajzzsq3hpwg1zacmzbqg393a14j80ff8izsgpc"; + sha256 = "0arh47qg9ln3l8q4x9wcpwmsq4j1cc08mimw3sh3g86pjs3b72wh"; dependencies = [ { name = "futures-util"; @@ -2781,7 +2920,12 @@ rec { name = "hyper"; packageId = "hyper"; usesDefaultFeatures = false; - features = [ "client" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + usesDefaultFeatures = false; + features = [ "client-legacy" "tokio" ]; } { name = "log"; @@ -2798,6 +2942,11 @@ rec { packageId = "rustls-native-certs"; optional = true; } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } { name = "tokio"; packageId = "tokio"; @@ -2807,12 +2956,17 @@ rec { packageId = "tokio-rustls"; usesDefaultFeatures = false; } + { + name = "tower-service"; + packageId = "tower-service"; + } ]; devDependencies = [ { - name = "hyper"; - packageId = "hyper"; - features = [ "full" ]; + name = "hyper-util"; + packageId = "hyper-util"; + usesDefaultFeatures = false; + features = [ "server-auto" ]; } { name = "rustls"; @@ -2827,26 +2981,28 @@ rec { } ]; features = { - "acceptor" = [ "hyper/server" "tokio-runtime" ]; - "default" = [ "native-tokio" "http1" "tls12" "logging" "acceptor" ]; - "http1" = [ "hyper/http1" ]; - "http2" = [ "hyper/http2" ]; + "aws-lc-rs" = [ "rustls/aws_lc_rs" ]; + "default" = [ "native-tokio" "http1" "tls12" "logging" "aws-lc-rs" ]; + "fips" = [ "aws-lc-rs" "rustls/fips" ]; + "http1" = [ "hyper-util/http1" ]; + "http2" = [ "hyper-util/http2" ]; "log" = [ "dep:log" ]; "logging" = [ "log" "tokio-rustls/logging" "rustls/logging" ]; - "native-tokio" = [ "tokio-runtime" "rustls-native-certs" ]; + "native-tokio" = [ "rustls-native-certs" ]; + "ring" = [ "rustls/ring" ]; "rustls-native-certs" = [ "dep:rustls-native-certs" ]; + "rustls-platform-verifier" = [ "dep:rustls-platform-verifier" ]; "tls12" = [ "tokio-rustls/tls12" "rustls/tls12" ]; - "tokio-runtime" = [ "hyper/runtime" ]; "webpki-roots" = [ "dep:webpki-roots" ]; - "webpki-tokio" = [ "tokio-runtime" "webpki-roots" ]; + "webpki-tokio" = [ "webpki-roots" ]; }; - resolvedDefaultFeatures = [ "acceptor" "default" "http1" "log" "logging" "native-tokio" "rustls-native-certs" "tls12" "tokio-runtime" ]; + resolvedDefaultFeatures = [ "http1" "log" "logging" "native-tokio" "ring" "rustls-native-certs" "tls12" ]; }; "hyper-timeout" = rec { crateName = "hyper-timeout"; - version = "0.4.1"; + version = "0.5.1"; edition = "2018"; - sha256 = "1c8k3g8k2yh1gxvsx9p7amkimgxhl9kafwpj7jyf8ywc5r45ifdv"; + sha256 = "14rpyv9zz0ncadn9qgmnjz0hiqk3nav7hglkk1a6yfy8wmhsj0rj"; authors = [ "Herman J. Radtke III " ]; @@ -2854,7 +3010,11 @@ rec { { name = "hyper"; packageId = "hyper"; - features = [ "client" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "client-legacy" "http1" ]; } { name = "pin-project-lite"; @@ -2865,15 +3025,15 @@ rec { packageId = "tokio"; } { - name = "tokio-io-timeout"; - packageId = "tokio-io-timeout"; + name = "tower-service"; + packageId = "tower-service"; } ]; devDependencies = [ { name = "hyper"; packageId = "hyper"; - features = [ "client" "http1" "tcp" ]; + features = [ "http1" ]; } { name = "tokio"; @@ -2885,9 +3045,9 @@ rec { }; "hyper-tls" = rec { crateName = "hyper-tls"; - version = "0.5.0"; + version = "0.6.0"; edition = "2018"; - sha256 = "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n"; + sha256 = "1q36x2yps6hhvxq5r7mc8ph9zz6xlb573gx0x3yskb0fi736y83h"; authors = [ "Sean McArthur " ]; @@ -2896,11 +3056,18 @@ rec { name = "bytes"; packageId = "bytes"; } + { + name = "http-body-util"; + packageId = "http-body-util"; + } { name = "hyper"; packageId = "hyper"; - usesDefaultFeatures = false; - features = [ "tcp" "client" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "client-legacy" "tokio" ]; } { name = "native-tls"; @@ -2911,32 +3078,135 @@ rec { packageId = "tokio"; } { - name = "tokio-native-tls"; - packageId = "tokio-native-tls"; + name = "tokio-native-tls"; + packageId = "tokio-native-tls"; + } + { + name = "tower-service"; + packageId = "tower-service"; + } + ]; + devDependencies = [ + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "http1" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "io-std" "macros" "io-util" ]; + } + ]; + features = { + "alpn" = [ "native-tls/alpn" ]; + "vendored" = [ "native-tls/vendored" ]; + }; + }; + "hyper-util" = rec { + crateName = "hyper-util"; + version = "0.1.3"; + edition = "2021"; + sha256 = "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a"; + authors = [ + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-channel"; + packageId = "futures-channel"; + optional = true; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + } + { + name = "http"; + packageId = "http"; + } + { + name = "http-body"; + packageId = "http-body"; + } + { + name = "hyper"; + packageId = "hyper"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "socket2"; + packageId = "socket2"; + optional = true; + features = [ "all" ]; + } + { + name = "tokio"; + packageId = "tokio"; + optional = true; + features = [ "net" "rt" "time" ]; + } + { + name = "tower"; + packageId = "tower"; + optional = true; + features = [ "make" "util" ]; + } + { + name = "tower-service"; + packageId = "tower-service"; + optional = true; + } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; } ]; devDependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } { name = "hyper"; packageId = "hyper"; - usesDefaultFeatures = false; - features = [ "http1" ]; + features = [ "full" ]; } { name = "tokio"; packageId = "tokio"; - features = [ "io-std" "macros" "io-util" ]; + features = [ "macros" "test-util" ]; } ]; features = { - "vendored" = [ "native-tls/vendored" ]; + "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower" "dep:tower-service" ]; + "client-legacy" = [ "client" ]; + "full" = [ "client" "client-legacy" "server" "server-auto" "service" "http1" "http2" "tokio" ]; + "http1" = [ "hyper/http1" ]; + "http2" = [ "hyper/http2" ]; + "server" = [ "hyper/server" ]; + "server-auto" = [ "server" "http1" "http2" ]; + "service" = [ "dep:tower" "dep:tower-service" ]; + "tokio" = [ "dep:tokio" "dep:socket2" ]; }; + resolvedDefaultFeatures = [ "client" "client-legacy" "default" "http1" "http2" "server" "tokio" ]; }; "iana-time-zone" = rec { crateName = "iana-time-zone"; - version = "0.1.58"; + version = "0.1.60"; edition = "2018"; - sha256 = "081vcr8z8ddhl5r1ywif6grnswk01b2ac4nks2bhn8zzdimvh9l3"; + sha256 = "0hdid5xz3jznm04lysjm3vi93h3c523w0hcc3xba47jl3ddbpzz7"; authors = [ "Andrew Straw " "René Kijewski " @@ -3033,9 +3303,9 @@ rec { }; "indexmap" = rec { crateName = "indexmap"; - version = "2.1.0"; + version = "2.2.6"; edition = "2021"; - sha256 = "07rxrqmryr1xfnmhrjlz8ic6jw28v6h5cig3ws2c9d0wifhy2c6m"; + sha256 = "09hgwi2ig0wyj5rjziia76zmhgfj95k0jb4ic3iiawm4vlavg3qn"; dependencies = [ { name = "equivalent"; @@ -3051,6 +3321,7 @@ rec { ]; features = { "arbitrary" = [ "dep:arbitrary" ]; + "borsh" = [ "dep:borsh" ]; "default" = [ "std" ]; "quickcheck" = [ "dep:quickcheck" ]; "rayon" = [ "dep:rayon" ]; @@ -3061,9 +3332,9 @@ rec { }; "indoc" = rec { crateName = "indoc"; - version = "2.0.4"; + version = "2.0.5"; edition = "2021"; - sha256 = "1n2z66b0y59rr6v4znpcijc2yd3yg6s40hpzv89yb140mvxnq60y"; + sha256 = "1dgjk49rkmx4kjy07k4b90qb5vl89smgb5rcw02n0q0x9ligaj5j"; procMacro = true; authors = [ "David Tolnay " @@ -3137,9 +3408,9 @@ rec { }; "itoa" = rec { crateName = "itoa"; - version = "1.0.9"; + version = "1.0.11"; edition = "2018"; - sha256 = "0f6cpb4yqzhkrhhg6kqsw3wnmmhdnnffi6r2xzy248gzi2v0l5dg"; + sha256 = "0nv9cqjwzr3q58qz84dcz63ggc54yhf1yqar1m858m1kfd4g3wa9"; authors = [ "David Tolnay " ]; @@ -3173,9 +3444,9 @@ rec { }; "jobserver" = rec { crateName = "jobserver"; - version = "0.1.27"; - edition = "2018"; - sha256 = "0z9w6vfqwbr6hfk9yaw7kydlh6f7k39xdlszxlh39in4acwzcdwc"; + version = "0.1.31"; + edition = "2021"; + sha256 = "0vnyfxr5gm03j3lpnd1zswnyvqa40kbssy08pz2m35salfm9kc6j"; authors = [ "Alex Crichton " ]; @@ -3190,9 +3461,9 @@ rec { }; "js-sys" = rec { crateName = "js-sys"; - version = "0.3.66"; + version = "0.3.69"; edition = "2018"; - sha256 = "1ji9la5ydg0vy17q54i7dnwc0wwb9zkx662w1583pblylm6wdsff"; + sha256 = "0v99rz97asnzapb0jsc3jjhvxpfxr7h7qd97yqyrf9i7viimbh99"; authors = [ "The wasm-bindgen Developers" ]; @@ -3206,9 +3477,9 @@ rec { }; "json-patch" = rec { crateName = "json-patch"; - version = "1.2.0"; + version = "1.4.0"; edition = "2021"; - sha256 = "1ml90ygj65zd3g9mq0fpkkgr10mk138wm34z29j3z7krhqa1xzsm"; + sha256 = "02xk7bd4bg2j73zdpqn4573nn2bvzs6942iqiz5g6225cw6xd6pc"; authors = [ "Ivan Dubrov " ]; @@ -3226,12 +3497,6 @@ rec { name = "thiserror"; packageId = "thiserror"; } - { - name = "treediff"; - packageId = "treediff"; - optional = true; - features = [ "with-serde-json" ]; - } ]; devDependencies = [ { @@ -3242,59 +3507,67 @@ rec { ]; features = { "default" = [ "diff" ]; - "diff" = [ "treediff" ]; - "treediff" = [ "dep:treediff" ]; "utoipa" = [ "dep:utoipa" ]; }; - resolvedDefaultFeatures = [ "default" "diff" "treediff" ]; + resolvedDefaultFeatures = [ "default" "diff" ]; }; - "jsonpath_lib" = rec { - crateName = "jsonpath_lib"; - version = "0.3.0"; - edition = "2015"; - sha256 = "0kvp4fargixqlwjvpb3w6f1lvmiysnmj7an5h75wqc42ss8k39pa";type = [ "cdylib" "rlib" ]; + "jsonpath-rust" = rec { + crateName = "jsonpath-rust"; + version = "0.5.1"; + edition = "2018"; + sha256 = "0032bp43w6k1bl8h55m126cdf8xljj8p736f65gp3zvhpn2zxn0r"; authors = [ - "Changseok Han " + "BorisZhguchev " ]; dependencies = [ { - name = "log"; - packageId = "log"; + name = "lazy_static"; + packageId = "lazy_static"; } { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; + name = "once_cell"; + packageId = "once_cell"; + } + { + name = "pest"; + packageId = "pest"; + } + { + name = "pest_derive"; + packageId = "pest_derive"; + } + { + name = "regex"; + packageId = "regex"; } { name = "serde_json"; packageId = "serde_json"; - features = [ "preserve_order" ]; + } + { + name = "thiserror"; + packageId = "thiserror"; } ]; }; "k8s-openapi" = rec { crateName = "k8s-openapi"; - version = "0.20.0"; + version = "0.22.0"; edition = "2021"; - links = "k8s-openapi-0.20.0"; - sha256 = "19i30l9v9xss0b8bq7gssv3700jdd0jvp11gvf4pkjkas5pn1hzd"; + links = "k8s-openapi-0.22.0"; + sha256 = "0mcpy1gdxpqayc74i3x3ayh3q5bl6dzvsgmw91jq1r9sjkxill0r"; + libName = "k8s_openapi"; authors = [ "Arnav Singh " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; usesDefaultFeatures = false; features = [ "alloc" ]; } - { - name = "bytes"; - packageId = "bytes"; - usesDefaultFeatures = false; - } { name = "chrono"; packageId = "chrono"; @@ -3325,17 +3598,17 @@ rec { } ]; features = { - "earliest" = [ "v1_22" ]; - "latest" = [ "v1_28" ]; + "earliest" = [ "v1_24" ]; + "latest" = [ "v1_30" ]; "schemars" = [ "dep:schemars" ]; }; - resolvedDefaultFeatures = [ "schemars" "v1_28" ]; + resolvedDefaultFeatures = [ "schemars" "v1_30" ]; }; "kube" = rec { crateName = "kube"; - version = "0.87.1"; + version = "0.91.0"; edition = "2021"; - sha256 = "1hqg3mxiagbc65hp84bx9m9wd6k8x9nrmcymviq5051mm6p94hz3"; + sha256 = "1ykvydgqjnlvglhdw0yhc7p9cmkw73wy9iz44g7hzyzlxfkn2i16"; authors = [ "clux " "Natalie Klestrup Röijezon " @@ -3387,12 +3660,14 @@ rec { "kube-client" = [ "dep:kube-client" ]; "kube-derive" = [ "dep:kube-derive" ]; "kube-runtime" = [ "dep:kube-runtime" ]; + "kubelet-debug" = [ "kube-client/kubelet-debug" "kube-core/kubelet-debug" ]; "oauth" = [ "kube-client/oauth" ]; "oidc" = [ "kube-client/oidc" ]; "openssl-tls" = [ "kube-client/openssl-tls" ]; "runtime" = [ "kube-runtime" ]; "rustls-tls" = [ "kube-client/rustls-tls" ]; "socks5" = [ "kube-client/socks5" ]; + "unstable-client" = [ "kube-client/unstable-client" ]; "unstable-runtime" = [ "kube-runtime/unstable-runtime" ]; "ws" = [ "kube-client/ws" "kube-core/ws" ]; }; @@ -3400,9 +3675,9 @@ rec { }; "kube-client" = rec { crateName = "kube-client"; - version = "0.87.1"; + version = "0.91.0"; edition = "2021"; - sha256 = "14icr3y56r4qws9ip8rbzc9g6r3yd43df81608czmnb9ja5m8rkj"; + sha256 = "1sc51ahc47iscas7wdxi3ir2jqh28ixrql4hvx5yx63kqkb4l5j7"; authors = [ "clux " "Natalie Klestrup Röijezon " @@ -3411,7 +3686,7 @@ rec { dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; optional = true; } { @@ -3432,8 +3707,10 @@ rec { } { name = "futures"; - packageId = "futures 0.3.29"; + packageId = "futures 0.3.30"; optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; } { name = "home"; @@ -3449,16 +3726,23 @@ rec { packageId = "http-body"; optional = true; } + { + name = "http-body-util"; + packageId = "http-body-util"; + optional = true; + } { name = "hyper"; packageId = "hyper"; optional = true; - features = [ "client" "http1" "stream" "tcp" ]; + features = [ "client" "http1" ]; } { name = "hyper-rustls"; packageId = "hyper-rustls"; optional = true; + usesDefaultFeatures = false; + features = [ "http1" "logging" "native-tokio" "ring" "tls12" ]; } { name = "hyper-timeout"; @@ -3466,8 +3750,14 @@ rec { optional = true; } { - name = "jsonpath_lib"; - packageId = "jsonpath_lib"; + name = "hyper-util"; + packageId = "hyper-util"; + optional = true; + features = [ "client" "client-legacy" "http1" "tokio" ]; + } + { + name = "jsonpath-rust"; + packageId = "jsonpath-rust"; optional = true; } { @@ -3484,16 +3774,11 @@ rec { packageId = "pem"; optional = true; } - { - name = "pin-project"; - packageId = "pin-project"; - optional = true; - } { name = "rustls"; packageId = "rustls"; optional = true; - features = [ "dangerous_configuration" ]; + usesDefaultFeatures = false; } { name = "rustls-pemfile"; @@ -3555,6 +3840,12 @@ rec { } ]; devDependencies = [ + { + name = "futures"; + packageId = "futures 0.3.30"; + usesDefaultFeatures = false; + features = [ "async-await" ]; + } { name = "k8s-openapi"; packageId = "k8s-openapi"; @@ -3573,7 +3864,7 @@ rec { "base64" = [ "dep:base64" ]; "bytes" = [ "dep:bytes" ]; "chrono" = [ "dep:chrono" ]; - "client" = [ "config" "__non_core" "hyper" "http-body" "tower" "tower-http" "hyper-timeout" "pin-project" "chrono" "jsonpath_lib" "bytes" "futures" "tokio" "tokio-util" "either" ]; + "client" = [ "config" "__non_core" "hyper" "hyper-util" "http-body" "http-body-util" "tower" "tower-http" "hyper-timeout" "chrono" "jsonpath-rust" "bytes" "futures" "tokio" "tokio-util" "either" ]; "config" = [ "__non_core" "pem" "home" ]; "default" = [ "client" ]; "either" = [ "dep:either" ]; @@ -3582,19 +3873,21 @@ rec { "gzip" = [ "client" "tower-http/decompression-gzip" ]; "home" = [ "dep:home" ]; "http-body" = [ "dep:http-body" ]; + "http-body-util" = [ "dep:http-body-util" ]; "hyper" = [ "dep:hyper" ]; "hyper-openssl" = [ "dep:hyper-openssl" ]; "hyper-rustls" = [ "dep:hyper-rustls" ]; "hyper-socks2" = [ "dep:hyper-socks2" ]; "hyper-timeout" = [ "dep:hyper-timeout" ]; + "hyper-util" = [ "dep:hyper-util" ]; "jsonpatch" = [ "kube-core/jsonpatch" ]; - "jsonpath_lib" = [ "dep:jsonpath_lib" ]; + "jsonpath-rust" = [ "dep:jsonpath-rust" ]; + "kubelet-debug" = [ "ws" "kube-core/kubelet-debug" ]; "oauth" = [ "client" "tame-oauth" ]; "oidc" = [ "client" "form_urlencoded" ]; "openssl" = [ "dep:openssl" ]; "openssl-tls" = [ "openssl" "hyper-openssl" ]; "pem" = [ "dep:pem" ]; - "pin-project" = [ "dep:pin-project" ]; "rand" = [ "dep:rand" ]; "rustls" = [ "dep:rustls" ]; "rustls-pemfile" = [ "dep:rustls-pemfile" ]; @@ -3610,15 +3903,16 @@ rec { "tracing" = [ "dep:tracing" ]; "ws" = [ "client" "tokio-tungstenite" "rand" "kube-core/ws" "tokio/macros" ]; }; - resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "hyper" "hyper-rustls" "hyper-timeout" "jsonpatch" "jsonpath_lib" "pem" "pin-project" "rustls" "rustls-pemfile" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ]; + resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "http-body-util" "hyper" "hyper-rustls" "hyper-timeout" "hyper-util" "jsonpatch" "jsonpath-rust" "pem" "rustls" "rustls-pemfile" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ]; }; "kube-core" = rec { crateName = "kube-core"; - version = "0.87.1"; + version = "0.91.0"; edition = "2021"; - sha256 = "1c970994r4wxj17ll4gzz6w5m42bp02gccvbxxcrzdcnbcqiqcmq"; + sha256 = "0kzd0lamx9aymy0j6ddmpfn6saicw4vrbk99451jb213982d75r7"; authors = [ "clux " + "Natalie Klestrup Röijezon " "kazk " ]; dependencies = [ @@ -3626,7 +3920,7 @@ rec { name = "chrono"; packageId = "chrono"; usesDefaultFeatures = false; - features = [ "clock" ]; + features = [ "now" ]; } { name = "form_urlencoded"; @@ -3646,10 +3940,6 @@ rec { packageId = "k8s-openapi"; usesDefaultFeatures = false; } - { - name = "once_cell"; - packageId = "once_cell"; - } { name = "schemars"; packageId = "schemars"; @@ -3681,6 +3971,7 @@ rec { "admission" = [ "json-patch" ]; "json-patch" = [ "dep:json-patch" ]; "jsonpatch" = [ "json-patch" ]; + "kubelet-debug" = [ "ws" ]; "schema" = [ "schemars" ]; "schemars" = [ "dep:schemars" ]; }; @@ -3688,12 +3979,13 @@ rec { }; "kube-derive" = rec { crateName = "kube-derive"; - version = "0.87.1"; + version = "0.91.0"; edition = "2021"; - sha256 = "08clnj7hyw2izj1z4fbaaidk1h8c07nsrzf02ba2khvzyghr2ifm"; + sha256 = "0h9g2vm56mz5m6rj59xgq5bqmmc0z8bxpkd3x62qyiqcmbnkgy7w"; procMacro = true; authors = [ "clux " + "Natalie Klestrup Röijezon " "kazk " ]; dependencies = [ @@ -3715,7 +4007,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "extra-traits" ]; } ]; @@ -3723,18 +4015,27 @@ rec { }; "kube-runtime" = rec { crateName = "kube-runtime"; - version = "0.87.1"; + version = "0.91.0"; edition = "2021"; - sha256 = "1fm8f2iigswag80a5damyf6q2pakgqcminvhdszx9nb8lg0y44g5"; + sha256 = "0vnwdskcrrjrnr1dva44s09vzlak6606idb9aidcc8mj3ydfhqz4"; authors = [ - "Natalie Klestrup Röijezon " "clux " + "Natalie Klestrup Röijezon " + "kazk " ]; dependencies = [ { name = "ahash"; packageId = "ahash"; } + { + name = "async-broadcast"; + packageId = "async-broadcast"; + } + { + name = "async-stream"; + packageId = "async-stream"; + } { name = "async-trait"; packageId = "async-trait"; @@ -3749,7 +4050,8 @@ rec { } { name = "futures"; - packageId = "futures 0.3.29"; + packageId = "futures 0.3.30"; + usesDefaultFeatures = false; } { name = "hashbrown"; @@ -3845,9 +4147,9 @@ rec { }; "libc" = rec { crateName = "libc"; - version = "0.2.150"; + version = "0.2.154"; edition = "2015"; - sha256 = "0g10n8c830alndgjb8xk1i9kz5z727np90z1z81119pr8d3jmnc9"; + sha256 = "0inkwrnwzrr1kw75x944ihdajrhhldkgg4irx1n19y9gp4w36x5f"; authors = [ "The Rust Project Developers" ]; @@ -3861,10 +4163,10 @@ rec { }; "libgit2-sys" = rec { crateName = "libgit2-sys"; - version = "0.15.2+1.6.4"; + version = "0.16.2+1.7.2"; edition = "2018"; links = "git2"; - sha256 = "1yllyq9wiryy257cfx8s7wadls24yzkxnhmbl95iz9ml3zhz43d8"; + sha256 = "1s149nkximw3n42925rp0jax1sf1zmf8gpcim2g9sp7fnkc2chgf"; libName = "libgit2_sys"; libPath = "lib.rs"; authors = [ @@ -3905,10 +4207,10 @@ rec { }; "libz-sys" = rec { crateName = "libz-sys"; - version = "1.1.12"; + version = "1.1.16"; edition = "2018"; links = "z"; - sha256 = "0yqahz2m5g44mpgfdy0k53hpfkfs5rfiv3a1y7p766ijbsr3fwfr"; + sha256 = "1yd7mnw0h469rbsxfbb0r6czc4q8fabn9jkbiz99a9kbcrg3n52y"; authors = [ "Alex Crichton " "Josh Triplett " @@ -3945,9 +4247,9 @@ rec { }; "linux-raw-sys" = rec { crateName = "linux-raw-sys"; - version = "0.4.12"; + version = "0.4.13"; edition = "2021"; - sha256 = "0mhlla3gk1jgn6mrq9s255rvvq8a1w3yk2vpjiwsd6hmmy1imkf4"; + sha256 = "172k2c6422gsc914ig8rh99mb9yc7siw6ikc3d9xw1k7vx0s3k81"; authors = [ "Dan Gohman " ]; @@ -3961,9 +4263,9 @@ rec { }; "lock_api" = rec { crateName = "lock_api"; - version = "0.4.11"; - edition = "2018"; - sha256 = "0iggx0h4jx63xm35861106af3jkxq06fpqhpkhgw0axi2n38y5iw"; + version = "0.4.12"; + edition = "2021"; + sha256 = "05qvxa6g27yyva25a5ghsg85apdxkvr77yhkyhapj6r8vnf8pbq7"; authors = [ "Amanieu d'Antras " ]; @@ -3989,17 +4291,20 @@ rec { }; "log" = rec { crateName = "log"; - version = "0.4.20"; - edition = "2015"; - sha256 = "13rf7wphnwd61vazpxr7fiycin6cb1g8fmvgqg18i464p0y1drmm"; + version = "0.4.21"; + edition = "2021"; + sha256 = "074hldq1q8rlzq2s2qa8f25hj4s3gpw71w64vdwzjd01a4g8rvch"; authors = [ "The Rust Project Developers" ]; features = { - "kv_unstable" = [ "value-bag" ]; - "kv_unstable_serde" = [ "kv_unstable_std" "value-bag/serde" "serde" ]; - "kv_unstable_std" = [ "std" "kv_unstable" "value-bag/error" ]; - "kv_unstable_sval" = [ "kv_unstable" "value-bag/sval" "sval" "sval_ref" ]; + "kv_serde" = [ "kv_std" "value-bag/serde" "serde" ]; + "kv_std" = [ "std" "kv" "value-bag/error" ]; + "kv_sval" = [ "kv" "value-bag/sval" "sval" "sval_ref" ]; + "kv_unstable" = [ "kv" "value-bag" ]; + "kv_unstable_serde" = [ "kv_serde" "kv_unstable_std" ]; + "kv_unstable_std" = [ "kv_std" "kv_unstable" ]; + "kv_unstable_sval" = [ "kv_sval" "kv_unstable" ]; "serde" = [ "dep:serde" ]; "sval" = [ "dep:sval" ]; "sval_ref" = [ "dep:sval_ref" ]; @@ -4007,23 +4312,6 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "mach2" = rec { - crateName = "mach2"; - version = "0.4.1"; - edition = "2015"; - sha256 = "1s5dbscwk0w6czzvhxp9ix9c2djv4fpnj4za9byaclfiphq1h3bd"; - dependencies = [ - { - name = "libc"; - packageId = "libc"; - usesDefaultFeatures = false; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); - } - ]; - features = { - }; - resolvedDefaultFeatures = [ "default" ]; - }; "matchers" = rec { crateName = "matchers"; version = "0.1.0"; @@ -4054,9 +4342,9 @@ rec { }; "memchr" = rec { crateName = "memchr"; - version = "2.6.4"; + version = "2.7.2"; edition = "2021"; - sha256 = "0rq1ka8790ns41j147npvxcqcl2anxyngsdimy85ag2api0fwrgn"; + sha256 = "07bcqxb0vx4ji0648ny5xsicjnpma95x1n07v7mi7jrhsz2l11kc"; authors = [ "Andrew Gallant " "bluss" @@ -4072,24 +4360,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; - "memoffset" = rec { - crateName = "memoffset"; - version = "0.9.0"; - edition = "2015"; - sha256 = "0v20ihhdzkfw1jx00a7zjpk2dcp5qjq6lz302nyqamd9c4f4nqss"; - authors = [ - "Gilad Naaman " - ]; - buildDependencies = [ - { - name = "autocfg"; - packageId = "autocfg"; - } - ]; - features = { - }; - resolvedDefaultFeatures = [ "default" ]; - }; "mime" = rec { crateName = "mime"; version = "0.3.17"; @@ -4102,9 +4372,9 @@ rec { }; "miniz_oxide" = rec { crateName = "miniz_oxide"; - version = "0.7.1"; + version = "0.7.2"; edition = "2018"; - sha256 = "1ivl3rbbdm53bzscrd01g60l46lz5krl270487d8lhjvwl5hx0g7"; + sha256 = "19qlxb21s6kabgqq61mk7kd1qk2invyygj076jz6i1gj2lz1z0cx"; authors = [ "Frommi " "oyvindln " @@ -4128,9 +4398,9 @@ rec { }; "mio" = rec { crateName = "mio"; - version = "0.8.9"; + version = "0.8.11"; edition = "2018"; - sha256 = "1l23hg513c23nhcdzvk25caaj28mic6qgqadbn8axgj6bqf2ikix"; + sha256 = "034byyl0ardml5yliy1hmvx8arkmn9rv479pid794sm07ia519m4"; authors = [ "Carl Lerche " "Thomas de Zeeuw " @@ -4168,9 +4438,9 @@ rec { }; "moka" = rec { crateName = "moka"; - version = "0.12.1"; - edition = "2018"; - sha256 = "12xdj0sg3sps42a13wy0fi51c0ac0hmy3h3sxx67vzlgak1pw0fq"; + version = "0.12.7"; + edition = "2021"; + sha256 = "020x0816cr4415xhiphvg1cdrw7a4sdjds0dni1xfqf5dml8h3cy"; dependencies = [ { name = "async-lock"; @@ -4194,6 +4464,11 @@ rec { name = "crossbeam-utils"; packageId = "crossbeam-utils"; } + { + name = "event-listener"; + packageId = "event-listener 5.3.0"; + optional = true; + } { name = "futures-util"; packageId = "futures-util"; @@ -4241,23 +4516,13 @@ rec { packageId = "rustc_version"; target = {target, features}: (target."rustver" or false); } - { - name = "skeptic"; - packageId = "skeptic"; - target = {target, features}: (target."skeptic" or false); - } - ]; - devDependencies = [ - { - name = "skeptic"; - packageId = "skeptic"; - } ]; features = { "async-lock" = [ "dep:async-lock" ]; "async-trait" = [ "dep:async-trait" ]; "default" = [ "atomic64" "quanta" ]; - "future" = [ "async-lock" "async-trait" "futures-util" ]; + "event-listener" = [ "dep:event-listener" ]; + "future" = [ "async-lock" "async-trait" "event-listener" "futures-util" ]; "futures-util" = [ "dep:futures-util" ]; "js" = [ "uuid/js" ]; "log" = [ "dep:log" ]; @@ -4265,7 +4530,7 @@ rec { "quanta" = [ "dep:quanta" ]; "unstable-debug-counters" = [ "future" ]; }; - resolvedDefaultFeatures = [ "async-lock" "async-trait" "atomic64" "default" "future" "futures-util" "quanta" ]; + resolvedDefaultFeatures = [ "async-lock" "async-trait" "atomic64" "default" "event-listener" "future" "futures-util" "quanta" ]; }; "native-tls" = rec { crateName = "native-tls"; @@ -4368,9 +4633,9 @@ rec { }; "num-traits" = rec { crateName = "num-traits"; - version = "0.2.17"; - edition = "2018"; - sha256 = "0z16bi5zwgfysz6765v3rd6whfbjpihx3mhsn4dg8dzj2c221qrr"; + version = "0.2.19"; + edition = "2021"; + sha256 = "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787"; authors = [ "The Rust Project Developers" ]; @@ -4410,9 +4675,9 @@ rec { }; "object" = rec { crateName = "object"; - version = "0.32.1"; + version = "0.32.2"; edition = "2018"; - sha256 = "1c02x4kvqpnl3wn7gz9idm4jrbirbycyqjgiw6lm1g9k77fzkxcw"; + sha256 = "0hc4cjwyngiy6k51hlzrlsxgv5z25vv7c2cp0ky1lckfic0259m6"; dependencies = [ { name = "memchr"; @@ -4438,38 +4703,39 @@ rec { "write_core" = [ "dep:crc32fast" "dep:indexmap" "dep:hashbrown" ]; "write_std" = [ "write_core" "std" "indexmap?/std" "crc32fast?/std" ]; }; - resolvedDefaultFeatures = [ "archive" "coff" "elf" "macho" "pe" "read_core" "unaligned" ]; + resolvedDefaultFeatures = [ "archive" "coff" "elf" "macho" "pe" "read_core" "unaligned" "xcoff" ]; }; "once_cell" = rec { crateName = "once_cell"; - version = "1.18.0"; + version = "1.19.0"; edition = "2021"; - sha256 = "0vapcd5ambwck95wyz3ymlim35jirgnqn9a0qmi19msymv95v2yx"; + sha256 = "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz"; authors = [ "Aleksey Kladov " ]; features = { "alloc" = [ "race" ]; "atomic-polyfill" = [ "critical-section" ]; - "critical-section" = [ "dep:critical-section" "dep:atomic-polyfill" ]; + "critical-section" = [ "dep:critical-section" "portable-atomic" ]; "default" = [ "std" ]; "parking_lot" = [ "dep:parking_lot_core" ]; + "portable-atomic" = [ "dep:portable-atomic" ]; "std" = [ "alloc" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "race" "std" "unstable" ]; + resolvedDefaultFeatures = [ "alloc" "default" "race" "std" ]; }; "openssl" = rec { crateName = "openssl"; - version = "0.10.61"; + version = "0.10.64"; edition = "2018"; - sha256 = "0idv3n9n9f2sxq8cqzxvq44633vg5sx4n9q1p3g6dn66ikf1k13b"; + sha256 = "07vb455yh08qh3n493ssw1qsa3zg3zfj438kk2180453hq94i84m"; authors = [ "Steven Fackler " ]; dependencies = [ { name = "bitflags"; - packageId = "bitflags 2.4.1"; + packageId = "bitflags 2.5.0"; } { name = "cfg-if"; @@ -4521,7 +4787,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -4539,10 +4805,10 @@ rec { }; "openssl-sys" = rec { crateName = "openssl-sys"; - version = "0.9.97"; + version = "0.9.102"; edition = "2018"; links = "openssl"; - sha256 = "02s670ir38fsavphdna07144y41dkvrcfkwnjzg82zfrrlsavsn3"; + sha256 = "18jzni7xzdcqwf9r8kp6j46abrxqn82dvc2ylf9kij7varyn75y5"; build = "build/main.rs"; authors = [ "Alex Crichton " @@ -4578,9 +4844,9 @@ rec { }; "opentelemetry" = rec { crateName = "opentelemetry"; - version = "0.21.0"; + version = "0.22.0"; edition = "2021"; - sha256 = "12jfmyx8k9q2sjlx4wp76ddzaf94i7lnkliv1c9mj164bnd36chy"; + sha256 = "1gv70rx8172g9n82v9f97ircax7v4ydzyprq1nvsxwp3gfc5f3ch"; dependencies = [ { name = "futures-core"; @@ -4590,10 +4856,6 @@ rec { name = "futures-sink"; packageId = "futures-sink"; } - { - name = "indexmap"; - packageId = "indexmap"; - } { name = "js-sys"; packageId = "js-sys"; @@ -4611,6 +4873,7 @@ rec { { name = "thiserror"; packageId = "thiserror"; + usesDefaultFeatures = false; } { name = "urlencoding"; @@ -4628,9 +4891,9 @@ rec { }; "opentelemetry-jaeger" = rec { crateName = "opentelemetry-jaeger"; - version = "0.20.0"; + version = "0.21.0"; edition = "2021"; - sha256 = "18gq28byn3x1lfqmji2x29dhk4vkr3yk4sfnpc6hxr48smpwc5z6"; + sha256 = "0xwjs7vnv92hghy9hsrx4aa5knysvjvknvrc73l6ls976kqmwzzv"; dependencies = [ { name = "async-trait"; @@ -4670,6 +4933,7 @@ rec { name = "tokio"; packageId = "tokio"; optional = true; + usesDefaultFeatures = false; features = [ "net" "sync" ]; } ]; @@ -4677,6 +4941,7 @@ rec { { name = "tokio"; packageId = "tokio"; + usesDefaultFeatures = false; features = [ "net" "sync" ]; } ]; @@ -4684,7 +4949,7 @@ rec { "async-std" = [ "dep:async-std" ]; "base64" = [ "dep:base64" ]; "collector_client" = [ "http" "opentelemetry-http" ]; - "full" = [ "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "isahc_collector_client" "reqwest_collector_client" "reqwest_blocking_collector_client" "reqwest_rustls_collector_client" "surf_collector_client" "wasm_collector_client" "rt-tokio" "rt-tokio-current-thread" "rt-async-std" "integration_test" ]; + "full" = [ "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "isahc_collector_client" "reqwest_collector_client" "reqwest_blocking_collector_client" "reqwest_rustls_collector_client" "wasm_collector_client" "rt-tokio" "rt-tokio-current-thread" "rt-async-std" "integration_test" ]; "futures-executor" = [ "dep:futures-executor" ]; "headers" = [ "dep:headers" ]; "http" = [ "dep:http" ]; @@ -4692,7 +4957,7 @@ rec { "hyper-tls" = [ "dep:hyper-tls" ]; "hyper_collector_client" = [ "collector_client" "headers" "http" "hyper" "opentelemetry-http/tokio" "opentelemetry-http/hyper" ]; "hyper_tls_collector_client" = [ "hyper_collector_client" "hyper-tls" ]; - "integration_test" = [ "tonic" "prost" "prost-types" "rt-tokio" "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "reqwest_collector_client" "surf_collector_client" "isahc_collector_client" ]; + "integration_test" = [ "tonic" "prost" "prost-types" "rt-tokio" "collector_client" "hyper_collector_client" "hyper_tls_collector_client" "reqwest_collector_client" "isahc_collector_client" ]; "isahc" = [ "dep:isahc" ]; "isahc_collector_client" = [ "isahc" "opentelemetry-http/isahc" ]; "js-sys" = [ "dep:js-sys" ]; @@ -4707,8 +4972,6 @@ rec { "rt-async-std" = [ "async-std" "opentelemetry_sdk/rt-async-std" ]; "rt-tokio" = [ "tokio" "opentelemetry_sdk/rt-tokio" ]; "rt-tokio-current-thread" = [ "tokio" "opentelemetry_sdk/rt-tokio-current-thread" ]; - "surf" = [ "dep:surf" ]; - "surf_collector_client" = [ "surf" "collector_client" "opentelemetry-http/surf" ]; "tokio" = [ "dep:tokio" ]; "tonic" = [ "dep:tonic" ]; "wasm-bindgen" = [ "dep:wasm-bindgen" ]; @@ -4720,23 +4983,16 @@ rec { }; "opentelemetry-semantic-conventions" = rec { crateName = "opentelemetry-semantic-conventions"; - version = "0.13.0"; + version = "0.14.0"; edition = "2021"; - sha256 = "115wbgk840dklyhpg3lwp4x1m643qd7f0vkz8hmfz0pry4g4yxzm"; - dependencies = [ - { - name = "opentelemetry"; - packageId = "opentelemetry"; - usesDefaultFeatures = false; - } - ]; + sha256 = "04197racbkpj75fh9jnwkdznjzv6l2ljpbr8ryfk9f9gqkb5pazr"; }; "opentelemetry_sdk" = rec { crateName = "opentelemetry_sdk"; - version = "0.21.1"; + version = "0.22.1"; edition = "2021"; - sha256 = "1rbxgcxwmxg5ijf7i1xfcg0z5xqyg5ng9r7mhx8hxs83rbra72wn"; + sha256 = "0zkbkl29qik7cfmwbhr2ncink8fp9vi5x2qgk8gf6jg67c8wg44y"; dependencies = [ { name = "async-trait"; @@ -4789,11 +5045,12 @@ rec { packageId = "rand"; optional = true; usesDefaultFeatures = false; - features = [ "std" "std_rng" ]; + features = [ "std" "std_rng" "small_rng" ]; } { name = "thiserror"; packageId = "thiserror"; + usesDefaultFeatures = false; } { name = "tokio"; @@ -4910,11 +5167,24 @@ rec { ]; }; + "parking" = rec { + crateName = "parking"; + version = "2.2.0"; + edition = "2018"; + sha256 = "1blwbkq6im1hfxp5wlbr475mw98rsyc0bbr2d5n16m38z253p0dv"; + authors = [ + "Stjepan Glavina " + "The Rust Project Developers" + ]; + features = { + "loom" = [ "dep:loom" ]; + }; + }; "parking_lot" = rec { crateName = "parking_lot"; - version = "0.12.1"; - edition = "2018"; - sha256 = "13r2xk7mnxfc5g0g6dkdxqdqad99j7s7z8zhzz4npw5r0g0v4hip"; + version = "0.12.2"; + edition = "2021"; + sha256 = "1ys2dzz6cysjmwyivwxczl1ljpcf5cj4qmhdj07d5bkc9z5g0jky"; authors = [ "Amanieu d'Antras " ]; @@ -4939,9 +5209,9 @@ rec { }; "parking_lot_core" = rec { crateName = "parking_lot_core"; - version = "0.9.9"; - edition = "2018"; - sha256 = "13h0imw1aq86wj28gxkblhkzx6z1gk8q18n0v76qmmj6cliajhjc"; + version = "0.9.10"; + edition = "2021"; + sha256 = "1y3cf9ld9ijf7i4igwzffcn0xl16dxyn4c5bwgjck1dkgabiyh0y"; authors = [ "Amanieu d'Antras " ]; @@ -4966,7 +5236,7 @@ rec { } { name = "windows-targets"; - packageId = "windows-targets 0.48.5"; + packageId = "windows-targets 0.52.5"; target = { target, features }: (target."windows" or false); } ]; @@ -4979,16 +5249,16 @@ rec { }; "pem" = rec { crateName = "pem"; - version = "3.0.2"; + version = "3.0.4"; edition = "2021"; - sha256 = "08sr305rhn9svnw7bvr65p95rfn9xv3z4md0a7b54fvw5f8x4qri"; + sha256 = "1blgcn17wc41yxdzrxlsir5m6ds8r13ijmpsqda6lwwhwmjr6icf"; authors = [ "Jonathan Creekmore " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; usesDefaultFeatures = false; features = [ "alloc" ]; } @@ -5022,9 +5292,9 @@ rec { }; "pest" = rec { crateName = "pest"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "1xgzh2sl4amycl4c20r68br20ypr583lhs6wi65vwi55almfx75f"; + sha256 = "1s4fvis7h6l872g6nk17r130kcllj4c0hjvwkzd3hi196g3320an"; authors = [ "Dragoș Tiselice " ]; @@ -5055,9 +5325,9 @@ rec { }; "pest_derive" = rec { crateName = "pest_derive"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "1hnzw8bcv4baf8z4dcfradi07fyakyyay75xnfiz4pjzd0j8bmw1"; + sha256 = "0n8lsk9s21dp7958p9yarbk2gsc8wg0rvdzr7cd7pjpvjf8kqa96"; procMacro = true; authors = [ "Dragoș Tiselice " @@ -5084,9 +5354,9 @@ rec { }; "pest_generator" = rec { crateName = "pest_generator"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "09y2w0l8m92ys75im8znksq2h7mir1hxqpdfdlsva60iww315gb8"; + sha256 = "11s6q0vf25lckbzak0qndzpv87ksaxy6pa9cvn2hlizvsgvjmhiy"; authors = [ "Dragoș Tiselice " ]; @@ -5110,7 +5380,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; } ]; features = { @@ -5123,9 +5393,9 @@ rec { }; "pest_meta" = rec { crateName = "pest_meta"; - version = "2.7.5"; + version = "2.7.10"; edition = "2021"; - sha256 = "1rlx167d2j2mgq5kjj4nxzkzz6m3h8g8yyf8p554m7mdsj8p2x3w"; + sha256 = "1kdxl164yyjsmn01lvllsll4sz3xbgy4dmkq33n63hrp5w1418np"; authors = [ "Dragoș Tiselice " ]; @@ -5153,9 +5423,9 @@ rec { }; "pin-project" = rec { crateName = "pin-project"; - version = "1.1.3"; + version = "1.1.5"; edition = "2021"; - sha256 = "08k4cpy8q3j93qqgnrbzkcgpn7g0a88l4a9nm33kyghpdhffv97x"; + sha256 = "1cxl146x0q7lawp0m1826wsgj8mmmfs6ja8q7m6f7ff5j6vl7gxn"; dependencies = [ { name = "pin-project-internal"; @@ -5166,9 +5436,9 @@ rec { }; "pin-project-internal" = rec { crateName = "pin-project-internal"; - version = "1.1.3"; + version = "1.1.5"; edition = "2021"; - sha256 = "01a4l3vb84brv9v7wl71chzxra2kynm6yvcjca66xv3ij6fgsna3"; + sha256 = "0r9r4ivwiyqf45sv6b30l1dx282lxaax2f6gl84jwa3q590s8f1g"; procMacro = true; dependencies = [ { @@ -5181,7 +5451,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" "visit-mut" ]; } ]; @@ -5189,9 +5459,9 @@ rec { }; "pin-project-lite" = rec { crateName = "pin-project-lite"; - version = "0.2.13"; + version = "0.2.14"; edition = "2018"; - sha256 = "0n0bwr5qxlf0mhn2xkl36sy55118s9qmvx2yl5f3ixkb007lbywa"; + sha256 = "00nx3f04agwjlsmd3mc5rx5haibj2v8q9b52b0kwn63wcv4nz9mx"; }; "pin-utils" = rec { @@ -5206,9 +5476,9 @@ rec { }; "pkg-config" = rec { crateName = "pkg-config"; - version = "0.3.27"; + version = "0.3.30"; edition = "2015"; - sha256 = "0r39ryh1magcq4cz5g9x88jllsnxnhcqr753islvyk4jp9h2h1r6"; + sha256 = "1v07557dj1sa0aly9c90wsygc0i8xv5vnmyv0g94lpkvj8qb4cfj"; authors = [ "Alex Crichton " ]; @@ -5229,9 +5499,10 @@ rec { }; "proc-macro2" = rec { crateName = "proc-macro2"; - version = "1.0.70"; + version = "1.0.82"; edition = "2021"; - sha256 = "0fzxg3dkrjy101vv5b6llc8mh74xz1vhhsaiwrn68kzvynxqy9rr"; + sha256 = "06qk88hbf6wg4v1i961zibhjz512873jwkz3myx1z82ip6dd9lwa"; + libName = "proc_macro2"; authors = [ "David Tolnay " "Alex Crichton " @@ -5301,41 +5572,11 @@ rec { ]; }; - "pulldown-cmark" = rec { - crateName = "pulldown-cmark"; - version = "0.9.3"; - edition = "2021"; - crateBin = []; - sha256 = "166rhmwk42ffirrzhv7lmsh9f3my6xv1ggmb66fgzv57y3qs58bp"; - authors = [ - "Raph Levien " - "Marcus Klaas de Vries " - ]; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags 1.3.2"; - } - { - name = "memchr"; - packageId = "memchr"; - } - { - name = "unicase"; - packageId = "unicase"; - } - ]; - features = { - "default" = [ "getopts" ]; - "getopts" = [ "dep:getopts" ]; - "serde" = [ "dep:serde" ]; - }; - }; "quanta" = rec { crateName = "quanta"; - version = "0.11.1"; + version = "0.12.3"; edition = "2021"; - sha256 = "1axrw0nqc90bq671w05jd9460pmwg86c4r132mjsi4c2g8m6czm1"; + sha256 = "19cds3yg3ri0wrypn7b3j2x8qf1w9rkw5yl4nah2i4k1fyj6flcf"; authors = [ "Toby Lawrence " ]; @@ -5347,17 +5588,7 @@ rec { { name = "libc"; packageId = "libc"; - target = { target, features }: (!(("macos" == target."os" or null) || ("ios" == target."os" or null) || ("windows" == target."os" or null) || ("wasm32" == target."arch" or null))); - } - { - name = "mach2"; - packageId = "mach2"; - target = { target, features }: ("ios" == target."os" or null); - } - { - name = "mach2"; - packageId = "mach2"; - target = { target, features }: ("macos" == target."os" or null); + target = { target, features }: (!(("windows" == target."os" or null) || ("wasm32" == target."arch" or null))); } { name = "once_cell"; @@ -5400,9 +5631,9 @@ rec { }; "quote" = rec { crateName = "quote"; - version = "1.0.33"; + version = "1.0.36"; edition = "2018"; - sha256 = "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj"; + sha256 = "19xcmh445bg6simirnnd4fvkmp6v2qiwxh5f6rw4a70h76pnm9qg"; authors = [ "David Tolnay " ]; @@ -5461,7 +5692,7 @@ rec { "std" = [ "rand_core/std" "rand_chacha/std" "alloc" "getrandom" "libc" ]; "std_rng" = [ "rand_chacha" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "std" "std_rng" ]; + resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "small_rng" "std" "std_rng" ]; }; "rand_chacha" = rec { crateName = "rand_chacha"; @@ -5519,17 +5750,17 @@ rec { }; "raw-cpuid" = rec { crateName = "raw-cpuid"; - version = "10.7.0"; + version = "11.0.2"; edition = "2018"; crateBin = []; - sha256 = "0ckkg47m8wbdinqg4z4dx7ipi3d7fjxdnrwzikx70x46rdwpcabc"; + sha256 = "1k8ys0658ssmfya1ws98w7kiqqwdblfgjfn74i7l03i9n75k1672"; authors = [ "Gerd Zellweger " ]; dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags 2.5.0"; } ]; features = { @@ -5545,9 +5776,9 @@ rec { }; "redox_syscall" = rec { crateName = "redox_syscall"; - version = "0.4.1"; + version = "0.5.1"; edition = "2018"; - sha256 = "1aiifyz5dnybfvkk4cdab9p2kmphag1yad6iknc7aszlxxldf8j7"; + sha256 = "0zja6y3av9z50gg1hh0vsc053941wng21r43whhk8mfb9n4m5426"; libName = "syscall"; authors = [ "Jeremy Soller " @@ -5555,7 +5786,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags 2.5.0"; } ]; features = { @@ -5565,9 +5796,9 @@ rec { }; "regex" = rec { crateName = "regex"; - version = "1.10.2"; + version = "1.10.4"; edition = "2021"; - sha256 = "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq"; + sha256 = "0k5sb0h2mkwf51ab0gvv3x38jp1q7wgxf63abfbhi0wwvvgxn5y1"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -5577,21 +5808,23 @@ rec { name = "aho-corasick"; packageId = "aho-corasick"; optional = true; + usesDefaultFeatures = false; } { name = "memchr"; packageId = "memchr"; optional = true; + usesDefaultFeatures = false; } { name = "regex-automata"; - packageId = "regex-automata 0.4.3"; + packageId = "regex-automata 0.4.6"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa-pikevm" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.2"; + packageId = "regex-syntax 0.8.3"; usesDefaultFeatures = false; } ]; @@ -5643,11 +5876,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ]; }; - "regex-automata 0.4.3" = rec { + "regex-automata 0.4.6" = rec { crateName = "regex-automata"; - version = "0.4.3"; + version = "0.4.6"; edition = "2021"; - sha256 = "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z"; + sha256 = "1spaq7y4im7s56d1gxa2hi4hzf6dwswb1bv8xyavzya7k25kpf46"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -5667,7 +5900,7 @@ rec { } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.2"; + packageId = "regex-syntax 0.8.3"; optional = true; usesDefaultFeatures = false; } @@ -5717,11 +5950,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; }; - "regex-syntax 0.8.2" = rec { + "regex-syntax 0.8.3" = rec { crateName = "regex-syntax"; - version = "0.8.2"; + version = "0.8.3"; edition = "2021"; - sha256 = "17rd2s8xbiyf6lb4aj2nfi44zqlj98g2ays8zzj2vfs743k79360"; + sha256 = "0mhzkm1pkqg6y53xv056qciazlg47pq0czqs94cn302ckvi49bdd"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -5735,16 +5968,16 @@ rec { }; "reqwest" = rec { crateName = "reqwest"; - version = "0.11.22"; - edition = "2018"; - sha256 = "0nx9mczsf11pcjicfpwad0l8drf2nn72dbpcvp42lv644s4djv04"; + version = "0.12.4"; + edition = "2021"; + sha256 = "047aa0qnngnlnf9i0abrs6pgmz15vk81p5pvscwhk3l6jbfsyv2n"; authors = [ "Sean McArthur " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; } { name = "bytes"; @@ -5753,6 +5986,7 @@ rec { { name = "encoding_rs"; packageId = "encoding_rs"; + optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } { @@ -5768,6 +6002,7 @@ rec { { name = "h2"; packageId = "h2"; + optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } { @@ -5779,12 +6014,16 @@ rec { packageId = "http-body"; target = { target, features }: (!("wasm32" == target."arch" or null)); } + { + name = "http-body-util"; + packageId = "http-body-util"; + target = { target, features }: (!("wasm32" == target."arch" or null)); + } { name = "hyper"; packageId = "hyper"; - usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); - features = [ "tcp" "http1" "http2" "client" "runtime" ]; + features = [ "http1" "client" ]; } { name = "hyper-tls"; @@ -5792,6 +6031,12 @@ rec { optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } + { + name = "hyper-util"; + packageId = "hyper-util"; + target = { target, features }: (!("wasm32" == target."arch" or null)); + features = [ "http1" "client" "client-legacy" "tokio" ]; + } { name = "ipnet"; packageId = "ipnet"; @@ -5834,6 +6079,12 @@ rec { packageId = "pin-project-lite"; target = { target, features }: (!("wasm32" == target."arch" or null)); } + { + name = "rustls-pemfile"; + packageId = "rustls-pemfile"; + optional = true; + target = { target, features }: (!("wasm32" == target."arch" or null)); + } { name = "serde"; packageId = "serde"; @@ -5852,9 +6103,14 @@ rec { name = "serde_urlencoded"; packageId = "serde_urlencoded"; } + { + name = "sync_wrapper"; + packageId = "sync_wrapper 0.1.2"; + } { name = "system-configuration"; packageId = "system-configuration"; + optional = true; target = { target, features }: ("macos" == target."os" or null); } { @@ -5901,12 +6157,25 @@ rec { } ]; devDependencies = [ + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + target = {target, features}: (!("wasm32" == target."arch" or null)); + features = [ "std" "alloc" ]; + } { name = "hyper"; packageId = "hyper"; usesDefaultFeatures = false; target = {target, features}: (!("wasm32" == target."arch" or null)); - features = [ "tcp" "stream" "http1" "http2" "client" "server" "runtime" ]; + features = [ "http1" "http2" "client" "server" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + target = {target, features}: (!("wasm32" == target."arch" or null)); + features = [ "http1" "http2" "client" "client-legacy" "server-auto" "tokio" ]; } { name = "serde"; @@ -5929,62 +6198,55 @@ rec { } ]; features = { - "__rustls" = [ "hyper-rustls" "tokio-rustls" "rustls" "__tls" "rustls-pemfile" ]; - "async-compression" = [ "dep:async-compression" ]; - "blocking" = [ "futures-util/io" "tokio/rt-multi-thread" "tokio/sync" ]; - "brotli" = [ "async-compression" "async-compression/brotli" "tokio-util" ]; - "cookie_crate" = [ "dep:cookie_crate" ]; - "cookie_store" = [ "dep:cookie_store" ]; - "cookies" = [ "cookie_crate" "cookie_store" ]; - "default" = [ "default-tls" ]; - "default-tls" = [ "hyper-tls" "native-tls-crate" "__tls" "tokio-native-tls" ]; - "deflate" = [ "async-compression" "async-compression/zlib" "tokio-util" ]; + "__rustls" = [ "dep:hyper-rustls" "dep:tokio-rustls" "dep:rustls" "__tls" "dep:rustls-pemfile" "rustls-pki-types" ]; + "__tls" = [ "dep:rustls-pemfile" "tokio/io-util" ]; + "blocking" = [ "futures-channel/sink" "futures-util/io" "futures-util/sink" "tokio/rt-multi-thread" "tokio/sync" ]; + "brotli" = [ "dep:async-compression" "async-compression?/brotli" "dep:tokio-util" ]; + "charset" = [ "dep:encoding_rs" ]; + "cookies" = [ "dep:cookie_crate" "dep:cookie_store" ]; + "default" = [ "default-tls" "charset" "http2" "macos-system-configuration" ]; + "default-tls" = [ "dep:hyper-tls" "dep:native-tls-crate" "__tls" "dep:tokio-native-tls" ]; + "deflate" = [ "dep:async-compression" "async-compression?/zlib" "dep:tokio-util" ]; "futures-channel" = [ "dep:futures-channel" ]; - "gzip" = [ "async-compression" "async-compression/gzip" "tokio-util" ]; + "gzip" = [ "dep:async-compression" "async-compression?/gzip" "dep:tokio-util" ]; + "h2" = [ "dep:h2" ]; "h3" = [ "dep:h3" ]; "h3-quinn" = [ "dep:h3-quinn" ]; - "http3" = [ "rustls-tls-manual-roots" "h3" "h3-quinn" "quinn" "futures-channel" ]; - "hyper-rustls" = [ "dep:hyper-rustls" ]; - "hyper-tls" = [ "dep:hyper-tls" ]; - "json" = [ "serde_json" ]; - "mime_guess" = [ "dep:mime_guess" ]; - "multipart" = [ "mime_guess" ]; + "hickory-dns" = [ "dep:hickory-resolver" ]; + "http2" = [ "h2" "hyper/http2" "hyper-util/http2" ]; + "json" = [ "dep:serde_json" ]; + "macos-system-configuration" = [ "dep:system-configuration" ]; + "multipart" = [ "dep:mime_guess" ]; "native-tls" = [ "default-tls" ]; - "native-tls-alpn" = [ "native-tls" "native-tls-crate/alpn" ]; - "native-tls-crate" = [ "dep:native-tls-crate" ]; - "native-tls-vendored" = [ "native-tls" "native-tls-crate/vendored" ]; + "native-tls-alpn" = [ "native-tls" "native-tls-crate?/alpn" "hyper-tls?/alpn" ]; + "native-tls-vendored" = [ "native-tls" "native-tls-crate?/vendored" ]; "quinn" = [ "dep:quinn" ]; - "rustls" = [ "dep:rustls" ]; - "rustls-native-certs" = [ "dep:rustls-native-certs" ]; - "rustls-pemfile" = [ "dep:rustls-pemfile" ]; + "rustls-pki-types" = [ "dep:rustls-pki-types" ]; "rustls-tls" = [ "rustls-tls-webpki-roots" ]; "rustls-tls-manual-roots" = [ "__rustls" ]; - "rustls-tls-native-roots" = [ "rustls-native-certs" "__rustls" ]; - "rustls-tls-webpki-roots" = [ "webpki-roots" "__rustls" ]; - "serde_json" = [ "dep:serde_json" ]; - "socks" = [ "tokio-socks" ]; - "stream" = [ "tokio/fs" "tokio-util" "wasm-streams" ]; - "tokio-native-tls" = [ "dep:tokio-native-tls" ]; - "tokio-rustls" = [ "dep:tokio-rustls" ]; - "tokio-socks" = [ "dep:tokio-socks" ]; - "tokio-util" = [ "dep:tokio-util" ]; - "trust-dns" = [ "trust-dns-resolver" ]; - "trust-dns-resolver" = [ "dep:trust-dns-resolver" ]; - "wasm-streams" = [ "dep:wasm-streams" ]; - "webpki-roots" = [ "dep:webpki-roots" ]; + "rustls-tls-native-roots" = [ "dep:rustls-native-certs" "__rustls" ]; + "rustls-tls-webpki-roots" = [ "dep:webpki-roots" "__rustls" ]; + "socks" = [ "dep:tokio-socks" ]; + "stream" = [ "tokio/fs" "dep:tokio-util" "dep:wasm-streams" ]; + "zstd" = [ "dep:async-compression" "async-compression?/zstd" "dep:tokio-util" ]; }; - resolvedDefaultFeatures = [ "__tls" "default" "default-tls" "hyper-tls" "json" "native-tls-crate" "serde_json" "tokio-native-tls" ]; + resolvedDefaultFeatures = [ "__tls" "charset" "default" "default-tls" "h2" "http2" "json" "macos-system-configuration" ]; }; "ring" = rec { crateName = "ring"; - version = "0.17.6"; + version = "0.17.8"; edition = "2021"; - links = "ring_core_0_17_6"; - sha256 = "0rh830kj0638fdif6470ggq396nvnxmj74jayvmwqsgn31p5wkb8"; + links = "ring_core_0_17_8"; + sha256 = "03fwlb1ssrmfxdckvqv033pfmk01rhx9ynwi7r186dcfcp5s8zy1"; authors = [ "Brian Smith " ]; dependencies = [ + { + name = "cfg-if"; + packageId = "cfg-if"; + usesDefaultFeatures = false; + } { name = "getrandom"; packageId = "getrandom"; @@ -5999,7 +6261,7 @@ rec { name = "spin"; packageId = "spin"; usesDefaultFeatures = false; - target = { target, features }: (("x86" == target."arch" or null) || ("x86_64" == target."arch" or null) || ((("aarch64" == target."arch" or null) || ("arm" == target."arch" or null)) && (("android" == target."os" or null) || ("fuchsia" == target."os" or null) || ("linux" == target."os" or null) || ("windows" == target."os" or null)))); + target = { target, features }: (("aarch64" == target."arch" or null) || ("arm" == target."arch" or null) || ("x86" == target."arch" or null) || ("x86_64" == target."arch" or null)); features = [ "once" ]; } { @@ -6008,7 +6270,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (("aarch64" == target."arch" or null) && ("windows" == target."os" or null)); features = [ "Win32_Foundation" "Win32_System_Threading" ]; } @@ -6037,9 +6299,10 @@ rec { }; "rustc-demangle" = rec { crateName = "rustc-demangle"; - version = "0.1.23"; + version = "0.1.24"; edition = "2015"; - sha256 = "0xnbk2bmyzshacjm2g1kd4zzv2y2az14bw3sjccq5qkpmsfvn9nn"; + sha256 = "07zysaafgrkzy2rjgwqdj2a8qdpsm6zv6f5pgpk9x0lm40z9b6vi"; + libName = "rustc_demangle"; authors = [ "Alex Crichton " ]; @@ -6068,9 +6331,9 @@ rec { }; "rustix" = rec { crateName = "rustix"; - version = "0.38.26"; + version = "0.38.34"; edition = "2021"; - sha256 = "12nqg468a4wifiazl70ygcs10rgv0yldr64mbzrdmj26hazw8w4l"; + sha256 = "03vkqa2ism7q56rkifyy8mns0wwqrk70f4i4fd53r97p8b05xp3h"; authors = [ "Dan Gohman " "Jakub Konka " @@ -6078,7 +6341,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 2.4.1"; + packageId = "bitflags 2.5.0"; usesDefaultFeatures = false; } { @@ -6109,14 +6372,12 @@ rec { optional = true; usesDefaultFeatures = false; target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))); - features = [ "extra_traits" ]; } { name = "libc"; packageId = "libc"; usesDefaultFeatures = false; target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))))))); - features = [ "extra_traits" ]; } { name = "linux-raw-sys"; @@ -6157,9 +6418,10 @@ rec { "io_uring" = [ "event" "fs" "net" "linux-raw-sys/io_uring" ]; "itoa" = [ "dep:itoa" ]; "libc" = [ "dep:libc" ]; + "libc-extra-traits" = [ "libc?/extra_traits" ]; "libc_errno" = [ "dep:libc_errno" ]; "linux_latest" = [ "linux_4_11" ]; - "net" = [ "linux-raw-sys/net" "linux-raw-sys/netlink" "linux-raw-sys/if_ether" ]; + "net" = [ "linux-raw-sys/net" "linux-raw-sys/netlink" "linux-raw-sys/if_ether" "linux-raw-sys/xdp" ]; "once_cell" = [ "dep:once_cell" ]; "param" = [ "fs" ]; "process" = [ "linux-raw-sys/prctl" ]; @@ -6168,37 +6430,56 @@ rec { "runtime" = [ "linux-raw-sys/prctl" ]; "rustc-dep-of-std" = [ "dep:core" "dep:alloc" "dep:compiler_builtins" "linux-raw-sys/rustc-dep-of-std" "bitflags/rustc-dep-of-std" "compiler_builtins?/rustc-dep-of-std" ]; "shm" = [ "fs" ]; - "std" = [ "bitflags/std" "alloc" "libc?/std" "libc_errno?/std" ]; + "std" = [ "bitflags/std" "alloc" "libc?/std" "libc_errno?/std" "libc-extra-traits" ]; "system" = [ "linux-raw-sys/system" ]; "thread" = [ "linux-raw-sys/prctl" ]; - "use-libc" = [ "libc_errno" "libc" ]; + "use-libc" = [ "libc_errno" "libc" "libc-extra-traits" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "fs" "std" "use-libc-auxv" ]; + resolvedDefaultFeatures = [ "alloc" "default" "fs" "libc-extra-traits" "std" "use-libc-auxv" ]; }; "rustls" = rec { crateName = "rustls"; - version = "0.21.9"; + version = "0.23.5"; edition = "2021"; - sha256 = "1fcqlk5ff9mdxrgd89i1655s10r9n33v9cjhmxcdaxapxnn4i5k2"; + sha256 = "0zm97n6n7v46s4dv7bcrp0a20wj40lnbzbg530zaml8vaphcxaxg"; dependencies = [ { name = "log"; packageId = "log"; optional = true; } + { + name = "once_cell"; + packageId = "once_cell"; + usesDefaultFeatures = false; + features = [ "alloc" "race" ]; + } { name = "ring"; packageId = "ring"; + optional = true; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + features = [ "alloc" ]; } { name = "rustls-webpki"; packageId = "rustls-webpki"; rename = "webpki"; - features = [ "alloc" "std" ]; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "subtle"; + packageId = "subtle"; + usesDefaultFeatures = false; } { - name = "sct"; - packageId = "sct"; + name = "zeroize"; + packageId = "zeroize"; } ]; devDependencies = [ @@ -6208,19 +6489,25 @@ rec { } ]; features = { - "default" = [ "logging" "tls12" ]; + "aws-lc-rs" = [ "aws_lc_rs" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws_lc_rs" ]; + "default" = [ "aws_lc_rs" "logging" "std" "tls12" ]; + "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" ]; + "hashbrown" = [ "dep:hashbrown" ]; "log" = [ "dep:log" ]; "logging" = [ "log" ]; - "read_buf" = [ "rustversion" ]; + "read_buf" = [ "rustversion" "std" ]; + "ring" = [ "dep:ring" "webpki/ring" ]; "rustversion" = [ "dep:rustversion" ]; + "std" = [ "webpki/std" "pki-types/std" "once_cell/std" ]; }; - resolvedDefaultFeatures = [ "dangerous_configuration" "default" "log" "logging" "tls12" ]; + resolvedDefaultFeatures = [ "log" "logging" "ring" "std" "tls12" ]; }; "rustls-native-certs" = rec { crateName = "rustls-native-certs"; - version = "0.6.3"; + version = "0.7.0"; edition = "2021"; - sha256 = "007zind70rd5rfsrkdcfm8vn09j8sg02phg9334kark6rdscxam9"; + sha256 = "14ip15dcr6fmjzi12lla9cpln7mmkdid4a7wsp344v4kz9gbh7wg"; dependencies = [ { name = "openssl-probe"; @@ -6231,6 +6518,11 @@ rec { name = "rustls-pemfile"; packageId = "rustls-pemfile"; } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } { name = "schannel"; packageId = "schannel"; @@ -6246,27 +6538,59 @@ rec { }; "rustls-pemfile" = rec { crateName = "rustls-pemfile"; - version = "1.0.4"; + version = "2.1.2"; edition = "2018"; - sha256 = "1324n5bcns0rnw6vywr5agff3rwfvzphi7rmbyzwnv6glkhclx0w"; + sha256 = "0ggpmk5n7p096nim2hn57facx6rwf76l55qqsj4fny37d0jkm699"; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.22.1"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; } ]; - + features = { + "default" = [ "std" ]; + "std" = [ "base64/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "rustls-pki-types" = rec { + crateName = "rustls-pki-types"; + version = "1.7.0"; + edition = "2021"; + sha256 = "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp"; + libName = "rustls_pki_types"; + features = { + "default" = [ "alloc" ]; + "std" = [ "alloc" ]; + "web" = [ "web-time" ]; + "web-time" = [ "dep:web-time" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.101.7"; + version = "0.102.3"; edition = "2021"; - sha256 = "0rapfhpkqp75552i8r0y7f4vq7csb4k7gjjans0df73sxv8paqlb"; + sha256 = "1gzahmw0lqhszsczmk63bamsf5ps6wa5lsff6gjvqhfxq20ybg7k"; libName = "webpki"; dependencies = [ { name = "ring"; packageId = "ring"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; usesDefaultFeatures = false; } { @@ -6275,17 +6599,19 @@ rec { } ]; features = { - "alloc" = [ "ring/alloc" ]; - "default" = [ "std" ]; - "std" = [ "alloc" ]; + "alloc" = [ "ring?/alloc" "pki-types/alloc" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" ]; + "default" = [ "std" "ring" ]; + "ring" = [ "dep:ring" ]; + "std" = [ "alloc" "pki-types/std" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + resolvedDefaultFeatures = [ "alloc" "ring" "std" ]; }; "rustversion" = rec { crateName = "rustversion"; - version = "1.0.14"; + version = "1.0.16"; edition = "2018"; - sha256 = "1x1pz1yynk5xzzrazk2svmidj69jhz89dz5vrc28sixl20x1iz3z"; + sha256 = "1c6zy65i4jmhn2raxpb3p6wfbyh5hjcmi8z6d67jga0yl38p8909"; procMacro = true; build = "build/build.rs"; authors = [ @@ -6295,9 +6621,9 @@ rec { }; "ryu" = rec { crateName = "ryu"; - version = "1.0.15"; + version = "1.0.18"; edition = "2018"; - sha256 = "0hfphpn1xnpzxwj8qg916ga1lyc33lc03lnf1gb3wwpglj6wrm0s"; + sha256 = "17xx2s8j1lln7iackzd9p0sv546vjq71i779gphjq923vjh5pjzk"; authors = [ "David Tolnay " ]; @@ -6305,28 +6631,11 @@ rec { "no-panic" = [ "dep:no-panic" ]; }; }; - "same-file" = rec { - crateName = "same-file"; - version = "1.0.6"; - edition = "2018"; - sha256 = "00h5j1w87dmhnvbv9l8bic3y7xxsnjmssvifw2ayvgx9mb1ivz4k"; - authors = [ - "Andrew Gallant " - ]; - dependencies = [ - { - name = "winapi-util"; - packageId = "winapi-util"; - target = { target, features }: (target."windows" or false); - } - ]; - - }; "schannel" = rec { crateName = "schannel"; - version = "0.1.22"; + version = "0.1.23"; edition = "2018"; - sha256 = "126zy5jb95fc5hvzyjwiq6lc81r08rdcn6affn00ispp9jzk6dqc"; + sha256 = "0d1m156bsjrws6xzzr1wyfyih9i22mb2csb5pc5kmkrvci2ibjgv"; authors = [ "Steven Fackler " "Steffen Butzer " @@ -6334,14 +6643,14 @@ rec { dependencies = [ { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; features = [ "Win32_Foundation" "Win32_Security_Cryptography" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_System_Memory" ]; } ]; devDependencies = [ { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; features = [ "Win32_System_SystemInformation" "Win32_System_Time" ]; } ]; @@ -6349,9 +6658,9 @@ rec { }; "schemars" = rec { crateName = "schemars"; - version = "0.8.16"; + version = "0.8.19"; edition = "2021"; - sha256 = "0aadpjkaq7yl11b02pg4mwanylck328zg0q7w56dv6j89568z8j5"; + sha256 = "1vr1dwpx900b3d824f309lmzc6cj61a1dzq1zc3nbd4wj7b7wvpw"; authors = [ "Graham Esau " ]; @@ -6374,6 +6683,12 @@ rec { name = "serde_json"; packageId = "serde_json"; } + { + name = "url"; + packageId = "url"; + optional = true; + usesDefaultFeatures = false; + } ]; features = { "arrayvec" = [ "arrayvec05" ]; @@ -6405,13 +6720,13 @@ rec { "uuid08" = [ "dep:uuid08" ]; "uuid1" = [ "dep:uuid1" ]; }; - resolvedDefaultFeatures = [ "default" "derive" "schemars_derive" ]; + resolvedDefaultFeatures = [ "default" "derive" "schemars_derive" "url" ]; }; "schemars_derive" = rec { crateName = "schemars_derive"; - version = "0.8.16"; + version = "0.8.19"; edition = "2021"; - sha256 = "0rq9sdcf5hyvsyj9v9nfy2jgjbjzaldjq4i6y2fcz72xlrpzsry7"; + sha256 = "0j9znm9110a8agfbf16d5fynn9chd3hxv41p8n742bg0lxx2npqq"; procMacro = true; authors = [ "Graham Esau " @@ -6431,7 +6746,7 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.61"; features = [ "extra-traits" ]; } ]; @@ -6449,26 +6764,6 @@ rec { "default" = [ "use_std" ]; }; }; - "sct" = rec { - crateName = "sct"; - version = "0.7.1"; - edition = "2021"; - sha256 = "056lmi2xkzdg1dbai6ha3n57s18cbip4pnmpdhyljli3m99n216s"; - authors = [ - "Joseph Birr-Pixton " - ]; - dependencies = [ - { - name = "ring"; - packageId = "ring"; - } - { - name = "untrusted"; - packageId = "untrusted"; - } - ]; - - }; "secrecy" = rec { crateName = "secrecy"; version = "0.8.0"; @@ -6499,9 +6794,9 @@ rec { }; "security-framework" = rec { crateName = "security-framework"; - version = "2.9.2"; + version = "2.11.0"; edition = "2021"; - sha256 = "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"; + sha256 = "1h0ipvv8wi9wvhad0a9w7jpmb189jng4jhfgnp6vl1lps0zp49y6"; authors = [ "Steven Fackler " "Kornel " @@ -6509,7 +6804,7 @@ rec { dependencies = [ { name = "bitflags"; - packageId = "bitflags 1.3.2"; + packageId = "bitflags 2.5.0"; } { name = "core-foundation"; @@ -6537,17 +6832,17 @@ rec { "OSX_10_14" = [ "OSX_10_13" "security-framework-sys/OSX_10_14" ]; "OSX_10_15" = [ "OSX_10_14" "security-framework-sys/OSX_10_15" ]; "OSX_10_9" = [ "security-framework-sys/OSX_10_9" ]; - "default" = [ "OSX_10_9" ]; + "default" = [ "OSX_10_11" ]; "log" = [ "dep:log" ]; "serial-number-bigint" = [ "dep:num-bigint" ]; }; - resolvedDefaultFeatures = [ "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_9" "default" ]; }; "security-framework-sys" = rec { crateName = "security-framework-sys"; - version = "2.9.1"; + version = "2.11.0"; edition = "2021"; - sha256 = "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"; + sha256 = "1mq7ykz3fi0ba55aj4afz24v9qvwdpkbjiirb197f8h5pnxkcy9i"; authors = [ "Steven Fackler " "Kornel " @@ -6569,37 +6864,29 @@ rec { "OSX_10_13" = [ "OSX_10_12" ]; "OSX_10_14" = [ "OSX_10_13" ]; "OSX_10_15" = [ "OSX_10_14" ]; - "default" = [ "OSX_10_9" ]; + "default" = [ "OSX_10_11" ]; }; - resolvedDefaultFeatures = [ "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_9" "default" ]; }; "semver" = rec { crateName = "semver"; - version = "1.0.20"; + version = "1.0.23"; edition = "2018"; - sha256 = "140hmbfa743hbmah1zjf07s8apavhvn04204qjigjiz5w6iscvw3"; + sha256 = "12wqpxfflclbq4dv8sa6gchdh92ahhwn4ci1ls22wlby3h57wsb1"; authors = [ "David Tolnay " ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - usesDefaultFeatures = false; - } - ]; features = { "default" = [ "std" ]; "serde" = [ "dep:serde" ]; }; - resolvedDefaultFeatures = [ "default" "serde" "std" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; "serde" = rec { crateName = "serde"; - version = "1.0.193"; + version = "1.0.201"; edition = "2018"; - sha256 = "129b0j67594f8qg5cbyi3nyk31y97wrqihi026mba34dwrsrkp95"; + sha256 = "0g1nrz2s6l36na6gdbph8k07xf9h5p3s6f0s79sy8a8nxpmiq3vq"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -6651,9 +6938,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.193"; + version = "1.0.201"; edition = "2015"; - sha256 = "1lwlx2k7wxr1v160kpyqjfabs37gm1yxqg65383rnyrm06jnqms3"; + sha256 = "0r98v8h47s7zhml7gz0sl6wv82vyzh1hv27f1g0g35lp1f9hbr65"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -6663,14 +6950,20 @@ rec { { name = "proc-macro2"; packageId = "proc-macro2"; + usesDefaultFeatures = false; + features = [ "proc-macro" ]; } { name = "quote"; packageId = "quote"; + usesDefaultFeatures = false; + features = [ "proc-macro" ]; } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; + usesDefaultFeatures = false; + features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } ]; features = { @@ -6679,9 +6972,9 @@ rec { }; "serde_derive_internals" = rec { crateName = "serde_derive_internals"; - version = "0.26.0"; + version = "0.29.0"; edition = "2015"; - sha256 = "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5"; + sha256 = "1qsl3pkk9yg57wivsxg8lsw77d94l34z70hclrczx9d3cp7023rk"; libPath = "lib.rs"; authors = [ "Erick Tryzelaar " @@ -6698,28 +6991,23 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.61"; usesDefaultFeatures = false; - features = [ "derive" "parsing" "printing" "clone-impls" ]; + features = [ "clone-impls" "derive" "parsing" "printing" ]; } ]; }; "serde_json" = rec { crateName = "serde_json"; - version = "1.0.108"; + version = "1.0.117"; edition = "2021"; - sha256 = "0ssj59s7lpzqh1m50kfzlnrip0p0jg9lmhn4098i33a0mhz7w71x"; + sha256 = "1hxziifjlc0kn1cci9d4crmjc7qwnfi20lxwyj9lzca2c7m84la5"; authors = [ "Erick Tryzelaar " "David Tolnay " ]; dependencies = [ - { - name = "indexmap"; - packageId = "indexmap"; - optional = true; - } { name = "itoa"; packageId = "itoa"; @@ -6748,13 +7036,13 @@ rec { "preserve_order" = [ "indexmap" "std" ]; "std" = [ "serde/std" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "indexmap" "preserve_order" "raw_value" "std" "unbounded_depth" ]; + resolvedDefaultFeatures = [ "alloc" "default" "raw_value" "std" ]; }; "serde_path_to_error" = rec { crateName = "serde_path_to_error"; - version = "0.1.14"; + version = "0.1.16"; edition = "2021"; - sha256 = "0dc31z4bg0jwn69gcqsczbmcy5y4w6r0vdcc4c38vma9x2ycivjb"; + sha256 = "19hlz2359l37ifirskpcds7sxg0gzpqvfilibs7whdys0128i6dg"; authors = [ "David Tolnay " ]; @@ -6770,23 +7058,6 @@ rec { ]; }; - "serde_spanned" = rec { - crateName = "serde_spanned"; - version = "0.6.4"; - edition = "2021"; - sha256 = "102ym47sr1y48ml42wjv6aq8y77bij1qckx1j0gb3rbka21jn0hj"; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - } - ]; - features = { - "serde" = [ "dep:serde" ]; - }; - resolvedDefaultFeatures = [ "serde" ]; - }; "serde_urlencoded" = rec { crateName = "serde_urlencoded"; version = "0.7.1"; @@ -6817,9 +7088,9 @@ rec { }; "serde_yaml" = rec { crateName = "serde_yaml"; - version = "0.9.27"; + version = "0.9.34+deprecated"; edition = "2021"; - sha256 = "0v36d0rxsnrbsfzz8xibw9bym1zq218jwwsl87z2qciq1rbs3irw"; + sha256 = "0isba1fjyg3l6rxk156k600ilzr8fp7crv82rhal0rxz5qd1m2va"; authors = [ "David Tolnay " ]; @@ -6906,9 +7177,9 @@ rec { }; "signal-hook-registry" = rec { crateName = "signal-hook-registry"; - version = "1.4.1"; + version = "1.4.2"; edition = "2015"; - sha256 = "18crkkw5k82bvcx088xlf5g4n3772m24qhzgfan80nda7d3rn8nq"; + sha256 = "1cb5akgq8ajnd5spyn587srvs4n26ryq0p78nswffwhv46sf1sd9"; authors = [ "Michal 'vorner' Vaner " "Masaki Hara " @@ -6920,45 +7191,6 @@ rec { } ]; - }; - "skeptic" = rec { - crateName = "skeptic"; - version = "0.13.7"; - edition = "2018"; - sha256 = "1a205720pnss0alxvbx0fcn3883cg3fbz5y1047hmjbnaq0kplhn"; - dependencies = [ - { - name = "bytecount"; - packageId = "bytecount"; - } - { - name = "cargo_metadata"; - packageId = "cargo_metadata"; - } - { - name = "error-chain"; - packageId = "error-chain"; - usesDefaultFeatures = false; - } - { - name = "glob"; - packageId = "glob"; - } - { - name = "pulldown-cmark"; - packageId = "pulldown-cmark"; - usesDefaultFeatures = false; - } - { - name = "tempfile"; - packageId = "tempfile"; - } - { - name = "walkdir"; - packageId = "walkdir"; - } - ]; - }; "slab" = rec { crateName = "slab"; @@ -6982,9 +7214,9 @@ rec { }; "smallvec" = rec { crateName = "smallvec"; - version = "1.11.2"; + version = "1.13.2"; edition = "2018"; - sha256 = "0w79x38f7c0np7hqfmzrif9zmn0avjvvm31b166zdk9d1aad1k2d"; + sha256 = "0rsw5samawl3wsw6glrsb127rx6sh89a8wyikicw6dkdcjd1lpiw"; authors = [ "The Servo Project Developers" ]; @@ -6994,6 +7226,7 @@ rec { "drain_keep_rest" = [ "drain_filter" ]; "serde" = [ "dep:serde" ]; }; + resolvedDefaultFeatures = [ "const_generics" "const_new" ]; }; "snafu 0.6.10" = rec { crateName = "snafu"; @@ -7067,6 +7300,35 @@ rec { }; resolvedDefaultFeatures = [ "default" "rust_1_39" "rust_1_46" "std" ]; }; + "snafu 0.8.2" = rec { + crateName = "snafu"; + version = "0.8.2"; + edition = "2018"; + sha256 = "0bji6fqyphs041gp4zmgms6w2bbw9r1bw0i16gjzci5b913nz5vm"; + authors = [ + "Jake Goulding " + ]; + dependencies = [ + { + name = "snafu-derive"; + packageId = "snafu-derive 0.8.2"; + } + ]; + features = { + "backtrace" = [ "dep:backtrace" ]; + "backtraces-impl-backtrace-crate" = [ "backtrace" ]; + "default" = [ "std" "rust_1_65" ]; + "futures" = [ "futures-core-crate" "pin-project" ]; + "futures-core-crate" = [ "dep:futures-core-crate" ]; + "futures-crate" = [ "dep:futures-crate" ]; + "internal-dev-dependencies" = [ "futures-crate" ]; + "pin-project" = [ "dep:pin-project" ]; + "rust_1_61" = [ "snafu-derive/rust_1_61" ]; + "rust_1_65" = [ "rust_1_61" ]; + "unstable-provider-api" = [ "snafu-derive/unstable-provider-api" ]; + }; + resolvedDefaultFeatures = [ "default" "rust_1_61" "rust_1_65" "std" ]; + }; "snafu-derive 0.6.10" = rec { crateName = "snafu-derive"; version = "0.6.10"; @@ -7126,37 +7388,43 @@ rec { }; resolvedDefaultFeatures = [ "rust_1_39" "rust_1_46" ]; }; - "socket2 0.4.10" = rec { - crateName = "socket2"; - version = "0.4.10"; + "snafu-derive 0.8.2" = rec { + crateName = "snafu-derive"; + version = "0.8.2"; edition = "2018"; - sha256 = "03ack54dxhgfifzsj14k7qa3r5c9wqy3v6mqhlim99cc03y1cycz"; + sha256 = "0pyr3rdipfsr74hlk14q7bssls0qssr6rg0727xw5f5zvq8rkcdl"; + procMacro = true; authors = [ - "Alex Crichton " - "Thomas de Zeeuw " + "Jake Goulding " ]; dependencies = [ { - name = "libc"; - packageId = "libc"; - target = { target, features }: (target."unix" or false); + name = "heck"; + packageId = "heck 0.4.1"; } { - name = "winapi"; - packageId = "winapi"; - target = { target, features }: (target."windows" or false); - features = [ "handleapi" "ws2ipdef" "ws2tcpip" ]; + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.61"; + features = [ "full" ]; } ]; features = { }; - resolvedDefaultFeatures = [ "all" ]; + resolvedDefaultFeatures = [ "rust_1_61" ]; }; - "socket2 0.5.5" = rec { + "socket2" = rec { crateName = "socket2"; - version = "0.5.5"; + version = "0.5.7"; edition = "2021"; - sha256 = "1sgq315f1njky114ip7wcy83qlphv9qclprfjwvxcpfblmcsqpvv"; + sha256 = "070r941wbq76xpy039an4pyiy3rfj7mp7pvibf1rcri9njq5wc6f"; authors = [ "Alex Crichton " "Thomas de Zeeuw " @@ -7169,7 +7437,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_System_IO" "Win32_System_Threading" "Win32_System_WindowsProgramming" ]; } @@ -7235,7 +7503,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-operator"; @@ -7273,6 +7541,10 @@ rec { "Stackable GmbH " ]; dependencies = [ + { + name = "anyhow"; + packageId = "anyhow"; + } { name = "clap"; packageId = "clap"; @@ -7283,7 +7555,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.29"; + packageId = "futures 0.3.30"; features = [ "compat" ]; } { @@ -7313,7 +7585,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-opa-crd"; @@ -7377,7 +7649,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.29"; + packageId = "futures 0.3.30"; features = [ "compat" ]; } { @@ -7413,7 +7685,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-opa-crd"; @@ -7441,13 +7713,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.64.0"; + version = "0.67.1"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "d988822e7af3d363d52fb35643f0c6ed933f340a"; - sha256 = "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp"; + rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; + sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; }; authors = [ "Stackable GmbH " @@ -7485,7 +7757,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.29"; + packageId = "futures 0.3.30"; } { name = "json-patch"; @@ -7495,7 +7767,7 @@ rec { name = "k8s-openapi"; packageId = "k8s-openapi"; usesDefaultFeatures = false; - features = [ "schemars" "v1_28" ]; + features = [ "schemars" "v1_30" ]; } { name = "kube"; @@ -7507,10 +7779,6 @@ rec { name = "lazy_static"; packageId = "lazy_static"; } - { - name = "opentelemetry"; - packageId = "opentelemetry"; - } { name = "opentelemetry-jaeger"; packageId = "opentelemetry-jaeger"; @@ -7525,10 +7793,6 @@ rec { name = "product-config"; packageId = "product-config"; } - { - name = "rand"; - packageId = "rand"; - } { name = "regex"; packageId = "regex"; @@ -7536,6 +7800,7 @@ rec { { name = "schemars"; packageId = "schemars"; + features = [ "url" ]; } { name = "semver"; @@ -7556,7 +7821,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.7.5"; + packageId = "snafu 0.8.2"; } { name = "stackable-operator-derive"; @@ -7567,14 +7832,10 @@ rec { packageId = "strum"; features = [ "derive" ]; } - { - name = "thiserror"; - packageId = "thiserror"; - } { name = "tokio"; packageId = "tokio"; - features = [ "macros" "rt-multi-thread" ]; + features = [ "macros" "rt-multi-thread" "fs" ]; } { name = "tracing"; @@ -7592,6 +7853,7 @@ rec { { name = "url"; packageId = "url"; + features = [ "serde" ]; } ]; features = { @@ -7600,13 +7862,13 @@ rec { }; "stackable-operator-derive" = rec { crateName = "stackable-operator-derive"; - version = "0.64.0"; + version = "0.3.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "d988822e7af3d363d52fb35643f0c6ed933f340a"; - sha256 = "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp"; + rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; + sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; }; procMacro = true; authors = [ @@ -7627,7 +7889,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; } ]; @@ -7655,9 +7917,9 @@ rec { }; "strum" = rec { crateName = "strum"; - version = "0.25.0"; + version = "0.26.2"; edition = "2018"; - sha256 = "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"; + sha256 = "0aayk2m3cw9zz12qn82kqaayq43xdgdpcy9b5d1lq6d504syr32x"; authors = [ "Peter Glotfelty " ]; @@ -7684,9 +7946,9 @@ rec { }; "strum_macros" = rec { crateName = "strum_macros"; - version = "0.25.3"; + version = "0.26.2"; edition = "2018"; - sha256 = "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13"; + sha256 = "0in9jvbb3g16x8fj7lf91vwzj98319hj3z8lpaaa9h42ybd5kky6"; procMacro = true; authors = [ "Peter Glotfelty " @@ -7710,12 +7972,25 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "parsing" "extra-traits" ]; } ]; }; + "subtle" = rec { + crateName = "subtle"; + version = "2.5.0"; + edition = "2018"; + sha256 = "1g2yjs7gffgmdvkkq0wrrh0pxds3q0dv6dhkw9cdpbib656xdkc1"; + authors = [ + "Isis Lovecruft " + "Henry de Valence " + ]; + features = { + "default" = [ "std" "i128" ]; + }; + }; "syn 1.0.109" = rec { crateName = "syn"; version = "1.0.109"; @@ -7750,11 +8025,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; }; - "syn 2.0.39" = rec { + "syn 2.0.61" = rec { crateName = "syn"; - version = "2.0.39"; + version = "2.0.61"; edition = "2021"; - sha256 = "0ymyhxnk1yi4pzf72qk3lrdm9lgjwcrcwci0hhz5vx7wya88prr3"; + sha256 = "1j8zhf5mmd2l5niwhiniw5wcp9v6fbd4a61v6rbfhsm5rf6fv4y9"; authors = [ "David Tolnay " ]; @@ -7777,14 +8052,13 @@ rec { ]; features = { "default" = [ "derive" "parsing" "printing" "clone-impls" "proc-macro" ]; - "printing" = [ "quote" ]; - "proc-macro" = [ "proc-macro2/proc-macro" "quote/proc-macro" ]; - "quote" = [ "dep:quote" ]; + "printing" = [ "dep:quote" ]; + "proc-macro" = [ "proc-macro2/proc-macro" "quote?/proc-macro" ]; "test" = [ "syn-test-suite/all-features" ]; }; - resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" "visit-mut" ]; + resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "visit" "visit-mut" ]; }; - "sync_wrapper" = rec { + "sync_wrapper 0.1.2" = rec { crateName = "sync_wrapper"; version = "0.1.2"; edition = "2018"; @@ -7797,6 +8071,19 @@ rec { "futures-core" = [ "dep:futures-core" ]; }; }; + "sync_wrapper 1.0.1" = rec { + crateName = "sync_wrapper"; + version = "1.0.1"; + edition = "2018"; + sha256 = "150k6lwvr4nl237ngsz8fj5j78k712m4bggrfyjsidllraz5l1m7"; + authors = [ + "Actyx AG " + ]; + features = { + "futures" = [ "futures-core" ]; + "futures-core" = [ "dep:futures-core" ]; + }; + }; "system-configuration" = rec { crateName = "system-configuration"; version = "0.5.1"; @@ -7853,9 +8140,9 @@ rec { }; "tempfile" = rec { crateName = "tempfile"; - version = "3.8.1"; - edition = "2018"; - sha256 = "1r88v07zdafzf46y63vs39rmzwl4vqd4g2c5qarz9mqa8nnavwby"; + version = "3.10.1"; + edition = "2021"; + sha256 = "1wdzz35ri168jn9al4s1g2rnsrr5ci91khgarc2rvpb3nappzdw5"; authors = [ "Steven Allen " "The Rust Project Developers" @@ -7871,11 +8158,6 @@ rec { name = "fastrand"; packageId = "fastrand"; } - { - name = "redox_syscall"; - packageId = "redox_syscall"; - target = { target, features }: ("redox" == target."os" or null); - } { name = "rustix"; packageId = "rustix"; @@ -7884,7 +8166,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ]; } @@ -7894,9 +8176,9 @@ rec { }; "thiserror" = rec { crateName = "thiserror"; - version = "1.0.50"; + version = "1.0.60"; edition = "2021"; - sha256 = "1ll2sfbrxks8jja161zh1pgm3yssr7aawdmaa2xmcwcsbh7j39zr"; + sha256 = "067wi7pb1zn9jhhk82w0ppmvjwa00nwkp4m9j77rvpaqra1r17jp"; authors = [ "David Tolnay " ]; @@ -7910,10 +8192,11 @@ rec { }; "thiserror-impl" = rec { crateName = "thiserror-impl"; - version = "1.0.50"; + version = "1.0.60"; edition = "2021"; - sha256 = "1f0lmam4765sfnwr4b1n00y14vxh10g0311mkk0adr80pi02wsr6"; + sha256 = "0945q2hk1rqdzjz2zqakxbddwm4h26k5c0wdncdarhvfq10h0iz2"; procMacro = true; + libName = "thiserror_impl"; authors = [ "David Tolnay " ]; @@ -7928,16 +8211,16 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; } ]; }; "thread_local" = rec { crateName = "thread_local"; - version = "1.1.7"; + version = "1.1.8"; edition = "2021"; - sha256 = "0lp19jdgvp5m4l60cgxdnl00yw1hlqy8gcywg9bddwng9h36zp9z"; + sha256 = "173i5lyjh011gsimk21np9jn8al18rxsrkjli20a7b8ks2xgk7lb"; authors = [ "Amanieu d'Antras " ]; @@ -8051,9 +8334,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.34.0"; + version = "1.37.0"; edition = "2021"; - sha256 = "1fgmssdga42a2hn9spm9dh1v9ajpcbs4r3svmzvk9s0iciv19h6h"; + sha256 = "11v7qhvpwsf976frqgrjl1jy308bdkxq195gb38cypx7xkzypnqs"; authors = [ "Tokio Contributors " ]; @@ -8102,7 +8385,7 @@ rec { } { name = "socket2"; - packageId = "socket2 0.5.5"; + packageId = "socket2"; optional = true; target = { target, features }: (!(builtins.elem "wasm" target."family")); features = [ "all" ]; @@ -8127,7 +8410,7 @@ rec { } { name = "socket2"; - packageId = "socket2 0.5.5"; + packageId = "socket2"; target = {target, features}: (!(builtins.elem "wasm" target."family")); } { @@ -8159,34 +8442,6 @@ rec { }; resolvedDefaultFeatures = [ "bytes" "default" "fs" "full" "io-std" "io-util" "libc" "macros" "mio" "net" "num_cpus" "parking_lot" "process" "rt" "rt-multi-thread" "signal" "signal-hook-registry" "socket2" "sync" "time" "tokio-macros" "windows-sys" ]; }; - "tokio-io-timeout" = rec { - crateName = "tokio-io-timeout"; - version = "1.2.0"; - edition = "2018"; - sha256 = "1gx84f92q1491vj4pkn81j8pz1s3pgwnbrsdhfsa2556mli41drh"; - authors = [ - "Steven Fackler " - ]; - dependencies = [ - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "time" ]; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "full" ]; - } - ]; - - }; "tokio-macros" = rec { crateName = "tokio-macros"; version = "2.2.0"; @@ -8207,7 +8462,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" ]; } ]; @@ -8244,14 +8499,20 @@ rec { }; "tokio-rustls" = rec { crateName = "tokio-rustls"; - version = "0.24.1"; - edition = "2018"; - sha256 = "10bhibg57mqir7xjhb2xmf24xgfpx6fzpyw720a4ih8a737jg0y2"; + version = "0.26.0"; + edition = "2021"; + sha256 = "1m00czrmk8x7pdjnz10a3da3i1d0sdf9j9vfp5dnk5ss1q6w8yqc"; dependencies = [ { name = "rustls"; packageId = "rustls"; usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; } { name = "tokio"; @@ -8266,19 +8527,21 @@ rec { } ]; features = { - "dangerous_configuration" = [ "rustls/dangerous_configuration" ]; - "default" = [ "logging" "tls12" ]; + "aws-lc-rs" = [ "aws_lc_rs" ]; + "aws_lc_rs" = [ "rustls/aws_lc_rs" ]; + "default" = [ "logging" "tls12" "aws_lc_rs" ]; + "fips" = [ "rustls/fips" ]; "logging" = [ "rustls/logging" ]; - "secret_extraction" = [ "rustls/secret_extraction" ]; + "ring" = [ "rustls/ring" ]; "tls12" = [ "rustls/tls12" ]; }; resolvedDefaultFeatures = [ "logging" "tls12" ]; }; "tokio-stream" = rec { crateName = "tokio-stream"; - version = "0.1.14"; + version = "0.1.15"; edition = "2021"; - sha256 = "0hi8hcwavh5sdi1ivc9qc4yvyr32f153c212dpd7sb366y6rhz1r"; + sha256 = "1brpbsqyg8yfmfc4y0j9zxvc8xsxjc31d48kb0g6jvpc1fgchyi6"; authors = [ "Tokio Contributors " ]; @@ -8319,9 +8582,9 @@ rec { }; "tokio-util" = rec { crateName = "tokio-util"; - version = "0.7.10"; + version = "0.7.11"; edition = "2021"; - sha256 = "058y6x4mf0fsqji9rfyb77qbfyc50y4pk2spqgj6xsyr693z66al"; + sha256 = "1qcz30db6m8lxkl61b3nic4bim1symi636nhbb3rmi3i6xxv9xlw"; authors = [ "Tokio Contributors " ]; @@ -8352,13 +8615,6 @@ rec { packageId = "tokio"; features = [ "sync" ]; } - { - name = "tracing"; - packageId = "tracing"; - optional = true; - usesDefaultFeatures = false; - features = [ "std" ]; - } ]; devDependencies = [ { @@ -8369,7 +8625,6 @@ rec { ]; features = { "__docs_rs" = [ "futures-util" ]; - "codec" = [ "tracing" ]; "compat" = [ "futures-io" ]; "full" = [ "codec" "compat" "io-util" "time" "net" "rt" ]; "futures-io" = [ "dep:futures-io" ]; @@ -8382,114 +8637,7 @@ rec { "time" = [ "tokio/time" "slab" ]; "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "codec" "default" "io" "slab" "time" "tracing" ]; - }; - "toml" = rec { - crateName = "toml"; - version = "0.7.8"; - edition = "2021"; - sha256 = "0mr2dpmzw4ndvzpnnli2dprcx61pdk62fq4mzw0b6zb27ffycyfx"; - authors = [ - "Alex Crichton " - ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - } - { - name = "serde_spanned"; - packageId = "serde_spanned"; - features = [ "serde" ]; - } - { - name = "toml_datetime"; - packageId = "toml_datetime"; - features = [ "serde" ]; - } - { - name = "toml_edit"; - packageId = "toml_edit"; - optional = true; - features = [ "serde" ]; - } - ]; - devDependencies = [ - { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; - } - ]; - features = { - "default" = [ "parse" "display" ]; - "display" = [ "dep:toml_edit" ]; - "indexmap" = [ "dep:indexmap" ]; - "parse" = [ "dep:toml_edit" ]; - "preserve_order" = [ "indexmap" ]; - }; - resolvedDefaultFeatures = [ "default" "display" "parse" ]; - }; - "toml_datetime" = rec { - crateName = "toml_datetime"; - version = "0.6.5"; - edition = "2021"; - sha256 = "1wds4pm2cn6agd38f0ivm65xnc7c7bmk9m0fllcaq82nd3lz8l1m"; - authors = [ - "Alex Crichton " - ]; - dependencies = [ - { - name = "serde"; - packageId = "serde"; - optional = true; - } - ]; - features = { - "serde" = [ "dep:serde" ]; - }; - resolvedDefaultFeatures = [ "serde" ]; - }; - "toml_edit" = rec { - crateName = "toml_edit"; - version = "0.19.15"; - edition = "2021"; - sha256 = "08bl7rp5g6jwmfpad9s8jpw8wjrciadpnbaswgywpr9hv9qbfnqv"; - authors = [ - "Andronik Ordian " - "Ed Page " - ]; - dependencies = [ - { - name = "indexmap"; - packageId = "indexmap"; - features = [ "std" ]; - } - { - name = "serde"; - packageId = "serde"; - optional = true; - } - { - name = "serde_spanned"; - packageId = "serde_spanned"; - optional = true; - features = [ "serde" ]; - } - { - name = "toml_datetime"; - packageId = "toml_datetime"; - } - { - name = "winnow"; - packageId = "winnow"; - } - ]; - features = { - "perf" = [ "dep:kstring" ]; - "serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ]; - }; - resolvedDefaultFeatures = [ "default" "serde" ]; + resolvedDefaultFeatures = [ "codec" "default" "io" "slab" "time" ]; }; "tower" = rec { crateName = "tower"; @@ -8598,35 +8746,26 @@ rec { }; "tower-http" = rec { crateName = "tower-http"; - version = "0.4.4"; + version = "0.5.2"; edition = "2018"; - sha256 = "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1"; + sha256 = "1xakj3x0anp55gjqibiwvzma5iz0w9pcjsr7qk97sx4qm4sd970y"; authors = [ "Tower Maintainers " ]; dependencies = [ { name = "base64"; - packageId = "base64"; + packageId = "base64 0.21.7"; optional = true; } { name = "bitflags"; - packageId = "bitflags 2.4.1"; + packageId = "bitflags 2.5.0"; } { name = "bytes"; packageId = "bytes"; } - { - name = "futures-core"; - packageId = "futures-core"; - } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } { name = "http"; packageId = "http"; @@ -8636,8 +8775,8 @@ rec { packageId = "http-body"; } { - name = "http-range-header"; - packageId = "http-range-header"; + name = "http-body-util"; + packageId = "http-body-util"; } { name = "mime"; @@ -8675,19 +8814,21 @@ rec { "auth" = [ "base64" "validate-request" ]; "base64" = [ "dep:base64" ]; "catch-panic" = [ "tracing" "futures-util/std" ]; - "compression-br" = [ "async-compression/brotli" "tokio-util" "tokio" ]; - "compression-deflate" = [ "async-compression/zlib" "tokio-util" "tokio" ]; + "compression-br" = [ "async-compression/brotli" "futures-core" "tokio-util" "tokio" ]; + "compression-deflate" = [ "async-compression/zlib" "futures-core" "tokio-util" "tokio" ]; "compression-full" = [ "compression-br" "compression-deflate" "compression-gzip" "compression-zstd" ]; - "compression-gzip" = [ "async-compression/gzip" "tokio-util" "tokio" ]; - "compression-zstd" = [ "async-compression/zstd" "tokio-util" "tokio" ]; - "decompression-br" = [ "async-compression/brotli" "tokio-util" "tokio" ]; - "decompression-deflate" = [ "async-compression/zlib" "tokio-util" "tokio" ]; + "compression-gzip" = [ "async-compression/gzip" "futures-core" "tokio-util" "tokio" ]; + "compression-zstd" = [ "async-compression/zstd" "futures-core" "tokio-util" "tokio" ]; + "decompression-br" = [ "async-compression/brotli" "futures-core" "tokio-util" "tokio" ]; + "decompression-deflate" = [ "async-compression/zlib" "futures-core" "tokio-util" "tokio" ]; "decompression-full" = [ "decompression-br" "decompression-deflate" "decompression-gzip" "decompression-zstd" ]; - "decompression-gzip" = [ "async-compression/gzip" "tokio-util" "tokio" ]; - "decompression-zstd" = [ "async-compression/zstd" "tokio-util" "tokio" ]; - "follow-redirect" = [ "iri-string" "tower/util" ]; - "fs" = [ "tokio/fs" "tokio-util/io" "tokio/io-util" "mime_guess" "mime" "percent-encoding" "httpdate" "set-status" "futures-util/alloc" "tracing" ]; + "decompression-gzip" = [ "async-compression/gzip" "futures-core" "tokio-util" "tokio" ]; + "decompression-zstd" = [ "async-compression/zstd" "futures-core" "tokio-util" "tokio" ]; + "follow-redirect" = [ "futures-util" "iri-string" "tower/util" ]; + "fs" = [ "futures-util" "tokio/fs" "tokio-util/io" "tokio/io-util" "dep:http-range-header" "mime_guess" "mime" "percent-encoding" "httpdate" "set-status" "futures-util/alloc" "tracing" ]; "full" = [ "add-extension" "auth" "catch-panic" "compression-full" "cors" "decompression-full" "follow-redirect" "fs" "limit" "map-request-body" "map-response-body" "metrics" "normalize-path" "propagate-header" "redirect" "request-id" "sensitive-headers" "set-header" "set-status" "timeout" "trace" "util" "validate-request" ]; + "futures-core" = [ "dep:futures-core" ]; + "futures-util" = [ "dep:futures-util" ]; "httpdate" = [ "dep:httpdate" ]; "iri-string" = [ "dep:iri-string" ]; "metrics" = [ "tokio/time" ]; @@ -8796,7 +8937,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -8867,9 +9008,9 @@ rec { }; "tracing-opentelemetry" = rec { crateName = "tracing-opentelemetry"; - version = "0.22.0"; + version = "0.23.0"; edition = "2018"; - sha256 = "15jmwmbp6wz15bx20bfsmabx53wmlnd7wvzwz9hvkrq7aifc4yn6"; + sha256 = "1112kmckw0qwyckhbwarb230n4ldmfgzixr9jagbfjmy3fx19gm9"; authors = [ "Julian Tescher " "Tokio Contributors " @@ -8957,6 +9098,7 @@ rec { features = { "async-trait" = [ "dep:async-trait" ]; "default" = [ "tracing-log" "metrics" ]; + "futures-util" = [ "dep:futures-util" ]; "metrics" = [ "opentelemetry/metrics" "opentelemetry_sdk/metrics" "smallvec" ]; "smallvec" = [ "dep:smallvec" ]; "thiserror" = [ "dep:thiserror" ]; @@ -9077,33 +9219,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" ]; }; - "treediff" = rec { - crateName = "treediff"; - version = "4.0.2"; - edition = "2018"; - sha256 = "00s3mh5n6m3x5m6dd5kn5yqbvzkp0gn31pxmf887aanzgcklv62j"; - authors = [ - "Sebastian Thiel " - ]; - dependencies = [ - { - name = "serde_json"; - packageId = "serde_json"; - optional = true; - } - ]; - features = { - "rustc-serialize" = [ "dep:rustc-serialize" ]; - "serde_json" = [ "dep:serde_json" ]; - "serde_yaml" = [ "dep:serde_yaml" ]; - "with-rustc-serialize" = [ "rustc-serialize" ]; - "with-serde-json" = [ "serde_json" ]; - "with-serde-yaml" = [ "serde_yaml" ]; - "with-yaml-rust" = [ "yaml-rust" ]; - "yaml-rust" = [ "dep:yaml-rust" ]; - }; - resolvedDefaultFeatures = [ "serde_json" "with-serde-json" ]; - }; "triomphe" = rec { crateName = "triomphe"; version = "0.1.11"; @@ -9122,9 +9237,9 @@ rec { }; "try-lock" = rec { crateName = "try-lock"; - version = "0.2.4"; + version = "0.2.5"; edition = "2015"; - sha256 = "1vc15paa4zi06ixsxihwbvfn24d708nsyg1ncgqwcrn42byyqa1m"; + sha256 = "0jqijrrvm1pyq34zn1jmy2vihd4jcrjlvsh4alkjahhssjnsn8g4"; authors = [ "Sean McArthur " ]; @@ -9158,28 +9273,11 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "unicase" = rec { - crateName = "unicase"; - version = "2.7.0"; - edition = "2015"; - sha256 = "12gd74j79f94k4clxpf06l99wiv4p30wjr0qm04ihqk9zgdd9lpp"; - authors = [ - "Sean McArthur " - ]; - buildDependencies = [ - { - name = "version_check"; - packageId = "version_check"; - } - ]; - features = { - }; - }; "unicode-bidi" = rec { crateName = "unicode-bidi"; - version = "0.3.13"; + version = "0.3.15"; edition = "2018"; - sha256 = "0q0l7rdkiq54pan7a4ama39dgynaf1mnjj1nddrq1w1zayjqp24j"; + sha256 = "0xcdxm7h0ydyprwpcbh436rbs6s6lph7f3gr527lzgv6lw053y88"; libName = "unicode_bidi"; authors = [ "The Servo Project Developers" @@ -9206,9 +9304,9 @@ rec { }; "unicode-normalization" = rec { crateName = "unicode-normalization"; - version = "0.1.22"; + version = "0.1.23"; edition = "2018"; - sha256 = "08d95g7b1irc578b2iyhzv4xhsa4pfvwsqxcl9lbcpabzkq16msw"; + sha256 = "1x81a50h2zxigj74b9bqjsirxxbyhmis54kg600xj213vf31cvd5"; authors = [ "kwantam " "Manish Goregaokar " @@ -9241,10 +9339,10 @@ rec { }; "unsafe-libyaml" = rec { crateName = "unsafe-libyaml"; - version = "0.2.9"; + version = "0.2.11"; edition = "2021"; crateBin = []; - sha256 = "1yjwnz124wp1fhj075rdqkz00n2gahzj9yi5ixnmiinkw79ng17j"; + sha256 = "0qdq69ffl3v5pzx9kzxbghzn0fzn266i1xn70y88maybz9csqfk7"; authors = [ "David Tolnay " ]; @@ -9281,11 +9379,24 @@ rec { name = "percent-encoding"; packageId = "percent-encoding"; } + { + name = "serde"; + packageId = "serde"; + optional = true; + features = [ "derive" ]; + } + ]; + devDependencies = [ + { + name = "serde"; + packageId = "serde"; + features = [ "derive" ]; + } ]; features = { "serde" = [ "dep:serde" ]; }; - resolvedDefaultFeatures = [ "default" ]; + resolvedDefaultFeatures = [ "default" "serde" ]; }; "urlencoding" = rec { crateName = "urlencoding"; @@ -9313,9 +9424,9 @@ rec { }; "uuid" = rec { crateName = "uuid"; - version = "1.6.1"; + version = "1.8.0"; edition = "2018"; - sha256 = "0q45jxahvysldn3iy04m8xmr8hgig80855y9gq9di8x72v7myfay"; + sha256 = "1h7wks153j08xmdk06wnza3is8pn6j37hihd3kfv95xsxrzwz0x1"; authors = [ "Ashley Mannix" "Christopher Armstrong" @@ -9326,39 +9437,32 @@ rec { { name = "getrandom"; packageId = "getrandom"; - rename = "getrandom"; optional = true; } ]; features = { "arbitrary" = [ "dep:arbitrary" ]; "atomic" = [ "dep:atomic" ]; - "borsh" = [ "dep:borsh" ]; + "borsh" = [ "dep:borsh" "dep:borsh-derive" ]; "bytemuck" = [ "dep:bytemuck" ]; "default" = [ "std" ]; - "fast-rng" = [ "rng" "rand" ]; - "getrandom" = [ "dep:getrandom" ]; - "js" = [ "wasm-bindgen" "getrandom" "getrandom/js" ]; - "macro-diagnostics" = [ "uuid-macro-internal" ]; - "md-5" = [ "dep:md-5" ]; - "md5" = [ "md-5" ]; - "rand" = [ "dep:rand" ]; - "rng" = [ "getrandom" ]; + "fast-rng" = [ "rng" "dep:rand" ]; + "js" = [ "dep:wasm-bindgen" "getrandom?/js" ]; + "macro-diagnostics" = [ "dep:uuid-macro-internal" ]; + "md5" = [ "dep:md-5" ]; + "rng" = [ "dep:getrandom" ]; "serde" = [ "dep:serde" ]; - "sha1" = [ "sha1_smol" ]; - "sha1_smol" = [ "dep:sha1_smol" ]; + "sha1" = [ "dep:sha1_smol" ]; "slog" = [ "dep:slog" ]; - "uuid-macro-internal" = [ "dep:uuid-macro-internal" ]; "v1" = [ "atomic" ]; "v3" = [ "md5" ]; "v4" = [ "rng" ]; "v5" = [ "sha1" ]; "v6" = [ "atomic" ]; "v7" = [ "atomic" "rng" ]; - "wasm-bindgen" = [ "dep:wasm-bindgen" ]; "zerocopy" = [ "dep:zerocopy" ]; }; - resolvedDefaultFeatures = [ "default" "getrandom" "rng" "std" "v4" ]; + resolvedDefaultFeatures = [ "default" "rng" "std" "v4" ]; }; "valuable" = rec { crateName = "valuable"; @@ -9392,27 +9496,6 @@ rec { "Sergio Benitez " ]; - }; - "walkdir" = rec { - crateName = "walkdir"; - version = "2.4.0"; - edition = "2018"; - sha256 = "1vjl9fmfc4v8k9ald23qrpcbyb8dl1ynyq8d516cm537r1yqa7fp"; - authors = [ - "Andrew Gallant " - ]; - dependencies = [ - { - name = "same-file"; - packageId = "same-file"; - } - { - name = "winapi-util"; - packageId = "winapi-util"; - target = { target, features }: (target."windows" or false); - } - ]; - }; "want" = rec { crateName = "want"; @@ -9449,9 +9532,9 @@ rec { }; "wasm-bindgen" = rec { crateName = "wasm-bindgen"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "0kh6akdldy13z9xqj0skz6b4npq1d98bjkgzb8ccq59hibvd9l0f"; + sha256 = "1a4mcw13nsk3fr8fxjzf9kk1wj88xkfsmnm0pjraw01ryqfm7qjb"; authors = [ "The wasm-bindgen Developers" ]; @@ -9480,9 +9563,9 @@ rec { }; "wasm-bindgen-backend" = rec { crateName = "wasm-bindgen-backend"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "09l8lyylsdssz993h4fzja69zpvpykaw84fivs210fjgwqjzcmhv"; + sha256 = "1nj7wxbi49f0rw9d44rjzms26xlw6r76b2mrggx8jfbdjrxphkb1"; authors = [ "The wasm-bindgen Developers" ]; @@ -9509,7 +9592,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "full" ]; } { @@ -9524,9 +9607,9 @@ rec { }; "wasm-bindgen-futures" = rec { crateName = "wasm-bindgen-futures"; - version = "0.4.39"; + version = "0.4.42"; edition = "2018"; - sha256 = "04lsxpw4jqfwh7c0crzx0smj52nvwp1w3bh4098sq90149da2dmc"; + sha256 = "1h322zjvpjllcpj7dahfxjsv6inkr6y0baw7nkdwivr1c4v19g3n"; authors = [ "The wasm-bindgen Developers" ]; @@ -9557,9 +9640,9 @@ rec { }; "wasm-bindgen-macro" = rec { crateName = "wasm-bindgen-macro"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "1cl2w7k5jn2jbd5kx613c8k8vjvda22hfgcgx7y2mk93fbrxnqh1"; + sha256 = "09npa1srjjabd6nfph5yc03jb26sycjlxhy0c2a1pdrpx4yq5y51"; procMacro = true; authors = [ "The wasm-bindgen Developers" @@ -9582,9 +9665,9 @@ rec { }; "wasm-bindgen-macro-support" = rec { crateName = "wasm-bindgen-macro-support"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; - sha256 = "10sj1gr2naxv5q116yjb929hhpvz45dxbkvyk8hyc2lknzy85szh"; + sha256 = "1dqv2xs8zcyw4kjgzj84bknp2h76phmsb3n7j6hn396h4ssifkz9"; authors = [ "The wasm-bindgen Developers" ]; @@ -9599,7 +9682,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; features = [ "visit" "full" ]; } { @@ -9619,10 +9702,10 @@ rec { }; "wasm-bindgen-shared" = rec { crateName = "wasm-bindgen-shared"; - version = "0.2.89"; + version = "0.2.92"; edition = "2018"; links = "wasm_bindgen"; - sha256 = "17s5rppad113c6ggkaq8c3cg7a3zz15i78wxcg6mcl1n15iv7fbs"; + sha256 = "15kyavsrna2cvy30kg03va257fraf9x00ny554vxngvpyaa0q6dg"; authors = [ "The wasm-bindgen Developers" ]; @@ -9630,9 +9713,9 @@ rec { }; "web-sys" = rec { crateName = "web-sys"; - version = "0.3.66"; + version = "0.3.69"; edition = "2018"; - sha256 = "03q1z22djv5ncqkyydcvnchmdsl5gvnyzcyixkxnifw6xi24mhjh"; + sha256 = "1vqkxk935xa8zcnsi4bd88sb267ly2i24xl1yiq26d1n32hskbvp"; authors = [ "The wasm-bindgen Developers" ]; @@ -9915,6 +9998,7 @@ rec { "RtcDataChannel" = [ "EventTarget" ]; "RtcDataChannelEvent" = [ "Event" ]; "RtcPeerConnection" = [ "EventTarget" ]; + "RtcPeerConnectionIceErrorEvent" = [ "Event" ]; "RtcPeerConnectionIceEvent" = [ "Event" ]; "RtcTrackEvent" = [ "Event" ]; "RtcdtmfSender" = [ "EventTarget" ]; @@ -10099,23 +10183,25 @@ rec { }; "web-time" = rec { crateName = "web-time"; - version = "0.2.3"; + version = "1.1.0"; edition = "2021"; - sha256 = "1gykl6dlhm1fjqdrl01b5sa7p7124kf2i0iyk4zh9a5k3xq9l2ap"; + sha256 = "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras"; dependencies = [ { name = "js-sys"; packageId = "js-sys"; - target = { target, features }: ((builtins.elem "wasm" target."family") && (!(("emscripten" == target."os" or null) || ("wasi" == target."os" or null)))); + target = { target, features }: ((builtins.elem "wasm" target."family") && ("unknown" == target."os" or null)); } { name = "wasm-bindgen"; packageId = "wasm-bindgen"; usesDefaultFeatures = false; - target = { target, features }: ((builtins.elem "wasm" target."family") && (!(("emscripten" == target."os" or null) || ("wasi" == target."os" or null)))); + target = { target, features }: ((builtins.elem "wasm" target."family") && ("unknown" == target."os" or null)); } ]; - + features = { + "serde" = [ "dep:serde" ]; + }; }; "winapi" = rec { crateName = "winapi"; @@ -10140,7 +10226,7 @@ rec { features = { "debug" = [ "impl-debug" ]; }; - resolvedDefaultFeatures = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "minwindef" "processenv" "profileapi" "std" "sysinfoapi" "winbase" "wincon" "winerror" "winnt" "ws2ipdef" "ws2tcpip" ]; + resolvedDefaultFeatures = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "processenv" "profileapi" ]; }; "winapi-i686-pc-windows-gnu" = rec { crateName = "winapi-i686-pc-windows-gnu"; @@ -10151,24 +10237,6 @@ rec { "Peter Atashian " ]; - }; - "winapi-util" = rec { - crateName = "winapi-util"; - version = "0.1.6"; - edition = "2021"; - sha256 = "15i5lm39wd44004i9d5qspry2cynkrpvwzghr6s2c3dsk28nz7pj"; - authors = [ - "Andrew Gallant " - ]; - dependencies = [ - { - name = "winapi"; - packageId = "winapi"; - target = { target, features }: (target."windows" or false); - features = [ "std" "consoleapi" "errhandlingapi" "fileapi" "minwindef" "processenv" "sysinfoapi" "winbase" "wincon" "winerror" "winnt" ]; - } - ]; - }; "winapi-x86_64-pc-windows-gnu" = rec { crateName = "winapi-x86_64-pc-windows-gnu"; @@ -10182,16 +10250,16 @@ rec { }; "windows-core" = rec { crateName = "windows-core"; - version = "0.51.1"; + version = "0.52.0"; edition = "2021"; - sha256 = "0r1f57hsshsghjyc7ypp2s0i78f7b1vr93w68sdb8baxyf2czy7i"; + sha256 = "1nc3qv7sy24x0nlnb32f7alzpd6f72l4p24vl65vydbyil669ark"; authors = [ "Microsoft" ]; dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.48.5"; + packageId = "windows-targets 0.52.5"; } ]; features = { @@ -10489,7 +10557,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_Registry" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_Time" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Pipes" "Win32_System_Registry" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_Time" "Win32_System_WindowsProgramming" "default" ]; }; "windows-sys 0.52.0" = rec { crateName = "windows-sys"; @@ -10502,7 +10570,7 @@ rec { dependencies = [ { name = "windows-targets"; - packageId = "windows-targets 0.52.0"; + packageId = "windows-targets 0.52.5"; } ]; features = { @@ -10736,7 +10804,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_Threading" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Threading" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ]; }; "windows-targets 0.48.5" = rec { crateName = "windows-targets"; @@ -10785,49 +10853,54 @@ rec { ]; }; - "windows-targets 0.52.0" = rec { + "windows-targets 0.52.5" = rec { crateName = "windows-targets"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1kg7a27ynzw8zz3krdgy6w5gbqcji27j1sz4p7xk2j5j8082064a"; + sha256 = "1sz7jrnkygmmlj1ia8fk85wbyil450kq5qkh5qh9sh2rcnj161vg"; authors = [ "Microsoft" ]; dependencies = [ { name = "windows_aarch64_gnullvm"; - packageId = "windows_aarch64_gnullvm 0.52.0"; + packageId = "windows_aarch64_gnullvm 0.52.5"; target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); } { name = "windows_aarch64_msvc"; - packageId = "windows_aarch64_msvc 0.52.0"; + packageId = "windows_aarch64_msvc 0.52.5"; target = { target, features }: (("aarch64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } { name = "windows_i686_gnu"; - packageId = "windows_i686_gnu 0.52.0"; - target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!(target."windows_raw_dylib" or false))); + packageId = "windows_i686_gnu 0.52.5"; + target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); + } + { + name = "windows_i686_gnullvm"; + packageId = "windows_i686_gnullvm"; + target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "i686-pc-windows-gnullvm"); } { name = "windows_i686_msvc"; - packageId = "windows_i686_msvc 0.52.0"; + packageId = "windows_i686_msvc 0.52.5"; target = { target, features }: (("x86" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } { name = "windows_x86_64_gnu"; - packageId = "windows_x86_64_gnu 0.52.0"; + packageId = "windows_x86_64_gnu 0.52.5"; target = { target, features }: (("x86_64" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false))); } { name = "windows_x86_64_gnullvm"; - packageId = "windows_x86_64_gnullvm 0.52.0"; + packageId = "windows_x86_64_gnullvm 0.52.5"; target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm"); } { name = "windows_x86_64_msvc"; - packageId = "windows_x86_64_msvc 0.52.0"; - target = { target, features }: (("x86_64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); + packageId = "windows_x86_64_msvc 0.52.5"; + target = { target, features }: ((("x86_64" == target."arch" or null) || ("arm64ec" == target."arch" or null)) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false))); } ]; @@ -10842,11 +10915,11 @@ rec { ]; }; - "windows_aarch64_gnullvm 0.52.0" = rec { + "windows_aarch64_gnullvm 0.52.5" = rec { crateName = "windows_aarch64_gnullvm"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1shmn1kbdc0bpphcxz0vlph96bxz0h1jlmh93s9agf2dbpin8xyb"; + sha256 = "0qrjimbj67nnyn7zqy15mzzmqg0mn5gsr2yciqjxm3cb3vbyx23h"; authors = [ "Microsoft" ]; @@ -10862,11 +10935,11 @@ rec { ]; }; - "windows_aarch64_msvc 0.52.0" = rec { + "windows_aarch64_msvc 0.52.5" = rec { crateName = "windows_aarch64_msvc"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1vvmy1ypvzdvxn9yf0b8ygfl85gl2gpcyvsvqppsmlpisil07amv"; + sha256 = "1dmga8kqlmln2ibckk6mxc9n59vdg8ziqa2zr8awcl720hazv1cr"; authors = [ "Microsoft" ]; @@ -10882,11 +10955,21 @@ rec { ]; }; - "windows_i686_gnu 0.52.0" = rec { + "windows_i686_gnu 0.52.5" = rec { crateName = "windows_i686_gnu"; - version = "0.52.0"; + version = "0.52.5"; + edition = "2021"; + sha256 = "0w4np3l6qwlra9s2xpflqrs60qk1pz6ahhn91rr74lvdy4y0gfl8"; + authors = [ + "Microsoft" + ]; + + }; + "windows_i686_gnullvm" = rec { + crateName = "windows_i686_gnullvm"; + version = "0.52.5"; edition = "2021"; - sha256 = "04zkglz4p3pjsns5gbz85v4s5aw102raz4spj4b0lmm33z5kg1m2"; + sha256 = "1s9f4gff0cixd86mw3n63rpmsm4pmr4ffndl6s7qa2h35492dx47"; authors = [ "Microsoft" ]; @@ -10902,11 +10985,11 @@ rec { ]; }; - "windows_i686_msvc 0.52.0" = rec { + "windows_i686_msvc 0.52.5" = rec { crateName = "windows_i686_msvc"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "16kvmbvx0vr0zbgnaz6nsks9ycvfh5xp05bjrhq65kj623iyirgz"; + sha256 = "1gw7fklxywgpnwbwg43alb4hm0qjmx72hqrlwy5nanrxs7rjng6v"; authors = [ "Microsoft" ]; @@ -10922,11 +11005,11 @@ rec { ]; }; - "windows_x86_64_gnu 0.52.0" = rec { + "windows_x86_64_gnu 0.52.5" = rec { crateName = "windows_x86_64_gnu"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "1zdy4qn178sil5sdm63lm7f0kkcjg6gvdwmcprd2yjmwn8ns6vrx"; + sha256 = "1n8p2mcf3lw6300k77a0knksssmgwb9hynl793mhkzyydgvlchjf"; authors = [ "Microsoft" ]; @@ -10942,11 +11025,11 @@ rec { ]; }; - "windows_x86_64_gnullvm 0.52.0" = rec { + "windows_x86_64_gnullvm 0.52.5" = rec { crateName = "windows_x86_64_gnullvm"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "17lllq4l2k1lqgcnw1cccphxp9vs7inq99kjlm2lfl9zklg7wr8s"; + sha256 = "15n56jrh4s5bz66zimavr1rmcaw6wa306myrvmbc6rydhbj9h8l5"; authors = [ "Microsoft" ]; @@ -10962,43 +11045,21 @@ rec { ]; }; - "windows_x86_64_msvc 0.52.0" = rec { + "windows_x86_64_msvc 0.52.5" = rec { crateName = "windows_x86_64_msvc"; - version = "0.52.0"; + version = "0.52.5"; edition = "2021"; - sha256 = "012wfq37f18c09ij5m6rniw7xxn5fcvrxbqd0wd8vgnl3hfn9yfz"; + sha256 = "1w1bn24ap8dp9i85s8mlg8cim2bl2368bd6qyvm0xzqvzmdpxi5y"; authors = [ "Microsoft" ]; }; - "winnow" = rec { - crateName = "winnow"; - version = "0.5.24"; - edition = "2021"; - sha256 = "0jvh09jba1ylpm6rny8fwqdls6ssajm4fq552iizr38h35mjd0q3"; - dependencies = [ - { - name = "memchr"; - packageId = "memchr"; - optional = true; - usesDefaultFeatures = false; - } - ]; - features = { - "debug" = [ "dep:anstream" "dep:anstyle" "dep:is-terminal" "dep:terminal_size" ]; - "default" = [ "std" ]; - "simd" = [ "dep:memchr" ]; - "std" = [ "alloc" "memchr?/std" ]; - "unstable-doc" = [ "alloc" "std" "simd" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; - }; "winreg" = rec { crateName = "winreg"; - version = "0.50.0"; + version = "0.52.0"; edition = "2018"; - sha256 = "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj"; + sha256 = "19gh9vp7mp1ab84kc3ag48nm9y7xgjhh3xa4vxss1gylk1rsaxx2"; authors = [ "Igor Shaula " ]; @@ -11021,10 +11082,10 @@ rec { }; "xml-rs" = rec { crateName = "xml-rs"; - version = "0.8.19"; + version = "0.8.20"; edition = "2021"; crateBin = []; - sha256 = "0nnpvk3fv32hgh7vs9gbg2swmzxx5yz73f4b7rak7q39q2x9rjqg"; + sha256 = "14s1czpj83zhgr4pizxa4j07layw9wmlqhkq0k3wz5q5ixwph6br"; libName = "xml"; authors = [ "Vladimir Matveev " @@ -11033,9 +11094,9 @@ rec { }; "zerocopy" = rec { crateName = "zerocopy"; - version = "0.7.28"; + version = "0.7.34"; edition = "2018"; - sha256 = "03hgzsiyg6fw6dqxkhawl1qdq8vcjdxlajp36m4jlpg0mpviavvx"; + sha256 = "11xhrwixm78m6ca1jdxf584wdwvpgg7q00vg21fhwl0psvyf71xf"; authors = [ "Joshua Liebow-Feeser " ]; @@ -11069,9 +11130,9 @@ rec { }; "zerocopy-derive" = rec { crateName = "zerocopy-derive"; - version = "0.7.28"; + version = "0.7.34"; edition = "2018"; - sha256 = "16v4p85wv11z9mzwnqacbz04by9ywsjdzmyb1qsh11gpwchx5fnv"; + sha256 = "0fqvglw01w3hp7xj9gdk1800x9j7v58s9w8ijiyiz2a7krb39s8m"; procMacro = true; authors = [ "Joshua Liebow-Feeser " @@ -11087,7 +11148,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.39"; + packageId = "syn 2.0.61"; } ]; @@ -11107,7 +11168,7 @@ rec { "std" = [ "alloc" ]; "zeroize_derive" = [ "dep:zeroize_derive" ]; }; - resolvedDefaultFeatures = [ "alloc" ]; + resolvedDefaultFeatures = [ "alloc" "default" ]; }; }; diff --git a/Cargo.toml b/Cargo.toml index 341db02d..bfb8f5df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", branch = "main" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.37", features = ["full"] } tracing = "0.1" diff --git a/crate-hashes.json b/crate-hashes.json index 3d1f373a..5623023b 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,5 +1,5 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#stackable-operator-derive@0.64.0": "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp", - "git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#stackable-operator@0.64.0": "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator-derive@0.3.0": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator@0.67.1": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", "git+https://github.com/stackabletech/product-config.git?tag=0.6.0#product-config@0.6.0": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41" -} +} \ No newline at end of file diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index c1f7cd9b..17daf7b5 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -287,26 +287,6 @@ impl ReconcilerError for Error { } } -trait OpaLogLevel { - fn to_opa_literal(&self) -> String; -} - -impl OpaLogLevel for LogLevel { - // based on https://www.openpolicyagent.org/docs/latest/cli/#options-10 opa has only log levels {debug,info,error} - fn to_opa_literal(&self) -> String { - match self { - LogLevel::TRACE => "debug", - LogLevel::DEBUG => "debug", - LogLevel::INFO => "info", - LogLevel::WARN => "error", - LogLevel::ERROR => "error", - LogLevel::FATAL => "error", - LogLevel::NONE => "error", - } - .into() - } -} - #[derive(Serialize, Deserialize)] pub struct OpaClusterConfigFile { services: Vec, From 0e3e0a5f78b81588ba4c2f8da590987c11aee8c2 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 May 2024 13:39:40 +0200 Subject: [PATCH 20/25] temporary change opa version for integration tes --- tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 | 2 ++ tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 | 2 ++ tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 | 2 ++ tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 | 2 ++ tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 | 2 ++ tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 | 2 ++ tests/templates/kuttl/logging/02-install-opa.yaml.j2 | 2 ++ tests/templates/kuttl/resources/10-install-opa.yaml.j2 | 2 ++ tests/templates/kuttl/smoke/10-install-opa.yaml.j2 | 2 ++ 9 files changed, 18 insertions(+) diff --git a/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 b/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 index 9e9ac895..06a3527d 100644 --- a/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 @@ -27,7 +27,9 @@ commands: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent clusterConfig: userInfo: diff --git a/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 index 566fcda4..42deed30 100644 --- a/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 @@ -5,7 +5,9 @@ metadata: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 index 62baf2c6..6846c4e7 100644 --- a/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 @@ -5,7 +5,9 @@ metadata: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 index 4fcc8bf0..acb47da9 100644 --- a/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 @@ -5,7 +5,9 @@ metadata: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 index 01db2a31..6a34fb04 100644 --- a/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 @@ -5,7 +5,9 @@ metadata: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: vectorAggregatorConfigMapName: vector-aggregator-discovery diff --git a/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 b/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 index cd80b3b0..17791a37 100644 --- a/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 @@ -27,7 +27,9 @@ commands: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent clusterConfig: userInfo: diff --git a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 index 95933f27..71038a29 100644 --- a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 @@ -23,7 +23,9 @@ metadata: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent clusterConfig: vectorAggregatorConfigMapName: opa-vector-aggregator-discovery diff --git a/tests/templates/kuttl/resources/10-install-opa.yaml.j2 b/tests/templates/kuttl/resources/10-install-opa.yaml.j2 index b409e017..d9efb822 100644 --- a/tests/templates/kuttl/resources/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/resources/10-install-opa.yaml.j2 @@ -5,7 +5,9 @@ metadata: name: opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 b/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 index 3ee45eaf..3be46ce8 100644 --- a/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 @@ -23,7 +23,9 @@ metadata: name: test-opa spec: image: + repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa'] }}" + stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: From 5b5773e690053fb02920b8f991767c406977797c Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 May 2024 15:03:02 +0200 Subject: [PATCH 21/25] correct indentation --- tests/templates/kuttl/logging/02-install-opa.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 index 71038a29..0c8132cf 100644 --- a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 @@ -43,7 +43,7 @@ spec: level: INFO loggers: decision: - level: INFO + level: INFO bundle-builder: console: level: NONE From 199f49716b6606465f25df1940d0c4f4d7ceeed2 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 May 2024 16:27:02 +0200 Subject: [PATCH 22/25] pass envvars directly --- rust/operator-binary/src/controller.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 17daf7b5..d24b6c6f 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -1061,7 +1061,7 @@ fn build_opa_start_command(merged_config: &OpaConfig, container_name: &str) -> S // See https://stackoverflow.com/a/8048493 let logging_redirects = format!( - "&> >(process-logs --file-log-level {file} --console-log-level {console} --decision-log-level {decision} --server-log-level {server} --opa-rolling-log-file-size-bytes {OPA_ROLLING_LOG_FILE_SIZE_BYTES} --opa-rolling-log-files {OPA_ROLLING_LOG_FILES} --stackable-log-dir {STACKABLE_LOG_DIR} --container-name {container_name})", + "&> >(CONSOLE_LEVEL={console} FILE_LEVEL={file} DECISION_LEVEL={decision} SERVER_LEVEL={server} OPA_ROLLING_LOG_FILE_SIZE_BYTES={OPA_ROLLING_LOG_FILE_SIZE_BYTES} OPA_ROLLING_LOG_FILES={OPA_ROLLING_LOG_FILES} STACKABLE_LOG_DIR={STACKABLE_LOG_DIR} CONTAINER_NAME={container_name} process-logs)", file = file_log_level.to_opa_literal(), console = console_log_level.to_opa_literal(), decision = decision_log_level.to_opa_literal(), From 53f1029e8c32958c2d5e224b8d851530bd965898 Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 3 Jun 2024 12:03:30 +0200 Subject: [PATCH 23/25] Revert "temporary change opa version for integration tes" This reverts commit 0e3e0a5f78b81588ba4c2f8da590987c11aee8c2. --- tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 | 2 -- tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 | 2 -- tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 | 2 -- tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 | 2 -- tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 | 2 -- tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 | 2 -- tests/templates/kuttl/logging/02-install-opa.yaml.j2 | 2 -- tests/templates/kuttl/resources/10-install-opa.yaml.j2 | 2 -- tests/templates/kuttl/smoke/10-install-opa.yaml.j2 | 2 -- 9 files changed, 18 deletions(-) diff --git a/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 b/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 index 06a3527d..9e9ac895 100644 --- a/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/aas-user-info/10-install-opa.yaml.j2 @@ -27,9 +27,7 @@ commands: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent clusterConfig: userInfo: diff --git a/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 index 42deed30..566fcda4 100644 --- a/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 @@ -5,9 +5,7 @@ metadata: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 index 6846c4e7..62baf2c6 100644 --- a/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 @@ -5,9 +5,7 @@ metadata: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 index acb47da9..4fcc8bf0 100644 --- a/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 @@ -5,9 +5,7 @@ metadata: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 index 6a34fb04..01db2a31 100644 --- a/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 @@ -5,9 +5,7 @@ metadata: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: vectorAggregatorConfigMapName: vector-aggregator-discovery diff --git a/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 b/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 index 17791a37..cd80b3b0 100644 --- a/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/keycloak-user-info/10-install-opa.yaml.j2 @@ -27,9 +27,7 @@ commands: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent clusterConfig: userInfo: diff --git a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 index 0c8132cf..f1a43ceb 100644 --- a/tests/templates/kuttl/logging/02-install-opa.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-opa.yaml.j2 @@ -23,9 +23,7 @@ metadata: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent clusterConfig: vectorAggregatorConfigMapName: opa-vector-aggregator-discovery diff --git a/tests/templates/kuttl/resources/10-install-opa.yaml.j2 b/tests/templates/kuttl/resources/10-install-opa.yaml.j2 index d9efb822..b409e017 100644 --- a/tests/templates/kuttl/resources/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/resources/10-install-opa.yaml.j2 @@ -5,9 +5,7 @@ metadata: name: opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa-latest'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: diff --git a/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 b/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 index 3be46ce8..3ee45eaf 100644 --- a/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 @@ -23,9 +23,7 @@ metadata: name: test-opa spec: image: - repo: docker.stackable.tech/sandbox productVersion: "{{ test_scenario['values']['opa'] }}" - stackableVersion: 0.0.0-dev pullPolicy: IfNotPresent {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: From 3ee71745688dd517c3a9e3642f000fd057c2fd17 Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 3 Jun 2024 14:20:36 +0200 Subject: [PATCH 24/25] bump operator-rs version --- Cargo.lock | 98 +++++++++++++++++++++--------------------------------- Cargo.toml | 2 +- 2 files changed, 39 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 383df100..3d7524cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -117,24 +117,24 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener", + "event-listener-strategy", "pin-project-lite", ] @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -639,43 +639,22 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] @@ -844,9 +823,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" @@ -1040,9 +1019,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -1439,7 +1418,7 @@ dependencies = [ "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "event-listener 5.3.0", + "event-listener", "futures-util", "once_cell", "parking_lot", @@ -1454,11 +1433,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1501,9 +1479,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1777,9 +1755,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -2419,8 +2397,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.68.0" -source = "git+https://github.com/stackabletech/operator-rs.git?branch=main#4127d8dc6e235f27d60e8402e44fee4159ce4085" +version = "0.69.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.0#9ff61fa29c30b5aedc5c11b929079477e2642a7a" dependencies = [ "chrono", "clap", @@ -2456,7 +2434,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.0" -source = "git+https://github.com/stackabletech/operator-rs.git?branch=main#4127d8dc6e235f27d60e8402e44fee4159ce4085" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.0#9ff61fa29c30b5aedc5c11b929079477e2642a7a" dependencies = [ "darling", "proc-macro2", @@ -2481,11 +2459,11 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -2640,9 +2618,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2659,9 +2637,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -2844,9 +2822,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" [[package]] name = "try-lock" diff --git a/Cargo.toml b/Cargo.toml index bfb8f5df..e2dcff2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", branch = "main" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.69.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.37", features = ["full"] } tracing = "0.1" From f25330faaeb401c473cafe2390274063cc15e3f3 Mon Sep 17 00:00:00 2001 From: xeniape Date: Mon, 3 Jun 2024 14:35:03 +0200 Subject: [PATCH 25/25] update cargo.nix and crate-hashes.json --- Cargo.nix | 433 ++++++++++++++++++++-------------------------- crate-hashes.json | 4 +- 2 files changed, 192 insertions(+), 245 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 5c6a0439..8ae603fa 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -93,9 +93,9 @@ rec { crates = { "addr2line" = rec { crateName = "addr2line"; - version = "0.21.0"; + version = "0.22.0"; edition = "2018"; - sha256 = "1jx0k3iwyqr8klqbzk6kjvr496yd94aspis10vwsj5wy7gib4c4a"; + sha256 = "0y66f1sa27i9kvmlh76ynk60rxfrmkba9ja8x527h32wdb206ibf"; dependencies = [ { name = "gimli"; @@ -360,9 +360,9 @@ rec { }; "anyhow" = rec { crateName = "anyhow"; - version = "1.0.83"; + version = "1.0.86"; edition = "2018"; - sha256 = "1wzm0i8jlmxpcfkmrqnmcpi00ca4g2kg6zfdm4cvbqnwpcnb7g95"; + sha256 = "1nk301x8qhpdaks6a9zvcp7yakjqnczjmqndbg7vk4494d3d1ldk"; authors = [ "David Tolnay " ]; @@ -374,9 +374,9 @@ rec { }; "async-broadcast" = rec { crateName = "async-broadcast"; - version = "0.7.0"; + version = "0.7.1"; edition = "2018"; - sha256 = "1nybg8i495m380rr7xj7z2xigdpf1b7qcb9vg04ry6vlmahm52r5"; + sha256 = "0zia7z1y31awmxma9c89zmvkbj7mdkf7highkmz5z3pa4lp0xk90"; authors = [ "Stjepan Glavina " "Yoshua Wuyts " @@ -385,11 +385,11 @@ rec { dependencies = [ { name = "event-listener"; - packageId = "event-listener 5.3.0"; + packageId = "event-listener"; } { name = "event-listener-strategy"; - packageId = "event-listener-strategy 0.5.2"; + packageId = "event-listener-strategy"; } { name = "futures-core"; @@ -404,21 +404,21 @@ rec { }; "async-lock" = rec { crateName = "async-lock"; - version = "3.3.0"; + version = "3.4.0"; edition = "2021"; - sha256 = "0yxflkfw46rad4lv86f59b5z555dlfmg1riz1n8830rgi0qb8d6h"; + sha256 = "060vh45i809wcqyxzs5g69nqiqah7ydz0hpkcjys9258vqn4fvpz"; authors = [ "Stjepan Glavina " ]; dependencies = [ { name = "event-listener"; - packageId = "event-listener 4.0.3"; + packageId = "event-listener"; usesDefaultFeatures = false; } { name = "event-listener-strategy"; - packageId = "event-listener-strategy 0.4.0"; + packageId = "event-listener-strategy"; usesDefaultFeatures = false; } { @@ -428,6 +428,7 @@ rec { ]; features = { "default" = [ "std" ]; + "loom" = [ "event-listener/loom" "dep:loom" ]; "std" = [ "event-listener/std" "event-listener-strategy/std" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; @@ -476,7 +477,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -502,12 +503,25 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; }; + "atomic-waker" = rec { + crateName = "atomic-waker"; + version = "1.1.2"; + edition = "2018"; + sha256 = "1h5av1lw56m0jf0fd3bchxq8a30xv0b4wv8s4zkp4s0i7mfvs18m"; + authors = [ + "Stjepan Glavina " + "Contributors to futures-rs" + ]; + features = { + "portable-atomic" = [ "dep:portable-atomic" ]; + }; + }; "autocfg" = rec { crateName = "autocfg"; version = "1.3.0"; @@ -810,9 +824,9 @@ rec { }; "backtrace" = rec { crateName = "backtrace"; - version = "0.3.71"; + version = "0.3.72"; edition = "2021"; - sha256 = "17bgd7pbjb9gc8q47qwsg2lmy9i62x3bsjmmnjrwh5z8s805ic16"; + sha256 = "048syxl94cigv2wka9wdg145bcc2dnbimcmpn65jx7blydfs7ihp"; authors = [ "The Rust Project Developers" ]; @@ -860,11 +874,9 @@ rec { features = { "cpp_demangle" = [ "dep:cpp_demangle" ]; "default" = [ "std" ]; - "rustc-serialize" = [ "dep:rustc-serialize" ]; "serde" = [ "dep:serde" ]; - "serialize-rustc" = [ "rustc-serialize" ]; "serialize-serde" = [ "serde" ]; - "verify-winapi" = [ "winapi/dbghelp" "winapi/handleapi" "winapi/libloaderapi" "winapi/memoryapi" "winapi/minwindef" "winapi/processthreadsapi" "winapi/synchapi" "winapi/tlhelp32" "winapi/winbase" "winapi/winnt" ]; + "verify-winapi" = [ "winapi/dbghelp" "winapi/handleapi" "winapi/libloaderapi" "winapi/memoryapi" "winapi/minwindef" "winapi/processthreadsapi" "winapi/synchapi" "winapi/tlhelp32" "winapi/winbase" "winapi/winnt" "winapi/winnls" "winapi/stringapiset" ]; "winapi" = [ "dep:winapi" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; @@ -986,9 +998,9 @@ rec { }; "built" = rec { crateName = "built"; - version = "0.7.2"; + version = "0.7.3"; edition = "2021"; - sha256 = "05igfjr1hxcha6j7pz8jx1w825gdiqdbiyl0bs5pmf2n2arbvgs1"; + sha256 = "05vwkcfhj08ygp9sb7821yf3hdk40s40mc1qqd57bz9qkjrw19n6"; authors = [ "Lukas Lueg " ]; @@ -1060,9 +1072,9 @@ rec { }; "cc" = rec { crateName = "cc"; - version = "1.0.97"; + version = "1.0.98"; edition = "2018"; - sha256 = "1d6rv3nk5q6lrr3mf7lifqpjr44slylsz3pw6pmn2k2cv1bm76h9"; + sha256 = "0gzhij74hblfkzwwyysdc8crfd6fr0m226vzmijmwwhdakkp1hj1"; authors = [ "Alex Crichton " ]; @@ -1230,7 +1242,7 @@ rec { } { name = "strsim"; - packageId = "strsim 0.11.1"; + packageId = "strsim"; optional = true; } ]; @@ -1269,7 +1281,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -1458,9 +1470,9 @@ rec { }; "crossbeam-channel" = rec { crateName = "crossbeam-channel"; - version = "0.5.12"; + version = "0.5.13"; edition = "2021"; - sha256 = "159gp30clv2ci3r473659ii04pjznspb3g9gwkhj2lavkhmb0gdb"; + sha256 = "1wkx45r34v7g3wyi3lg2wz536lrrrab4h4hh741shfhr8rlhsj1k"; dependencies = [ { name = "crossbeam-utils"; @@ -1497,9 +1509,9 @@ rec { }; "crossbeam-utils" = rec { crateName = "crossbeam-utils"; - version = "0.8.19"; + version = "0.8.20"; edition = "2021"; - sha256 = "0iakrb1b8fjqrag7wphl94d10irhbh2fw1g444xslsywqyn3p3i4"; + sha256 = "100fksq5mm1n7zj242cclkw6yf7a4a8ix3lvpfkhxvdhbda9kv12"; features = { "default" = [ "std" ]; "loom" = [ "dep:loom" ]; @@ -1532,9 +1544,9 @@ rec { }; "darling" = rec { crateName = "darling"; - version = "0.20.8"; - edition = "2018"; - sha256 = "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl"; + version = "0.20.9"; + edition = "2021"; + sha256 = "1q9zdyiva4p1ly6ip4lg9y8mfk6b59n6iphpxnjxsayij16ypcl3"; authors = [ "Ted Driggs " ]; @@ -1557,9 +1569,9 @@ rec { }; "darling_core" = rec { crateName = "darling_core"; - version = "0.20.8"; - edition = "2018"; - sha256 = "03x7s149p06xfwcq0lgkk4yxh6jf7jckny18nzp1yyk87b1g2b4w"; + version = "0.20.9"; + edition = "2021"; + sha256 = "086i3kisa1yq8jsskahv1ywi2qbrym8r20lram7a0wmc1gz8f9k2"; authors = [ "Ted Driggs " ]; @@ -1582,12 +1594,12 @@ rec { } { name = "strsim"; - packageId = "strsim 0.10.0"; + packageId = "strsim"; optional = true; } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "extra-traits" ]; } ]; @@ -1599,9 +1611,9 @@ rec { }; "darling_macro" = rec { crateName = "darling_macro"; - version = "0.20.8"; - edition = "2018"; - sha256 = "0gwkz0cjfy3fgcc1zmm7azzhj5qpja34s0cklcria4l38sjyss56"; + version = "0.20.9"; + edition = "2021"; + sha256 = "0y015yy33p85sgpq7shm49clss78p71871gf7sss3cc26jsang3k"; procMacro = true; authors = [ "Ted Driggs " @@ -1617,7 +1629,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; @@ -1643,7 +1655,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -1771,9 +1783,9 @@ rec { }; "either" = rec { crateName = "either"; - version = "1.11.0"; + version = "1.12.0"; edition = "2018"; - sha256 = "18l0cwyw18syl8b52syv6balql8mnwfyhihjqqllx5pms93iqz54"; + sha256 = "12xmhlrv5gfsraimh6xaxcmb0qh6cc7w7ap4sw40ky9wfm095jix"; authors = [ "bluss" ]; @@ -1831,9 +1843,9 @@ rec { }; "errno" = rec { crateName = "errno"; - version = "0.3.8"; + version = "0.3.9"; edition = "2018"; - sha256 = "0ia28ylfsp36i27g1qih875cyyy4by2grf80ki8vhgh6vinf8n52"; + sha256 = "1fi0m0493maq1jygcf1bya9cymz2pc1mqxj26bdv7yjd37v5qk2k"; authors = [ "Chris Wong " ]; @@ -1869,48 +1881,14 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "event-listener 4.0.3" = rec { + "event-listener" = rec { crateName = "event-listener"; - version = "4.0.3"; + version = "5.3.1"; edition = "2021"; - sha256 = "0vk4smw1vf871vi76af1zn7w69jg3zmpjddpby2qq91bkg21bck7"; - authors = [ - "Stjepan Glavina " - ]; - dependencies = [ - { - name = "concurrent-queue"; - packageId = "concurrent-queue"; - usesDefaultFeatures = false; - } - { - name = "parking"; - packageId = "parking"; - optional = true; - target = { target, features }: (!(builtins.elem "wasm" target."family")); - } - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - ]; - features = { - "default" = [ "std" ]; - "parking" = [ "dep:parking" ]; - "portable-atomic" = [ "portable-atomic-util" "portable_atomic_crate" ]; - "portable-atomic-util" = [ "dep:portable-atomic-util" ]; - "portable_atomic_crate" = [ "dep:portable_atomic_crate" ]; - "std" = [ "concurrent-queue/std" "parking" ]; - }; - resolvedDefaultFeatures = [ "parking" "std" ]; - }; - "event-listener 5.3.0" = rec { - crateName = "event-listener"; - version = "5.3.0"; - edition = "2021"; - sha256 = "091a6bgxzjnycqa10l2sqwzzy0j9vpw7a1w0nbglqlqkraw496bd"; + sha256 = "1fkm6q4hjn61wl52xyqyyxai0x9w0ngrzi0wf1qsf8vhsadvwck0"; authors = [ "Stjepan Glavina " + "John Nunley " ]; dependencies = [ { @@ -1933,39 +1911,14 @@ rec { "default" = [ "std" ]; "loom" = [ "concurrent-queue/loom" "parking?/loom" "dep:loom" ]; "parking" = [ "dep:parking" ]; - "portable-atomic" = [ "portable-atomic-util" "portable_atomic_crate" ]; + "portable-atomic" = [ "portable-atomic-util" "portable_atomic_crate" "concurrent-queue/portable-atomic" ]; "portable-atomic-util" = [ "dep:portable-atomic-util" ]; "portable_atomic_crate" = [ "dep:portable_atomic_crate" ]; "std" = [ "concurrent-queue/std" "parking" ]; }; resolvedDefaultFeatures = [ "default" "parking" "std" ]; }; - "event-listener-strategy 0.4.0" = rec { - crateName = "event-listener-strategy"; - version = "0.4.0"; - edition = "2018"; - sha256 = "1lwprdjqp2ibbxhgm9khw7s7y7k4xiqj5i5yprqiks6mnrq4v3lm"; - authors = [ - "John Nunley " - ]; - dependencies = [ - { - name = "event-listener"; - packageId = "event-listener 4.0.3"; - usesDefaultFeatures = false; - } - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - ]; - features = { - "default" = [ "std" ]; - "std" = [ "event-listener/std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; - "event-listener-strategy 0.5.2" = rec { + "event-listener-strategy" = rec { crateName = "event-listener-strategy"; version = "0.5.2"; edition = "2021"; @@ -1976,7 +1929,7 @@ rec { dependencies = [ { name = "event-listener"; - packageId = "event-listener 5.3.0"; + packageId = "event-listener"; usesDefaultFeatures = false; } { @@ -2270,7 +2223,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -2455,9 +2408,9 @@ rec { }; "gimli" = rec { crateName = "gimli"; - version = "0.28.1"; + version = "0.29.0"; edition = "2018"; - sha256 = "0lv23wc8rxvmjia3mcxc6hj9vkqnv1bqq0h8nzjcgf71mrxx6wa2"; + sha256 = "1zgzprnjaawmg6zyic4f2q2hc39kdhn116qnkqpgvsasgc3x9v20"; features = { "default" = [ "read-all" "write" ]; "endian-reader" = [ "read" "dep:stable_deref_trait" ]; @@ -2525,14 +2478,18 @@ rec { }; "h2" = rec { crateName = "h2"; - version = "0.4.4"; + version = "0.4.5"; edition = "2021"; - sha256 = "0sc0ymhiqp4hbz39d405cjbga77wnz2pprbgyc498xs58hlwfvl1"; + sha256 = "1aw62k5xnghpryjnlsbxxhjiwpxir6yi15l3y02w933s225f50ps"; authors = [ "Carl Lerche " "Sean McArthur " ]; dependencies = [ + { + name = "atomic-waker"; + packageId = "atomic-waker"; + } { name = "bytes"; packageId = "bytes"; @@ -2551,11 +2508,6 @@ rec { packageId = "futures-sink"; usesDefaultFeatures = false; } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } { name = "http"; packageId = "http"; @@ -2903,9 +2855,9 @@ rec { }; "hyper-rustls" = rec { crateName = "hyper-rustls"; - version = "0.27.1"; + version = "0.27.2"; edition = "2021"; - sha256 = "0arh47qg9ln3l8q4x9wcpwmsq4j1cc08mimw3sh3g86pjs3b72wh"; + sha256 = "0ma1wyfnqnkz7zyr7wpply3xfvlijd0rqqhb6ajs28c9jhnbxr2y"; dependencies = [ { name = "futures-util"; @@ -3105,9 +3057,10 @@ rec { }; "hyper-util" = rec { crateName = "hyper-util"; - version = "0.1.3"; + version = "0.1.5"; edition = "2021"; - sha256 = "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a"; + sha256 = "0mhw6n1s40ifr5a8z0nij2yirpdi81jhcyxfp7byb5hblqj5k1vv"; + libName = "hyper_util"; authors = [ "Sean McArthur " ]; @@ -3152,12 +3105,13 @@ rec { name = "tokio"; packageId = "tokio"; optional = true; - features = [ "net" "rt" "time" ]; + usesDefaultFeatures = false; } { name = "tower"; packageId = "tower"; optional = true; + usesDefaultFeatures = false; features = [ "make" "util" ]; } { @@ -3186,19 +3140,20 @@ rec { { name = "tokio"; packageId = "tokio"; - features = [ "macros" "test-util" ]; + features = [ "macros" "test-util" "signal" ]; } ]; features = { "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower" "dep:tower-service" ]; - "client-legacy" = [ "client" ]; - "full" = [ "client" "client-legacy" "server" "server-auto" "service" "http1" "http2" "tokio" ]; + "client-legacy" = [ "client" "dep:socket2" "tokio/sync" ]; + "full" = [ "client" "client-legacy" "server" "server-auto" "server-graceful" "service" "http1" "http2" "tokio" ]; "http1" = [ "hyper/http1" ]; "http2" = [ "hyper/http2" ]; "server" = [ "hyper/server" ]; "server-auto" = [ "server" "http1" "http2" ]; + "server-graceful" = [ "server" "tokio/sync" ]; "service" = [ "dep:tower" "dep:tower-service" ]; - "tokio" = [ "dep:tokio" "dep:socket2" ]; + "tokio" = [ "dep:tokio" "tokio/net" "tokio/rt" "tokio/time" ]; }; resolvedDefaultFeatures = [ "client" "client-legacy" "default" "http1" "http2" "server" "tokio" ]; }; @@ -3343,9 +3298,9 @@ rec { }; "instant" = rec { crateName = "instant"; - version = "0.1.12"; + version = "0.1.13"; edition = "2018"; - sha256 = "0b2bx5qdlwayriidhrag8vhy10kdfimfhmb3jnjmsz2h9j1bwnvs"; + sha256 = "08h27kzvb5jw74mh0ajv0nv9ggwvgqm8ynjsn2sa9jsks4cjh970"; authors = [ "sebcrozet " ]; @@ -4007,7 +3962,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "extra-traits" ]; } ]; @@ -4147,9 +4102,9 @@ rec { }; "libc" = rec { crateName = "libc"; - version = "0.2.154"; + version = "0.2.155"; edition = "2015"; - sha256 = "0inkwrnwzrr1kw75x944ihdajrhhldkgg4irx1n19y9gp4w36x5f"; + sha256 = "0z44c53z54znna8n322k5iwg80arxxpdzjj5260pxxzc9a58icwp"; authors = [ "The Rust Project Developers" ]; @@ -4207,10 +4162,10 @@ rec { }; "libz-sys" = rec { crateName = "libz-sys"; - version = "1.1.16"; + version = "1.1.18"; edition = "2018"; links = "z"; - sha256 = "1yd7mnw0h469rbsxfbb0r6czc4q8fabn9jkbiz99a9kbcrg3n52y"; + sha256 = "0bpqmfzvijbrqs29vphnafjz834lpz6pabbsnf85rqppb9pa4pf1"; authors = [ "Alex Crichton " "Josh Triplett " @@ -4242,14 +4197,15 @@ rec { "default" = [ "libc" "stock-zlib" ]; "libc" = [ "dep:libc" ]; "zlib-ng" = [ "libc" "cmake" ]; + "zlib-ng-no-cmake-experimental-community-maintained" = [ "libc" ]; }; resolvedDefaultFeatures = [ "libc" ]; }; "linux-raw-sys" = rec { crateName = "linux-raw-sys"; - version = "0.4.13"; + version = "0.4.14"; edition = "2021"; - sha256 = "172k2c6422gsc914ig8rh99mb9yc7siw6ikc3d9xw1k7vx0s3k81"; + sha256 = "12gsjgbhhjwywpqcrizv80vrp7p7grsz5laqq773i33wphjsxcvq"; authors = [ "Dan Gohman " ]; @@ -4372,9 +4328,9 @@ rec { }; "miniz_oxide" = rec { crateName = "miniz_oxide"; - version = "0.7.2"; + version = "0.7.3"; edition = "2018"; - sha256 = "19qlxb21s6kabgqq61mk7kd1qk2invyygj076jz6i1gj2lz1z0cx"; + sha256 = "1bndap8kj8ihlaz23a5cq0ihc09xh3c1m4ip5dbnpilmw4gx1pw7"; authors = [ "Frommi " "oyvindln " @@ -4466,7 +4422,7 @@ rec { } { name = "event-listener"; - packageId = "event-listener 5.3.0"; + packageId = "event-listener"; optional = true; } { @@ -4534,42 +4490,37 @@ rec { }; "native-tls" = rec { crateName = "native-tls"; - version = "0.2.11"; + version = "0.2.12"; edition = "2015"; - sha256 = "0bmrlg0fmzxaycjpkgkchi93av07v2yf9k33gc12ca9gqdrn28h7"; + sha256 = "0rkl65z70n7sy4d5w0qa99klg1hr43wx6kcprk4d2n9xr2r4wqd8"; authors = [ "Steven Fackler " ]; dependencies = [ - { - name = "lazy_static"; - packageId = "lazy_static"; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); - } { name = "libc"; packageId = "libc"; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); + target = { target, features }: ("apple" == target."vendor" or null); } { name = "log"; packageId = "log"; - target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null))); + target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); } { name = "openssl"; packageId = "openssl"; - target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null))); + target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); } { name = "openssl-probe"; packageId = "openssl-probe"; - target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null))); + target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); } { name = "openssl-sys"; packageId = "openssl-sys"; - target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null))); + target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); } { name = "schannel"; @@ -4579,17 +4530,17 @@ rec { { name = "security-framework"; packageId = "security-framework"; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); + target = { target, features }: ("apple" == target."vendor" or null); } { name = "security-framework-sys"; packageId = "security-framework-sys"; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); + target = { target, features }: ("apple" == target."vendor" or null); } { name = "tempfile"; packageId = "tempfile"; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); + target = { target, features }: ("macos" == target."os" or null); } ]; devDependencies = [ @@ -4675,9 +4626,9 @@ rec { }; "object" = rec { crateName = "object"; - version = "0.32.2"; + version = "0.35.0"; edition = "2018"; - sha256 = "0hc4cjwyngiy6k51hlzrlsxgv5z25vv7c2cp0ky1lckfic0259m6"; + sha256 = "0pnv84mx3f3p847hfnsp4znivnwkc1x53maq459a92w42fw7mv5q"; dependencies = [ { name = "memchr"; @@ -4686,13 +4637,15 @@ rec { } ]; features = { - "all" = [ "read" "write" "std" "compression" "wasm" ]; + "all" = [ "read" "write" "build" "std" "compression" "wasm" ]; "alloc" = [ "dep:alloc" ]; + "build" = [ "build_core" "write_std" "elf" ]; + "build_core" = [ "read_core" "write_core" ]; "compiler_builtins" = [ "dep:compiler_builtins" ]; "compression" = [ "dep:flate2" "dep:ruzstd" "std" ]; "core" = [ "dep:core" ]; "default" = [ "read" "compression" ]; - "doc" = [ "read_core" "write_std" "std" "compression" "archive" "coff" "elf" "macho" "pe" "wasm" "xcoff" ]; + "doc" = [ "read_core" "write_std" "build_core" "std" "compression" "archive" "coff" "elf" "macho" "pe" "wasm" "xcoff" ]; "pe" = [ "coff" ]; "read" = [ "read_core" "archive" "coff" "elf" "macho" "pe" "xcoff" "unaligned" ]; "rustc-dep-of-std" = [ "core" "compiler_builtins" "alloc" "memchr/rustc-dep-of-std" ]; @@ -4787,7 +4740,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -5182,9 +5135,9 @@ rec { }; "parking_lot" = rec { crateName = "parking_lot"; - version = "0.12.2"; + version = "0.12.3"; edition = "2021"; - sha256 = "1ys2dzz6cysjmwyivwxczl1ljpcf5cj4qmhdj07d5bkc9z5g0jky"; + sha256 = "09ws9g6245iiq8z975h8ycf818a66q3c6zv4b5h8skpm7hc1igzi"; authors = [ "Amanieu d'Antras " ]; @@ -5380,7 +5333,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; features = { @@ -5451,7 +5404,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -5499,9 +5452,9 @@ rec { }; "proc-macro2" = rec { crateName = "proc-macro2"; - version = "1.0.82"; + version = "1.0.85"; edition = "2021"; - sha256 = "06qk88hbf6wg4v1i961zibhjz512873jwkz3myx1z82ip6dd9lwa"; + sha256 = "08zwg5l5f3czp62g4cvzgjwnk176lsrwq6kdi4x0arm9bbhlq912"; libName = "proc_macro2"; authors = [ "David Tolnay " @@ -6439,9 +6392,9 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.23.5"; + version = "0.23.8"; edition = "2021"; - sha256 = "0zm97n6n7v46s4dv7bcrp0a20wj40lnbzbg530zaml8vaphcxaxg"; + sha256 = "0h17kl17livjwg9iip12lq7pmkk1da4pcxp68gcb4vpm45kv3bbr"; dependencies = [ { name = "log"; @@ -6576,9 +6529,9 @@ rec { }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.102.3"; + version = "0.102.4"; edition = "2021"; - sha256 = "1gzahmw0lqhszsczmk63bamsf5ps6wa5lsff6gjvqhfxq20ybg7k"; + sha256 = "0gmk2abk7y2cdppqlaqmnhcv690p19af9n66sjvw84z9j9z8yi7z"; libName = "webpki"; dependencies = [ { @@ -6609,9 +6562,9 @@ rec { }; "rustversion" = rec { crateName = "rustversion"; - version = "1.0.16"; + version = "1.0.17"; edition = "2018"; - sha256 = "1c6zy65i4jmhn2raxpb3p6wfbyh5hjcmi8z6d67jga0yl38p8909"; + sha256 = "1mm3fckyvb0l2209in1n2k05sws5d9mpkszbnwhq3pkq8apjhpcm"; procMacro = true; build = "build/build.rs"; authors = [ @@ -6658,9 +6611,9 @@ rec { }; "schemars" = rec { crateName = "schemars"; - version = "0.8.19"; + version = "0.8.21"; edition = "2021"; - sha256 = "1vr1dwpx900b3d824f309lmzc6cj61a1dzq1zc3nbd4wj7b7wvpw"; + sha256 = "14lyx04388wgbilgcm0nl75w6359nw16glswfqv7x2rpi9329h09"; authors = [ "Graham Esau " ]; @@ -6724,9 +6677,9 @@ rec { }; "schemars_derive" = rec { crateName = "schemars_derive"; - version = "0.8.19"; + version = "0.8.21"; edition = "2021"; - sha256 = "0j9znm9110a8agfbf16d5fynn9chd3hxv41p8n742bg0lxx2npqq"; + sha256 = "03ncmrkldfmdc9skmlyysx2vqdlyyz91r5mbavw77zwaay4fbvmi"; procMacro = true; authors = [ "Graham Esau " @@ -6746,7 +6699,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "extra-traits" ]; } ]; @@ -6884,9 +6837,9 @@ rec { }; "serde" = rec { crateName = "serde"; - version = "1.0.201"; + version = "1.0.203"; edition = "2018"; - sha256 = "0g1nrz2s6l36na6gdbph8k07xf9h5p3s6f0s79sy8a8nxpmiq3vq"; + sha256 = "1500ghq198n6py5anvz5qbqagd9h1hq04f4qpsvjzrvix56snlvj"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -6938,9 +6891,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.201"; + version = "1.0.203"; edition = "2015"; - sha256 = "0r98v8h47s7zhml7gz0sl6wv82vyzh1hv27f1g0g35lp1f9hbr65"; + sha256 = "1fmmqmfza3mwxb1v80737dj01gznrh8mhgqgylkndx5npq7bq32h"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -6961,7 +6914,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } @@ -6972,9 +6925,9 @@ rec { }; "serde_derive_internals" = rec { crateName = "serde_derive_internals"; - version = "0.29.0"; + version = "0.29.1"; edition = "2015"; - sha256 = "1qsl3pkk9yg57wivsxg8lsw77d94l34z70hclrczx9d3cp7023rk"; + sha256 = "04g7macx819vbnxhi52cx0nhxi56xlhrybgwybyy7fb9m4h6mlhq"; libPath = "lib.rs"; authors = [ "Erick Tryzelaar " @@ -6984,14 +6937,16 @@ rec { { name = "proc-macro2"; packageId = "proc-macro2"; + usesDefaultFeatures = false; } { name = "quote"; packageId = "quote"; + usesDefaultFeatures = false; } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" ]; } @@ -7300,18 +7255,18 @@ rec { }; resolvedDefaultFeatures = [ "default" "rust_1_39" "rust_1_46" "std" ]; }; - "snafu 0.8.2" = rec { + "snafu 0.8.3" = rec { crateName = "snafu"; - version = "0.8.2"; + version = "0.8.3"; edition = "2018"; - sha256 = "0bji6fqyphs041gp4zmgms6w2bbw9r1bw0i16gjzci5b913nz5vm"; + sha256 = "0pnrr29g03zznmw43bm9jbghj6gc8wldmrwvm3mmd6f4zqv832s1"; authors = [ "Jake Goulding " ]; dependencies = [ { name = "snafu-derive"; - packageId = "snafu-derive 0.8.2"; + packageId = "snafu-derive 0.8.3"; } ]; features = { @@ -7388,11 +7343,11 @@ rec { }; resolvedDefaultFeatures = [ "rust_1_39" "rust_1_46" ]; }; - "snafu-derive 0.8.2" = rec { + "snafu-derive 0.8.3" = rec { crateName = "snafu-derive"; - version = "0.8.2"; + version = "0.8.3"; edition = "2018"; - sha256 = "0pyr3rdipfsr74hlk14q7bssls0qssr6rg0727xw5f5zvq8rkcdl"; + sha256 = "1dbzdwcrvsrfwlkzjcpp2y5wijyavng47836h9yx206sd6k14j0s"; procMacro = true; authors = [ "Jake Goulding " @@ -7400,7 +7355,8 @@ rec { dependencies = [ { name = "heck"; - packageId = "heck 0.4.1"; + packageId = "heck 0.5.0"; + usesDefaultFeatures = false; } { name = "proc-macro2"; @@ -7412,7 +7368,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -7503,7 +7459,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.8.2"; + packageId = "snafu 0.8.3"; } { name = "stackable-operator"; @@ -7585,7 +7541,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.8.2"; + packageId = "snafu 0.8.3"; } { name = "stackable-opa-crd"; @@ -7685,7 +7641,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.8.2"; + packageId = "snafu 0.8.3"; } { name = "stackable-opa-crd"; @@ -7713,13 +7669,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.67.1"; + version = "0.69.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; - sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; + rev = "9ff61fa29c30b5aedc5c11b929079477e2642a7a"; + sha256 = "033zxfdwf202h48lshnw9wznbrkl80px8rdcg4h0rcb0wc2pa37q"; }; authors = [ "Stackable GmbH " @@ -7821,7 +7777,7 @@ rec { } { name = "snafu"; - packageId = "snafu 0.8.2"; + packageId = "snafu 0.8.3"; } { name = "stackable-operator-derive"; @@ -7867,8 +7823,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; - sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; + rev = "9ff61fa29c30b5aedc5c11b929079477e2642a7a"; + sha256 = "033zxfdwf202h48lshnw9wznbrkl80px8rdcg4h0rcb0wc2pa37q"; }; procMacro = true; authors = [ @@ -7889,22 +7845,12 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; }; - "strsim 0.10.0" = rec { - crateName = "strsim"; - version = "0.10.0"; - edition = "2015"; - sha256 = "08s69r4rcrahwnickvi0kq49z524ci50capybln83mg6b473qivk"; - authors = [ - "Danny Guo " - ]; - - }; - "strsim 0.11.1" = rec { + "strsim" = rec { crateName = "strsim"; version = "0.11.1"; edition = "2015"; @@ -7946,9 +7892,9 @@ rec { }; "strum_macros" = rec { crateName = "strum_macros"; - version = "0.26.2"; + version = "0.26.3"; edition = "2018"; - sha256 = "0in9jvbb3g16x8fj7lf91vwzj98319hj3z8lpaaa9h42ybd5kky6"; + sha256 = "11zak1qw2p5xwmln9xw8l0iv349cablslss8a41s124y7a73m6gp"; procMacro = true; authors = [ "Peter Glotfelty " @@ -7956,7 +7902,7 @@ rec { dependencies = [ { name = "heck"; - packageId = "heck 0.4.1"; + packageId = "heck 0.5.0"; } { name = "proc-macro2"; @@ -7972,7 +7918,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "parsing" "extra-traits" ]; } ]; @@ -8025,11 +7971,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; }; - "syn 2.0.61" = rec { + "syn 2.0.66" = rec { crateName = "syn"; - version = "2.0.61"; + version = "2.0.66"; edition = "2021"; - sha256 = "1j8zhf5mmd2l5niwhiniw5wcp9v6fbd4a61v6rbfhsm5rf6fv4y9"; + sha256 = "1xfgrprsbz8j31kabvfinb4fyhajlk2q7lxa18fb006yl90kyby4"; authors = [ "David Tolnay " ]; @@ -8176,9 +8122,9 @@ rec { }; "thiserror" = rec { crateName = "thiserror"; - version = "1.0.60"; + version = "1.0.61"; edition = "2021"; - sha256 = "067wi7pb1zn9jhhk82w0ppmvjwa00nwkp4m9j77rvpaqra1r17jp"; + sha256 = "028prh962l16cmjivwb1g9xalbpqip0305zhq006mg74dc6whin5"; authors = [ "David Tolnay " ]; @@ -8192,9 +8138,9 @@ rec { }; "thiserror-impl" = rec { crateName = "thiserror-impl"; - version = "1.0.60"; + version = "1.0.61"; edition = "2021"; - sha256 = "0945q2hk1rqdzjz2zqakxbddwm4h26k5c0wdncdarhvfq10h0iz2"; + sha256 = "0cvm37hp0kbcyk1xac1z0chpbd9pbn2g456iyid6sah0a113ihs6"; procMacro = true; libName = "thiserror_impl"; authors = [ @@ -8211,7 +8157,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; @@ -8334,9 +8280,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.37.0"; + version = "1.38.0"; edition = "2021"; - sha256 = "11v7qhvpwsf976frqgrjl1jy308bdkxq195gb38cypx7xkzypnqs"; + sha256 = "0jjsb2c9dqi93yij3rqzsh9bk0z3qyasmw1n8qkny3d8lw14lkxs"; authors = [ "Tokio Contributors " ]; @@ -8444,9 +8390,9 @@ rec { }; "tokio-macros" = rec { crateName = "tokio-macros"; - version = "2.2.0"; + version = "2.3.0"; edition = "2021"; - sha256 = "0fwjy4vdx1h9pi4g2nml72wi0fr27b5m954p13ji9anyy8l1x2jv"; + sha256 = "16nkan0x9b62hnqmjqcyd71j1mgpda2sv7gfm2mvbm39l2cfjnjz"; procMacro = true; authors = [ "Tokio Contributors " @@ -8462,7 +8408,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -8937,7 +8883,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -9221,10 +9167,11 @@ rec { }; "triomphe" = rec { crateName = "triomphe"; - version = "0.1.11"; + version = "0.1.12"; edition = "2015"; - sha256 = "1crf71hndy3fc68x8v4aikkdjynp4n5sdhq28sck8x7frx8bd7l5"; + sha256 = "140dp3fhpdqxj5xjsjvbkpwmik8w0cjdzyl6mhvfnplrp7xv8b0v"; authors = [ + "Manish Goregaokar " "The Servo Project Developers" ]; features = { @@ -9592,7 +9539,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } { @@ -9682,7 +9629,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "visit" "full" ]; } { @@ -11148,16 +11095,16 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; }; "zeroize" = rec { crateName = "zeroize"; - version = "1.7.0"; + version = "1.8.1"; edition = "2021"; - sha256 = "0bfvby7k9pdp6623p98yz2irqnamcyzpn7zh20nqmdn68b0lwnsj"; + sha256 = "1pjdrmjwmszpxfd7r860jx54cyk94qk59x13sc307cvr5256glyf"; authors = [ "The RustCrypto Project Developers" ]; diff --git a/crate-hashes.json b/crate-hashes.json index 5623023b..283c0922 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,5 +1,5 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator-derive@0.3.0": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator@0.67.1": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.0#stackable-operator-derive@0.3.0": "033zxfdwf202h48lshnw9wznbrkl80px8rdcg4h0rcb0wc2pa37q", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.0#stackable-operator@0.69.0": "033zxfdwf202h48lshnw9wznbrkl80px8rdcg4h0rcb0wc2pa37q", "git+https://github.com/stackabletech/product-config.git?tag=0.6.0#product-config@0.6.0": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41" } \ No newline at end of file