cumulusci-plus 5.0.26__tar.gz → 5.0.27__tar.gz

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci-plus
-Version: 5.0.26
+Version: 5.0.27
 Summary: Build and release tools for Salesforce developers
 Project-URL: Homepage, https://github.com/jorgesolebur/CumulusCI
 Project-URL: Changelog, https://cumulusci.readthedocs.io/en/stable/history.html
@@ -129,14 +129,13 @@ license](https://github.com/SFDO-Tooling/CumulusCI/blob/main/LICENSE)
 and is not covered by the Salesforce Master Subscription Agreement.
 
 <!-- Changelog -->
-## v5.0.26 (2025-10-14)
+## v5.0.27 (2025-10-24)
 <!-- Release notes generated using configuration in .github/release.yml at main -->
 
 ## What's Changed
 ### Changes
-* Fix lint issues. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#95](https://github.com/jorgesolebur/CumulusCI/pull/95)
-* Fix failing test on Mac with Python 3.11 and 3.13 by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#97](https://github.com/jorgesolebur/CumulusCI/pull/97)
-* Feature/secret manager by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#99](https://github.com/jorgesolebur/CumulusCI/pull/99)
+* Fix default secret provider to load from env when not set. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#103](https://github.com/jorgesolebur/CumulusCI/pull/103)
+* PM-2264 - Supporting env variables in when conditions in tasks by [@jorgesolebur](https://github.com/jorgesolebur) in [#102](https://github.com/jorgesolebur/CumulusCI/pull/102)
 
 
-**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.25...v5.0.26
+**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.26...v5.0.27

cumulusci_plus-5.0.27/cumulusci/__about__.py

@@ -0,0 +1 @@
+__version__ = "5.0.27"

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/cumulusci/core/flowrunner.py

@@ -53,6 +53,7 @@ Option values/overrides can be passed in at a number of levels, in increasing or
 
 import copy
 import logging
+import os
 from collections import defaultdict
 from operator import attrgetter
 from typing import (
@@ -543,6 +544,7 @@ class FlowCoordinator:
             self._jinja2_context = {
                 "project_config": project_config,
                 "org_config": org_config,
+                "env": dict(os.environ),
             }
             self._context_project_config = project_config
             self._context_org_config = org_config

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/cumulusci/core/tests/test_flowrunner.py

@@ -542,6 +542,106 @@ class TestSimpleTestFlowCoordinator(AbstractFlowCoordinatorTest):
         flow.run(self.org_config)
         assert len(flow.results) == 0
 
+    def test_run__when_condition_with_env_var_true(self):
+        """A flow step runs when env var condition evaluates to True"""
+        import os
+
+        with mock.patch.dict(os.environ, {"RUN_TASK": "true"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "env.get('RUN_TASK') == 'true'",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            flow.run(self.org_config)
+            assert len(flow.results) == 1
+
+    def test_run__when_condition_with_env_var_false(self):
+        """A flow step is skipped when env var condition evaluates to False"""
+        import os
+
+        with mock.patch.dict(os.environ, {"RUN_TASK": "false"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "env.get('RUN_TASK') == 'true'",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            flow.run(self.org_config)
+            assert len(flow.results) == 0
+
+    def test_run__when_condition_with_env_var_default(self):
+        """A flow step uses default value when env var is not set"""
+        import os
+
+        # Make sure the env var is not set
+        if "UNDEFINED_VAR" in os.environ:
+            del os.environ["UNDEFINED_VAR"]
+        flow_config = FlowConfig(
+            {
+                "steps": {
+                    1: {
+                        "task": "pass_name",
+                        "when": "env.get('UNDEFINED_VAR', 'default') == 'default'",
+                    }
+                }
+            }
+        )
+        flow = FlowCoordinator(self.project_config, flow_config)
+        flow.run(self.org_config)
+        assert len(flow.results) == 1
+
+    def test_run__when_condition_with_env_var_and_org_config(self):
+        """A flow step can combine env vars with org_config in when condition"""
+        import os
+
+        with mock.patch.dict(os.environ, {"DEPLOY_TO_SCRATCH": "true"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "org_config.scratch and env.get('DEPLOY_TO_SCRATCH') == 'true'",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            # Set org_config.scratch to True
+            self.org_config.config["scratch"] = True
+            flow.run(self.org_config)
+            assert len(flow.results) == 1
+
+    def test_run__when_condition_with_missing_env_var_is_none(self):
+        """A flow step can check if env var exists using 'is not none'"""
+        import os
+
+        # Test when var is set
+        with mock.patch.dict(os.environ, {"MY_VAR": "value"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "env.get('MY_VAR') is not none",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            flow.run(self.org_config)
+            assert len(flow.results) == 1
+
     def test_run__task_raises_exception_fail(self):
         """A flow aborts when a task raises an exception"""
 

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/cumulusci/tasks/utility/credentialManager.py

@@ -224,7 +224,7 @@ class CredentialManager:
     env_secrets_type = "CUMULUSCI_SECRETS_TYPE"
 
     @staticmethod
-    def _load_secrets_type_from_environment() -> str:
+    def load_secrets_type_from_environment() -> str:
         """Load any secrets specified by environment variables"""
         provider_type = os.getenv(CredentialManager.env_secrets_type)
 
@@ -240,7 +240,7 @@ class CredentialManager:
         """
         if not provider_type:
             # If no config is provided, load the secrets from the environment
-            provider_type = CredentialManager._load_secrets_type_from_environment()
+            provider_type = CredentialManager.load_secrets_type_from_environment()
 
         # Check if the requested provider type exists in our registry
         if provider_type not in CredentialProvider._registry:

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/cumulusci/tasks/utility/secretsToEnv.py

@@ -19,8 +19,8 @@ class SecretsToEnv(BaseTask):
     class Options(CCIOptions):
         env_path: Path = Field("./.env", description="Path to the .env file")
         secrets_provider: str = Field(
-            "local",
-            description="Secrets provider type i.e local, ado_variables, aws_secrets. Defaults to 'local'",
+            None,
+            description='Secrets provider type i.e local, ado_variables, aws_secrets. Default value is None, which will use the secrets type from the environment variable CUMULUSCI_SECRETS_TYPE if it is set, otherwise it will use the "local" provider.',
         )
         provider_options: MappingOption = Field({}, description="Provider options")
         secrets: Union[ListOfStringsOption, MappingOption] = Field(
@@ -33,7 +33,9 @@ class SecretsToEnv(BaseTask):
     def _init_options(self, kwargs):
         super()._init_options(kwargs)
         self.provider = CredentialManager.get_provider(
-            self.parsed_options.secrets_provider, **self.parsed_options.provider_options
+            self.parsed_options.secrets_provider
+            or CredentialManager.load_secrets_type_from_environment(),
+            **self.parsed_options.provider_options,
         )
         self.env_values = dotenv_values(self.parsed_options.env_path)
 

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/cumulusci/tasks/utility/tests/test_credentialManager.py

@@ -427,19 +427,19 @@ class TestCredentialManager:
     @mock.patch.dict(os.environ, {"CUMULUSCI_SECRETS_TYPE": "local"})
     def test_load_secrets_type_from_environment(self):
         """Test loading secrets type from environment variable."""
-        provider_type = CredentialManager._load_secrets_type_from_environment()
+        provider_type = CredentialManager.load_secrets_type_from_environment()
         assert provider_type == "local"
 
     @mock.patch.dict(os.environ, {"CUMULUSCI_SECRETS_TYPE": "AWS_SECRETS"})
     def test_load_secrets_type_case_insensitive(self):
         """Test loading secrets type is case insensitive."""
-        provider_type = CredentialManager._load_secrets_type_from_environment()
+        provider_type = CredentialManager.load_secrets_type_from_environment()
         assert provider_type == "aws_secrets"
 
     @mock.patch.dict(os.environ, {}, clear=True)
     def test_load_secrets_type_defaults_to_local(self):
         """Test loading secrets type defaults to 'local' when not set."""
-        provider_type = CredentialManager._load_secrets_type_from_environment()
+        provider_type = CredentialManager.load_secrets_type_from_environment()
         assert provider_type == "local"
 
     @mock.patch.dict(os.environ, {"CUMULUSCI_SECRETS_TYPE": "environment"})

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/cumulusci/tasks/utility/tests/test_secretsToEnv.py

@@ -29,7 +29,7 @@ class TestSecretsToEnvOptions:
             )
 
             assert task.parsed_options.env_path == Path(env_path)
-            assert task.parsed_options.secrets_provider == "local"
+            assert task.parsed_options.secrets_provider is None
             assert task.parsed_options.provider_options == {}
             assert task.parsed_options.secrets == []
 

{cumulusci_plus-5.0.26 → cumulusci_plus-5.0.27}/docs/history.md

@@ -2,6 +2,20 @@
 
 <!-- latest-start -->
 
+## v5.0.27 (2025-10-24)
+<!-- Release notes generated using configuration in .github/release.yml at main -->
+
+## What's Changed
+### Changes
+* Fix default secret provider to load from env when not set. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#103](https://github.com/jorgesolebur/CumulusCI/pull/103)
+* PM-2264 - Supporting env variables in when conditions in tasks by [@jorgesolebur](https://github.com/jorgesolebur) in [#102](https://github.com/jorgesolebur/CumulusCI/pull/102)
+
+
+**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.26...v5.0.27
+
+
+<!-- latest-stop -->
+
 ## v5.0.26 (2025-10-14)
 <!-- Release notes generated using configuration in .github/release.yml at main -->
 
@@ -15,8 +29,6 @@
 **Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.25...v5.0.26
 
 
-<!-- latest-stop -->
-
 ## v5.0.25 (2025-10-09)
 
 <!-- Release notes generated using configuration in .github/release.yml at main -->

cumulusci_plus-5.0.26/cumulusci/__about__.py

@@ -1 +0,0 @@
-__version__ = "5.0.26"