[fuchsia-component] Migrate ServiceFs to io2

Migrate remaining uses of io1 in fuchsia-component and
fuchsia-component-test.

Bug: 324111518
Test: fx test //src/lib/fuchsia-component \
  //src/lib/fuchsia-component-test
Change-Id: I8afe7a39cb1d1baa72c3b945a841a426c55e23c2
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1200344
Commit-Queue: Brandon Castellano <[email protected]>
Reviewed-by: Claire Gonyeo <[email protected]>

Author: Breakthrough

src/lib/fuchsia-component-test/realm_builder_server/src/builtin.rs

@@ -13,6 +13,7 @@ use vfs::directory::immutable::simple as simpledir;
 use vfs::execution_scope::ExecutionScope;
 use vfs::file::vmo::VmoFile;
 use vfs::path::Path as VfsPath;
+use vfs::ObjectRequest;
 use zx::{self as zx, HandleBased};
 use {fidl_fuchsia_component_test as ftest, fidl_fuchsia_io as fio};
 
@@ -60,12 +61,13 @@ pub async fn read_only_directory_helper(
     top_directory.clone().set_not_found_handler(Box::new(move |path| {
         warn!("nonexistent path {:?} accessed in read only directory {:?}", path, directory_name);
     }));
-    top_directory.open(
+    let flags = fio::PERM_READABLE | fio::Flags::PROTOCOL_DIRECTORY;
+    top_directory.open3(
         execution_scope_dropper.execution_scope.clone(),
-        fio::OpenFlags::RIGHT_READABLE | fio::OpenFlags::DIRECTORY,
         VfsPath::dot(),
-        outgoing_dir.into_channel().into(),
-    );
+        flags.clone(),
+        &mut ObjectRequest::new(flags, &Default::default(), outgoing_dir.into_channel().into()),
+    )?;
     execution_scope_dropper.execution_scope.wait().await;
     Ok(())
 }

src/lib/fuchsia-component-test/src/lib.rs

@@ -2061,12 +2061,7 @@ impl ScopedInstance {
         server_end: zx::Channel,
     ) -> Result<(), anyhow::Error> {
         self.exposed_dir
-            .open(
-                fio::OpenFlags::NOT_DIRECTORY,
-                fio::ModeType::empty(),
-                protocol_name,
-                ServerEnd::new(server_end),
-            )
+            .open3(protocol_name, fio::Flags::PROTOCOL_SERVICE, &Default::default(), server_end)
             .map_err(Into::into)
     }
 

src/lib/fuchsia-component/src/server/mod.rs

@@ -28,6 +28,7 @@ use vfs::name::Name;
 use vfs::path::Path;
 use vfs::remote::remote_dir;
 use vfs::service::endpoint;
+use vfs::ObjectRequest;
 use zx::MonotonicDuration;
 use {fidl_fuchsia_io as fio, fuchsia_async as fasync};
 
@@ -471,19 +472,27 @@ impl<ServiceObjTy: ServiceObjTrait> ServiceFs<ServiceObjTy> {
 
     /// When a connection is first made to the `ServiceFs` in the absence of a parent connection,
     /// it will be granted these rights.
-    fn base_connection_flags() -> fio::OpenFlags {
-        return fio::OpenFlags::RIGHT_READABLE
-            | fio::OpenFlags::RIGHT_WRITABLE
-            | fio::OpenFlags::RIGHT_EXECUTABLE;
+    const fn base_connection_flags() -> fio::Flags {
+        return fio::Flags::PROTOCOL_DIRECTORY
+            .union(fio::PERM_READABLE)
+            .union(fio::PERM_WRITABLE)
+            .union(fio::PERM_EXECUTABLE);
     }
 
     fn serve_connection_impl(&self, chan: fidl::endpoints::ServerEnd<fio::DirectoryMarker>) {
-        self.dir.clone().open(
-            self.scope.clone(),
-            Self::base_connection_flags(),
-            Path::dot(),
-            fidl::endpoints::ServerEnd::<fio::NodeMarker>::new(chan.into_channel()),
-        );
+        self.dir
+            .clone()
+            .open3(
+                self.scope.clone(),
+                Path::dot(),
+                Self::base_connection_flags(),
+                &mut ObjectRequest::new(
+                    Self::base_connection_flags(),
+                    &Default::default(),
+                    chan.into_channel(),
+                ),
+            )
+            .expect("failed to serve root ServiceFs connection");
     }
 
     /// Creates a protocol connector that can access the capabilities exposed by this ServiceFs.

src/lib/fuchsia-component/src/server/until_stalled.rs

@@ -130,7 +130,7 @@ impl<ServiceObjTy: ServiceObjTrait> Stream for StallableServiceFs<ServiceObjTy>
 }
 
 struct OutgoingConnector {
-    flags: fio::OpenFlags,
+    flags: fio::Flags,
     scope: ExecutionScope,
     dir: Arc<Simple>,
 }