Require Hippo args on push (#52)

Author: technosophos

src/main.rs

@@ -13,6 +13,19 @@ mod expander;
 mod hippo_notifier;
 mod hippofacts;
 
+/// Indicate which flags are required for bindle builds
+#[allow(dead_code)]
+enum BindleBuildRequirements {
+    /// A Bindle server URL is required
+    RequireBindleServer,
+    /// An explicit stage directory is required
+    RequireStageDirectory,
+    /// Both the Bindle server and the stage directory are required
+    RequireBindleServerAndStageDirectory,
+    /// There are no required arguments for the bindle builds
+    NoRequirements,
+}
+
 const ARG_HIPPOFACTS: &str = "hippofacts_path";
 const ARG_STAGING_DIR: &str = "output_dir";
 const ARG_OUTPUT: &str = "output_format";
@@ -35,49 +48,6 @@ in which you are running the 'hippo' command.
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    // Arguments necessary to build a bindle (but not push it)
-    // - ARG_HIPPOFACTS
-    // - ARG_VERSIONING
-    // - ARG_OUTPUT
-    // - ARG_BINDLE_URL
-    // - ARG_STAGING_DIR
-    let bindle_build_args = vec![
-        Arg::new(ARG_HIPPOFACTS)
-            .required(true)
-            .index(1)
-            .about("The artifacts spec (file or directory containing HIPPOFACTS file)"),
-        Arg::new(ARG_VERSIONING)
-            .possible_values(&["dev", "production"])
-            .default_value("dev")
-            .required(false)
-            .short('v')
-            .long("invoice-version")
-            .about("How to version the generated invoice"),
-        Arg::new(ARG_OUTPUT)
-            .possible_values(&["id", "message", "none"])
-            .default_value("message")
-            .required(false)
-            .short('o')
-            .long("output")
-            .about("What to print on success"),
-        Arg::new(ARG_BINDLE_URL)
-            .short('s')
-            .long("server")
-            .env("BINDLE_URL")
-            .about("The Bindle server to push the artifacts to"),
-        Arg::new(ARG_INSECURE)
-            .required(false)
-            .takes_value(false)
-            .short('k')
-            .long("insecure")
-            .about("If set, ignore server certificate errors"),
-        Arg::new(ARG_STAGING_DIR)
-            .takes_value(true)
-            .short('d')
-            .long("dir")
-            .about("The path to output the artifacts to. Required when doing a `hippo prepare`. Other commands will use a temp dir if this is not specified."),
-    ];
-
     let matches = App::new(env!("CARGO_PKG_NAME"))
         .version(env!("CARGO_PKG_VERSION"))
         .author("Deis Labs")
@@ -86,21 +56,24 @@ async fn main() -> anyhow::Result<()> {
         .subcommand(
             App::new("push")
                 .about("Packages and uploads Hippo artifacts, notifying Hippo")
-                .args(&bindle_build_args)
+                .args(bindle_build_args(BindleBuildRequirements::RequireBindleServer))
                 .arg(
                     Arg::new(ARG_HIPPO_URL)
+                        .required(true)
                         .long("hippo-url")
                         .env("HIPPO_URL")
                         .about("The Hippo service to push the artifacts to"),
                 )
                 .arg(
                     Arg::new(ARG_HIPPO_USERNAME)
+                        .required(true)
                         .long("hippo-username")
                         .env("HIPPO_USERNAME")
                         .about("The username for connecting to Hippo"),
                 )
                 .arg(
                     Arg::new(ARG_HIPPO_PASSWORD)
+                        .required(true)
                         .long("hippo-password")
                         .env("HIPPO_PASSWORD")
                         .about("The username for connecting to Hippo"),
@@ -109,12 +82,12 @@ async fn main() -> anyhow::Result<()> {
         .subcommand(
             App::new("prepare")
                 .about("Reads a HIPPOFACTS file and prepares a Bindle, caching it locally.")
-                .args(&bindle_build_args),
+                .args(bindle_build_args(BindleBuildRequirements::RequireStageDirectory)),
         )
         .subcommand(
             App::new("bindle")
                 .about("Creates a bindle and pushes it to the Bindle server, but does not notify Hippo")
-                .args(&bindle_build_args),
+                .args(bindle_build_args(BindleBuildRequirements::RequireBindleServer)),
         )
         .get_matches();
 
@@ -127,6 +100,65 @@ async fn main() -> anyhow::Result<()> {
     }
 }
 
+/// Constructs arguments used to do a Bindle build.
+/// Arguments necessary to build a bindle (but not push it)
+/// - ARG_HIPPOFACTS
+/// - ARG_VERSIONING
+/// - ARG_OUTPUT
+/// - ARG_BINDLE_URL
+/// - ARG_STAGING_DIR
+fn bindle_build_args<'a>(requirements: BindleBuildRequirements) -> Vec<Arg<'a>> {
+    let require_bindle_server = matches!(
+        requirements,
+        BindleBuildRequirements::RequireBindleServer
+            | BindleBuildRequirements::RequireBindleServerAndStageDirectory
+    );
+    let require_stage_dir = matches!(
+        requirements,
+        BindleBuildRequirements::RequireStageDirectory
+            | BindleBuildRequirements::RequireBindleServerAndStageDirectory
+    );
+
+    vec![
+        Arg::new(ARG_HIPPOFACTS)
+            .required(true)
+            .index(1)
+            .about("The artifacts spec (file or directory containing HIPPOFACTS file)"),
+        Arg::new(ARG_VERSIONING)
+            .possible_values(&["dev", "production"])
+            .default_value("dev")
+            .required(false)
+            .short('v')
+            .long("invoice-version")
+            .about("How to version the generated invoice"),
+        Arg::new(ARG_OUTPUT)
+            .possible_values(&["id", "message", "none"])
+            .default_value("message")
+            .required(false)
+            .short('o')
+            .long("output")
+            .about("What to print on success"),
+        Arg::new(ARG_BINDLE_URL)
+            .short('s')
+            .long("server")
+            .env("BINDLE_URL")
+            .about("The Bindle server to push the artifacts to")
+            .required(require_bindle_server),
+        Arg::new(ARG_INSECURE)
+            .required(false)
+            .takes_value(false)
+            .short('k')
+            .long("insecure")
+            .about("If set, ignore server certificate errors"),
+        Arg::new(ARG_STAGING_DIR)
+            .takes_value(true)
+            .short('d')
+            .long("dir")
+            .about("The path to output the artifacts to. Required when doing a `hippo prepare`. Other commands will use a temp dir if this is not specified.")
+            .required(require_stage_dir),
+    ]
+}
+
 /// Run the prepare command
 ///
 /// Args:
@@ -231,13 +263,16 @@ async fn push(args: &ArgMatches) -> anyhow::Result<()> {
     })?);
 
     // Hippo configuration
-    let hippo_url = args.value_of(ARG_HIPPO_URL).map(|s| s.to_owned());
+    let hippo_url = args
+        .value_of(ARG_HIPPO_URL)
+        .map(|s| s.to_owned())
+        .ok_or_else(|| anyhow::anyhow!("A Hippo url is required. Use --hippo-url or $HIPPO_URL"))?;
     let hippo_username = args.value_of(ARG_HIPPO_USERNAME);
     let hippo_password = args.value_of(ARG_HIPPO_PASSWORD);
 
     // Notification configuration
-    let notify_to = hippo_url.map(|url| hippo_notifier::ConnectionInfo {
-        url,
+    let notify_to = Some(hippo_notifier::ConnectionInfo {
+        url: hippo_url,
         danger_accept_invalid_certs: args.is_present(ARG_INSECURE),
         username: hippo_username.unwrap().to_owned(), // Known to be set if the URL is
         password: hippo_password.unwrap().to_owned(),