Use the standard ZOO_API_TOKEN environment variable (#989)

Author: jacebrowning

.envrc

@@ -1 +1,4 @@
-use flake .
+# Enable nix development environment if installed
+if has nix; then
+    use flake .
+fi

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
         - name: cargo test
           shell: bash
           run: |
-            export KITTYCAD_API_TOKEN=${{secrets.KITTYCAD_API_TOKEN}}
+            export ZOO_API_TOKEN=${{secrets.KITTYCAD_API_TOKEN}}
             just test-with-coverage
           env:
             RUST_BACKTRACE: 1

modeling-session/examples/cube_png.rs

@@ -20,14 +20,16 @@ const CUBE_WIDTH: LengthUnit = LengthUnit(100.0);
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<()> {
     // Set up the API client.
-    let kittycad_api_token = env::var("KITTYCAD_API_TOKEN").context("You must set $KITTYCAD_API_TOKEN")?;
-    let kittycad_api_client = kittycad::Client::new(kittycad_api_token);
+    let token = env::var("ZOO_API_TOKEN")
+    .or_else(|_| env::var("KITTYCAD_API_TOKEN")) // legacy name
+    .context("You must set $ZOO_API_TOKEN")?;
+    let client = kittycad::Client::new(token);
 
     // Where should the final PNG be saved?
     let img_output_path = env::var("IMAGE_OUTPUT_PATH").unwrap_or_else(|_| "model.png".to_owned());
 
     let session_builder = SessionBuilder {
-        client: kittycad_api_client,
+        client,
         fps: Some(10),
         unlocked_framerate: Some(false),
         video_res_height: Some(720),

modeling-session/examples/cube_png_batch.rs

@@ -21,14 +21,16 @@ const CUBE_WIDTH: LengthUnit = LengthUnit(100.0);
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<()> {
     // Set up the API client.
-    let kittycad_api_token = env::var("KITTYCAD_API_TOKEN").context("You must set $KITTYCAD_API_TOKEN")?;
-    let kittycad_api_client = kittycad::Client::new(kittycad_api_token);
+    let token = env::var("ZOO_API_TOKEN")
+        .or_else(|_| env::var("KITTYCAD_API_TOKEN")) // legacy name
+        .context("You must set $ZOO_API_TOKEN")?;
+    let client = kittycad::Client::new(token);
 
     // Where should the final PNG be saved?
     let img_output_path = env::var("IMAGE_OUTPUT_PATH").unwrap_or_else(|_| "model_batched.png".to_owned());
 
     let session_builder = SessionBuilder {
-        client: kittycad_api_client,
+        client,
         fps: Some(10),
         unlocked_framerate: Some(false),
         video_res_height: Some(720),

modeling-session/examples/lsystem_png_batch.rs

@@ -20,14 +20,16 @@ use uuid::Uuid;
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<()> {
     // Set up the API client.
-    let kittycad_api_token = env::var("KITTYCAD_API_TOKEN").context("You must set $KITTYCAD_API_TOKEN")?;
-    let kittycad_api_client = kittycad::Client::new(kittycad_api_token);
+    let token = env::var("ZOO_API_TOKEN")
+        .or_else(|_| env::var("KITTYCAD_API_TOKEN")) // legacy name
+        .context("You must set $ZOO_API_TOKEN")?;
+    let client = kittycad::Client::new(token);
 
     // Where should the final PNG be saved?
     let img_output_path = env::var("IMAGE_OUTPUT_PATH").unwrap_or_else(|_| "model_lsystem_batched.png".to_owned());
 
     let session_builder = SessionBuilder {
-        client: kittycad_api_client,
+        client,
         fps: Some(10),
         unlocked_framerate: Some(false),
         video_res_height: Some(720),