From e5d4f180f8edab54963374aac62eb6f1d0660787 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Sun, 30 May 2021 19:34:40 -0500 Subject: [PATCH 01/14] pants: add pack_metadata targets --- contrib/chatops/BUILD | 3 +++ contrib/core/BUILD | 6 +++++- contrib/default/BUILD | 3 +++ contrib/examples/BUILD | 4 ++++ contrib/hello_st2/BUILD | 3 +++ contrib/linux/BUILD | 4 ++++ contrib/packs/BUILD | 3 +++ contrib/packs/tests/fixtures/stackstorm-test/BUILD | 3 +++ contrib/packs/tests/fixtures/stackstorm-test2/BUILD | 3 +++ contrib/packs/tests/fixtures/stackstorm-test3/BUILD | 3 +++ contrib/packs/tests/fixtures/stackstorm-test4/BUILD | 3 +++ st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD | 4 ++++ .../packs/dummy_pack_schema_with_additional_items_1/BUILD | 4 ++++ .../dummy_pack_schema_with_additional_properties_1/BUILD | 4 ++++ .../packs/dummy_pack_schema_with_nested_object_1/BUILD | 4 ++++ .../packs/dummy_pack_schema_with_nested_object_2/BUILD | 4 ++++ .../packs/dummy_pack_schema_with_nested_object_3/BUILD | 4 ++++ .../packs/dummy_pack_schema_with_nested_object_4/BUILD | 4 ++++ .../packs/dummy_pack_schema_with_nested_object_5/BUILD | 4 ++++ .../BUILD | 4 ++++ .../packs/dummy_pack_schema_with_pattern_properties_1/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD | 4 ++++ .../fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD | 4 ++++ .../st2tests/fixtures/packs/pack_invalid_requirements/BUILD | 4 ++++ .../st2tests/fixtures/packs/test_library_dependencies/BUILD | 4 ++++ st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD | 4 ++++ .../st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD | 4 ++++ .../st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD | 4 ++++ 51 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 contrib/chatops/BUILD create mode 100644 contrib/default/BUILD create mode 100644 contrib/hello_st2/BUILD create mode 100644 contrib/packs/BUILD create mode 100644 contrib/packs/tests/fixtures/stackstorm-test/BUILD create mode 100644 contrib/packs/tests/fixtures/stackstorm-test2/BUILD create mode 100644 contrib/packs/tests/fixtures/stackstorm-test3/BUILD create mode 100644 contrib/packs/tests/fixtures/stackstorm-test4/BUILD diff --git a/contrib/chatops/BUILD b/contrib/chatops/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/chatops/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/core/BUILD b/contrib/core/BUILD index a71b6ad328..53fcedc7d8 100644 --- a/contrib/core/BUILD +++ b/contrib/core/BUILD @@ -1,4 +1,6 @@ -python_sources() +pack_metadata( + name="metadata", +) python_requirements( name="reqs", @@ -7,3 +9,5 @@ python_requirements( # https://github.com/pantsbuild/pants/pull/17390 module_mapping={"mail-parser": ["mailparser"]}, ) + +python_sources() diff --git a/contrib/default/BUILD b/contrib/default/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/default/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/examples/BUILD b/contrib/examples/BUILD index cdb13c30df..de3b866405 100644 --- a/contrib/examples/BUILD +++ b/contrib/examples/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + # Using `python_requirements()` here results in: # ">1 target exports this module, so it is ambiguous which to use" # This error refers to the "requests" module. diff --git a/contrib/hello_st2/BUILD b/contrib/hello_st2/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/hello_st2/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/linux/BUILD b/contrib/linux/BUILD index b8519ce575..8a73ff391a 100644 --- a/contrib/linux/BUILD +++ b/contrib/linux/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_requirements( name="reqs", ) diff --git a/contrib/packs/BUILD b/contrib/packs/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/packs/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/packs/tests/fixtures/stackstorm-test/BUILD b/contrib/packs/tests/fixtures/stackstorm-test/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/packs/tests/fixtures/stackstorm-test/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/packs/tests/fixtures/stackstorm-test2/BUILD b/contrib/packs/tests/fixtures/stackstorm-test2/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/packs/tests/fixtures/stackstorm-test2/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/packs/tests/fixtures/stackstorm-test3/BUILD b/contrib/packs/tests/fixtures/stackstorm-test3/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/packs/tests/fixtures/stackstorm-test3/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/contrib/packs/tests/fixtures/stackstorm-test4/BUILD b/contrib/packs/tests/fixtures/stackstorm-test4/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/packs/tests/fixtures/stackstorm-test4/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD b/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD +++ b/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD index 4a173b377b..c10cdf396f 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_1.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD index af53903c91..ebde20ee8e 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_11.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD index a7cbcb14b2..51601ca352 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_19.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD index 075e7aff44..acb2d9932b 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + resource( name="pack_requirements", source="requirements.txt", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD index 76fb2a9339..d3692b9f7d 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_22.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD index e12c5b4ab9..891bb31a37 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_5.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD index d5287b4ba2..da0e9f5128 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_6.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD index 852ffa1b22..f4fa92dabf 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_7.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD index f577a9434a..101275a29a 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_1.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD index 6c3d0aff16..7b9bf42928 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_2.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD index 7dacccd590..65b7384505 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_3.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD index 80faba7d5c..6795821267 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + python_sources( dependencies=[ "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_4.yaml", diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD b/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD +++ b/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD b/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD +++ b/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD b/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD index 075e7aff44..acb2d9932b 100644 --- a/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD +++ b/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + resource( name="pack_requirements", source="requirements.txt", diff --git a/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD b/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD index 075e7aff44..acb2d9932b 100644 --- a/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD +++ b/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD @@ -1,3 +1,7 @@ +pack_metadata( + name="metadata", +) + resource( name="pack_requirements", source="requirements.txt", diff --git a/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD b/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD +++ b/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD +++ b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD +++ b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() From f18e1a0e596f2ef9ed7401b091d54d8f57998f88 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 31 May 2021 12:09:35 -0500 Subject: [PATCH 02/14] add packs_metadata and related targets --- st2tests/st2tests/BUILD | 2 + st2tests/st2tests/fixtures/BUILD | 14 +++++++ st2tests/st2tests/fixtures/aliases/BUILD | 4 ++ st2tests/st2tests/fixtures/backstop/BUILD | 4 ++ st2tests/st2tests/fixtures/generic/BUILD | 4 ++ .../st2tests/fixtures/localrunner_pack/BUILD | 4 ++ st2tests/st2tests/fixtures/packs/BUILD | 42 +++++++++++++++++++ st2tests/st2tests/fixtures/packs_1/BUILD | 6 +++ .../st2tests/fixtures/packs_invalid/BUILD | 7 ++++ st2tests/st2tests/fixtures/traces/BUILD | 4 ++ 10 files changed, 91 insertions(+) create mode 100644 st2tests/st2tests/fixtures/packs_1/BUILD create mode 100644 st2tests/st2tests/fixtures/packs_invalid/BUILD diff --git a/st2tests/st2tests/BUILD b/st2tests/st2tests/BUILD index bdd44d7ac9..7e367c547e 100644 --- a/st2tests/st2tests/BUILD +++ b/st2tests/st2tests/BUILD @@ -5,5 +5,7 @@ python_sources( "st2tests/conf:logging.conf", "./resources:ssh", "./resources:packs", + "./fixtures:packs_metadata", + "./fixtures:registered_content", ], ) diff --git a/st2tests/st2tests/fixtures/BUILD b/st2tests/st2tests/fixtures/BUILD index 010e795e35..2d806fe93b 100644 --- a/st2tests/st2tests/fixtures/BUILD +++ b/st2tests/st2tests/fixtures/BUILD @@ -6,3 +6,17 @@ resources( "./rbac_invalid/**/*.yaml", ], ) + +target( + name="packs_metadata", + dependencies=[ + "./aliases:metadata", + "./backstop:metadata", + "./generic:metadata", + "./localrunner_pack:metadata", + "./packs:packs_metadata", + "./packs_1:packs_metadata", + "./packs_invalid:packs_metadata", + "./traces:metadata", + ], +) diff --git a/st2tests/st2tests/fixtures/aliases/BUILD b/st2tests/st2tests/fixtures/aliases/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/aliases/BUILD +++ b/st2tests/st2tests/fixtures/aliases/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/backstop/BUILD b/st2tests/st2tests/fixtures/backstop/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/backstop/BUILD +++ b/st2tests/st2tests/fixtures/backstop/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/generic/BUILD b/st2tests/st2tests/fixtures/generic/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/generic/BUILD +++ b/st2tests/st2tests/fixtures/generic/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/localrunner_pack/BUILD b/st2tests/st2tests/fixtures/localrunner_pack/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/localrunner_pack/BUILD +++ b/st2tests/st2tests/fixtures/localrunner_pack/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() diff --git a/st2tests/st2tests/fixtures/packs/BUILD b/st2tests/st2tests/fixtures/packs/BUILD index 4813fd914d..4e9fea3c73 100644 --- a/st2tests/st2tests/fixtures/packs/BUILD +++ b/st2tests/st2tests/fixtures/packs/BUILD @@ -35,3 +35,45 @@ python_sources( "test_content_version/**/*.py", ], ) + +target( + name="packs_metadata", + dependencies=[ + # sadly dependencies can't use globs. We must list every subdirectory. + "./action_chain_tests:metadata", + "./dummy_pack_1:metadata", + "./dummy_pack_2:metadata", + "./dummy_pack_3:metadata", + "./dummy_pack_4:metadata", + "./dummy_pack_5:metadata", + "./dummy_pack_6:metadata", + "./dummy_pack_7:metadata", + "./dummy_pack_8:metadata", + "./dummy_pack_9:metadata", + "./dummy_pack_10:metadata", + "./dummy_pack_11:metadata", + "./dummy_pack_12:metadata", + "./dummy_pack_13:metadata", + "./dummy_pack_14:metadata", + "./dummy_pack_15:metadata", + "./dummy_pack_16:metadata", + "./dummy_pack_17:metadata", + "./dummy_pack_18:metadata", + "./dummy_pack_19:metadata", + "./dummy_pack_20:metadata", + "./dummy_pack_21:metadata", + "./dummy_pack_22:metadata", + "./dummy_pack_schema_with_additional_properties_1:metadata", + "./dummy_pack_schema_with_nested_object_1:metadata", + "./dummy_pack_schema_with_nested_object_2:metadata", + "./dummy_pack_schema_with_nested_object_3:metadata", + "./dummy_pack_schema_with_nested_object_4:metadata", + "./dummy_pack_schema_with_nested_object_5:metadata", + "./orquesta_tests:metadata", + "./pack_dir_name_doesnt_match_ref:metadata", + "./pack_invalid_requirements:metadata", + "./test_library_dependencies:metadata", + "./test_content_version:metadata", # submodule + # "./core:metadata", # todo: how to deal with a symlink like this? relocated_files? + ], +) diff --git a/st2tests/st2tests/fixtures/packs_1/BUILD b/st2tests/st2tests/fixtures/packs_1/BUILD new file mode 100644 index 0000000000..cc5f8e614e --- /dev/null +++ b/st2tests/st2tests/fixtures/packs_1/BUILD @@ -0,0 +1,6 @@ +target( + name="packs_metadata", + dependencies=[ + "./dummy_pack_4:metadata", + ], +) diff --git a/st2tests/st2tests/fixtures/packs_invalid/BUILD b/st2tests/st2tests/fixtures/packs_invalid/BUILD new file mode 100644 index 0000000000..783ab21eb8 --- /dev/null +++ b/st2tests/st2tests/fixtures/packs_invalid/BUILD @@ -0,0 +1,7 @@ +target( + name="packs_metadata", + dependencies=[ + "./dummy_pack_17:metadata", + "./dummy_pack_18:metadata", + ], +) diff --git a/st2tests/st2tests/fixtures/traces/BUILD b/st2tests/st2tests/fixtures/traces/BUILD index db46e8d6c9..27c8dcf012 100644 --- a/st2tests/st2tests/fixtures/traces/BUILD +++ b/st2tests/st2tests/fixtures/traces/BUILD @@ -1 +1,5 @@ +pack_metadata( + name="metadata", +) + python_sources() From 8aebc18f5113c614eb8f3e76ae0187586cf02248 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 31 May 2021 17:36:11 -0500 Subject: [PATCH 03/14] Add pack_metadata dependencies --- st2tests/st2tests/fixtures/packs/BUILD | 42 ------------------- .../fixtures/packs/action_chain_tests/BUILD | 4 +- .../fixtures/packs/dummy_pack_1/BUILD | 1 + .../fixtures/packs/dummy_pack_10/BUILD | 4 +- .../fixtures/packs/dummy_pack_11/BUILD | 1 + .../fixtures/packs/dummy_pack_12/BUILD | 4 +- .../fixtures/packs/dummy_pack_13/BUILD | 4 +- .../fixtures/packs/dummy_pack_14/BUILD | 4 +- .../fixtures/packs/dummy_pack_15/BUILD | 4 +- .../fixtures/packs/dummy_pack_16/BUILD | 4 +- .../fixtures/packs/dummy_pack_17/BUILD | 4 +- .../fixtures/packs/dummy_pack_18/BUILD | 4 +- .../fixtures/packs/dummy_pack_19/BUILD | 1 + .../fixtures/packs/dummy_pack_2/BUILD | 4 +- .../fixtures/packs/dummy_pack_20/BUILD | 4 +- .../fixtures/packs/dummy_pack_21/BUILD | 4 +- .../fixtures/packs/dummy_pack_22/BUILD | 1 + .../fixtures/packs/dummy_pack_23/BUILD | 4 +- .../fixtures/packs/dummy_pack_3/BUILD | 4 +- .../fixtures/packs/dummy_pack_4/BUILD | 4 +- .../fixtures/packs/dummy_pack_5/BUILD | 1 + .../fixtures/packs/dummy_pack_6/BUILD | 1 + .../fixtures/packs/dummy_pack_7/BUILD | 1 + .../fixtures/packs/dummy_pack_8/BUILD | 4 +- .../fixtures/packs/dummy_pack_9/BUILD | 4 +- .../BUILD | 4 +- .../BUILD | 4 +- .../BUILD | 1 + .../BUILD | 1 + .../BUILD | 1 + .../BUILD | 1 + .../BUILD | 4 +- .../BUILD | 4 +- .../BUILD | 4 +- .../fixtures/packs/orquesta_tests/BUILD | 4 +- .../pack_dir_name_doesnt_match_ref/BUILD | 4 +- .../packs/pack_invalid_requirements/BUILD | 4 +- .../packs/test_library_dependencies/BUILD | 4 +- st2tests/st2tests/fixtures/packs_1/BUILD | 6 --- .../fixtures/packs_1/dummy_pack_4/BUILD | 4 +- .../st2tests/fixtures/packs_invalid/BUILD | 7 ---- .../packs_invalid/dummy_pack_17/BUILD | 4 +- .../packs_invalid/dummy_pack_18/BUILD | 4 +- 43 files changed, 98 insertions(+), 84 deletions(-) mode change 100644 => 100755 st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD mode change 100644 => 100755 st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD delete mode 100644 st2tests/st2tests/fixtures/packs_1/BUILD delete mode 100644 st2tests/st2tests/fixtures/packs_invalid/BUILD diff --git a/st2tests/st2tests/fixtures/packs/BUILD b/st2tests/st2tests/fixtures/packs/BUILD index 4e9fea3c73..4813fd914d 100644 --- a/st2tests/st2tests/fixtures/packs/BUILD +++ b/st2tests/st2tests/fixtures/packs/BUILD @@ -35,45 +35,3 @@ python_sources( "test_content_version/**/*.py", ], ) - -target( - name="packs_metadata", - dependencies=[ - # sadly dependencies can't use globs. We must list every subdirectory. - "./action_chain_tests:metadata", - "./dummy_pack_1:metadata", - "./dummy_pack_2:metadata", - "./dummy_pack_3:metadata", - "./dummy_pack_4:metadata", - "./dummy_pack_5:metadata", - "./dummy_pack_6:metadata", - "./dummy_pack_7:metadata", - "./dummy_pack_8:metadata", - "./dummy_pack_9:metadata", - "./dummy_pack_10:metadata", - "./dummy_pack_11:metadata", - "./dummy_pack_12:metadata", - "./dummy_pack_13:metadata", - "./dummy_pack_14:metadata", - "./dummy_pack_15:metadata", - "./dummy_pack_16:metadata", - "./dummy_pack_17:metadata", - "./dummy_pack_18:metadata", - "./dummy_pack_19:metadata", - "./dummy_pack_20:metadata", - "./dummy_pack_21:metadata", - "./dummy_pack_22:metadata", - "./dummy_pack_schema_with_additional_properties_1:metadata", - "./dummy_pack_schema_with_nested_object_1:metadata", - "./dummy_pack_schema_with_nested_object_2:metadata", - "./dummy_pack_schema_with_nested_object_3:metadata", - "./dummy_pack_schema_with_nested_object_4:metadata", - "./dummy_pack_schema_with_nested_object_5:metadata", - "./orquesta_tests:metadata", - "./pack_dir_name_doesnt_match_ref:metadata", - "./pack_invalid_requirements:metadata", - "./test_library_dependencies:metadata", - "./test_content_version:metadata", # submodule - # "./core:metadata", # todo: how to deal with a symlink like this? relocated_files? - ], -) diff --git a/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD b/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD +++ b/st2tests/st2tests/fixtures/packs/action_chain_tests/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD index c10cdf396f..c10f509354 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_1.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD old mode 100644 new mode 100755 index 27c8dcf012..99d651ce3c --- a/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD index ebde20ee8e..f90764bca7 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_11/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_11.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_12/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_13/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_14/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_15/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_16/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_17/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_18/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD index 51601ca352..3c95d4e816 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_19/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_19.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD index acb2d9932b..410ec9f74b 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD @@ -7,4 +7,6 @@ resource( source="requirements.txt", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_20/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_21/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD index d3692b9f7d..97f24397dc 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_22/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_22.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD old mode 100644 new mode 100755 index 27c8dcf012..99d651ce3c --- a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_4/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD index 891bb31a37..53ee2df8ad 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_5/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_5.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD index da0e9f5128..e8b74443c7 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_6/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_6.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD index f4fa92dabf..9549df1e2a 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_7.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_8/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_items_1/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_additional_properties_1/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD index 101275a29a..6cbc9cb043 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_1/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_1.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD index 7b9bf42928..96edf54ccb 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_2/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_2.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD index 65b7384505..ba5ec6b5df 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_3/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_3.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD index 6795821267..a10cb48e40 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_4/BUILD @@ -4,6 +4,7 @@ pack_metadata( python_sources( dependencies=[ + ":metadata", "st2tests/st2tests/fixtures/packs/configs/dummy_pack_schema_with_nested_object_4.yaml", ], ) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_nested_object_5/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_and_additional_properties_1/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_schema_with_pattern_properties_1/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD b/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD +++ b/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD b/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD +++ b/st2tests/st2tests/fixtures/packs/pack_dir_name_doesnt_match_ref/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD b/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD index acb2d9932b..410ec9f74b 100644 --- a/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD +++ b/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD @@ -7,4 +7,6 @@ resource( source="requirements.txt", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD b/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD index acb2d9932b..410ec9f74b 100644 --- a/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD +++ b/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD @@ -7,4 +7,6 @@ resource( source="requirements.txt", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs_1/BUILD b/st2tests/st2tests/fixtures/packs_1/BUILD deleted file mode 100644 index cc5f8e614e..0000000000 --- a/st2tests/st2tests/fixtures/packs_1/BUILD +++ /dev/null @@ -1,6 +0,0 @@ -target( - name="packs_metadata", - dependencies=[ - "./dummy_pack_4:metadata", - ], -) diff --git a/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD b/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD +++ b/st2tests/st2tests/fixtures/packs_1/dummy_pack_4/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs_invalid/BUILD b/st2tests/st2tests/fixtures/packs_invalid/BUILD deleted file mode 100644 index 783ab21eb8..0000000000 --- a/st2tests/st2tests/fixtures/packs_invalid/BUILD +++ /dev/null @@ -1,7 +0,0 @@ -target( - name="packs_metadata", - dependencies=[ - "./dummy_pack_17:metadata", - "./dummy_pack_18:metadata", - ], -) diff --git a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD +++ b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_17/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD +++ b/st2tests/st2tests/fixtures/packs_invalid/dummy_pack_18/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) From d9950030a9310a0320d9a6f5b1eb0a98d75aa0c8 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 31 May 2021 19:35:04 -0500 Subject: [PATCH 04/14] Add pack_metadata for more fixtures --- st2tests/st2tests/BUILD | 1 - st2tests/st2tests/fixtures/BUILD | 14 -------------- st2tests/st2tests/fixtures/aliases/BUILD | 4 +++- st2tests/st2tests/fixtures/backstop/BUILD | 4 +++- st2tests/st2tests/fixtures/descendants/BUILD | 8 +++++++- st2tests/st2tests/fixtures/generic/BUILD | 4 +++- st2tests/st2tests/fixtures/localrunner_pack/BUILD | 4 +++- st2tests/st2tests/fixtures/rule_enforcements/BUILD | 8 +++++++- st2tests/st2tests/fixtures/timers/BUILD | 8 +++++++- st2tests/st2tests/fixtures/traces/BUILD | 4 +++- 10 files changed, 36 insertions(+), 23 deletions(-) diff --git a/st2tests/st2tests/BUILD b/st2tests/st2tests/BUILD index 7e367c547e..8e869768e0 100644 --- a/st2tests/st2tests/BUILD +++ b/st2tests/st2tests/BUILD @@ -5,7 +5,6 @@ python_sources( "st2tests/conf:logging.conf", "./resources:ssh", "./resources:packs", - "./fixtures:packs_metadata", "./fixtures:registered_content", ], ) diff --git a/st2tests/st2tests/fixtures/BUILD b/st2tests/st2tests/fixtures/BUILD index 2d806fe93b..010e795e35 100644 --- a/st2tests/st2tests/fixtures/BUILD +++ b/st2tests/st2tests/fixtures/BUILD @@ -6,17 +6,3 @@ resources( "./rbac_invalid/**/*.yaml", ], ) - -target( - name="packs_metadata", - dependencies=[ - "./aliases:metadata", - "./backstop:metadata", - "./generic:metadata", - "./localrunner_pack:metadata", - "./packs:packs_metadata", - "./packs_1:packs_metadata", - "./packs_invalid:packs_metadata", - "./traces:metadata", - ], -) diff --git a/st2tests/st2tests/fixtures/aliases/BUILD b/st2tests/st2tests/fixtures/aliases/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/aliases/BUILD +++ b/st2tests/st2tests/fixtures/aliases/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/backstop/BUILD b/st2tests/st2tests/fixtures/backstop/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/backstop/BUILD +++ b/st2tests/st2tests/fixtures/backstop/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/descendants/BUILD b/st2tests/st2tests/fixtures/descendants/BUILD index db46e8d6c9..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/descendants/BUILD +++ b/st2tests/st2tests/fixtures/descendants/BUILD @@ -1 +1,7 @@ -python_sources() +pack_metadata( + name="metadata", +) + +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/generic/BUILD b/st2tests/st2tests/fixtures/generic/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/generic/BUILD +++ b/st2tests/st2tests/fixtures/generic/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/localrunner_pack/BUILD b/st2tests/st2tests/fixtures/localrunner_pack/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/localrunner_pack/BUILD +++ b/st2tests/st2tests/fixtures/localrunner_pack/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/rule_enforcements/BUILD b/st2tests/st2tests/fixtures/rule_enforcements/BUILD index db46e8d6c9..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/rule_enforcements/BUILD +++ b/st2tests/st2tests/fixtures/rule_enforcements/BUILD @@ -1 +1,7 @@ -python_sources() +pack_metadata( + name="metadata", +) + +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/timers/BUILD b/st2tests/st2tests/fixtures/timers/BUILD index db46e8d6c9..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/timers/BUILD +++ b/st2tests/st2tests/fixtures/timers/BUILD @@ -1 +1,7 @@ -python_sources() +pack_metadata( + name="metadata", +) + +python_sources( + dependencies=[":metadata"], +) diff --git a/st2tests/st2tests/fixtures/traces/BUILD b/st2tests/st2tests/fixtures/traces/BUILD index 27c8dcf012..99d651ce3c 100644 --- a/st2tests/st2tests/fixtures/traces/BUILD +++ b/st2tests/st2tests/fixtures/traces/BUILD @@ -2,4 +2,6 @@ pack_metadata( name="metadata", ) -python_sources() +python_sources( + dependencies=[":metadata"], +) From e1614fc4c7123cb25a1f1fd9915cfe13ac884225 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 31 May 2021 20:50:55 -0500 Subject: [PATCH 05/14] Allow pants to detect packs fixture usage --- contrib/packs/tests/fixtures/BUILD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/packs/tests/fixtures/BUILD b/contrib/packs/tests/fixtures/BUILD index db46e8d6c9..57c54c7b41 100644 --- a/contrib/packs/tests/fixtures/BUILD +++ b/contrib/packs/tests/fixtures/BUILD @@ -1 +1,8 @@ -python_sources() +python_sources( + dependencies=[ + "./stackstorm-test:metadata", + "./stackstorm-test2:metadata", + "./stackstorm-test3:metadata", + "./stackstorm-test4:metadata", + ], +) From e2bef63a4aac444c5b4f29aec2120cf0fa5ed6ea Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 1 Jun 2021 21:48:40 -0500 Subject: [PATCH 06/14] Cleanup fixtures BUILD files Several fixtures have been adjusted so pants can infer them. So, I dropped the hard-coded dep in the BUILD files. --- st2tests/st2tests/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/st2tests/st2tests/BUILD b/st2tests/st2tests/BUILD index 8e869768e0..bdd44d7ac9 100644 --- a/st2tests/st2tests/BUILD +++ b/st2tests/st2tests/BUILD @@ -5,6 +5,5 @@ python_sources( "st2tests/conf:logging.conf", "./resources:ssh", "./resources:packs", - "./fixtures:registered_content", ], ) From 0f2c7cc62b62d31cebef6f549c47040c543e81dc Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 31 May 2021 20:58:49 -0500 Subject: [PATCH 07/14] add BUILD metadata for st2tests/testpacks --- st2tests/testpacks/checks/BUILD | 3 +++ st2tests/testpacks/errorcheck/BUILD | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 st2tests/testpacks/checks/BUILD create mode 100644 st2tests/testpacks/errorcheck/BUILD diff --git a/st2tests/testpacks/checks/BUILD b/st2tests/testpacks/checks/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/st2tests/testpacks/checks/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) diff --git a/st2tests/testpacks/errorcheck/BUILD b/st2tests/testpacks/errorcheck/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/st2tests/testpacks/errorcheck/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) From adf97fa8c485af6b21b4ad8dae0b8d4abb8c7fa1 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 4 Jun 2021 11:42:53 -0500 Subject: [PATCH 08/14] depend on pack_metadata in st2tests.fixtures.packs.core.fixture --- contrib/core/BUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/core/BUILD b/contrib/core/BUILD index 53fcedc7d8..b59086b916 100644 --- a/contrib/core/BUILD +++ b/contrib/core/BUILD @@ -10,4 +10,6 @@ python_requirements( module_mapping={"mail-parser": ["mailparser"]}, ) -python_sources() +python_sources( + dependencies=[":metadata"], +) From 521397bf3e268ed547639a95a80e56b1d5871d70 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 8 Jun 2021 14:35:51 -0500 Subject: [PATCH 09/14] Add pack_metadata targets in st2reactor pack fixtures --- st2reactor/tests/fixtures/packs/pack_with_rules/BUILD | 8 +++++++- st2reactor/tests/fixtures/packs/pack_with_sensor/BUILD | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/st2reactor/tests/fixtures/packs/pack_with_rules/BUILD b/st2reactor/tests/fixtures/packs/pack_with_rules/BUILD index db46e8d6c9..99d651ce3c 100644 --- a/st2reactor/tests/fixtures/packs/pack_with_rules/BUILD +++ b/st2reactor/tests/fixtures/packs/pack_with_rules/BUILD @@ -1 +1,7 @@ -python_sources() +pack_metadata( + name="metadata", +) + +python_sources( + dependencies=[":metadata"], +) diff --git a/st2reactor/tests/fixtures/packs/pack_with_sensor/BUILD b/st2reactor/tests/fixtures/packs/pack_with_sensor/BUILD index db46e8d6c9..99d651ce3c 100644 --- a/st2reactor/tests/fixtures/packs/pack_with_sensor/BUILD +++ b/st2reactor/tests/fixtures/packs/pack_with_sensor/BUILD @@ -1 +1,7 @@ -python_sources() +pack_metadata( + name="metadata", +) + +python_sources( + dependencies=[":metadata"], +) From d864817db654a9d4f07a44211bd486fd065c6e91 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 23 Jan 2023 12:59:20 -0600 Subject: [PATCH 10/14] Enable pants-plugins/pack_metadata This reverts commit 4a1b241cb983ae468e265355d20849ae8a870b9c. --- pants.toml | 2 +- st2tests/st2tests/fixtures/packs/BUILD | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pants.toml b/pants.toml index e9bf57cb95..375f9a1843 100644 --- a/pants.toml +++ b/pants.toml @@ -25,7 +25,7 @@ backend_packages = [ # internal plugins in pants-plugins/ "pants.backend.plugin_development", "api_spec", - #"pack_metadata", + "pack_metadata", "sample_conf", "schemas", ] diff --git a/st2tests/st2tests/fixtures/packs/BUILD b/st2tests/st2tests/fixtures/packs/BUILD index 4813fd914d..c53022a3ca 100644 --- a/st2tests/st2tests/fixtures/packs/BUILD +++ b/st2tests/st2tests/fixtures/packs/BUILD @@ -3,8 +3,7 @@ # instructions on how to checkout the submodules if they are not checked out. # The test_content_version* targets are dependencies of ./test_content_version_fixture -# pack_metadata_in_git_submodule( -resources( +pack_metadata_in_git_submodule( name="test_content_version_metadata", sources=[ "test_content_version/pack.yaml", From 26132d118546ee4df5bf0c819cb19e661616cf78 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 23 Jan 2023 13:00:20 -0600 Subject: [PATCH 11/14] update changelog entry --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 728a95fb90..3d37b236c2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,7 +14,7 @@ Added 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. #5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850 - #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 + #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 Contributed by @cognifloyd * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805 From f4062f79e73d292dc42fba6a427172969b861b7e Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 23 Jan 2023 14:31:00 -0600 Subject: [PATCH 12/14] disable spurious pack_metadata target where there is no metadata --- st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD index 99d651ce3c..a1f15b1ca7 100755 --- a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD +++ b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD @@ -1,7 +1,9 @@ -pack_metadata( - name="metadata", -) +# There are no metadata files in dummy_pack_23 yet. +# It is used in the pack copy tests. +# pack_metadata( +# name="metadata", +# ) python_sources( - dependencies=[":metadata"], + # dependencies=[":metadata"], ) From e18e3ae0753db3d18acde2dd78a29a31a66d0c78 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 23 Jan 2023 14:31:54 -0600 Subject: [PATCH 13/14] add pack_metadata to contrib/debug with `./pants tailor ::` --- contrib/debug/BUILD | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contrib/debug/BUILD diff --git a/contrib/debug/BUILD b/contrib/debug/BUILD new file mode 100644 index 0000000000..1a74d30186 --- /dev/null +++ b/contrib/debug/BUILD @@ -0,0 +1,3 @@ +pack_metadata( + name="metadata", +) From 54012ec7336521600b74f3dd5846f46f47a01606 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 26 Jan 2023 12:07:31 -0600 Subject: [PATCH 14/14] oops. executable bit should not be set on BUILD files --- st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD | 0 st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD mode change 100755 => 100644 st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_10/BUILD old mode 100755 new mode 100644 diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_23/BUILD old mode 100755 new mode 100644