rhdl 0.1.0.post1729158829__tar.gz → 0.1.0.post1729715499__tar.gz

{rhdl-0.1.0.post1729158829/rhdl.egg-info → rhdl-0.1.0.post1729715499}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rhdl
-Version: 0.1.0.post1729158829
+Version: 0.1.0.post1729715499
 Summary: RHDL CLI module
 Home-page: https://gitlab.cee.redhat.com/rhdl/rhdl
 Author: Distributed CI team

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499/rhdl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rhdl
-Version: 0.1.0.post1729158829
+Version: 0.1.0.post1729715499
 Summary: RHDL CLI module
 Home-page: https://gitlab.cee.redhat.com/rhdl/rhdl
 Author: Distributed CI team

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/rhdlcli/api.py

@@ -24,12 +24,20 @@ class HmacSession(requests.Session):
         self.secret_key = secret_key
         super(HmacSession, self).__init__()
 
-    def request(self, method, url, *args, **kwargs):
+    def request(self, method, url, *args, allow_redirects=True, **kwargs):
         url = urljoin(self.base_url, url)
         auth = HmacAuthBase(
             self.access_key, self.secret_key, service="api", region="us-east-1"
         )
-        return super(HmacSession, self).request(method, url, auth=auth, *args, **kwargs)
+        response = super(HmacSession, self).request(
+            method, url, auth=auth, allow_redirects=False, *args, **kwargs
+        )
+        if response.status_code == 302 and allow_redirects:
+            redirect_url = response.headers.get("Location")
+            return super(HmacSession, self).request(
+                method, redirect_url, *args, **kwargs
+            )
+        return response
 
 
 def retry(tries=3, delay=2, multiplier=2):

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/rhdlcli/cli.py

@@ -9,7 +9,7 @@ examples:
   # Login to RHDL
   rhdl login
 
-  # download lastest RHEL-10 compose in the current folder
+  # download lastest RHEL-10 compose in <cwd>/RHEL-10 folder
   rhdl download RHEL-10
 
   # download latest RHEL-10 in /tmp/repo folder
@@ -39,6 +39,8 @@ def clean_with_default_values(parsed_arguments):
         setattr(parsed_arguments, "include_and_exclude", DEFAULT_INCLUDE_EXCLUDE_LIST)
     del parsed_arguments.include
     del parsed_arguments.exclude
+    if parsed_arguments.destination is None:
+        setattr(parsed_arguments, "destination", f"./{parsed_arguments.compose}")
     return vars(parsed_arguments)
 
 
@@ -71,7 +73,6 @@ def parse_arguments(arguments):
         "-d",
         "--destination",
         metavar="DESTINATION",
-        default=".",
         help="Destination folder where rhdl will download the compose",
     )
     parser.add_argument(

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/rhdlcli/downloader.py

@@ -10,11 +10,7 @@ from rhdlcli.api import (
 )
 from rhdlcli.stats import check_download_folder_has_enough_space
 from rhdlcli.files import get_files_to_remove, filter_files
-from rhdlcli.fs import (
-    mkdir_p,
-    delete_all_symlink_in_path,
-    recreate_symlinks,
-)
+from rhdlcli.fs import mkdir_p
 
 
 def clean_download_folder(download_folder, files):
@@ -27,8 +23,6 @@ def clean_download_folder(download_folder, files):
         print(f"Remove file {file}")
         os.remove(file)
 
-    delete_all_symlink_in_path(download_folder)
-
 
 def download_component(options):
     component = get_component(options)
@@ -46,4 +40,3 @@ def download_component(options):
     clean_download_folder(download_folder, files)
     check_download_folder_has_enough_space(download_folder, files)
     download_files(session, download_folder, files)
-    recreate_symlinks(download_folder, files_list["symlinks"])

rhdl-0.1.0.post1729715499/rhdlcli/fs.py

@@ -0,0 +1,23 @@
+import errno
+import os
+
+
+def mkdir_p(path):
+    try:
+        os.makedirs(path)
+    except OSError as exc:
+        if exc.errno == errno.EEXIST and os.path.isdir(path):
+            pass
+        elif exc.errno in [errno.EPERM, errno.EACCES]:
+            print(f"Permission error on {path}")
+        else:
+            raise
+
+
+def create_parent_dir(path):
+    mkdir_p(os.path.dirname(path))
+
+
+def get_config_path(env_variables):
+    path = env_variables.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
+    return os.path.join(path, "rhdl")

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/rhdlcli/options.py

@@ -1,3 +1,4 @@
+import getpass
 import json
 import os
 import pathlib
@@ -24,7 +25,7 @@ def build_options(cwd, arguments, env_variables):
     options.update(
         {
             "app_config_path": app_config_path,
-            "base_url": env_variables.get("RHDL_BASE_URL", credentials.get("base_url")),
+            "base_url": env_variables.get("RHDL_API_URL", credentials.get("base_url")),
             "access_key": env_variables.get(
                 "RHDL_ACCESS_KEY", credentials.get("access_key")
             ),
@@ -44,10 +45,10 @@ def login(options):
     if not os.path.exists(app_config_path):
         os.makedirs(app_config_path)
 
-    access_key = input("RHDL Access Key [None]: ")
-    secret_key = input("RHDL Secret Key [None]:")
+    access_key = input("RHDL Access Key: ")
+    secret_key = getpass.getpass("RHDL Secret Key: ")
     default_base_url = "https://api.rhdl.distributed-ci.io"
-    base_url = input(f"RHDL server host [{default_base_url}]:") or default_base_url
+    base_url = input(f"RHDL server host ({default_base_url}):") or default_base_url
     credentials = {
         "base_url": base_url,
         "access_key": access_key,

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/tests/test_cli.py

@@ -3,7 +3,7 @@ from rhdlcli.cli import parse_arguments
 
 def test_parse_arguments_when_no_options():
     args = parse_arguments(["download", "RHEL-9.4"])
-    assert args["destination"] == "."
+    assert args["destination"] == "./RHEL-9.4"
     assert args["tag"] == "milestone"
     assert args["include_and_exclude"] == [
         {"pattern": ".composeinfo", "type": "include"},

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/tests/test_files.py

@@ -58,7 +58,7 @@ def _get_options(args):
         "/tmp",
         parse_arguments(args),
         {
-            "RHDL_BASE_URL": "",
+            "RHDL_API_URL": "",
             "RHDL_ACCESS_KEY": "",
             "RHDL_SECRET_KEY": "",
         },

{rhdl-0.1.0.post1729158829 → rhdl-0.1.0.post1729715499}/tests/test_options.py

@@ -10,7 +10,7 @@ def test_build_options():
         ["download", "RHEL-9.4", "-d", "/tmp/repo", "-t", "nightly"]
     )
     cwd = "/tmp"
-    env_variables = {"RHDL_BASE_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
+    env_variables = {"RHDL_API_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
     options = build_options(cwd, arguments, env_variables)
     assert options == {
         "command": "download",
@@ -40,14 +40,14 @@ def test_build_options_transform_relative_folder_into_absolute_folder():
         ["download", "RHEL-9.4", "-d", "../home/rhdl", "-t", "nightly"]
     )
     cwd = "/tmp"
-    env_variables = {"RHDL_BASE_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
+    env_variables = {"RHDL_API_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
     assert build_options(cwd, arguments, env_variables)["destination"] == "/home/rhdl"
 
 
 def test_build_options_read_XDG_CONFIG_HOME_env_variable_for_app_config_path():
     arguments = parse_arguments(["login"])
     cwd = "/tmp"
-    env_variables = {"RHDL_BASE_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
+    env_variables = {"RHDL_API_URL": "", "RHDL_ACCESS_KEY": "", "RHDL_SECRET_KEY": ""}
     assert build_options(cwd, arguments, env_variables)["app_config_path"].endswith(
         ".config/rhdl"
     )
@@ -101,7 +101,7 @@ def test_build_options_read_env_variables_over_app_config_file_if_both_present(
     cwd = "/tmp"
     env_variables = {
         "XDG_CONFIG_HOME": str(tmp_path),
-        "RHDL_BASE_URL": "http://localhost:5000",
+        "RHDL_API_URL": "http://localhost:5000",
         "RHDL_ACCESS_KEY": "access_key",
         "RHDL_SECRET_KEY": "secret_key",
     }

rhdl-0.1.0.post1729158829/rhdlcli/fs.py

@@ -1,41 +0,0 @@
-import errno
-import os
-
-
-def mkdir_p(path):
-    try:
-        os.makedirs(path)
-    except OSError as exc:
-        if exc.errno == errno.EEXIST and os.path.isdir(path):
-            pass
-        elif exc.errno in [errno.EPERM, errno.EACCES]:
-            print(f"Permission error on {path}")
-        else:
-            raise
-
-
-def create_parent_dir(path):
-    mkdir_p(os.path.dirname(path))
-
-
-def delete_all_symlink_in_path(path):
-    for root, dirs, files in os.walk(path):
-        for file in files:
-            file_path = os.path.join(root, file)
-            if os.path.islink(file_path):
-                os.unlink(file_path)
-        for dir in dirs:
-            folder_path = os.path.join(root, dir)
-            if os.path.islink(folder_path):
-                os.unlink(folder_path)
-
-
-def recreate_symlinks(download_folder, symlinks):
-    for symlink in symlinks:
-        link_path = os.path.join(download_folder, symlink["path"], symlink["name"])
-        os.symlink(symlink["destination"], link_path)
-
-
-def get_config_path(env_variables):
-    path = env_variables.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
-    return os.path.join(path, "rhdl")