atex 0.12__py3-none-any.whl → 0.13__py3-none-any.whl

atex/cli/__init__.py

@@ -93,4 +93,4 @@ def main():
     try:
         mains[args._module](args)
     except KeyboardInterrupt:
-        raise SystemExit() from None
+        raise SystemExit from None

atex/cli/testingfarm.py

@@ -137,15 +137,20 @@ def stats(args):
             print(f"{count:>{digits}}  {repo_url}")
 
     def request_search_results():
-        if args.before is not None or args.after is not None:
+        func_kwargs = {}
+        if args.before is not None:
+            func_kwargs["created_before"] = args.before
+        if args.after is not None:
+            func_kwargs["created_after"] = args.after
+
+        if args.page is not None:
             for state in args.states.split(","):
                 reply = api.search_requests_paged(
                     state=state,
                     page=args.page,
                     mine=False,
                     ranch=args.ranch,
-                    created_before=args.before,
-                    created_after=args.after,
+                    **func_kwargs,
                 )
                 if reply:
                     yield from reply
@@ -155,6 +160,7 @@ def stats(args):
                     state=state,
                     mine=False,
                     ranch=args.ranch,
+                    **func_kwargs,
                 )
                 if reply:
                     yield from reply

atex/connection/ssh.py

@@ -36,6 +36,7 @@ DEFAULT_OPTIONS = {
     "TCPKeepAlive": "no",
     "EscapeChar": "none",
     "ExitOnForwardFailure": "yes",
+    "RequestTTY": "no",
 }
 
 

atex/provisioner/testingfarm/api.py

@@ -19,7 +19,7 @@ DEFAULT_API_URL = "https://api.testing-farm.io"
 
 DEFAULT_RESERVE_TEST = {
     "url": "https://github.com/RHSecurityCompliance/atex-reserve",
-    "ref": "0.12",
+    "ref": "main",
     "path": ".",
     "name": "/plans/reserve",
 }
@@ -436,7 +436,7 @@ class Reserve:
     def __init__(
         self, *, compose, arch="x86_64", pool=None, hardware=None, kickstart=None,
         timeout=60, ssh_key=None, source_host=None,
-        reserve_test=None, variables=None, secrets=None,
+        reserve_test=None, variables=None, secrets=None, tags=None,
         api=None,
     ):
         """
@@ -482,6 +482,10 @@ class Reserve:
         exported for the reserve test - variables are visible via TF API,
         secrets are not (but can still be extracted from pipeline log).
 
+        'tags' is a dict of custom key/values to be submitted in TF Request as
+        environments->settings->provisioning->tags, useful for storing custom
+        metadata to be queried later.
+
         'api' is a TestingFarmAPI instance - if unspecified, a sensible default
         will be used.
         """
@@ -521,6 +525,8 @@ class Reserve:
         if variables:
             spec_env["variables"] = variables
         spec_env["secrets"] = secrets.copy() if secrets else {}  # we need it for ssh pubkey
+        if tags:
+            spec_env["settings"]["provisioning"]["tags"] |= tags
 
         self._spec = spec
         self._ssh_key = Path(ssh_key) if ssh_key else None
@@ -537,7 +543,7 @@ class Reserve:
         try:
             r = _http.request("GET", "https://ifconfig.me", headers=curl_agent)
             if r.status != 200:
-                raise ConnectionError()
+                raise ConnectionError
         except (ConnectionError, urllib3.exceptions.RequestError):
             r = _http.request("GET", "https://ifconfig.co", headers=curl_agent)
         return r.data.decode().strip()

{atex-0.12.dist-info → atex-0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atex
-Version: 0.12
+Version: 0.13
 Summary: Ad-hoc Test EXecutor
 Project-URL: Homepage, https://github.com/RHSecurityCompliance/atex
 License-Expression: GPL-3.0-or-later

{atex-0.12.dist-info → atex-0.13.dist-info}/RECORD

@@ -2,13 +2,13 @@ atex/__init__.py,sha256=LdX67gprtHYeAkjLhFPKzpc7ECv2rHxUbHKDGbGXO1c,517
 atex/fmf.py,sha256=gkJXIaRO7_KvwJR-V6Tc1NVn4a9Hq7hoBLQLhxYIdbg,8834
 atex/aggregator/__init__.py,sha256=8mN-glHdzR4icKAUGO4JPodsTrLMdJoeuZsO2CTbhyU,1773
 atex/aggregator/json.py,sha256=tpoUZoZM8EMYhZKwVr4LRtgEIDjRxC11BIKVXZKYPOs,10441
-atex/cli/__init__.py,sha256=Ew2z-gC0jvOmU_DqYgXVQla3p1rTnrz64I63q52aHv4,2899
+atex/cli/__init__.py,sha256=0YzZ4sIYvZ47yF9STA2znINIQfEoGAV1N0pduTA7NhI,2897
 atex/cli/fmf.py,sha256=pvj_OIp6XT_nVUwziL7-v_HNbyAtuUmb7k_Ey_KkFJc,3616
 atex/cli/libvirt.py,sha256=6tt5ANb8XBBRXOQsYPTWILThKqf-gvt5AZh5Dctg2PA,3782
-atex/cli/testingfarm.py,sha256=MXfcKnzbmr71LrTpJcIghC6SfB4EBkKXh3Yy5SZlUUc,10744
+atex/cli/testingfarm.py,sha256=b6IzoouYx-Qzuu7350QhyC-PW8576b7hyhiTDka_xak,10899
 atex/connection/__init__.py,sha256=dj8ZBcEspom7Z_UjecfLGBRNvLZ3dyGR9q19i_B4xpY,3880
 atex/connection/podman.py,sha256=1T56gh1TgbcQWpTIJHL4NaxZOI6aMg7Xp7sn6PQQyBk,1911
-atex/connection/ssh.py,sha256=9A57b9YR_HI-kIu06Asic1y__JPVXEheDZxjbG2Qcsc,13460
+atex/connection/ssh.py,sha256=6lama8q3tSQcWPRKN3B4lgFUGtuVA51tuKDiNh7IN0U,13484
 atex/executor/__init__.py,sha256=nmYJCbC36fRGGkjoniFJmsq-sqFw8YS2ndf4q_loVM0,471
 atex/executor/duration.py,sha256=x06sItKOZi6XA8KszQwZGpIb1Z_L-HWqIwZKo2SDo0s,1759
 atex/executor/executor.py,sha256=WJXPWQo6VQhZgXORVVyvTDAdOQbbZz26E7FpwizbGIk,16126
@@ -27,7 +27,7 @@ atex/provisioner/libvirt/setup-libvirt.sh,sha256=oCMy9SCnbC_QuAzO2sFwvB5ui1kMQ6u
 atex/provisioner/podman/__init__.py,sha256=dM0JzQXWX7edtWSc0KH0cMFXAjArFn2Vme4j_ZMsdYA,138
 atex/provisioner/podman/podman.py,sha256=ztRypoakSf-jF04iER58tEMUZ4Y6AuzIpNpFXp44bB4,4997
 atex/provisioner/testingfarm/__init__.py,sha256=kZncgLGdRCR4FMaRQr2GTwJ8vjlA-24ri8JO2ueZJuw,113
-atex/provisioner/testingfarm/api.py,sha256=K3s87rWNqZ6q1AMkjYaNTNqIOZR-Bl1JonbKx67O9pQ,23549
+atex/provisioner/testingfarm/api.py,sha256=3vPpAmPisn99-NruZHUy_lS0I7A_IKHWGVGJcJBLBuI,23836
 atex/provisioner/testingfarm/testingfarm.py,sha256=yvQzWat92B4UnJNZzCLI8mpAKf_QvHUKyKbjlk5123Q,8573
 atex/util/__init__.py,sha256=cWHFbtQ4mDlKe6lXyPDWRmWJOTcHDGfVuW_-GYa8hB0,1473
 atex/util/dedent.py,sha256=SEuJMtLzqz3dQ7g7qyZzEJ9VYynVlk52tQCJY-FveXo,603
@@ -38,8 +38,8 @@ atex/util/path.py,sha256=x-kXqiWCVodfZWbEwtC5A8LFvutpDIPYv2m0boZSlXU,504
 atex/util/ssh_keygen.py,sha256=9yuSl2yBV7pG3Qfsf9tossVC00nbIUrAeLdbwTykpjk,384
 atex/util/subprocess.py,sha256=_oQN8CNgGoH9GAR6nZlpujYe2HjXFBcCuIkLPw-IxJ4,2971
 atex/util/threads.py,sha256=c8hsEc-8SqJGodInorv_6JxpiHiSkGFGob4qbMmOD2M,3531
-atex-0.12.dist-info/METADATA,sha256=v2DW_JNAKGa7yF6IVOpICXMant1I2qQNlj69Vxcv3rs,3050
-atex-0.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-atex-0.12.dist-info/entry_points.txt,sha256=pLqJdcfeyQTgup2h6dWb6SvkHhtOl-W5Eg9zV8moK0o,39
-atex-0.12.dist-info/licenses/COPYING.txt,sha256=oEuj51jdmbXcCUy7pZ-KE0BNcJTR1okudRp5zQ0yWnU,670
-atex-0.12.dist-info/RECORD,,
+atex-0.13.dist-info/METADATA,sha256=Q3S7eSPkLtzLYvRgIatm_RYyPGXUa_K7dAqZ_GvV5rY,3050
+atex-0.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+atex-0.13.dist-info/entry_points.txt,sha256=pLqJdcfeyQTgup2h6dWb6SvkHhtOl-W5Eg9zV8moK0o,39
+atex-0.13.dist-info/licenses/COPYING.txt,sha256=oEuj51jdmbXcCUy7pZ-KE0BNcJTR1okudRp5zQ0yWnU,670
+atex-0.13.dist-info/RECORD,,