fix(http): plan for future support of multiple profiles

Author: niklaslong

http/src/config.rs

@@ -58,7 +58,7 @@ pub enum InitializationError {
 pub fn initialize(
     ipfs_path: &Path,
     bits: NonZeroU16,
-    profile: Profile,
+    profiles: Vec<Profile>,
 ) -> Result<(), InitializationError> {
     let config_path = ipfs_path.join("config");
 
@@ -67,10 +67,14 @@ pub fn initialize(
         .and_then(|_| {
             fs::File::create(&config_path).map_err(InitializationError::ConfigCreationFailed)
         })
-        .and_then(|config_file| create(config_file, bits, profile))
+        .and_then(|config_file| create(config_file, bits, profiles))
 }
 
-fn create(config: File, bits: NonZeroU16, profile: Profile) -> Result<(), InitializationError> {
+fn create(
+    config: File,
+    bits: NonZeroU16,
+    profiles: Vec<Profile>,
+) -> Result<(), InitializationError> {
     use multibase::Base::Base64Pad;
     use prost::Message;
     use std::io::BufWriter;
@@ -82,19 +86,6 @@ fn create(config: File, bits: NonZeroU16, profile: Profile) -> Result<(), Initia
         return Err(InitializationError::InvalidRsaKeyLength(bits));
     }
 
-    // if profiles.len() != 1 || profiles[0] != "test" || profiles[0] != "default" {
-    //     // profiles are expected to be (comma separated) "test" as there are no bootstrap peer
-    //     // handling yet. the conformance test cases seem to init `go-ipfs` in this profile where
-    //     // it does not have any bootstrap nodes, and multi node tests later call swarm apis to
-    //     // dial the nodes together.
-    //     return Err(InitializationError::InvalidProfile(profiles));
-    // }
-
-    let api_addrs = match profile {
-        Profile::Test => "127.0.0.1:0",
-        Profile::Default => "127.0.0.1:4004",
-    };
-
     let pk = openssl::rsa::Rsa::generate(bits as u32)
         .map_err(|e| InitializationError::KeyGeneration(Box::new(e)))?;
 
@@ -133,6 +124,19 @@ fn create(config: File, bits: NonZeroU16, profile: Profile) -> Result<(), Initia
 
     let private_key = Base64Pad.encode(&private_key);
 
+    if profiles.len() != 1 {
+        // profiles are expected to be (comma separated) "test" as there are no bootstrap peer
+        // handling yet. the conformance test cases seem to init `go-ipfs` in this profile where
+        // it does not have any bootstrap nodes, and multi node tests later call swarm apis to
+        // dial the nodes together.
+        unimplemented!("Multiple profiles are currently unsupported!")
+    }
+
+    let api_addrs = match profiles[0] {
+        Profile::Test => "127.0.0.1:0",
+        Profile::Default => "127.0.0.1:4004",
+    };
+
     let config_contents = CompatibleConfigFile {
         identity: Identity {
             peer_id,

http/src/main.rs

@@ -16,9 +16,12 @@ enum Options {
         /// Generated key length
         #[structopt(long)]
         bits: NonZeroU16,
-        /// List of configuration profiles to apply
-        #[structopt(long)]
-        profile: config::Profile,
+        /// List of configuration profiles to apply. Currently only the `Test` and `Default`
+        /// profiles are supported.  
+        ///
+        /// `Test` uses ephemeral ports, `Default` uses `4004`.
+        #[structopt(long, use_delimiter = true)]
+        profile: Vec<config::Profile>,
     },
     /// Start the IPFS node in the foreground (not detaching from parent process).
     Daemon,
@@ -202,8 +205,6 @@ fn serve<Types: IpfsTypes>(
 
     let ipfs = ipfs.clone();
 
-    println!("SOCKET_ADDR: {:?}", listening_addrs);
-
     warp::serve(routes).bind_with_graceful_shutdown(listening_addrs, async move {
         shutdown_rx.next().await;
         info!("Shutdown trigger received; starting shutdown");