add st2_shell_sources_and_resources() to fixtures

Author: cognifloyd

pants-plugins/macros.py

@@ -22,7 +22,7 @@ def st2_shell_sources_and_resources(**kwargs):
     """
     shell_sources(**kwargs)  # noqa: F821
 
-    kwargs.pop("skip_shellcheck")
+    kwargs.pop("skip_shellcheck", None)
 
     kwargs["name"] += "_resources"
     resources(**kwargs)  # noqa: F821

st2tests/st2tests/fixtures/generic/BUILD

@@ -1,5 +1,9 @@
 pack_metadata(
     name="metadata",
+    dependencies=[
+        "./actions:shell",
+        "./actions:shell_resources",
+    ],
 )
 
 python_sources(

st2tests/st2tests/fixtures/generic/actions/BUILD

@@ -1 +1,4 @@
-shell_sources()
+st2_shell_sources_and_resources(
+    name="shell",
+    sources=["*.sh"],
+)

st2tests/st2tests/fixtures/packs/BUILD

@@ -13,7 +13,7 @@ pack_metadata_in_git_submodule(
     ],
 )
 
-shell_sources(
+st2_shell_sources_and_resources(
     name="test_content_version_shell",
     # do not check across git submodule boundary
     skip_shellcheck=True,
@@ -29,6 +29,7 @@ python_sources(
     dependencies=[
         ":test_content_version_metadata",
         ":test_content_version_shell",
+        ":test_content_version_shell_resources",
     ],
     sources=[
         "test_content_version/**/*.py",