Skip to content
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

Remove deprecated clap args_override_self #30895

Merged
merged 2 commits into from
Dec 30, 2024
+12 −7
Merged

Remove deprecated clap args_override_self #30895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78e68da
Remove deprecated clap args_override_self
alex-hunt-materialize Dec 23, 2024
8de613a
set actions for testdrive args that are being passed more than once
alex-hunt-materialize Dec 30, 2024
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 src/ore/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ where
})
.collect();

let mut clap = O::command().args_override_self(true);
let mut clap = O::command();

if !config.enable_version_flag {
clap = clap.disable_version_flag(true);
Expand Down
17 changes: 11 additions & 6 deletions src/testdrive/src/bin/testdrive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use std::{io, process};

use aws_credential_types::Credentials;
use aws_types::region::Region;
use clap::ArgAction;
use globset::GlobBuilder;
use itertools::Itertools;
use mz_build_info::{build_info, BuildInfo};
Expand Down Expand Up @@ -59,11 +60,11 @@ struct Args {
)]
var: Vec<String>,
/// A random number to distinguish each testdrive run.
#[clap(long, value_name = "N")]
#[clap(long, value_name = "N", action = ArgAction::Set)]
seed: Option<u32>,
/// Whether to reset Materialize state before executing each script and
/// to clean up AWS state after each script.
#[clap(long)]
#[clap(long, action = ArgAction::SetTrue)]
no_reset: bool,
/// Force the use of the specified temporary directory.
///
Expand Down Expand Up @@ -136,14 +137,16 @@ struct Args {
#[clap(
long,
default_value = "postgres://materialize@localhost:6875",
value_name = "URL"
value_name = "URL",
action = ArgAction::Set,
)]
materialize_url: tokio_postgres::Config,
/// materialize internal SQL connection string.
#[clap(
long,
default_value = "postgres://materialize@localhost:6877",
value_name = "INTERNAL_URL"
value_name = "INTERNAL_URL",
action = ArgAction::Set,
)]
materialize_internal_url: tokio_postgres::Config,
#[clap(long)]
Expand Down Expand Up @@ -172,7 +175,8 @@ struct Args {
#[clap(
long,
value_name = "PERSIST_CONSENSUS_URL",
required_if_eq("validate-catalog-store", "true")
required_if_eq("validate-catalog-store", "true"),
action = ArgAction::Set,
)]
persist_consensus_url: Option<SensitiveUrl>,
/// Handle to the persist blob storage.
Expand All @@ -188,7 +192,8 @@ struct Args {
#[clap(
long,
value_name = "ENCRYPTION://HOST:PORT",
default_value = "localhost:9092"
default_value = "localhost:9092",
action = ArgAction::Set,
)]
kafka_addr: String,
/// Default number of partitions to create for topics
Expand Down
Loading