clear-skies-aws 1.10.1__tar.gz → 1.10.2__tar.gz

{clear_skies_aws-1.10.1 → clear_skies_aws-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: clear-skies-aws
-Version: 1.10.1
+Version: 1.10.2
 Summary: clearskies bindings for working in AWS
 License: MIT
 Author: Conor Mancone

{clear_skies_aws-1.10.1 → clear_skies_aws-1.10.2}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies-aws"
-version = "1.10.1"
+version = "1.10.2"
 description = "clearskies bindings for working in AWS"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies_aws-1.10.1 → clear_skies_aws-1.10.2}/src/clearskies_aws/secrets/akeyless_with_ssm_cache.py

@@ -1,16 +1,24 @@
+import re
+
 from clearskies.secrets import AKeyless
+
+
 class AkeylessWithSsmCache(AKeyless):
     _boto3 = None
+
     def __init__(self, requests, environment, boto3):
         super().__init__(requests, environment)
         self._boto3 = boto3
-        if not self._environment.get('AWS_REGION', True):
-            raise ValueError("To use parameter store you must use set the 'AWS_REGION' environment variable")
+        if not self._environment.get("AWS_REGION", True):
+            raise ValueError(
+                "To use parameter store you must use set the 'AWS_REGION' environment variable"
+            )
 
     def get(self, path, refresh=False):
-        ssm = self._boto3.client('ssm', region_name='us-east-1')
-        # we have spaces in our akeyless names but parameter store doesn't allow that
-        ssm_name = path.replace(' ', '-')
+        ssm = self._boto3.client("ssm", region_name="us-east-1")
+        # AWS SSM parameter paths only allow a-z, A-Z, 0-9, -, _, ., /, @, and :
+        # Replace any disallowed characters with hyphens
+        ssm_name = re.sub(r"[^a-zA-Z0-9\-_\./@:]", "-", path)
         # if we're not forcing a refresh, then see if it is in paramater store
         if not refresh:
             missing = False
@@ -19,7 +27,7 @@ class AkeylessWithSsmCache(AKeyless):
             except ssm.exceptions.ParameterNotFound:
                 missing = True
             if not missing:
-                value = response['Parameter']['Value']
+                value = response["Parameter"]["Value"]
                 if value:
                     return value
 
@@ -31,7 +39,7 @@ class AkeylessWithSsmCache(AKeyless):
             ssm.put_parameter(
                 Name=ssm_name,
                 Value=value,
-                Type='SecureString',
+                Type="SecureString",
                 Overwrite=True,
             )