refactor: adapt for the autonomy command

Author: mrinalwadhwa

implementations/rust/ockam/ockam_api/src/cli_state/cli_state.rs

@@ -345,10 +345,10 @@ impl CliState {
     /// If $OCKAM_HOME is not defined, then $HOME is used instead
     pub(super) fn default_dir() -> Result<PathBuf> {
         Ok(get_env_with_default::<PathBuf>(
-            "OCKAM_HOME",
+            "AUTONOMY_HOME",
             home::home_dir()
                 .ok_or_else(|| CliStateError::InvalidPath("$HOME".to_string()))?
-                .join(".ockam"),
+                .join(".autonomy"),
         )?)
     }
 }

implementations/rust/ockam/ockam_api/src/enroll/ockam_oidc_provider.rs

@@ -6,7 +6,7 @@ use ockam_core::{Error, Result};
 use std::time::Duration;
 use url::Url;
 
-const PRODUCTION_AUTHENTICATOR_ENDPOINT: &str = "https://account.ockam.io";
+const PRODUCTION_AUTHENTICATOR_ENDPOINT: &str = "https://account.autonomy.computer";
 
 pub fn authenticator_endpoint() -> String {
     get_env_with_default(
@@ -26,7 +26,7 @@ pub fn auth0_client_id() -> Result<String> {
         None => {
             let endpoint = authenticator_endpoint();
             if endpoint == PRODUCTION_AUTHENTICATOR_ENDPOINT {
-                Ok("c1SAhEjrJAqEk6ArWjGjuWX11BD2gK8X".to_string())
+                Ok("id3p8DPYZBdkjvA7RO2FqWjaUasruNGW".to_string())
             } else {
                 Err(Error::new(Origin::Api, Kind::NotFound, format!("The OCKAM_AUTH0_CLIENT_ID variable must be defined when using the endpoint {endpoint}")))
             }

implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs

@@ -133,12 +133,12 @@ impl<W: TerminalWriter + Debug> Terminal<W> {
         no_color: bool,
         no_input: bool,
         output_format: OutputFormat,
-        branding: OutputBranding,
+        _branding: OutputBranding,
     ) -> Self {
         let no_color = Self::should_disable_color(no_color);
         let no_input = Self::should_disable_user_input(no_input);
-        let stdout = W::stdout(no_color, branding.clone());
-        let stderr = W::stderr(no_color, branding);
+        let stdout = W::stdout(no_color, OutputBranding::default());
+        let stderr = W::stderr(no_color, OutputBranding::default());
         let max_width_col_count = get_size().map(|it| it.col_count).unwrap_or(ch!(80)).into();
         Self {
             stdout,

implementations/rust/ockam/ockam_command/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ockam_command"
-version = "0.157.0"
+version = "0.158.0"
 authors = ["Ockam Developers"]
 categories = [
   "cryptography",
@@ -65,16 +65,28 @@ indicatif = "0.17.8"
 indoc = "2.0.5"
 miette = { version = "7.2.0", features = ["fancy-no-backtrace"] }
 mimalloc = { version = "0.1", features = ["secure"] }
-minicbor = { version = "0.26.3", default-features = false, features = ["alloc", "derive"] }
+minicbor = { version = "0.26.3", default-features = false, features = [
+  "alloc",
+  "derive",
+] }
 nix = { version = "0.29", features = ["signal"] }
 notify = "8.0.0"
-ockam = { path = "../ockam", version = "^0.157.0", features = ["software_vault"] }
+ockam = { path = "../ockam", version = "^0.157.0", features = [
+  "software_vault",
+] }
 ockam_abac = { path = "../ockam_abac", version = "0.84.0", features = ["std"] }
-ockam_api = { path = "../ockam_api", version = "0.100.0", default-features = false, features = ["std"] }
+ockam_api = { path = "../ockam_api", version = "0.100.0", default-features = false, features = [
+  "std",
+] }
 ockam_core = { path = "../ockam_core", version = "^0.126.0" }
-ockam_multiaddr = { path = "../ockam_multiaddr", version = "0.71.0", features = ["std"] }
+ockam_multiaddr = { path = "../ockam_multiaddr", version = "0.71.0", features = [
+  "std",
+] }
 ockam_node = { path = "../ockam_node", version = "^0.142.0" }
-ockam_vault = { path = "../ockam_vault", version = "^0.136.0", default-features = false, features = ["storage", "std"] }
+ockam_vault = { path = "../ockam_vault", version = "^0.136.0", default-features = false, features = [
+  "storage",
+  "std",
+] }
 once_cell = "1.21"
 open = "5.3.0"
 opentelemetry = { version = "0.27", features = ["metrics", "trace"] }
@@ -83,7 +95,11 @@ r3bl_rs_utils_core = "0.9.12"
 r3bl_tui = "0.5.8"
 rand = "0.8"
 regex = "1.10.6"
-reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-native-roots", "blocking"] }
+reqwest = { version = "0.12", default-features = false, features = [
+  "json",
+  "rustls-tls-native-roots",
+  "blocking",
+] }
 rustls = { version = "0.23.13", default-features = false }
 rustls-native-certs = "0.8.0"
 rustls-pki-types = "1.7.0"
@@ -92,9 +108,14 @@ semver = "1.0.23"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
-shellexpand = { version = "3.1.0", default-features = false, features = ["base-0"] }
+shellexpand = { version = "3.1.0", default-features = false, features = [
+  "base-0",
+] }
 strip-ansi-escapes = "0.2"
-syntect = { version = "5.2.0", default-features = false, features = ["default-syntaxes", "regex-onig"] }
+syntect = { version = "5.2.0", default-features = false, features = [
+  "default-syntaxes",
+  "regex-onig",
+] }
 tempfile = "3.17.1"
 thiserror = "2.0.9"
 tokio = { version = "1.43.1", features = ["full"] }
@@ -108,12 +129,18 @@ zip-extract = "0.2.3"
 [dev-dependencies]
 assert_cmd = "2"
 mockito = "1.5.0"
-ockam_api = { path = "../ockam_api", version = "0.100.0", default-features = false, features = ["test-utils"] }
+ockam_api = { path = "../ockam_api", version = "0.100.0", default-features = false, features = [
+  "test-utils",
+] }
 ockam_macros = { path = "../ockam_macros", version = "^0.39.0" }
 serial_test = "3.0.0"
 
 [features]
 default = ["rust-crypto", "privileged_portals"]
 privileged_portals = ["ockam_api/privileged_portals"]
 aws-lc = ["ockam_vault/aws-lc", "ockam_api/aws-lc", "rustls/aws-lc-rs"]
-rust-crypto = ["ockam_vault/rust-crypto", "ockam_api/rust-crypto", "rustls/ring"]
+rust-crypto = [
+  "ockam_vault/rust-crypto",
+  "ockam_api/rust-crypto",
+  "rustls/ring",
+]

implementations/rust/ockam/ockam_command/src/base_command.rs

@@ -13,7 +13,7 @@ use ockam_node::Context;
 #[derive(Clone, Debug, Args, Default)]
 pub struct BaseCommand {
     /// Whether to use a public AWS ECR
-    #[arg(long)]
+    #[arg(long, hide = true)]
     pub use_public_ecr: bool,
 
     #[command(flatten)]

implementations/rust/ockam/ockam_command/src/cluster/enroll.rs

@@ -6,33 +6,25 @@ use crate::{docs, Command, CommandGlobalOpts};
 use ockam::Context;
 
 const LONG_ABOUT: &str = include_str!("./static/enroll/long_about.txt");
-const PREVIEW_TAG: &str = include_str!("../static/preview_tag.txt");
 const AFTER_LONG_HELP: &str = include_str!("./static/enroll/after_long_help.txt");
 
-/// Enroll your identity with your cluster
+/// Enroll with your cluster in autonomy.
 #[derive(Clone, Debug, Args, Default)]
 #[command(
 long_about = docs::about(LONG_ABOUT),
-before_help = docs::before_help(PREVIEW_TAG),
 after_long_help = docs::after_help(AFTER_LONG_HELP)
 )]
 pub struct EnrollCommand {
     #[arg(global = true, value_name = "IDENTITY_NAME", long)]
-    #[arg(help = docs::about("\
-    The name of an existing Ockam Identity that you wish to enroll. \
-    You can use `ockam identity list` to get a list of existing Identities. \
-    To create a new Identity, use `ockam identity create`. \
-    If you don't specify an Identity name, and you don't have a default Identity, this command \
-    will create a default Identity for you and save it locally in the default Vault
-    "))]
+    #[arg(help = docs::about("The name of an existing Identity that you wish to enroll."))]
     pub identity: Option<String>,
 
     /// This option allows you to bypass pasting the one-time code and confirming device
     /// activation, and PKCE (Proof Key for Code Exchange) authorization flow. Please be
     /// careful with this option since it will open your default system browser. This
     /// option might be useful if you have already enrolled and want to re-enroll using
     /// the same account information
-    #[arg(long)]
+    #[arg(long, hide = true)]
     pub authorization_code_flow: bool,
 
     #[arg(long, hide = true)]

implementations/rust/ockam/ockam_command/src/cluster/mod.rs

@@ -14,7 +14,7 @@ use crate::{docs, Command, CommandGlobalOpts};
 const LONG_ABOUT: &str = include_str!("./static/long_about.txt");
 const AFTER_LONG_HELP: &str = include_str!("./static/after_long_help.txt");
 
-/// Manage Clusters
+/// Manage your cluster in autonomy.
 #[derive(Clone, Debug, Args)]
 #[command(
     arg_required_else_help = true,

implementations/rust/ockam/ockam_command/src/cluster/show.rs

@@ -13,14 +13,12 @@ use serde::Serialize;
 use std::sync::Arc;
 
 const LONG_ABOUT: &str = include_str!("./static/show/long_about.txt");
-const PREVIEW_TAG: &str = include_str!("../static/preview_tag.txt");
 const AFTER_LONG_HELP: &str = include_str!("./static/show/after_long_help.txt");
 
-/// Show the details of a cluster
+/// Show status of your cluster in autonomy.
 #[derive(Clone, Debug, Args)]
 #[command(
 long_about = docs::about(LONG_ABOUT),
-before_help = docs::before_help(PREVIEW_TAG),
 after_long_help = docs::after_help(AFTER_LONG_HELP)
 )]
 pub struct ShowCommand {

implementations/rust/ockam/ockam_command/src/cluster/static/enroll/long_about.txt

@@ -0,0 +1,11 @@
+Enroll with your cluster in autonomy.
+
+This command enrolls the default identity of this machine with your cluster
+in autonomy. Running it will give you the ability to manage your cluster from
+this machine. Once this machine is enrolled, it can deploy new zones.
+
+If no default identity exists on this machine, this command will first create
+a new vault and a new identity. It will store the secrets of that identity in
+the new vault. It will also mark that new identity as the default identity of
+this machine. Finally, it will use that is new identity to enroll this machine
+with your cluster in autonomy.

implementations/rust/ockam/ockam_command/src/cluster/static/long_about.txt

@@ -0,0 +1 @@
+Manage your cluster in autonomy.