From 09d523f2e8a4fae75db674bfcaaf4d2ee895310a Mon Sep 17 00:00:00 2001 From: Jeffrey Burt Date: Fri, 13 Jun 2025 16:20:22 -0700 Subject: [PATCH 1/2] fix env args --- crates/apollo-mcp-server/src/main.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/crates/apollo-mcp-server/src/main.rs b/crates/apollo-mcp-server/src/main.rs index 1bca39b..c3c2ea0 100644 --- a/crates/apollo-mcp-server/src/main.rs +++ b/crates/apollo-mcp-server/src/main.rs @@ -73,11 +73,21 @@ struct Args { introspection: bool, /// Enable use of uplink to get the schema and persisted queries (requires APOLLO_KEY and APOLLO_GRAPH_REF) - #[arg(long, short = 'u')] + #[arg( + long, + short = 'u', + requires = "apollo_key", + requires = "apollo_graph_ref" + )] uplink: bool, /// Expose a tool to open queries in Apollo Explorer (requires APOLLO_KEY and APOLLO_GRAPH_REF) - #[arg(long, short = 'x')] + #[arg( + long, + short = 'x', + requires = "apollo_key", + requires = "apollo_graph_ref" + )] explorer: bool, /// Operation files to expose as MCP tools @@ -117,7 +127,7 @@ struct Args { http_port: Option, /// collection id to expose as MCP tools (requires APOLLO_KEY) - #[arg(long, conflicts_with_all(["operations", "manifest"]))] + #[arg(long, conflicts_with_all(["operations", "manifest"]), requires = "apollo_key")] collection: Option, /// The endpoints (comma separated) polled to fetch the latest supergraph schema. @@ -129,11 +139,11 @@ struct Args { apollo_registry_url: Option, /// Your Apollo key. - #[clap(skip = std::env::var("APOLLO_KEY").ok())] + #[clap(env = "APOLLO_KEY", long)] apollo_key: Option, /// Your Apollo graph reference. - #[clap(skip = std::env::var("APOLLO_GRAPH_REF").ok())] + #[clap(env = "APOLLO_GRAPH_REF", long)] apollo_graph_ref: Option, } From a6aba27c3524341feb6672fb2a93933c42374b41 Mon Sep 17 00:00:00 2001 From: Jeffrey Burt Date: Tue, 17 Jun 2025 10:39:27 -0700 Subject: [PATCH 2/2] remove requires for explorer key --- crates/apollo-mcp-server/src/main.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/crates/apollo-mcp-server/src/main.rs b/crates/apollo-mcp-server/src/main.rs index c3c2ea0..971eeb5 100644 --- a/crates/apollo-mcp-server/src/main.rs +++ b/crates/apollo-mcp-server/src/main.rs @@ -81,13 +81,8 @@ struct Args { )] uplink: bool, - /// Expose a tool to open queries in Apollo Explorer (requires APOLLO_KEY and APOLLO_GRAPH_REF) - #[arg( - long, - short = 'x', - requires = "apollo_key", - requires = "apollo_graph_ref" - )] + /// Expose a tool to open queries in Apollo Explorer (requires APOLLO_GRAPH_REF) + #[arg(long, short = 'x', requires = "apollo_graph_ref")] explorer: bool, /// Operation files to expose as MCP tools