redisbench-admin 0.11.13__tar.gz → 0.11.15__tar.gz

{redisbench_admin-0.11.13 → redisbench_admin-0.11.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.13
+Version: 0.11.15
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redisbench_admin-0.11.13 → redisbench_admin-0.11.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.13"
+version = "0.11.15"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.13 → redisbench_admin-0.11.15}/redisbench_admin/compare/compare.py

@@ -168,7 +168,7 @@ def compare_command_logic(args, project_name, project_version):
     grafana_base_dashboard = args.grafana_base_dashboard
     baseline_github_org = args.baseline_github_org
     comparison_github_org = args.comparison_github_org
-    # using an access token 
+    # using an access token
     is_actionable_pr = False
     contains_regression_comment = False
     regression_comment = None
@@ -282,8 +282,8 @@ def compare_command_logic(args, project_name, project_version):
         to_ts_ms,
         use_metric_context_path,
         running_platform,
-         baseline_github_org,
-    comparison_github_org,
+        baseline_github_org,
+        comparison_github_org,
     )
     comment_body = ""
     if total_comparison_points > 0:
@@ -727,7 +727,6 @@ def from_rts_to_regression_table(
     baseline_github_org="",
     comparison_github_org="",
     running_platform=None,
-    
 ):
     print_all = print_regressions_only is False and print_improvements_only is False
     table = []

{redisbench_admin-0.11.13 → redisbench_admin-0.11.15}/redisbench_admin/deploy/deploy.py

@@ -69,7 +69,9 @@ def deploy_command_logic(args, project_name, project_version):
     )
     tf_setup_name_sufix = "{}-{}".format(args.setup_name_sufix, tf_github_sha)
     tf_setup_name = "{}{}".format(remote_setup, tf_setup_name_sufix)
-    terraform_backend_key = "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
+    terraform_backend_key = "benchmarks/infrastructure/{}.tfstate".format(
+        tf_setup_name
+    ).replace("/", "-")
     tf_triggering_env = "redisbench-admin-deploy"
     logging.info("Setting an infra timeout of {} secs".format(infra_timeout_secs))
     if args.destroy is False:
@@ -101,6 +103,7 @@ def deploy_command_logic(args, project_name, project_version):
         _, _, _ = tf.init(
             capture_output=True,
             backend_config={"key": terraform_backend_key},
+            reconfigure=True,
         )
         logging.info("Refreshing remote state")
         _, _, _ = tf.refresh()

{redisbench_admin-0.11.13 → redisbench_admin-0.11.15}/redisbench_admin/run/ssh.py

@@ -70,6 +70,19 @@ def check_connection(ssh_conn):
         return False
 
 
+def ensure_400_permissions(file_path):
+    import stat
+
+    file_stat = os.stat(file_path)
+    current_permissions = stat.S_IMODE(file_stat.st_mode)
+
+    if current_permissions != 0o400:
+        logging.info(f"Changing permissions of {file_path} to 400")
+        os.chmod(file_path, 0o400)
+    else:
+        logging.info(f"{file_path} already has 400 permissions.")
+
+
 def ssh_pem_check(EC2_PRIVATE_PEM, private_key):
     if os.path.exists(private_key) is False:
         if EC2_PRIVATE_PEM is not None and EC2_PRIVATE_PEM != "":
@@ -90,3 +103,4 @@ def ssh_pem_check(EC2_PRIVATE_PEM, private_key):
         logging.info(
             "Confirmed that private key path artifact: '{}' exists!".format(private_key)
         )
+    ensure_400_permissions(private_key)

{redisbench_admin-0.11.13 → redisbench_admin-0.11.15}/redisbench_admin/utils/remote.py

@@ -272,7 +272,9 @@ def setup_remote_environment(
     _, _, _ = tf.init(
         capture_output=True,
         backend_config={
-            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
+            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name).replace(
+                "/", "-"
+            )
         },
     )
     _, _, _ = tf.refresh()