Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(turbo): framework conditionals #9853

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 151 additions & 6 deletions crates/turborepo-lib/src/framework.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,42 @@
use std::sync::OnceLock;
use std::{collections::HashMap, sync::OnceLock};

use serde::Deserialize;
use turborepo_repository::package_graph::PackageInfo;

#[derive(Debug, PartialEq, Deserialize)]
#[derive(Debug, PartialEq, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
enum Strategy {
All,
Some,
}

#[derive(Debug, PartialEq, Deserialize)]
#[derive(Debug, PartialEq, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
struct Matcher {
strategy: Strategy,
dependencies: Vec<String>,
}

#[derive(Debug, PartialEq, Deserialize)]
#[derive(Debug, PartialEq, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
struct EnvConditionKey {
key: String,
value: Option<String>,
}

#[derive(Debug, PartialEq, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
struct EnvConditional {
when: EnvConditionKey,
include: Vec<String>,
}

#[derive(Debug, PartialEq, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Framework {
slug: String,
env_wildcards: Vec<String>,
env_conditionals: Option<Vec<EnvConditional>>,
dependency_match: Matcher,
}

Expand All @@ -30,8 +45,22 @@ impl Framework {
self.slug.clone()
}

pub fn env_wildcards(&self) -> &[String] {
&self.env_wildcards
pub fn env(&self, env_at_execution_start: &HashMap<String, String>) -> Vec<String> {
let mut env_vars = self.env_wildcards.clone();

if let Some(env_conditionals) = &self.env_conditionals {
for conditional in env_conditionals {
let (key, expected_value) = (&conditional.when.key, &conditional.when.value);

if let Some(actual_value) = env_at_execution_start.get(key) {
if expected_value.is_none() || expected_value.as_ref() == Some(actual_value) {
env_vars.extend(conditional.include.iter().cloned());
}
}
}
}

env_vars
}
}

Expand Down Expand Up @@ -80,6 +109,8 @@ pub fn infer_framework(workspace: &PackageInfo, is_monorepo: bool) -> Option<&Fr

#[cfg(test)]
mod tests {
use std::collections::HashMap;

use test_case::test_case;
use turborepo_repository::{package_graph::PackageInfo, package_json::PackageJson};

Expand Down Expand Up @@ -199,4 +230,118 @@ mod tests {
let framework = infer_framework(&workspace_info, is_monorepo);
assert_eq!(framework, expected);
}

#[test]
fn test_env_with_no_conditions() {
let framework = get_framework_by_slug("nextjs");

let env_at_execution_start = HashMap::new();
let env_vars = framework.env(&env_at_execution_start);

assert_eq!(
env_vars,
framework.env_wildcards.clone(),
"Expected env_wildcards when no conditionals exist"
);
}

#[test]
fn test_env_with_matching_condition() {
let framework = get_framework_by_slug("nextjs");

let mut env_at_execution_start = HashMap::new();
env_at_execution_start.insert(
"VERCEL_SKEW_PROTECTION_ENABLED".to_string(),
"1".to_string(),
);

let env_vars = framework.env(&env_at_execution_start);

let mut expected_vars = framework.env_wildcards.clone();
expected_vars.push("VERCEL_DEPLOYMENT_ID".to_string());

assert_eq!(
env_vars, expected_vars,
"Expected VERCEL_DEPLOYMENT_ID to be included when condition is met"
);
}

#[test]
fn test_env_with_non_matching_condition() {
let framework = get_framework_by_slug("nextjs");

let mut env_at_execution_start = HashMap::new();
env_at_execution_start.insert(
"VERCEL_SKEW_PROTECTION_ENABLED".to_string(),
"0".to_string(),
);

let env_vars = framework.env(&env_at_execution_start);

assert_eq!(
env_vars,
framework.env_wildcards.clone(),
"Expected only env_wildcards when condition is not met"
);
}

#[test]
fn test_env_with_condition_without_value_requirement() {
let mut framework = get_framework_by_slug("nextjs").clone();

if let Some(env_conditionals) = framework.env_conditionals.as_mut() {
env_conditionals[0].when.value = None;
}

let mut env_at_execution_start = HashMap::new();
env_at_execution_start.insert(
"VERCEL_SKEW_PROTECTION_ENABLED".to_string(),
"random".to_string(),
);

let env_vars = framework.env(&env_at_execution_start);

let mut expected_vars = framework.env_wildcards.clone();
expected_vars.push("VERCEL_DEPLOYMENT_ID".to_string());

assert_eq!(
env_vars, expected_vars,
"Expected VERCEL_DEPLOYMENT_ID to be included when condition key exists, regardless \
of value"
);
}

#[test]
fn test_env_with_multiple_conditions() {
let mut framework = get_framework_by_slug("nextjs").clone();

if let Some(env_conditionals) = framework.env_conditionals.as_mut() {
env_conditionals.push(crate::framework::EnvConditional {
when: crate::framework::EnvConditionKey {
key: "ANOTHER_CONDITION".to_string(),
value: Some("true".to_string()),
},
include: vec!["ADDITIONAL_ENV_VAR".to_string()],
});
}

let mut env_at_execution_start = HashMap::new();
env_at_execution_start.insert(
"VERCEL_SKEW_PROTECTION_ENABLED".to_string(),
"1".to_string(),
);
env_at_execution_start.insert("ANOTHER_CONDITION".to_string(), "true".to_string());

let env_vars = framework.env(&env_at_execution_start);

let mut expected_vars = framework.env_wildcards.clone();
expected_vars.push("VERCEL_DEPLOYMENT_ID".to_string());
expected_vars.push("ADDITIONAL_ENV_VAR".to_string());

assert_eq!(
env_vars, expected_vars,
"Expected both VERCEL_DEPLOYMENT_ID and ADDITIONAL_ENV_VAR when both conditions are \
met"
);
}
}
6 changes: 3 additions & 3 deletions crates/turborepo-lib/src/task_hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ impl<'a> TaskHasher<'a> {
.hashes
.get(task_id)
.ok_or_else(|| Error::MissingPackageFileHash(task_id.to_string()))?;
// See if we infer a framework
// See if we can infer a framework
let framework = do_framework_inference
.then(|| infer_framework(workspace, is_monorepo))
.flatten()
Expand All @@ -295,14 +295,14 @@ impl<'a> TaskHasher<'a> {
debug!(
"framework: {}, env_prefix: {:?}",
framework.slug(),
framework.env_wildcards()
framework.env(self.env_at_execution_start)
);
telemetry.track_framework(framework.slug());
});
let framework_slug = framework.map(|f| f.slug().to_string());

let env_vars = if let Some(framework) = framework {
let mut computed_wildcards = framework.env_wildcards().to_vec();
let mut computed_wildcards = framework.env(self.env_at_execution_start);

if let Some(exclude_prefix) = self
.env_at_execution_start
Expand Down
6 changes: 6 additions & 0 deletions packages/turbo-types/src/json/frameworks.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
"slug": "nextjs",
"name": "Next.js",
"envWildcards": ["NEXT_PUBLIC_*"],
"envConditionals": [
{
"when": { "key": "VERCEL_SKEW_PROTECTION_ENABLED", "value": "1" },
"include": ["VERCEL_DEPLOYMENT_ID"]
}
],
"dependencyMatch": {
"strategy": "all",
"dependencies": ["next"]
Expand Down
6 changes: 6 additions & 0 deletions packages/turbo-types/src/types/frameworks.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
export type FrameworkStrategy = "all" | "some";

export interface EnvConditional {
when: { key: string; value?: string };
include: Array<string>;
}

export interface Framework {
slug: string;
name: string;
envWildcards: Array<string>;
envConditionals?: Array<EnvConditional>;
dependencyMatch: {
strategy: FrameworkStrategy;
dependencies: Array<string>;
Expand Down
Loading