redisbench-admin 0.11.58__py3-none-any.whl → 0.11.59__py3-none-any.whl

redisbench_admin/utils/remote.py

@@ -498,13 +498,24 @@ def validate_result_expectations(
 
 
 def check_and_fix_pem_str(ec2_private_pem: str):
-    pem_str = ec2_private_pem.replace("-----BEGIN RSA PRIVATE KEY-----", "")
-    pem_str = pem_str.replace("-----END RSA PRIVATE KEY-----", "")
-    pem_str = pem_str.replace(" ", "\n")
-    pem_str = "-----BEGIN RSA PRIVATE KEY-----\n" + pem_str
-    pem_str = pem_str + "-----END RSA PRIVATE KEY-----\n"
-    # remove any dangling whitespace
+    if "RSA" in ec2_private_pem:
+        print("Detected RSA private key")
+        pem_str = ec2_private_pem.replace("-----BEGIN RSA PRIVATE KEY-----", "")
+        pem_str = pem_str.replace("-----END RSA PRIVATE KEY-----", "")
+        pem_str = pem_str.replace(" ", "\n")
+        pem_str = "-----BEGIN RSA PRIVATE KEY-----\n" + pem_str
+        pem_str = pem_str + "-----END RSA PRIVATE KEY-----\n"
+    if "OPENSSH" in ec2_private_pem:
+        print("Detected OPENSSH private key")
+        pem_str = ec2_private_pem.replace("-----BEGIN OPENSSH PRIVATE KEY-----", "")
+        pem_str = pem_str.replace("-----END OPENSSH PRIVATE KEY-----", "")
+        pem_str = pem_str.replace(" ", "\n")
+        pem_str = "-----BEGIN OPENSSH PRIVATE KEY-----\n" + pem_str
+        pem_str = pem_str + "-----END OPENSSH PRIVATE KEY-----\n"
+        # remove any dangling whitespace
     pem_str = os.linesep.join([s for s in pem_str.splitlines() if s])
+    # add a final newline
+    pem_str = pem_str + "\n"
     return pem_str
 
 

{redisbench_admin-0.11.58.dist-info → redisbench_admin-0.11.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.58
+Version: 0.11.59
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 License-File: LICENSE
 Author: filipecosta90

{redisbench_admin-0.11.58.dist-info → redisbench_admin-0.11.59.dist-info}/RECORD

@@ -103,15 +103,15 @@ redisbench_admin/utils/benchmark_config.py,sha256=SREplEGIfPtR9NKIjJXb5pug-ikbJD
 redisbench_admin/utils/local.py,sha256=uVU91Bvk3FAaDGmTIbI0zXYd1K24A9-Xwm15xI_SYC4,4086
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=MsRL6x-eekzJOVE6Ho05igZzUX54m-4fRVCQlSYxyw0,42306
+redisbench_admin/utils/remote.py,sha256=cyxIsN717RRtmd5R32wNA7OElLu1FPSiDwXxmg8Jo4A,42882
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
 redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6rTo,15085
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.58.dist-info/METADATA,sha256=c-SW0SwVQ3NXU7l69rv4zHC-J9DpCbePfKteRNPVYvU,5724
-redisbench_admin-0.11.58.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-redisbench_admin-0.11.58.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.58.dist-info/licenses/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.58.dist-info/RECORD,,
+redisbench_admin-0.11.59.dist-info/METADATA,sha256=gIu6nMDAasi35nV1kPgVq_D2kigtLUNiUeKRvzInim8,5724
+redisbench_admin-0.11.59.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+redisbench_admin-0.11.59.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.59.dist-info/licenses/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.59.dist-info/RECORD,,