From 17bd15bd820671aa544896491f3a2cbf53cc2d53 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 23 May 2024 13:42:25 -0500 Subject: [PATCH 01/20] pants: fix running st2common/tests/unit/test_policies.py by adding dependency metadata --- st2tests/st2tests/fixtures/generic/BUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/st2tests/st2tests/fixtures/generic/BUILD b/st2tests/st2tests/fixtures/generic/BUILD index 48fcf06310..5658638e23 100644 --- a/st2tests/st2tests/fixtures/generic/BUILD +++ b/st2tests/st2tests/fixtures/generic/BUILD @@ -3,6 +3,12 @@ pack_metadata( dependencies=[ "./actions:shell", "./actions:shell_resources", + # policytypes/fake_policy_type_1.py needs: + "//st2tests/st2tests/policies/concurrency.py", + # policytypes/fake_policy_type_2.py needs: + "//st2tests/st2tests/policies/mock_exception.py", + # policytypes/fake_policy_type_3.py needs: + "//st2actions/st2actions/policies/concurrency_by_attr.py", ], ) From 22425f2c9db551f3b64150a636048199e06e2201 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 23 May 2024 14:32:38 -0500 Subject: [PATCH 02/20] pants: update deps so pants can run test_policies_registrar.py tests --- st2common/tests/unit/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/st2common/tests/unit/BUILD b/st2common/tests/unit/BUILD index d8c6fe4709..fadc33869d 100644 --- a/st2common/tests/unit/BUILD +++ b/st2common/tests/unit/BUILD @@ -13,7 +13,7 @@ python_tests( ], uses=["mongo", "rabbitmq"], overrides={ - "test_util_file_system.py": dict( + ("test_util_file_system.py", "test_policies_registrar.py",): dict( dependencies=[ "st2tests/st2tests/policies", "st2tests/st2tests/policies/meta", From 33c2bd18d95fd23dace5dc689997a658de754012 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 23 May 2024 16:21:23 -0500 Subject: [PATCH 03/20] pants: adjust deps to fix running test_shell_action_system_model tests --- st2common/tests/fixtures/local_runner/BUILD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/st2common/tests/fixtures/local_runner/BUILD b/st2common/tests/fixtures/local_runner/BUILD index db46e8d6c9..25c5073d83 100644 --- a/st2common/tests/fixtures/local_runner/BUILD +++ b/st2common/tests/fixtures/local_runner/BUILD @@ -1 +1,8 @@ -python_sources() +resources( + name="command_strings", + sources=["escaping_test_command_*.txt"], +) + +python_sources( + dependencies=[":command_strings"], +) From f6c0d2cd33758cb5478f37bf76e480d0a080243e Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 24 May 2024 10:13:23 -0500 Subject: [PATCH 04/20] pants: register dependency on stevedore namespaces in st2actions/test/unit/policies --- st2actions/tests/unit/policies/BUILD | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/st2actions/tests/unit/policies/BUILD b/st2actions/tests/unit/policies/BUILD index 57341b1358..66a22040d1 100644 --- a/st2actions/tests/unit/policies/BUILD +++ b/st2actions/tests/unit/policies/BUILD @@ -1,3 +1,8 @@ python_tests( name="tests", + stevedore_namespaces=[ + "st2common.runners.runner", + "st2common.metrics.driver", + ], + uses=["mongo"], ) From aff5e3e7e18c8d3f5a9fe269263cde3c60f21c67 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 24 May 2024 11:40:49 -0500 Subject: [PATCH 05/20] pants: record st2actions/tests/unit deps on runners --- st2actions/tests/unit/BUILD | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/st2actions/tests/unit/BUILD b/st2actions/tests/unit/BUILD index 4e577b340a..e8c10aa3c7 100644 --- a/st2actions/tests/unit/BUILD +++ b/st2actions/tests/unit/BUILD @@ -5,13 +5,30 @@ __defaults__( python_tests( name="tests", + uses=["mongo"], overrides={ ( "test_execution_cancellation.py", "test_runner_container.py", "test_worker.py", ): dict( - uses=["system_user"], + uses=["mongo", "system_user"], + ), + ( + "test_execution*.py", + "test_notifier.py", + "test_output_schema.py", + "test_policies.py", + "test_queue_consumers.py", + "test_runner_container.py", + "test_scheduler*.py", + "test_worker.py", + "test_workflow_engine.py", + ): dict( + stevedore_namespaces=[ + "st2common.runners.runner", + "st2common.metrics.driver", + ], ), }, ) From 85e5e44e706e1a3b31551c71d8b647837e3e224d Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 24 May 2024 12:48:44 -0500 Subject: [PATCH 06/20] pants: add deps on stevedore_namespaces for st2reactor tests --- st2reactor/tests/unit/BUILD | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/st2reactor/tests/unit/BUILD b/st2reactor/tests/unit/BUILD index 9a24dba70a..abd3115705 100644 --- a/st2reactor/tests/unit/BUILD +++ b/st2reactor/tests/unit/BUILD @@ -5,4 +5,20 @@ __defaults__( python_tests( name="tests", + uses=["mongo"], + overrides={ + "test_enforce.py": dict( + stevedore_namespaces=[ + "st2common.rbac.backend", + "st2common.runners.runner", + "st2common.metrics.driver", + ], + ), + "test_rule_engine.py": dict( + stevedore_namespaces=[ + "st2common.runners.runner", + "st2common.metrics.driver", + ], + ), + }, ) From a6209723ca2bf40ded15a4c90e6696c6577fd0d2 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 24 May 2024 13:00:13 -0500 Subject: [PATCH 07/20] pants: add deps on stevedore_namespaces for st2stream tests --- st2stream/tests/unit/controllers/v1/BUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/st2stream/tests/unit/controllers/v1/BUILD b/st2stream/tests/unit/controllers/v1/BUILD index a1ca2f641e..982e61ec88 100644 --- a/st2stream/tests/unit/controllers/v1/BUILD +++ b/st2stream/tests/unit/controllers/v1/BUILD @@ -1,5 +1,11 @@ python_tests( name="tests", + stevedore_namespaces=[ + "st2common.rbac.backend", + "st2common.runners.runner", + "st2common.metrics.driver", + ], + uses=["mongo"], ) python_test_utils( From e9f7da8d69374aba76b367aa9ce6bf5496754145 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 24 May 2024 13:13:40 -0500 Subject: [PATCH 08/20] pants: add deps so pants can run st2auth unit tests --- st2auth/tests/unit/BUILD | 2 ++ st2auth/tests/unit/controllers/v1/BUILD | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/st2auth/tests/unit/BUILD b/st2auth/tests/unit/BUILD index 9a24dba70a..c128c7b4af 100644 --- a/st2auth/tests/unit/BUILD +++ b/st2auth/tests/unit/BUILD @@ -5,4 +5,6 @@ __defaults__( python_tests( name="tests", + dependencies=["//:auth_backends"], + uses=["mongo"], ) diff --git a/st2auth/tests/unit/controllers/v1/BUILD b/st2auth/tests/unit/controllers/v1/BUILD index 57341b1358..66f5d44271 100644 --- a/st2auth/tests/unit/controllers/v1/BUILD +++ b/st2auth/tests/unit/controllers/v1/BUILD @@ -1,3 +1,8 @@ python_tests( name="tests", + stevedore_namespaces=[ + "st2auth.sso.backends", + "st2common.metrics.driver", + ], + uses=["mongo"], ) From 19837f7fb221a28336c3817bf4c25505aac6a8b3 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 24 May 2024 14:12:50 -0500 Subject: [PATCH 09/20] pants: add BUILD deps to run st2api unit tests --- BUILD | 37 ++++++++++++++++++++++++++ st2api/tests/unit/BUILD | 5 ++++ st2api/tests/unit/controllers/BUILD | 4 +++ st2api/tests/unit/controllers/v1/BUILD | 13 ++++++++- 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/BUILD b/BUILD index b2d06d15f9..a56fcf6b6f 100644 --- a/BUILD +++ b/BUILD @@ -27,6 +27,36 @@ python_requirements( "st2auth/st2auth/backends/constants.py", ] ), + # make sure anything that uses st2-rbac-backend gets its deps + "st2-rbac-backend": dict( + dependencies=[ + # alphabetical order + "st2common/st2common/config.py", + "st2common/st2common/constants/keyvalue.py", + "st2common/st2common/constants/triggers.py", + "st2common/st2common/content/loader.py", + "st2common/st2common/exceptions/db.py", + "st2common/st2common/exceptions/rbac.py", + "st2common/st2common/log.py", + "st2common/st2common/models/api/rbac.py", + "st2common/st2common/models/db/action.py", + "st2common/st2common/models/db/auth.py", + "st2common/st2common/models/db/pack.py", + "st2common/st2common/models/db/rbac.py", + "st2common/st2common/models/db/webhook.py", + "st2common/st2common/models/system/common.py", + "st2common/st2common/persistence/auth.py", + "st2common/st2common/persistence/execution.py", + "st2common/st2common/persistence/rbac.py", + "st2common/st2common/rbac/backends/__init__.py", + "st2common/st2common/rbac/backends/base.py", + "st2common/st2common/rbac/types.py", + "st2common/st2common/script_setup.py", + "st2common/st2common/util/action_db.py", + "st2common/st2common/util/misc.py", + "st2common/st2common/util/uid.py", + ] + ), }, ) @@ -38,6 +68,13 @@ target( ], ) +target( + name="rbac_backends", + dependencies=[ + "//:reqs#st2-rbac-backend", + ], +) + python_test_utils( name="test_utils", skip_pylint=True, diff --git a/st2api/tests/unit/BUILD b/st2api/tests/unit/BUILD index 9a24dba70a..d649809607 100644 --- a/st2api/tests/unit/BUILD +++ b/st2api/tests/unit/BUILD @@ -5,4 +5,9 @@ __defaults__( python_tests( name="tests", + dependencies=["//:rbac_backends"], + stevedore_namespaces=[ + "st2common.rbac.backend", + ], + uses=["mongo"], ) diff --git a/st2api/tests/unit/controllers/BUILD b/st2api/tests/unit/controllers/BUILD index 57341b1358..e32c67ef43 100644 --- a/st2api/tests/unit/controllers/BUILD +++ b/st2api/tests/unit/controllers/BUILD @@ -1,3 +1,7 @@ python_tests( name="tests", + stevedore_namespaces=[ + "st2common.metrics.driver", + ], + uses=["mongo"], ) diff --git a/st2api/tests/unit/controllers/v1/BUILD b/st2api/tests/unit/controllers/v1/BUILD index 99064bb94c..5ef4f983f2 100644 --- a/st2api/tests/unit/controllers/v1/BUILD +++ b/st2api/tests/unit/controllers/v1/BUILD @@ -1,5 +1,11 @@ python_tests( name="tests", + stevedore_namespaces=[ + "st2common.runners.runner", + "st2common.rbac.backend", + "st2common.metrics.driver", + ], + uses=["mongo"], overrides={ ( "test_alias_execution.py", @@ -8,7 +14,12 @@ python_tests( "test_executions.py", "test_inquiries.py", ): dict( - uses=["system_user"], + uses=["mongo", "system_user"], + ), + "test_webhooks.py": dict( + dependencies=[ + "st2common/st2common/models/api/webhook.py", + ], ), }, ) From 89f935290967d848e147923572096064bd2dbd69 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 11 Jun 2024 10:40:56 -0500 Subject: [PATCH 10/20] wip support for running action_chain_runner tests via pants+pytest --- contrib/runners/action_chain_runner/tests/unit/BUILD | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contrib/runners/action_chain_runner/tests/unit/BUILD b/contrib/runners/action_chain_runner/tests/unit/BUILD index 9a24dba70a..e4bc611756 100644 --- a/contrib/runners/action_chain_runner/tests/unit/BUILD +++ b/contrib/runners/action_chain_runner/tests/unit/BUILD @@ -5,4 +5,15 @@ __defaults__( python_tests( name="tests", + stevedore_namespaces=[ + "st2common.rbac.backend", + "st2common.metrics.driver", + # TODO: we only need THIS runner, but this pulls in all. + "st2common.runners.runner", + ], + uses=["mongo"], + # TODO: need st2common.runners.runner stevedore namespace, but only this runner! + #dependencies=[ + # "contrib/runners/action_chain_runner", + #], ) From af7cfe9f7442c6832e527365bc7bb459aa3e702b Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 29 Jul 2024 22:25:17 -0500 Subject: [PATCH 11/20] pants: add note about upcoming pants feature for action runner tests --- contrib/runners/action_chain_runner/tests/unit/BUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/runners/action_chain_runner/tests/unit/BUILD b/contrib/runners/action_chain_runner/tests/unit/BUILD index e4bc611756..459639e1b7 100644 --- a/contrib/runners/action_chain_runner/tests/unit/BUILD +++ b/contrib/runners/action_chain_runner/tests/unit/BUILD @@ -12,8 +12,9 @@ python_tests( "st2common.runners.runner", ], uses=["mongo"], - # TODO: need st2common.runners.runner stevedore namespace, but only this runner! - #dependencies=[ - # "contrib/runners/action_chain_runner", - #], + # TODO: this will allow us to depend only on this runner once we upgrade to pants 2.23 + # https://github.com/pantsbuild/pants/pull/21062 + #entry_point_dependencies={ + # "contrib/runners/action_chain_runner": ["st2common.runners.runner"], + #}, ) From 780f838017f32837808667d72f8858d3487edbfc Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 1 Aug 2024 17:52:23 -0500 Subject: [PATCH 12/20] pants: note that a test needs mongo --- contrib/core/tests/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/core/tests/BUILD b/contrib/core/tests/BUILD index c7c3ee5dea..1a4583beb6 100644 --- a/contrib/core/tests/BUILD +++ b/contrib/core/tests/BUILD @@ -16,6 +16,7 @@ python_tests( # Use contrib/core as the canonical copy. "contrib/core:reqs#mail-parser", ], + uses=["mongo"], ), }, ) From 3bc545f324d17af7c4ff81d280d635023dd34c6d Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 10 Sep 2024 11:07:02 -0500 Subject: [PATCH 13/20] pants: record python_tests(entry_point_dependencies=...) for runner tests --- contrib/runners/action_chain_runner/tests/BUILD | 3 +++ contrib/runners/action_chain_runner/tests/unit/BUILD | 7 +------ contrib/runners/announcement_runner/tests/BUILD | 3 +++ contrib/runners/http_runner/tests/BUILD | 3 +++ contrib/runners/inquirer_runner/tests/BUILD | 3 +++ contrib/runners/local_runner/tests/BUILD | 3 +++ contrib/runners/noop_runner/tests/BUILD | 3 +++ contrib/runners/orquesta_runner/tests/BUILD | 3 +++ contrib/runners/python_runner/tests/BUILD | 3 +++ contrib/runners/remote_runner/tests/BUILD | 3 +++ contrib/runners/winrm_runner/tests/BUILD | 3 +++ st2common/tests/unit/services/BUILD | 8 ++++++++ 12 files changed, 39 insertions(+), 6 deletions(-) diff --git a/contrib/runners/action_chain_runner/tests/BUILD b/contrib/runners/action_chain_runner/tests/BUILD index 3280583e0c..d19247d547 100644 --- a/contrib/runners/action_chain_runner/tests/BUILD +++ b/contrib/runners/action_chain_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/action_chain_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/action_chain_runner/tests/unit/BUILD b/contrib/runners/action_chain_runner/tests/unit/BUILD index 459639e1b7..47c65e48d3 100644 --- a/contrib/runners/action_chain_runner/tests/unit/BUILD +++ b/contrib/runners/action_chain_runner/tests/unit/BUILD @@ -8,13 +8,8 @@ python_tests( stevedore_namespaces=[ "st2common.rbac.backend", "st2common.metrics.driver", - # TODO: we only need THIS runner, but this pulls in all. + # the core pack uses all runners. "st2common.runners.runner", ], uses=["mongo"], - # TODO: this will allow us to depend only on this runner once we upgrade to pants 2.23 - # https://github.com/pantsbuild/pants/pull/21062 - #entry_point_dependencies={ - # "contrib/runners/action_chain_runner": ["st2common.runners.runner"], - #}, ) diff --git a/contrib/runners/announcement_runner/tests/BUILD b/contrib/runners/announcement_runner/tests/BUILD index 3280583e0c..850b4aa71a 100644 --- a/contrib/runners/announcement_runner/tests/BUILD +++ b/contrib/runners/announcement_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/announcement_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/http_runner/tests/BUILD b/contrib/runners/http_runner/tests/BUILD index 3280583e0c..eccc29b3ee 100644 --- a/contrib/runners/http_runner/tests/BUILD +++ b/contrib/runners/http_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/http_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/inquirer_runner/tests/BUILD b/contrib/runners/inquirer_runner/tests/BUILD index 3280583e0c..36b90b1e2a 100644 --- a/contrib/runners/inquirer_runner/tests/BUILD +++ b/contrib/runners/inquirer_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/inquirer_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/local_runner/tests/BUILD b/contrib/runners/local_runner/tests/BUILD index 3280583e0c..d692891e08 100644 --- a/contrib/runners/local_runner/tests/BUILD +++ b/contrib/runners/local_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/local_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/noop_runner/tests/BUILD b/contrib/runners/noop_runner/tests/BUILD index 3280583e0c..208d20406f 100644 --- a/contrib/runners/noop_runner/tests/BUILD +++ b/contrib/runners/noop_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/noop_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/orquesta_runner/tests/BUILD b/contrib/runners/orquesta_runner/tests/BUILD index 3280583e0c..e0764b1850 100644 --- a/contrib/runners/orquesta_runner/tests/BUILD +++ b/contrib/runners/orquesta_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/orquesta_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/python_runner/tests/BUILD b/contrib/runners/python_runner/tests/BUILD index 3280583e0c..dfaf857926 100644 --- a/contrib/runners/python_runner/tests/BUILD +++ b/contrib/runners/python_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/python_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/remote_runner/tests/BUILD b/contrib/runners/remote_runner/tests/BUILD index 3280583e0c..3391ed1f72 100644 --- a/contrib/runners/remote_runner/tests/BUILD +++ b/contrib/runners/remote_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/remote_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/contrib/runners/winrm_runner/tests/BUILD b/contrib/runners/winrm_runner/tests/BUILD index 3280583e0c..9c9ad37ef4 100644 --- a/contrib/runners/winrm_runner/tests/BUILD +++ b/contrib/runners/winrm_runner/tests/BUILD @@ -1,6 +1,9 @@ __defaults__( all=dict( skip_pylint=True, + entry_point_dependencies={ + "contrib/runners/winrm_runner": ["st2common.runners.runner"], + }, ) ) diff --git a/st2common/tests/unit/services/BUILD b/st2common/tests/unit/services/BUILD index a30ca92a77..ae93633567 100644 --- a/st2common/tests/unit/services/BUILD +++ b/st2common/tests/unit/services/BUILD @@ -7,4 +7,12 @@ python_tests( "st2common.metrics.driver", ], uses=["mongo", "rabbitmq"], + overrides={ + "test_packs.py": dict( + # use the fixture to resolve ambiguous import (ambiguous due to symlink of core pack) + dependencies=[ + "st2tests/st2tests/fixtures/packs/core/actions/inject_trigger.py" + ], + ), + }, ) From d50bdc608946f8b68f07e8c2d3b9dc7d9bf802b6 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 10 Sep 2024 20:22:06 -0500 Subject: [PATCH 14/20] pants: record test dependency that was not inferred --- contrib/runners/python_runner/tests/integration/BUILD | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/runners/python_runner/tests/integration/BUILD b/contrib/runners/python_runner/tests/integration/BUILD index 2d782aaea0..5fdf71eed3 100644 --- a/contrib/runners/python_runner/tests/integration/BUILD +++ b/contrib/runners/python_runner/tests/integration/BUILD @@ -5,4 +5,9 @@ __defaults__( python_tests( name="tests", + overrides={ + "test_python_action_process_wrapper.py": dict( + dependencies=["contrib/examples/actions/noop.py"] + ) + }, ) From b586f6858f2d5e9c394c8d3dfdf993a8020735cf Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 10 Sep 2024 20:47:23 -0500 Subject: [PATCH 15/20] pants: record test dependencies that could not easily be inferred --- contrib/runners/python_runner/tests/unit/BUILD | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/contrib/runners/python_runner/tests/unit/BUILD b/contrib/runners/python_runner/tests/unit/BUILD index 9a24dba70a..c1479c4b4d 100644 --- a/contrib/runners/python_runner/tests/unit/BUILD +++ b/contrib/runners/python_runner/tests/unit/BUILD @@ -5,4 +5,16 @@ __defaults__( python_tests( name="tests", + overrides={ + "test_output_schema.py": dict( + dependencies=[ + "st2tests/st2tests/resources/packs/pythonactions/actions/pascal_row.py", + ], + ), + "test_pythonrunner.py": dict( + dependencies=[ + "st2tests/st2tests/resources/packs/pythonactions/actions", + ], + ), + }, ) From 24de9bd27c19374c4e56cab1f778068ff477cea9 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Wed, 11 Sep 2024 11:17:32 -0500 Subject: [PATCH 16/20] pants: record test dependency on st2common.metrics.driver --- contrib/runners/python_runner/tests/unit/BUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/runners/python_runner/tests/unit/BUILD b/contrib/runners/python_runner/tests/unit/BUILD index c1479c4b4d..2a106afcbb 100644 --- a/contrib/runners/python_runner/tests/unit/BUILD +++ b/contrib/runners/python_runner/tests/unit/BUILD @@ -15,6 +15,9 @@ python_tests( dependencies=[ "st2tests/st2tests/resources/packs/pythonactions/actions", ], + stevedore_namespaces=[ + "st2common.metrics.driver", + ], ), }, ) From 40c5e20b451e3006b37f50baeb709edbfa86cea9 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Wed, 11 Sep 2024 14:36:22 -0500 Subject: [PATCH 17/20] python runner test depends on rbac backend --- contrib/runners/python_runner/tests/unit/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/runners/python_runner/tests/unit/BUILD b/contrib/runners/python_runner/tests/unit/BUILD index 2a106afcbb..39ad860aa4 100644 --- a/contrib/runners/python_runner/tests/unit/BUILD +++ b/contrib/runners/python_runner/tests/unit/BUILD @@ -17,6 +17,7 @@ python_tests( ], stevedore_namespaces=[ "st2common.metrics.driver", + "st2common.rbac.backend", ], ), }, From 16c4d2f80347c46fff54b5e0208f878474744c9f Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Wed, 11 Sep 2024 15:28:13 -0500 Subject: [PATCH 18/20] pants: add dependency metadata for orquesta unit tests --- contrib/runners/orquesta_runner/tests/BUILD | 5 ++++- contrib/runners/orquesta_runner/tests/unit/BUILD | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/contrib/runners/orquesta_runner/tests/BUILD b/contrib/runners/orquesta_runner/tests/BUILD index e0764b1850..ea19a75243 100644 --- a/contrib/runners/orquesta_runner/tests/BUILD +++ b/contrib/runners/orquesta_runner/tests/BUILD @@ -2,7 +2,10 @@ __defaults__( all=dict( skip_pylint=True, entry_point_dependencies={ - "contrib/runners/orquesta_runner": ["st2common.runners.runner"], + "contrib/runners/orquesta_runner": [ + "st2common.runners.runner", + "orquesta.expressions.functions", + ], }, ) ) diff --git a/contrib/runners/orquesta_runner/tests/unit/BUILD b/contrib/runners/orquesta_runner/tests/unit/BUILD index 5b3cb7900c..51f3f0fc30 100644 --- a/contrib/runners/orquesta_runner/tests/unit/BUILD +++ b/contrib/runners/orquesta_runner/tests/unit/BUILD @@ -5,6 +5,13 @@ __defaults__( python_tests( name="tests", + stevedore_namespaces=[ + "st2common.metrics.driver", + "st2common.rbac.backend", + # the core pack uses all runners. + "st2common.runners.runner", + "orquesta.expressions.functions", + ], overrides={ ( "test_basic.py", @@ -16,6 +23,9 @@ python_tests( ): dict( uses=["system_user"], ), + "test_policies.py": dict( + dependencies=["st2actions/st2actions/policies/retry.py"] + ), }, ) From fe68e2c256b6f711b5fd24953cb6846603c27764 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 12 Sep 2024 16:01:46 -0500 Subject: [PATCH 19/20] pants: add BUILD metadata for pack tests --- contrib/chatops/actions/BUILD | 8 +++++++- contrib/chatops/actions/templates/BUILD | 3 +++ contrib/chatops/tests/BUILD | 5 ++++- contrib/packs/tests/BUILD | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 contrib/chatops/actions/templates/BUILD diff --git a/contrib/chatops/actions/BUILD b/contrib/chatops/actions/BUILD index db46e8d6c9..4a1bef88f4 100644 --- a/contrib/chatops/actions/BUILD +++ b/contrib/chatops/actions/BUILD @@ -1 +1,7 @@ -python_sources() +python_sources( + overrides={ + "format_execution_result.py": dict( + dependencies=["./templates"], + ), + }, +) diff --git a/contrib/chatops/actions/templates/BUILD b/contrib/chatops/actions/templates/BUILD new file mode 100644 index 0000000000..96d5a456eb --- /dev/null +++ b/contrib/chatops/actions/templates/BUILD @@ -0,0 +1,3 @@ +resources( + sources=["*.j2"], +) diff --git a/contrib/chatops/tests/BUILD b/contrib/chatops/tests/BUILD index 0c6d9cabdb..ead8561daa 100644 --- a/contrib/chatops/tests/BUILD +++ b/contrib/chatops/tests/BUILD @@ -13,6 +13,9 @@ files( python_tests( name="tests", - dependencies=[":fixtures"], + dependencies=[ + ":fixtures", + "contrib/chatops:metadata", + ], skip_pylint=True, ) diff --git a/contrib/packs/tests/BUILD b/contrib/packs/tests/BUILD index 25a2e7cc4b..c8265214ca 100644 --- a/contrib/packs/tests/BUILD +++ b/contrib/packs/tests/BUILD @@ -8,4 +8,22 @@ __defaults__( python_tests( skip_pylint=True, + overrides={ + "test_action_aliases.py": dict( + dependencies=[ + # test needs the pack and aliases metadata + "contrib/packs:metadata", + ], + ), + "test_action_unload.py": dict( + stevedore_namespaces=[ + "st2common.metrics.driver", + ], + entry_point_dependencies={ + "contrib/runners/http_runner": ["st2common.runners.runner"], + "contrib/runners/local_runner": ["st2common.runners.runner"], + "contrib/runners/python_runner": ["st2common.runners.runner"], + }, + ), + }, ) From 6929fc11250bf02351129c07d19977ce93a4039b Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 26 Sep 2024 10:23:01 -0500 Subject: [PATCH 20/20] update changelog entry --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2b9ece24ad..b8174a7b48 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -64,7 +64,7 @@ Added * Continue introducing `pants `_ to improve DX (Developer Experience) working on StackStorm, improve our security posture, and improve CI reliability thanks in part to pants' use of PEX lockfiles. This is not a user-facing addition. - #6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253 + #6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253 #6254 Contributed by @cognifloyd * Build of ST2 EL9 packages #6153 Contributed by @amanda11