From b49885a80c66d321b8bb4ff1ec2d91e879702896 Mon Sep 17 00:00:00 2001 From: Christian Haynes <06chaynes@gmail.com> Date: Fri, 1 Mar 2024 12:28:51 -0500 Subject: [PATCH 1/2] forgot to fix the naming here oops --- tfct/src/cli/command/run/about.rs | 4 ++-- tfct/src/cli/command/run/mod.rs | 10 +++++----- tfct/src/cli/command/run/plan.rs | 4 ++-- tfct/src/main.rs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tfct/src/cli/command/run/about.rs b/tfct/src/cli/command/run/about.rs index 03c1e25..74ef12b 100644 --- a/tfct/src/cli/command/run/about.rs +++ b/tfct/src/cli/command/run/about.rs @@ -1,6 +1,6 @@ pub(super) const STATUS: &str = "Get the status of a run."; -pub(super) const PLAN: &str = "Queue up plan only runs"; -pub(super) const APPLY: &str = "Queue up plan and apply runs"; +pub(super) const SPEC: &str = "Queue up speculative plan runs"; +pub(super) const PLAN: &str = "Queue up plan and apply runs"; pub(super) const CREATE: &str = "Create a run."; pub(super) const RUN_ID: &str = "The id of the run."; pub(super) const MESSAGE: &str = "A message to include with the run"; diff --git a/tfct/src/cli/command/run/mod.rs b/tfct/src/cli/command/run/mod.rs index f26694b..5aa5e64 100644 --- a/tfct/src/cli/command/run/mod.rs +++ b/tfct/src/cli/command/run/mod.rs @@ -21,14 +21,14 @@ pub(crate) struct Commands { pub(crate) enum RunCmds { #[clap(about = about::STATUS)] Status(StatusArgs), + #[clap(about = about::SPEC)] + Spec(DefaultArgs), #[clap(about = about::PLAN)] - Plan(DefaultArgs), - #[clap(about = about::APPLY)] - Apply(ApplyArgs), + Plan(PlanArgs), } #[derive(clap::Args, Debug)] -pub struct ApplyArgs { +pub struct PlanArgs { #[clap(flatten)] pub default: DefaultArgs, #[arg(long, help = about::AUTO_APPLY, default_value = "false")] @@ -101,7 +101,7 @@ fn override_queue_options(options: &mut QueueOptions, default: &DefaultArgs) { } } -fn set_apply_args(args: &mut Attributes, apply: &ApplyArgs) { +fn set_apply_args(args: &mut Attributes, apply: &PlanArgs) { if let Some(auto_apply) = apply.auto_apply { args.auto_apply = Some(auto_apply); } diff --git a/tfct/src/cli/command/run/plan.rs b/tfct/src/cli/command/run/plan.rs index ae6d8cc..f862caf 100644 --- a/tfct/src/cli/command/run/plan.rs +++ b/tfct/src/cli/command/run/plan.rs @@ -2,7 +2,7 @@ use crate::{ cli::{ command::common::{check_workspace_identifier, parse_workspace_file}, run::{ - override_queue_options, set_apply_args, set_default_args, ApplyArgs, + override_queue_options, set_apply_args, set_default_args, PlanArgs, }, }, error::ArgError, @@ -19,7 +19,7 @@ use tfc_toolset::{ use tfc_toolset_extras::parse_workspace_name; pub async fn plan( - args: &ApplyArgs, + args: &PlanArgs, config: &Settings, core: &Core, client: Client, diff --git a/tfct/src/main.rs b/tfct/src/main.rs index e82d709..5b05b4d 100644 --- a/tfct/src/main.rs +++ b/tfct/src/main.rs @@ -92,13 +92,13 @@ async fn main() -> miette::Result<()> { RunCmds::Status(args) => { run::status(args, &core, client.clone()).await?; } - RunCmds::Plan(args) => { + RunCmds::Spec(args) => { let config = Settings::new() .into_diagnostic() .wrap_err(SETTINGS_ERROR)?; run::spec(args, &config, &core, client.clone()).await?; } - RunCmds::Apply(args) => { + RunCmds::Plan(args) => { let config = Settings::new() .into_diagnostic() .wrap_err(SETTINGS_ERROR)?; From 6791efe28c311c508e7bb5db4ecc7861264ea417 Mon Sep 17 00:00:00 2001 From: Christian Haynes <06chaynes@gmail.com> Date: Fri, 1 Mar 2024 12:31:21 -0500 Subject: [PATCH 2/2] bumped patch version --- Cargo.lock | 2 +- tfct/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a95629..a08fd1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3241,7 +3241,7 @@ dependencies = [ [[package]] name = "tfct" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "async-scoped", diff --git a/tfct/Cargo.toml b/tfct/Cargo.toml index b87847a..15e69e7 100644 --- a/tfct/Cargo.toml +++ b/tfct/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tfct" -version = "0.2.0" +version = "0.2.1" description = "A tool to help manage a toolset that helps manage your deployments" authors = ["Christian Haynes <06chaynes@gmail.com>"] repository = "https://github.com/06chaynes/tfc-toolset.git"