Profiles override env vars and dependencies

Signed-off-by: itowlson <[email protected]>

Author: itowlson

crates/environments/src/loader.rs

@@ -77,7 +77,7 @@ impl ApplicationToValidate {
             spin_manifest::schema::v2::ComponentSpec::Inline(c) => (
                 trigger.id.as_str(),
                 &c.source(profile),
-                &c.dependencies,
+                &c.dependencies(profile),
                 spin_loader::requires_service_chaining(c),
             ),
             spin_manifest::schema::v2::ComponentSpec::Reference(r) => {
@@ -91,7 +91,7 @@ impl ApplicationToValidate {
                 (
                     id,
                     &component.source(profile),
-                    &component.dependencies,
+                    &component.dependencies(profile),
                     spin_loader::requires_service_chaining(component),
                 )
             }

crates/loader/src/local.rs

@@ -176,23 +176,23 @@ impl LocalLoader {
             })?;
 
         let metadata = ValuesMapBuilder::new()
-            .serializable("build", component.build(self.profile()))?
-            .string("description", component.description)
+            .string("description", component.description.clone())
             .string_array("allowed_outbound_hosts", allowed_outbound_hosts)
-            .string_array("key_value_stores", component.key_value_stores)
-            .string_array("databases", component.sqlite_databases)
-            .string_array("ai_models", component.ai_models)
+            .string_array("key_value_stores", component.key_value_stores.clone())
+            .string_array("databases", component.sqlite_databases.clone())
+            .string_array("ai_models", component.ai_models.clone())
+            .serializable("build", component.build(self.profile()))?
             .take();
 
         let dependencies = self
             .load_component_dependencies(
                 id,
                 component.dependencies_inherit_configuration,
-                &component.dependencies,
+                &component.dependencies(self.profile()),
             )
             .await?;
 
-        let env = component.environment.into_iter().collect();
+        let env = component.environment(self.profile()).into_iter().collect();
 
         let files = if component.files.is_empty() {
             vec![]

crates/manifest/src/schema/v2.rs

@@ -317,7 +317,7 @@ pub struct Component {
     ///
     /// `environment = { DB_URL = "mysql://spin:spin@localhost/dev" }`
     #[serde(default, skip_serializing_if = "Map::is_empty")]
-    pub environment: Map<String, String>,
+    pub(crate) environment: Map<String, String>,
     /// The files the component is allowed to read. Each list entry is either:
     ///
     /// - a glob pattern (e.g. "assets/**/*.jpg"); or
@@ -413,7 +413,7 @@ pub struct Component {
     ///
     /// Learn more: https://spinframework.dev/writing-apps#using-component-dependencies
     #[serde(default, skip_serializing_if = "ComponentDependencies::is_empty")]
-    pub dependencies: ComponentDependencies,
+    pub(crate) dependencies: ComponentDependencies,
     /// Override values to use when building or running a named build profile.
     ///
     /// Example: `profile.debug.build.command = "npm run build-debug"`
@@ -433,6 +433,22 @@ pub struct ComponentProfileOverride {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     source: Option<ComponentSource>,
 
+    /// Environment variables for the Wasm module to be overridden in this profile.
+    /// Environment variables specified in the default profile will still be set
+    /// if not overridden here.
+    ///
+    /// `environment = { DB_URL = "mysql://spin:spin@localhost/dev" }`
+    #[serde(default, skip_serializing_if = "Map::is_empty")]
+    environment: Map<String, String>,
+
+    /// Wasm Component Model imports to be overridden in this profile.
+    /// Dependencies specified in the default profile will still be composed
+    /// if not overridden here.
+    ///
+    /// Learn more: https://spinframework.dev/writing-apps#using-component-dependencies
+    #[serde(default, skip_serializing_if = "ComponentDependencies::is_empty")]
+    dependencies: ComponentDependencies,
+
     /// The command or commands for building the component in non-default profiles.
     /// If a component has no special build instructions for a profile, the
     /// default build command is used.
@@ -502,6 +518,36 @@ impl Component {
             None => &self.source,
         }
     }
+
+    /// The component's environment variables
+    pub fn environment(&self, profile: Option<&str>) -> Map<String, String> {
+        let mut environment = self.environment.clone();
+
+        let Some(overrides) = self.profile(profile).map(|o| o.environment.clone()) else {
+            return environment;
+        };
+
+        for (name, value) in overrides {
+            environment.insert(name, value);
+        }
+
+        environment
+    }
+
+    /// The component's dependencies
+    pub fn dependencies(&self, profile: Option<&str>) -> ComponentDependencies {
+        let mut dependencies = self.dependencies.clone();
+
+        let Some(overrides) = self.profile(profile).map(|o| o.dependencies.clone()) else {
+            return dependencies;
+        };
+
+        for (itf, dep) in overrides.inner {
+            dependencies.inner.insert(itf, dep);
+        }
+
+        dependencies
+    }
 }
 
 /// Component dependencies
@@ -1225,4 +1271,53 @@ mod tests {
                 .commands()[1]
         );
     }
+
+    #[test]
+    fn profiles_override_env_vars() {
+        let manifest = AppManifest::deserialize(toml! {
+            spin_manifest_version = 2
+            [application]
+            name = "trigger-configs"
+            [[trigger.fake]]
+            component = "profile-test"
+            [component.profile-test]
+            source = "original"
+            environment = { DB_URL = "pg://production" }
+            [component.profile-test.profile.fancy]
+            environment = { DB_URL = "pg://fancy", FANCINESS = "1" }
+        })
+        .expect("manifest should be valid");
+
+        let id = KebabId::try_from("profile-test".to_owned())
+            .expect("profile-test should have been kebab");
+        let component = manifest
+            .components
+            .get(&id)
+            .expect("should have compopnent with id profile-test");
+
+        assert_eq!(1, component.environment(None).len());
+        assert_eq!(
+            "pg://production",
+            component
+                .environment(None)
+                .get("DB_URL")
+                .expect("DB_URL should have been set")
+        );
+
+        assert_eq!(2, component.environment(Some("fancy")).len());
+        assert_eq!(
+            "pg://fancy",
+            component
+                .environment(Some("fancy"))
+                .get("DB_URL")
+                .expect("DB_URL should have been set")
+        );
+        assert_eq!(
+            "1",
+            component
+                .environment(Some("fancy"))
+                .get("FANCINESS")
+                .expect("FANCINESS should have been set")
+        );
+    }
 }