Router getting started WIP

apollographql · May 20, 2022 · 21f601c · 21f601c
1 parent 6a0b76c
commit 21f601c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 120 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
@@ -103,8 +103,7 @@ uname = "0.1.1"
 uname = "0.1.1"
 
 [dev-dependencies]
-#TODO Fix this once new scaffold is released
-cargo-scaffold = {path = "../../cargo-scaffold"}
+cargo-scaffold = "0.6.1"
 insta = "1.12.0"
 str_inflector = "0.12.0"
 jsonpath_lib = "0.3.0"

diff --git a/apollo-router/tests/common.rs b/apollo-router/tests/common.rs
@@ -24,6 +24,7 @@ pub struct TracingTest {
     test_config_location: PathBuf,
 }
 
+#[allow(dead_code)]
 impl TracingTest {
     pub fn new<P: TextMapPropagator + Send + Sync + 'static>(
         tracer: Tracer,

diff --git a/apollo-router/tests/scaffold.rs b/apollo-router/tests/scaffold.rs
@@ -1,7 +1,6 @@
 use cargo_scaffold::{Opts, ScaffoldDescription};
 use inflector::Inflector;
 use std::collections::BTreeMap;
-use std::fs;
 use std::process::Command;
 use tower::BoxError;
 

diff --git a/docs/source/config.json b/docs/source/config.json
@@ -40,6 +40,7 @@
     "Customizations": {
       "Overview": "/customizations/overview",
       "Native Rust plugins": "/customizations/native",
+      "Native Rust plugins - Tutorial": "/customizations/native-tutorial",
       "Rhai scripts (experimental)": "/customizations/rhai"
     },
     "Third-Party Support": {

diff --git a/docs/source/customizations/getting-started.mdx b/docs/source/customizations/getting-started.mdx
diff --git a/scaffold/xtask/Cargo.toml b/scaffold/xtask/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
 [dependencies]
 clap = { version = "3.1.8", features = ["derive"] }
 anyhow = "1.0.56"
-cargo-scaffold = "0.6.0"
+cargo-scaffold = "0.6.1"
 regex = "1"
 str_inflector = "0.12.0"
 toml = "0.5.8"
diff --git a/scaffold/xtask/src/main.rs b/scaffold/xtask/src/main.rs
@@ -44,6 +44,10 @@ fn main() -> Result<()> {
         Action::Plugin {
             action: PluginAction::Create { name },
         } => {
+            if Path::new(&format!("src/plugins/{}.rs", name.to_snake_case())).exists() {
+                return Err(anyhow::anyhow!("plugin '{}' already exists", name));
+            }
+
             let opts = cargo_scaffold::Opts::builder()
                 .template_path("scaffold/plugin")
                 .target_dir(".")