0.15.0

Author: tiptenbrink

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.15.0 2024-05-07
+
+* Address system is now used to replace StateIn/StatePaths, deploy now also works similar to before
+* A lot of the arguments for the CLI have been changed, so incompatible with 0.14. From now on follows the route to stabilization, as we are basically feature-complete
+
 ## 0.14.0 2024-05-05
 
 * Very large update that includes a complete rewrite, currently gated behind `tidploy next`. v1 should hopefully make this the default.

src/next/api.rs

@@ -55,17 +55,6 @@ impl GlobalArguments {
     // }
 }
 
-// impl From<GlobalArguments> for AddressIn {
-//     fn from(value: GlobalArguments) -> Self {
-//         Self::from_args(
-//             value.cwd_context,
-//             value.resolve_root,
-//             value.state_path,
-//             value.state_root,
-//         )
-//     }
-// }
-
 impl From<GlobalArguments> for StateOptions {
     fn from(value: GlobalArguments) -> Self {
         let default = Self::default();

src/next/archives.rs

@@ -10,24 +10,6 @@ pub struct NextSub {
     #[clap(subcommand)]
     pub subcommand: NextCommands,
 
-    // /// Contexts other than git-remote (default) are not fully supported.
-    // #[arg(long, value_enum, global = true)]
-    // context: Option<StateContext>,
-
-    // /// Set the repository URL, defaults to 'default_infer', in which case it is inferred from the current repository.
-    // /// Set to 'default' to not set it.
-    // /// Falls back to environment variable using TIDPLOY_REPO and then to config with key 'repo_url'
-    // /// For infering, it looks at the URL set to the 'origin' remote.
-    // #[arg(short, long, global = true)]
-    // repo: Option<String>,
-
-    // /// The git reference (commit or tag) to use.
-    // #[arg(short, long, global = true)]
-    // tag: Option<String>,
-
-    // /// The path inside the repository that should be used as the primary config source.
-    // #[arg(short, long, global = true)]
-    // deploy_pth: Option<String>,
     /// Directory to start resolving from. Can either be an absolute path (this requires --cwd), or relative to
     /// the current directory or Git root dir
     #[arg(long = "resolve-root")]
@@ -96,19 +78,6 @@ pub enum NextCommands {
         #[arg(long = "repo")]
         repo: Option<String>,
     },
-    // Address {
-    //     /// Location relative to resolve root where you want to begin reading configs. Defaults to be equal
-    //     /// to resolve root.
-    //     #[arg(long = "a-state-root")]
-    //     address_state_root: Option<String>,
-
-    //     /// Location relative to state root to stop reading configs, inclusive.
-    //     #[arg(long = "a-state-path")]
-    //     address_state_path: Option<String>,
-
-    //     #[clap(subcommand)]
-    //     subcommand: AddressSubCommands,
-    // }
 }
 
 #[derive(Subcommand, Debug)]
@@ -161,7 +130,6 @@ pub fn match_command(next_sub: NextSub, _cmd: Command) -> Result<ExitCode, Repor
                 execution_path,
                 variables,
             )?;
-            // If [process::ExitCode::from_raw] gets stabilized this can be simplified
             let code = u8::try_from(out.exit.code().unwrap_or(0))?;
 
             Ok(ExitCode::from(code))
@@ -190,38 +158,5 @@ pub fn match_command(next_sub: NextSub, _cmd: Command) -> Result<ExitCode, Repor
 
             Ok(ExitCode::from(code))
         }
-        // NextCommands::Address {
-        //     address_state_root,
-        //     address_state_path,
-        //     subcommand: addr_subcommands } => match addr_subcommands {
-        //         AddressSubCommands::Git {
-        //             url,
-        //             git_ref,
-        //             target_path
-        //         } => {
-        //             let addr_in = AddressIn::Git {
-        //                 url,
-        //                 git_ref,
-        //                 target_path,
-        //                 state_path: address_state_path,
-        //                 state_root: address_state_root
-        //             };
-
-        //             let state_in = StateIn::from_args(true, resolve_root, state_path, state_root);
-
-        //             Ok(())
-        //         },
-        //         AddressSubCommands::Local { path } => {
-        //             let addr_in = AddressIn::Local {
-        //                 path,
-        //                 state_path: address_state_path,
-        //                 state_root: address_state_root
-        //             };
-
-        //             let state_in = StateIn::from_args(true, resolve_root, state_path, state_root);
-
-        //             Ok(())
-        //         },
-        //     }
     }
 }

src/next/commands.rs

@@ -3,8 +3,6 @@ use std::io::Error as IOError;
 use thiserror::Error as ThisError;
 use tracing_error::TracedError;
 
-// use crate::filesystem::RelativePathError;
-
 #[derive(ThisError, Debug)]
 pub(crate) enum SecretError {
     #[error("Failed to get password from prompt! {0}")]
@@ -46,8 +44,6 @@ pub(crate) enum StateErrorKind {
     Config(#[from] ConfigError),
     #[error("{0}")]
     Address(#[from] AddressError),
-    // #[error("{0}")]
-    // RelativePath(#[from] RelativePathError)
 }
 
 pub trait WrapStateErr<T, E> {

src/next/deploy.rs

@@ -1,7 +1,6 @@
 pub mod api;
 pub(crate) mod commands;
 pub(crate) mod config;
-pub(crate) mod deploy;
 pub(crate) mod errors;
 pub(crate) mod fs;
 pub(crate) mod git;

src/next/errors.rs

@@ -85,8 +85,6 @@ pub(crate) fn run_command_input_old_state(
     )
     .wrap_err("Create state error.")?;
 
-    // let state = extra_envs(state);
-
     let relative_path = RelativePathBuf::from(&state.exe_name);
     let exe_path = relative_path.to_utf8_path(state.deploy_dir());
     run_entrypoint(&state.deploy_dir(), &exe_path, state.envs, input_bytes)
@@ -136,8 +134,6 @@ pub(crate) fn run_unit_input(
     run_resolved: RunResolved,
     input_bytes: Option<Vec<u8>>,
 ) -> Result<EntrypointOut, Report> {
-    //debug!("Run command called with in_state {:?}, executable {:?}, variables {:?} and input_bytes {:?}", state_in, executable, variables, input_bytes);
-
     let secret_vars = secret_vars_to_envs(&run_resolved.scope, run_resolved.envs)?;
 
     run_entrypoint(
@@ -147,71 +143,3 @@ pub(crate) fn run_unit_input(
         input_bytes,
     )
 }
-
-// #[instrument(name = "address", level = "debug", skip_all)]
-// pub(crate) fn address_command(
-//     state_in: StateIn,
-//     address_in: AddressIn
-// ) -> Result<EntrypointOut, Report> {
-//     debug!("Run command called with in_state {:?}, executable {:?}, variables {:?} and input_bytes {:?}", state_in, executable, variables, input_bytes);
-
-//     let resolve_state = resolve_from_base_state(state, state_options.unwrap_or_default())?;
-
-//     let run_resolved = merge_and_resolve(run_args, resolve_state)?;
-
-//     run_unit_input(run_resolved, input_bytes)
-// }
-
-// #[instrument(name = "deploy", level = "debug", skip_all)]
-// pub(crate) fn deploy_command(
-//     state_in: StateIn,
-//     state_options: Option<StateOptions>,
-//     address: Option<Address>,
-//     service: Option<String>,
-//     executable: Option<String>,
-//     execution_path: Option<String>,
-//     variables: Vec<String>,
-//     input_bytes: Option<Vec<u8>>,
-// ) -> Result<EntrypointOut, Report> {
-//     debug!("Run command called with in_state {:?}, executable {:?}, variables {:?} and input_bytes {:?}", state_in, executable, variables, input_bytes);
-
-//     let scope_args = SecretScopeArguments {
-//         service,
-//         ..Default::default()
-//     };
-//     let run_args = RunArguments {
-//         executable,
-//         execution_path,
-//         envs: parse_cli_vars(variables),
-//         scope_args,
-//     };
-//     let paths = StatePaths::new(state_in)?;
-
-//     // // Either provide address, or give none (then it's inferred)
-//     // let address = match address {
-//     //     None => {
-//     //         let url = git_root_origin_url(&paths.resolve_root)?;
-
-//     //         Address {
-//     //             root: AddressRoot::Git(GitAddress {
-//     //                 url,
-//     //                 git_ref: "HEAD".to_owned(),
-//     //                 path: RelativePathBuf::new()
-
-//     //             }), state_root: RelativePathBuf::new(), state_path: RelativePathBuf::new()
-//     //         }
-//     //     },
-//     //     Some(address) => address
-//     // };
-
-//     let state = State {
-//         address: Some(address),
-//         ..State::from(paths)
-//     };
-
-//     let resolve_state = resolve_from_base_state(state, state_options.unwrap_or_default())?;
-
-//     let run_resolved = merge_and_resolve(run_args, resolve_state)?;
-
-//     run_unit_input(run_resolved, input_bytes)
-// }