[iquery] Remove ":expose:" in accessor arguments

Fixed: 381127117
Change-Id: Idf9f6c6d4f74962e2bc4d2f49d3c77364c0a089f
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1164092
Reviewed-by: Clayton McCray <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>
Fuchsia-Auto-Submit: Miguel Flores <[email protected]>

Author: miguelfrde

src/developer/ffx/plugins/inspect/src/accessor_provider.rs

@@ -6,9 +6,7 @@ use anyhow::anyhow;
 use diagnostics_data::Data;
 use fidl_fuchsia_developer_remotecontrol::RemoteControlProxy;
 use fidl_fuchsia_diagnostics::ClientSelectorConfiguration::{SelectAll, Selectors};
-use fidl_fuchsia_diagnostics::{
-    Format, Selector, SelectorArgument, StreamParameters, StringSelector, TreeSelector,
-};
+use fidl_fuchsia_diagnostics::{Format, Selector, SelectorArgument, StreamParameters};
 use fidl_fuchsia_diagnostics_host::{ArchiveAccessorMarker, ArchiveAccessorProxy};
 use fidl_fuchsia_io::OpenFlags;
 use fidl_fuchsia_sys2 as fsys2;
@@ -35,43 +33,18 @@ fn add_host_before_last_dot(input: &str) -> Result<String, Error> {
     Ok(format!("{}.host.{}", rest, last))
 }
 
-struct MonikerAndProtocol {
-    protocol: String,
-    moniker: String,
+struct MonikerAndProtocol<'a> {
+    protocol: &'a str,
+    moniker: &'a str,
 }
 
-impl TryFrom<Selector> for MonikerAndProtocol {
+impl<'a> TryFrom<&'a str> for MonikerAndProtocol<'a> {
     type Error = Error;
 
-    fn try_from(selector: Selector) -> Result<Self, Self::Error> {
-        Ok(MonikerAndProtocol {
-            moniker: selector
-                .component_selector
-                .map(|selector| selector.moniker_segments)
-                .flatten()
-                .into_iter()
-                .flatten()
-                .map(|value| match value {
-                    StringSelector::ExactMatch(value) => Ok(value),
-                    _ => Err(Error::MustBeExactMoniker),
-                })
-                .collect::<Result<Vec<_>, Error>>()?
-                .join("/"),
-            protocol: selector
-                .tree_selector
-                .map(|value| match value {
-                    TreeSelector::PropertySelector(value) => Ok(value.target_properties),
-                    _ => Err(Error::MustUsePropertySelector),
-                })
-                .into_iter()
-                .flatten()
-                .map(|value| match value {
-                    StringSelector::ExactMatch(value) => Ok(value),
-                    _ => Err(Error::MustBeExactProtocol),
-                })
-                .next()
-                .ok_or(Error::MustBeExactProtocol)??,
-        })
+    fn try_from(s: &'a str) -> Result<Self, Self::Error> {
+        s.rsplit_once(":")
+            .map(|(moniker, protocol)| MonikerAndProtocol { moniker, protocol })
+            .ok_or_else(|| Error::invalid_accessor(s))
     }
 }
 
@@ -82,7 +55,7 @@ impl HostArchiveReader {
 
     pub async fn snapshot_diagnostics_data<D>(
         &self,
-        accessor: &Option<String>,
+        accessor: Option<&str>,
         selectors: impl IntoIterator<Item = Selector>,
     ) -> Result<Vec<Data<D>>, Error>
     where
@@ -95,18 +68,14 @@ impl HostArchiveReader {
             Selectors(selectors.map(|s| SelectorArgument::StructuredSelector(s)).collect())
         };
 
-        let accessor = match accessor {
-            Some(ref s) => {
+        let accessor = match accessor.as_deref() {
+            Some(s) => {
                 let s = add_host_before_last_dot(s)?;
-                let selector = selectors::parse_verbose(&s).map_err(|e| {
-                    Error::ParseSelector("unable to parse selector".to_owned(), anyhow!("{:?}", e))
-                })?;
-                let moniker_and_protocol = MonikerAndProtocol::try_from(selector)?;
-
+                let moniker_and_protocol = MonikerAndProtocol::try_from(s.as_str())?;
                 let (client, server) = fidl::endpoints::create_endpoints::<ArchiveAccessorMarker>();
                 self.rcs_proxy
                     .deprecated_open_capability(
-                        &format!("/{}", moniker_and_protocol.moniker),
+                        &format!("{}", moniker_and_protocol.moniker),
                         fsys2::OpenDirType::ExposedDir,
                         &moniker_and_protocol.protocol,
                         server.into_channel(),
@@ -156,7 +125,7 @@ impl HostArchiveReader {
 impl DiagnosticsProvider for HostArchiveReader {
     async fn snapshot<D>(
         &self,
-        accessor_path: &Option<String>,
+        accessor_path: Option<&str>,
         selectors: impl IntoIterator<Item = Selector>,
     ) -> Result<Vec<Data<D>>, Error>
     where

src/developer/ffx/plugins/inspect/src/apply_selectors/mod.rs

@@ -42,7 +42,7 @@ pub async fn execute(
         .context(format!("Unable to deserialize {}.", snapshot_file.display()))?
     } else {
         let provider = HostArchiveReader::new(diagnostics_proxy, rcs_proxy);
-        provider.snapshot::<Inspect>(&cmd.accessor_path, std::iter::empty()).await?
+        provider.snapshot::<Inspect>(cmd.accessor_path.as_deref(), std::iter::empty()).await?
     };
     let moniker = match cmd.moniker {
         Some(m) => Some(ExtendedMoniker::parse_str(&m)?),

src/developer/ffx/plugins/inspect/src/tests/list.rs

@@ -137,14 +137,14 @@ async fn test_list_with_data_with_manifest_and_archive() {
     let cmd = ListCommand {
         manifest: Some(String::from("moniker1")),
         with_url: true,
-        accessor: Some("./test/component:expose:fuchsia.diagnostics.ArchiveAccessor".to_owned()),
+        accessor: Some("test/component:fuchsia.diagnostics.ArchiveAccessor".to_owned()),
     };
     let (accessor, _task) = setup_fake_rcs_with_embedded_archive_accessor(
         setup_fake_archive_accessor(vec![FakeAccessorData::new(
             params.clone(),
             expected_responses.clone(),
         )]),
-        "/test/component".into(),
+        "test/component".into(),
         "fuchsia.diagnostics.host.ArchiveAccessor".into(),
     );
     run_command(

src/developer/ffx/plugins/inspect/src/tests/list_accessors.rs

@@ -22,9 +22,9 @@ async fn test_list_accessors() {
     .unwrap();
 
     let expected = serde_json::to_string(&vec![
-        String::from("example/component:expose:fuchsia.diagnostics.ArchiveAccessor"),
-        String::from("foo/bar/thing\\:instance:expose:fuchsia.diagnostics.FeedbackArchiveAccessor"),
-        String::from("foo/component:expose:fuchsia.diagnostics.FeedbackArchiveAccessor"),
+        String::from("example/component:fuchsia.diagnostics.ArchiveAccessor"),
+        String::from("foo/bar/thing\\:instance:fuchsia.diagnostics.FeedbackArchiveAccessor"),
+        String::from("foo/component:fuchsia.diagnostics.FeedbackArchiveAccessor"),
     ])
     .unwrap();
     let output = test_buffers.into_stdout_str();

src/developer/ffx/tests/cli-goldens/goldens/ffx/inspect/list.golden

@@ -40,7 +40,7 @@
       "optionality": "optional",
       "long": "--accessor",
       "short": null,
-      "description": "A selector specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to. The selector will be in the form of: <moniker>:<directory>:fuchsia.diagnostics.ArchiveAccessorName Typically this is the output of `iquery list-accessors`. For example: `bootstrap/archivist:expose:fuchsia.diagnostics.FeedbackArchiveAccessor` means that the command will connect to the `FeedbackArchiveAccecssor` exposed by `bootstrap/archivist`.",
+      "description": "A selector specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to. The selector will be in the form of: <moniker>:fuchsia.diagnostics.ArchiveAccessorName Typically this is the output of `iquery list-accessors`. For example: `bootstrap/archivist:fuchsia.diagnostics.FeedbackArchiveAccessor` means that the command will connect to the `FeedbackArchiveAccecssor` exposed by `bootstrap/archivist`.",
       "hidden": false
     }
   ],

src/developer/ffx/tests/cli-goldens/goldens/ffx/inspect/selectors.golden

@@ -44,7 +44,7 @@
       "optionality": "optional",
       "long": "--accessor",
       "short": null,
-      "description": "A string specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to. This can be copied from the output of `ffx inspect list-accessors`. The selector will be in the form of: <moniker>:<directory>:fuchsia.diagnostics.ArchiveAccessorName",
+      "description": "A string specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to. This can be copied from the output of `ffx inspect list-accessors`. The selector will be in the form of: <moniker>:fuchsia.diagnostics.ArchiveAccessorName",
       "hidden": false
     }
   ],

src/developer/ffx/tests/cli-goldens/goldens/ffx/inspect/show.golden

@@ -44,7 +44,7 @@
       "optionality": "optional",
       "long": "--accessor",
       "short": null,
-      "description": "A string specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to. This can be copied from the output of `ffx inspect list-accessors`. The selector will be in the form of: <moniker>:<directory>:fuchsia.diagnostics.ArchiveAccessorName",
+      "description": "A string specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to. This can be copied from the output of `ffx inspect list-accessors`. The selector will be in the form of: <moniker>:fuchsia.diagnostics.ArchiveAccessorName",
       "hidden": false
     },
     {

src/diagnostics/BUILD.gn

@@ -38,6 +38,9 @@ group("tests") {
     "tests",
     "triage:tests",
     "validator:tests",
+    "//src/developer/ffx/plugins/inspect:tests($host_toolchain)",
+    "//src/developer/ffx/plugins/log:tests($host_toolchain)",
+    "//src/developer/ffx/tools/triage:tests($host_toolchain)",
     "//src/lib/diagnostics:tests",
 
     # Disabled due to lack of support in Clang and Rust toolchain;

src/diagnostics/iquery/src/commands/list.rs

@@ -100,7 +100,7 @@ fn components_from_inspect_data(inspect_data: Vec<InspectData>) -> Vec<ListResul
 }
 
 pub fn list_response_items_from_components(
-    manifest: &Option<String>,
+    manifest: Option<&str>,
     with_url: bool,
     components: Vec<ListResultItem>,
 ) -> Vec<ListResultItem> {
@@ -146,11 +146,11 @@ pub struct ListCommand {
     #[argh(option)]
     /// A selector specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to.
     /// The selector will be in the form of:
-    /// <moniker>:<directory>:fuchsia.diagnostics.ArchiveAccessorName
+    /// <moniker>:fuchsia.diagnostics.ArchiveAccessorName
     ///
     /// Typically this is the output of `iquery list-accessors`.
     ///
-    /// For example: `bootstrap/archivist:expose:fuchsia.diagnostics.FeedbackArchiveAccessor`
+    /// For example: `bootstrap/archivist:fuchsia.diagnostics.FeedbackArchiveAccessor`
     /// means that the command will connect to the `FeedbackArchiveAccecssor`
     /// exposed by `bootstrap/archivist`.
     pub accessor: Option<String>,
@@ -160,10 +160,14 @@ impl Command for ListCommand {
     type Result = ListResult;
 
     async fn execute<P: DiagnosticsProvider>(self, provider: &P) -> Result<Self::Result, Error> {
-        let inspect = provider.snapshot::<Inspect>(&self.accessor, std::iter::empty()).await?;
+        let inspect =
+            provider.snapshot::<Inspect>(self.accessor.as_deref(), std::iter::empty()).await?;
         let components = components_from_inspect_data(inspect);
-        let results =
-            list_response_items_from_components(&self.manifest, self.with_url, components);
+        let results = list_response_items_from_components(
+            self.manifest.as_deref(),
+            self.with_url,
+            components,
+        );
         Ok(ListResult(results))
     }
 }

src/diagnostics/iquery/src/commands/selectors.rs

@@ -39,7 +39,7 @@ pub struct SelectorsCommand {
     /// A string specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to.
     /// This can be copied from the output of `ffx inspect list-accessors`.
     /// The selector will be in the form of:
-    /// <moniker>:<directory>:fuchsia.diagnostics.ArchiveAccessorName
+    /// <moniker>:fuchsia.diagnostics.ArchiveAccessorName
     pub accessor: Option<String>,
 }
 
@@ -65,16 +65,21 @@ impl Command for SelectorsCommand {
             )
             .await?
         } else if let Some(manifest) = self.manifest {
-            utils::get_selectors_for_manifest(manifest, self.selectors, &self.accessor, provider)
-                .await?
+            utils::get_selectors_for_manifest(
+                manifest,
+                self.selectors,
+                self.accessor.clone(),
+                provider,
+            )
+            .await?
         } else {
             utils::process_fuzzy_inputs(self.selectors, provider).await?
         };
 
         let selectors = utils::expand_selectors(selectors, None)?;
 
         let mut results =
-            provider.snapshot::<Inspect>(&self.accessor, selectors.into_iter()).await?;
+            provider.snapshot::<Inspect>(self.accessor.as_deref(), selectors.into_iter()).await?;
         for result in results.iter_mut() {
             if let Some(hierarchy) = &mut result.payload {
                 hierarchy.sort();

src/diagnostics/iquery/src/commands/show.rs

@@ -78,7 +78,7 @@ pub struct ShowCommand {
     /// A string specifying what `fuchsia.diagnostics.ArchiveAccessor` to connect to.
     /// This can be copied from the output of `ffx inspect list-accessors`.
     /// The selector will be in the form of:
-    /// <moniker>:<directory>:fuchsia.diagnostics.ArchiveAccessorName
+    /// <moniker>:fuchsia.diagnostics.ArchiveAccessorName
     pub accessor: Option<String>,
 
     #[argh(option)]
@@ -105,16 +105,21 @@ impl Command for ShowCommand {
             )
             .await?
         } else if let Some(manifest) = self.manifest {
-            utils::get_selectors_for_manifest(manifest, self.selectors, &self.accessor, provider)
-                .await?
+            utils::get_selectors_for_manifest(
+                manifest,
+                self.selectors,
+                self.accessor.clone(),
+                provider,
+            )
+            .await?
         } else {
             utils::process_fuzzy_inputs(self.selectors, provider).await?
         };
 
         let selectors = utils::expand_selectors(selectors, self.name)?;
 
         let inspect_data_iter =
-            provider.snapshot::<Inspect>(&self.accessor, selectors).await?.into_iter();
+            provider.snapshot::<Inspect>(self.accessor.as_deref(), selectors).await?.into_iter();
 
         let mut results = inspect_data_iter
             .map(|mut d: InspectData| {