cumulusci-plus 5.0.26__py3-none-any.whl → 5.0.27__py3-none-any.whl

cumulusci/__about__.py

@@ -1 +1 @@
-__version__ = "5.0.26"
+__version__ = "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/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/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/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/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/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.dist-info → cumulusci_plus-5.0.27.dist-info}/METADATA

@@ -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.26.dist-info → cumulusci_plus-5.0.27.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cumulusci/__about__.py,sha256=ZVNJcSyXHBMkob2w7pyAhX0LNnYHO7scPU_ovQgdwtw,23
+cumulusci/__about__.py,sha256=00l3VpAmIUGtJpCaTdCh0uWz16QeTxQS7eXpUbMsZpw,23
 cumulusci/__init__.py,sha256=jdanFQ_i8vbdO7Eltsf4pOfvV4mwa_Osyc4gxWKJ8ng,764
 cumulusci/__main__.py,sha256=kgRH-n5AJrH_daCK_EJwH7azAUxdXEmpi-r-dPGMR6Y,43
 cumulusci/conftest.py,sha256=AIL98BDwNAQtdo8YFmLKwav0tmrQ5dpbw1cX2FyGouQ,5108
@@ -37,7 +37,7 @@ cumulusci/core/datasets.py,sha256=cd0cWe8y2cJ1xHhLz06mzEF-efqywnQSM8vZ_6FzNGE,10
 cumulusci/core/debug.py,sha256=SB2FZXzeI5XSXiQtwyrpzdxFWqSHLj2vjCddMMRibXM,839
 cumulusci/core/enums.py,sha256=cG7qgegc5EAmwBzxLbociJ1zsG_fbbVZ29g5zywk908,272
 cumulusci/core/exceptions.py,sha256=7LxVFnalXG_9IU_fKmWhk_O1Gmxv4GolUW1jycaFcl8,6696
-cumulusci/core/flowrunner.py,sha256=mzNP_ErqLzO0xmEwWtJLPM5j8GeveP_L1hMWt1NeHck,35426
+cumulusci/core/flowrunner.py,sha256=Zt2WBWn86ecH8zIx55-ZpD0AkX_dtEO7XJEhvd0blYw,35477
 cumulusci/core/github.py,sha256=Q9w_ECBhB7Lnlh4aUzlHp3-fHavz00Dj-26hSOQxaRM,23457
 cumulusci/core/runtime.py,sha256=H2e3YN2i_nPiB2oVB_0V0rLsmTqBs8CdajdGOA4gsB0,3776
 cumulusci/core/sfdx.py,sha256=dx0TXLioR8p6DNOiEzrFUiFbSH5dZGmpFZLkdW83z-4,4790
@@ -98,7 +98,7 @@ cumulusci/core/source_transforms/tests/test_transforms.py,sha256=jOAGdvTziU0GsAH
 cumulusci/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cumulusci/core/tests/test_datasets_e2e.py,sha256=QoLCA6qmjQ_av7k0Ar-KgIf2ORrJ1VUhavpMFWwsTrg,13648
 cumulusci/core/tests/test_exceptions.py,sha256=fFGAOYPQpFKHOi0VCX9oDM_APj6DK6vKMHFCiKhtiS8,460
-cumulusci/core/tests/test_flowrunner.py,sha256=rcJyGp7WTWMA3JP64HDtDa9OpUSOPtbISkvELkklDXM,30912
+cumulusci/core/tests/test_flowrunner.py,sha256=C1vn1AizlpD5Tt5gzxnesJvFum5_ua-sphAbUU6zEpQ,34539
 cumulusci/core/tests/test_github.py,sha256=cXsCAMzub2EUAI0_x2CYBR-bn4FE_OYe72zZOMdt-WY,34462
 cumulusci/core/tests/test_sfdx.py,sha256=-pC6oGVF5H_OQfZxUG_YbPCYddxWhBS6gPImKO-XqN4,4540
 cumulusci/core/tests/test_source.py,sha256=m66vXcgMwc92R1OotTdMzd6Mg6gAHj5QrYJMDnL_i5s,24468
@@ -626,14 +626,14 @@ cumulusci/tasks/tests/test_pushfails.py,sha256=9JG9D0iD4dR-1fKheaRN7BEy3lzzuOKeR
 cumulusci/tasks/tests/test_salesforce.py,sha256=yCGtuHapxyAEmXQhuF2g2fh2naknTu7Md4OfEJQvGAA,2594
 cumulusci/tasks/tests/test_sfdx.py,sha256=oUbHo28d796m5RuskXMLitJw2rCLjjXIfxggzr4gsso,3545
 cumulusci/tasks/tests/test_util.py,sha256=SHNXQdfo3pxH7oFGvd-IpJS9noEoL4lm2b3CqW3KNws,9212
-cumulusci/tasks/utility/credentialManager.py,sha256=QsXKzal4ubPZBEWWWkuL-my8ngDTGj06wX4ov4gxmK4,9262
+cumulusci/tasks/utility/credentialManager.py,sha256=wXCCsmGSMyoLjZF_4ONnZpLY1C-OuRA5d1RRigbqhjs,9260
 cumulusci/tasks/utility/directoryRecreator.py,sha256=PjUBOOxJy2DQbjimkp1XYScdH07TtutZ_1CYLlHK1YA,934
 cumulusci/tasks/utility/env_management.py,sha256=hJX6ySEiXD2oFW38JqbGQKMj89ucxdSBsPwytSdkgO8,6591
-cumulusci/tasks/utility/secretsToEnv.py,sha256=RBJZQrwEa_geDrK8znyZh7iwWW2Xt2hgRYiwuCKNHsI,4427
-cumulusci/tasks/utility/tests/test_credentialManager.py,sha256=jXBTzxoMdIBWsjCrlRmssJv38lteg9dA7jXT9F0nxXI,24088
+cumulusci/tasks/utility/secretsToEnv.py,sha256=uqGsms7YpCVIbZ_NjsPZC242EkpzTJfvSxPnGipP60Q,4653
+cumulusci/tasks/utility/tests/test_credentialManager.py,sha256=lm9MtaPw54VxvXIX91hDVkFdwWJiyTs1BSpicB-Tbd4,24085
 cumulusci/tasks/utility/tests/test_directoryRecreator.py,sha256=zfBf_CMWHTGCKeHyoWPZ_kcu0rcU1H3e2MavqpJXabo,15488
 cumulusci/tasks/utility/tests/test_env_management.py,sha256=fw34meWGOe1YYZO449MMCi2O7BgSaOA_I_wScrIr1Uk,8702
-cumulusci/tasks/utility/tests/test_secretsToEnv.py,sha256=2xDHERPWViSHdMXqzI8pIxZCJji9JiILlVzvgOw9m3M,35646
+cumulusci/tasks/utility/tests/test_secretsToEnv.py,sha256=rKj1jNJlFZIOBGpRPtHlV54x__p_YCYQEW1nA2NV5wU,35643
 cumulusci/tasks/vcs/__init__.py,sha256=ZzpMZnhooXZ6r_ywBVTS3UNw9uMcXW6h33LylRqTDK0,700
 cumulusci/tasks/vcs/commit_status.py,sha256=hgPUVHeQyIfMsCuwrw2RI-ufnbjdRARc6HI3BEgdcxI,2332
 cumulusci/tasks/vcs/create_commit_status.py,sha256=kr_OFM3J32jxusS1og-K91Kl1F_Nr7SlevRsJKBhifs,1565
@@ -759,9 +759,9 @@ cumulusci/vcs/tests/dummy_service.py,sha256=RltOUpMIhSDNrfxk0LhLqlH4ppC0sK6NC2cO
 cumulusci/vcs/tests/test_vcs_base.py,sha256=9mp6uZ3lTxY4onjUNCucp9N9aB3UylKS7_2Zu_hdAZw,24331
 cumulusci/vcs/tests/test_vcs_bootstrap.py,sha256=N0NA48-rGNIIjY3Z7PtVnNwHObSlEGDk2K55TQGI8g4,27954
 cumulusci/vcs/utils/__init__.py,sha256=py4fEcHM7Vd0M0XWznOlywxaeCtG3nEVGmELmEKVGU8,869
-cumulusci_plus-5.0.26.dist-info/METADATA,sha256=f-lYlolfi4S3DpMQ7zPvRmVCeNCmCat1-WoxIUiNJpo,6102
-cumulusci_plus-5.0.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cumulusci_plus-5.0.26.dist-info/entry_points.txt,sha256=nTtu04b9iLXhzADcTrb5PwmdXE6e2MTUAMh9OK6Z2pg,80
-cumulusci_plus-5.0.26.dist-info/licenses/AUTHORS.rst,sha256=PvewjKImdKPhhJ6xR2EEZ4T7GbpY2ZeAeyWm2aLtiMQ,676
-cumulusci_plus-5.0.26.dist-info/licenses/LICENSE,sha256=NFsF_s7RVXk2dU6tmRAN8wF45pnD98VZ5IwqOsyBcaU,1499
-cumulusci_plus-5.0.26.dist-info/RECORD,,
+cumulusci_plus-5.0.27.dist-info/METADATA,sha256=PDgZ2P1Jq-AhjR7HzIBlPv9fWcq9zo2wJQRpUdTcens,6028
+cumulusci_plus-5.0.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cumulusci_plus-5.0.27.dist-info/entry_points.txt,sha256=nTtu04b9iLXhzADcTrb5PwmdXE6e2MTUAMh9OK6Z2pg,80
+cumulusci_plus-5.0.27.dist-info/licenses/AUTHORS.rst,sha256=PvewjKImdKPhhJ6xR2EEZ4T7GbpY2ZeAeyWm2aLtiMQ,676
+cumulusci_plus-5.0.27.dist-info/licenses/LICENSE,sha256=NFsF_s7RVXk2dU6tmRAN8wF45pnD98VZ5IwqOsyBcaU,1499
+cumulusci_plus-5.0.27.dist-info/RECORD,,