Pipe through env vars to control versions

apollographql · Jul 4, 2024 · f77a0b3 · f77a0b3
1 parent 40be0b8
commit f77a0b3
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 19 deletions.
diff --git a/.github/workflows/tests-mac-x86.yml b/.github/workflows/tests-mac-x86.yml
@@ -65,8 +65,8 @@ jobs:
     # x86-64 runner
     runs-on: macos-13
     env:
-      APOLLO_ROVER_DEV_ROUTER_VERSION: ${{ matrix.router-version }}
-      APOLLO_ROVER_DEV_COMPOSITION_VERSION: ${{ matrix.composition-version }}
+      TEST_ROUTER_VERSION: ${{ matrix.router-version }}
+      TEST_COMPOSITION_VERSION: ${{ matrix.composition-version }}
       ROVER_BINARY: ../../artifact/rover
       FLYBY_APOLLO_KEY: ${{ secrets.FLYBY_APOLLO_KEY }}
     steps:
@@ -76,4 +76,4 @@ jobs:
       - name: Run Integration tests
         run: |
           chmod +x ./artifact/{rover,xtask}
-          ./artifact/xtask integration-test --binary_path ./artifact/rover
+          ./artifact/xtask integration-test
diff --git a/xtask/src/commands/integration_test.rs b/xtask/src/commands/integration_test.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use anyhow::Result;
 use camino::Utf8PathBuf;
 use clap::Parser;
@@ -29,7 +31,20 @@ impl IntegrationTest {
             crate::info!("skipping flyby tests, to run unset SKIP_NPM_TESTS",);
         } else {
             let npm_runner = NpmRunner::new()?;
-            npm_runner.flyby()?;
+            let mut env_map = HashMap::new();
+            if std::env::var("TEST_COMPOSITION_VERSION").is_some() {
+                env_map.insert(
+                    "APOLLO_ROVER_DEV_COMPOSITION_VERSION",
+                    std::env::var("COMPOSITION_VERSION").unwrap(),
+                )
+            }
+            if std::env::var("TEST_ROUTER_VERSION").is_some() {
+                env_map.insert(
+                    "APOLLO_ROVER_DEV_ROUTER_VERSION",
+                    std::env::var("ROUTER_VERSION").unwrap(),
+                )
+            }
+            npm_runner.flyby(Some(env_map))?;
         }
 
         if std::env::var_os("CAN_RUN_DOCKER").is_some() {

diff --git a/xtask/src/tools/npm.rs b/xtask/src/tools/npm.rs
@@ -1,9 +1,11 @@
+use std::collections::HashMap;
+use std::{fs, str};
+
 use anyhow::{anyhow, Context, Result};
 use camino::Utf8PathBuf;
-use rover_std::Fs;
 use which::which;
 
-use std::{fs, str};
+use rover_std::Fs;
 
 use crate::info;
 use crate::{
@@ -107,21 +109,21 @@ impl NpmRunner {
     }
 
     // this command runs integration tests with a test account in Apollo Studio with the flyby demo
-    pub(crate) fn flyby(&self) -> Result<()> {
+    pub(crate) fn flyby(&self, env: Option<&HashMap<String, String>>) -> Result<()> {
         let run_studio_tests = || -> Result<()> {
             self.require_volta()?;
             self.npm_exec(&["install"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "compose:file"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "compose:graphref"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "compose:introspect"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "compose:broken"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "locations:check"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "locations:publish"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "locations:fetch"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "reviews:check"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "reviews:publish"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "reviews:fetch"], &self.flyby_directory)?;
-            self.npm_exec(&["run", "broken:check"], &self.flyby_directory)?;
+            self.npm_exec_with_env(&["run", "compose:file"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "compose:graphref"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "compose:introspect"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "compose:broken"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "locations:check"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "locations:publish"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "locations:fetch"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "reviews:check"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "reviews:publish"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "reviews:fetch"], &self.flyby_directory, env)?;
+            self.npm_exec_with_env(&["run", "broken:check"], &self.flyby_directory, env)?;
             Ok(())
         };
         if std::env::var_os("FLYBY_APOLLO_KEY").is_some()
@@ -181,7 +183,16 @@ impl NpmRunner {
     }
 
     fn npm_exec(&self, args: &[&str], directory: &Utf8PathBuf) -> Result<CommandOutput> {
-        self.runner.exec(args, directory, None)
+        self.npm_exec_with_env(args, directory, None)
+    }
+
+    fn npm_exec_with_env(
+        &self,
+        args: &[&str],
+        directory: &Utf8PathBuf,
+        env: Option<&HashMap<String, String>>,
+    ) -> Result<CommandOutput> {
+        self.runner.exec(args, directory, env)
     }
 }