Skip to content

chore: bump Rust edition to 2024 and apply cargo fix updates #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Saul-STFC wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: bump Rust edition to 2024 and apply cargo fix updates #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolver = "2"
version = "0.0.0-dev"
authors = ["Stackable GmbH <info@stackable.tech>"]
license = "OSL-3.0"
edition = "2021"
edition = "2024"
repository = "https://github.com/stackabletech/druid-operator"

[workspace.dependencies]
Expand Down
13 changes: 6 additions & 7 deletions rust/operator-binary/src/crd/authentication.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ impl AuthenticationClassesResolved {
Some(server_and_internal_secret_class) => {
if let Some(auth_class_secret_class) =
&provider.client_cert_secret_class
&& auth_class_secret_class != server_and_internal_secret_class
{
if auth_class_secret_class != server_and_internal_secret_class {
return TlsAuthenticationClassSecretClassDiffersFromDruidServerTlsSnafu { auth_class_name: auth_class_name.to_string(), server_and_internal_secret_class: server_and_internal_secret_class.clone() }.fail()?;
}
return TlsAuthenticationClassSecretClassDiffersFromDruidServerTlsSnafu { auth_class_name: auth_class_name.to_string(), server_and_internal_secret_class: server_and_internal_secret_class.clone() }.fail()?;
}
}
None => {
Expand Down Expand Up @@ -231,10 +230,10 @@ impl AuthenticationClassesResolved {
}

pub fn tls_authentication_enabled(&self) -> bool {
if !self.auth_classes.is_empty() {
if let Some(AuthenticationClassResolved::Tls { .. }) = self.auth_classes.first() {
return true;
}
if !self.auth_classes.is_empty()
&& let Some(AuthenticationClassResolved::Tls { .. }) = self.auth_classes.first()
{
return true;
}
false
}
Expand Down
12 changes: 6 additions & 6 deletions rust/operator-binary/src/crd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ impl v1alpha1::DruidCluster {
(
Vec<PropertyNameKind>,
Role<
impl Configuration<Configurable = v1alpha1::DruidCluster>,
impl Configuration<Configurable = v1alpha1::DruidCluster> + use<>,
DruidConfigOverrides,
GenericRoleConfig,
JavaCommonConfig,
Expand Down Expand Up @@ -725,7 +725,7 @@ impl v1alpha1::DruidCluster {
&self,
druid_role: &DruidRole,
) -> Role<
impl Configuration<Configurable = v1alpha1::DruidCluster>,
impl Configuration<Configurable = v1alpha1::DruidCluster> + use<>,
DruidConfigOverrides,
GenericRoleConfig,
JavaCommonConfig,
Expand Down Expand Up @@ -1043,10 +1043,10 @@ impl DruidRole {
) -> Vec<String> {
let mut commands = vec![];

if let Some(s3) = s3 {
if let Some(ca_cert_file) = s3.tls.tls_ca_cert_mount_path() {
commands.extend(add_cert_to_jvm_trust_store_cmd(&ca_cert_file));
}
if let Some(s3) = s3
&& let Some(ca_cert_file) = s3.tls.tls_ca_cert_mount_path()
{
commands.extend(add_cert_to_jvm_trust_store_cmd(&ca_cert_file));
}

// copy druid config to rw config
Expand Down
74 changes: 37 additions & 37 deletions rust/operator-binary/src/druid_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,46 +621,46 @@ pub async fn reconcile_druid(
);
}

if let Some(listener_class) = druid_role.listener_class_name(druid) {
if let Some(listener_group_name) = group_listener_name(druid, &druid_role) {
let role_group_listener = build_group_listener(
if let Some(listener_class) = druid_role.listener_class_name(druid)
&& let Some(listener_group_name) = group_listener_name(druid, &druid_role)
{
let role_group_listener = build_group_listener(
druid,
build_recommended_labels(
druid,
build_recommended_labels(
druid,
DRUID_CONTROLLER_NAME,
&resolved_product_image.app_version_label_value,
role_name,
"none",
),
listener_class.to_string(),
listener_group_name,
&druid_role,
&druid_tls_security,
)
.context(ListenerConfigurationSnafu)?;
DRUID_CONTROLLER_NAME,
&resolved_product_image.app_version_label_value,
role_name,
"none",
),
listener_class.to_string(),
listener_group_name,
&druid_role,
&druid_tls_security,
)
.context(ListenerConfigurationSnafu)?;

let listener = cluster_resources
.add(client, role_group_listener)
.await
.context(ApplyGroupListenerSnafu)?;
let listener = cluster_resources
.add(client, role_group_listener)
.await
.context(ApplyGroupListenerSnafu)?;

if druid_role == DruidRole::Router {
// discovery
for discovery_cm in build_discovery_configmaps(
druid,
druid,
&resolved_product_image,
&druid_tls_security,
listener,
)
.await
.context(BuildDiscoveryConfigSnafu)?
{
cluster_resources
.add(client, discovery_cm)
.await
.context(ApplyDiscoveryConfigSnafu)?;
}
if druid_role == DruidRole::Router {
// discovery
for discovery_cm in build_discovery_configmaps(
druid,
druid,
&resolved_product_image,
&druid_tls_security,
listener,
)
.await
.context(BuildDiscoveryConfigSnafu)?
{
cluster_resources
.add(client, discovery_cm)
.await
.context(ApplyDiscoveryConfigSnafu)?;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/webhooks/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub async fn create_webhook_server(
field_manager: FIELD_MANAGER.to_owned(),
};

let (conversion_webhook, _initial_reconcile_rx) =
let (conversion_webhook, _) =
ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);

let webhook_server_options = WebhookServerOptions {
Expand Down
Loading