[fix] checking if we're in a git repo prior filling the git vars (#162)

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.3.3"
+version = "0.3.4"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>"]
 readme = "README.md"

redisbench_admin/run_local/local_helpers.py

@@ -39,6 +39,7 @@ def check_benchmark_binaries_local_requirements(
         benchmark_tool,
         tool_source,
         tool_source_bin_path,
+        _,
     ) = extract_benchmark_tool_settings(benchmark_config)
     which_benchmark_tool = None
     if benchmark_tool is not None:

redisbench_admin/run_remote/run_remote.py

@@ -331,6 +331,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                 benchmark_tool,
                                 benchmark_tool_source,
                                 _,
+                                _,
                             ) = extract_benchmark_tool_settings(benchmark_config)
                             benchmark_tools_sanity_check(args, benchmark_tool)
                             # setup the benchmark tool

redisbench_admin/utils/benchmark_config.py

@@ -235,7 +235,7 @@ def extract_benchmark_tool_settings(benchmark_config):
     benchmark_min_tool_version_major = None
     benchmark_min_tool_version_minor = None
     benchmark_min_tool_version_patch = None
-
+    benchmark_tool_property_map = benchmark_config["clientconfig"]
     for entry in benchmark_config["clientconfig"]:
         if "tool" in entry:
             benchmark_tool = entry["tool"]
@@ -268,6 +268,7 @@ def extract_benchmark_tool_settings(benchmark_config):
         benchmark_tool,
         benchmark_tool_source,
         benchmark_tool_source_inner_path,
+        benchmark_tool_property_map,
     )
 
 

redisbench_admin/utils/remote.py

@@ -239,39 +239,53 @@ def tf_output_or_none(tf_output, output_prop):
 
 
 def extract_git_vars(path=None, github_url=None):
-    if path is None:
-        path = get_git_root(".")
-    github_repo = Repo(path)
-    if github_url is None:
-        github_url = github_repo.remotes[0].config_reader.get("url")
-    if "/" in github_url[-1:]:
-        github_url = github_url[:-1]
-    if "http" in github_url:
-        github_org_name = github_url.split("/")[-2]
-        github_repo_name = github_url.split("/")[-1].split(".")[0]
-    else:
-        github_url = github_url.replace(".git", "")
-        github_org_name = github_url.split(":")[1].split("/")[0]
-        github_repo_name = github_url.split(":")[1].split("/")[1]
-    github_sha = github_repo.head.object.hexsha
+    github_org_name = None
+    github_repo_name = None
+    github_sha = None
+    github_actor = None
     github_branch = None
-    github_branch_detached = False
+    github_branch_detached = None
     try:
-        github_branch = github_repo.active_branch
-    except TypeError as e:
-        logging.warning(
-            "Unable to detected github_branch. caught the following error: {}".format(
-                e.__str__()
+        if path is None:
+            path = get_git_root(".")
+        github_repo = Repo(path)
+        if github_url is None:
+            github_url = github_repo.remotes[0].config_reader.get("url")
+        if "/" in github_url[-1:]:
+            github_url = github_url[:-1]
+        if "http" in github_url:
+            github_org_name = github_url.split("/")[-2]
+            github_repo_name = github_url.split("/")[-1].split(".")[0]
+        else:
+            github_url = github_url.replace(".git", "")
+            github_org_name = github_url.split(":")[1].split("/")[0]
+            github_repo_name = github_url.split(":")[1].split("/")[1]
+        github_sha = github_repo.head.object.hexsha
+        github_branch = None
+        github_branch_detached = False
+        try:
+            github_branch = github_repo.active_branch
+        except TypeError as e:
+            logging.warning(
+                "Unable to detected github_branch. caught the following error: {}".format(
+                    e.__str__()
+                )
             )
-        )
-        github_branch_detached = True
+            github_branch_detached = True
 
-    github_actor = None
-    try:
-        github_actor = github_repo.config_reader().get_value("user", "name")
-    except configparser.NoSectionError as e:
+        github_actor = None
+        try:
+            github_actor = github_repo.config_reader().get_value("user", "name")
+        except configparser.NoSectionError as e:
+            logging.warning(
+                "Unable to detected github_actor. caught the following error: {}".format(
+                    e.__str__()
+                )
+            )
+            github_branch_detached = True
+    except git.exc.InvalidGitRepositoryError as e:
         logging.warning(
-            "Unable to detected github_actor. caught the following error: {}".format(
+            "Unable to fill git vars. caught the following error: {}".format(
                 e.__str__()
             )
         )

tests/test_common.py

@@ -99,6 +99,7 @@ def test_extract_benchmark_tool_settings():
                 benchmark_tool,
                 benchmark_tool_source,
                 benchmark_tool_source_bin_path,
+                _,
             ) = extract_benchmark_tool_settings(benchmark_config)
             assert benchmark_tool is not None
             prepare_benchmark_parameters(
@@ -117,6 +118,25 @@ def test_extract_benchmark_tool_settings_with_remote():
             benchmark_tool,
             benchmark_tool_source,
             benchmark_tool_source_bin_path,
+            _,
+        ) = extract_benchmark_tool_settings(benchmark_config)
+        assert benchmark_tool is not None
+        assert benchmark_tool_source is not None
+        assert benchmark_tool_source_bin_path is not None
+
+
+def test_extract_benchmark_tool_settings_with_resource():
+    with open("./tests/test_data/ycsb-config.yml", "r") as yml_file:
+        benchmark_config = yaml.safe_load(yml_file)
+        (
+            benchmark_min_tool_version,
+            benchmark_min_tool_version_major,
+            benchmark_min_tool_version_minor,
+            benchmark_min_tool_version_patch,
+            benchmark_tool,
+            benchmark_tool_source,
+            benchmark_tool_source_bin_path,
+            benchmark_tool_property_map,
         ) = extract_benchmark_tool_settings(benchmark_config)
         assert benchmark_tool is not None
         assert benchmark_tool_source is not None

tests/test_data/redis-benchmark.yml

@@ -13,3 +13,7 @@ clientconfig:
     - threads: 1
     - pipeline: 1
     - command: '"TS.MRANGE" "1609613705646" "1609617305646" "WITHLABELS" "AGGREGATION" "MAX" "60000" "FILTER" "measurement=cpu" "fieldname=usage_user" "hostname=(host_49,host_3,host_35,host_39,host_75,host_15,host_21,host_11)" "GROUPBY" "hostname" "REDUCE" "max"'
+  - resources:
+      requests:
+        cpus: "2"
+        memory: "2g"