chore: factors out SchemaOpt

Author: EverlastingBugstopper

src/command/graph/check.rs

@@ -5,28 +5,22 @@ use rover_client::operations::graph::check::{self, GraphCheckInput};
 use rover_client::shared::{CheckConfig, GitContext, ValidationPeriod};
 
 use crate::command::RoverOutput;
-use crate::options::GraphRefOpt;
+use crate::options::{GraphRefOpt, ProfileOpt, SchemaOpt};
 use crate::utils::client::StudioClientConfig;
-use crate::utils::parsers::{
-    parse_file_descriptor, parse_query_count_threshold, parse_query_percentage_threshold,
-    FileDescriptorType,
-};
+use crate::utils::parsers::{parse_query_count_threshold, parse_query_percentage_threshold};
 use crate::Result;
 
 #[derive(Debug, Serialize, StructOpt)]
 pub struct Check {
     #[structopt(flatten)]
     graph: GraphRefOpt,
 
-    /// Name of configuration profile to use
-    #[structopt(long = "profile", default_value = "default")]
-    #[serde(skip_serializing)]
-    profile_name: String,
+    #[structopt(flatten)]
+    profile: ProfileOpt,
 
-    /// The schema file to check. You can pass `-` to use stdin instead of a file.
-    #[structopt(long, short = "s", parse(try_from_str = parse_file_descriptor))]
+    #[structopt(flatten)]
     #[serde(skip_serializing)]
-    schema: FileDescriptorType,
+    schema: SchemaOpt,
 
     /// The minimum number of times a query or mutation must have been executed
     /// in order to be considered in the check operation
@@ -50,7 +44,7 @@ impl Check {
         client_config: StudioClientConfig,
         git_context: GitContext,
     ) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
         let proposed_schema = self
             .schema
             .read_file_descriptor("SDL", &mut std::io::stdin())?;

src/command/graph/publish.rs

@@ -6,9 +6,8 @@ use rover_client::operations::graph::publish::{self, GraphPublishInput};
 use rover_client::shared::GitContext;
 
 use crate::command::RoverOutput;
-use crate::options::{GraphRefOpt, ProfileOpt};
+use crate::options::{GraphRefOpt, ProfileOpt, SchemaOpt};
 use crate::utils::client::StudioClientConfig;
-use crate::utils::parsers::{parse_file_descriptor, FileDescriptorType};
 use crate::Result;
 
 #[derive(Debug, Serialize, StructOpt)]
@@ -19,10 +18,9 @@ pub struct Publish {
     #[structopt(flatten)]
     profile: ProfileOpt,
 
-    /// The schema file to publish. You can pass `-` to use stdin instead of a file.
-    #[structopt(long, short = "s", parse(try_from_str = parse_file_descriptor))]
+    #[structopt(flatten)]
     #[serde(skip_serializing)]
-    schema: FileDescriptorType,
+    schema: SchemaOpt,
 }
 
 impl Publish {

src/command/subgraph/check.rs

@@ -5,12 +5,9 @@ use rover_client::operations::subgraph::check::{self, SubgraphCheckInput};
 use rover_client::shared::{CheckConfig, GitContext, ValidationPeriod};
 
 use crate::command::RoverOutput;
-use crate::options::{GraphRefOpt, ProfileOpt, SubgraphOpt};
+use crate::options::{GraphRefOpt, ProfileOpt, SchemaOpt, SubgraphOpt};
 use crate::utils::client::StudioClientConfig;
-use crate::utils::parsers::{
-    parse_file_descriptor, parse_query_count_threshold, parse_query_percentage_threshold,
-    FileDescriptorType,
-};
+use crate::utils::parsers::{parse_query_count_threshold, parse_query_percentage_threshold};
 use crate::Result;
 
 #[derive(Debug, Serialize, StructOpt)]
@@ -24,10 +21,9 @@ pub struct Check {
     #[structopt(flatten)]
     profile: ProfileOpt,
 
-    /// The schema file to check. You can pass `-` to use stdin instead of a file.
-    #[structopt(long, short = "s", parse(try_from_str = parse_file_descriptor))]
+    #[structopt(flatten)]
     #[serde(skip_serializing)]
-    schema: FileDescriptorType,
+    schema: SchemaOpt,
 
     /// The minimum number of times a query or mutation must have been executed
     /// in order to be considered in the check operation

src/command/subgraph/publish.rs

@@ -3,11 +3,8 @@ use serde::Serialize;
 use structopt::StructOpt;
 
 use crate::command::RoverOutput;
-use crate::options::{GraphRefOpt, ProfileOpt, SubgraphOpt};
-use crate::utils::{
-    client::StudioClientConfig,
-    parsers::{parse_file_descriptor, FileDescriptorType},
-};
+use crate::options::{GraphRefOpt, ProfileOpt, SchemaOpt, SubgraphOpt};
+use crate::utils::client::StudioClientConfig;
 use crate::Result;
 
 use rover_client::operations::subgraph::publish::{self, SubgraphPublishInput};
@@ -24,10 +21,9 @@ pub struct Publish {
     #[structopt(flatten)]
     profile: ProfileOpt,
 
-    /// The schema file to publish. You can pass `-` to use stdin instead of a file.
-    #[structopt(long, short = "s", parse(try_from_str = parse_file_descriptor))]
+    #[structopt(flatten)]
     #[serde(skip_serializing)]
-    schema: FileDescriptorType,
+    schema: SchemaOpt,
 
     /// Indicate whether to convert a non-federated graph into a subgraph
     #[structopt(short, long)]

src/options/mod.rs

@@ -1,7 +1,9 @@
 mod graph;
 mod profile;
+mod schema;
 mod subgraph;
 
 pub(crate) use graph::GraphRefOpt;
 pub(crate) use profile::ProfileOpt;
+pub(crate) use schema::SchemaOpt;
 pub(crate) use subgraph::SubgraphOpt;

src/options/schema.rs

@@ -0,0 +1,25 @@
+use structopt::StructOpt;
+
+use crate::{
+    utils::parsers::{parse_file_descriptor, FileDescriptorType},
+    Result,
+};
+
+use std::io::Read;
+
+#[derive(Debug, StructOpt)]
+pub struct SchemaOpt {
+    /// The schema file to check. You can pass `-` to use stdin instead of a file.
+    #[structopt(long, short = "s", parse(try_from_str = parse_file_descriptor))]
+    schema: FileDescriptorType,
+}
+
+impl SchemaOpt {
+    pub(crate) fn read_file_descriptor(
+        &self,
+        file_description: &str,
+        stdin: &mut impl Read,
+    ) -> Result<String> {
+        self.schema.read_file_descriptor(file_description, stdin)
+    }
+}