velocity-python 0.1.47__tar.gz → 0.1.48__tar.gz

{velocity_python-0.1.47/src/velocity_python.egg-info → velocity_python-0.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.47
+Version: 0.1.48
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.47 → velocity_python-0.1.48}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.1.47"
+version = "0.1.48"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.1.47 → velocity_python-0.1.48}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.1.47"
+__version__ = version = "0.1.48"
 
 import importlib as _importlib
 

{velocity_python-0.1.47 → velocity_python-0.1.48}/src/velocity/aws/amplify.py

@@ -337,6 +337,7 @@ class AmplifyProject:
 }}"""
 
     def get_lambda_vpc_policy_template(self):
+        account_id = self.get_account_id()
         return {
             "Version": "2012-10-17",
             "Statement": [
@@ -356,6 +357,15 @@ class AmplifyProject:
                         "ec2:RevokeSecurityGroupEgress",
                         "cognito-idp:*",
                     ],
+                },
+                {
+                    "Effect": "Allow",
+                    "Resource": f"arn:aws:ssm:*:{account_id}:parameter/*",
+                    "Action": [
+                        "ssm:GetParameter",
+                        "ssm:GetParameters",
+                        "ssm:GetParametersByPath",
+                    ],
                 }
             ],
         }

{velocity_python-0.1.47 → velocity_python-0.1.48}/src/velocity/aws/amplify_build.py

@@ -7,6 +7,7 @@ import time
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, Mapping, Optional, Sequence, Tuple, Union
+from urllib.parse import unquote
 
 import boto3
 import botocore.exceptions
@@ -271,6 +272,50 @@ def _serialize_policy_document(policy_document: Any) -> str:
     return json.dumps(policy_document)
 
 
+def _normalize_policy_document(policy_document: Any) -> Any:
+    if not isinstance(policy_document, str):
+        return policy_document
+    try:
+        return json.loads(unquote(policy_document))
+    except json.JSONDecodeError:
+        return json.loads(policy_document)
+
+
+def _sync_managed_policy_document(iam_client, policy_arn: str, policy_document: Any) -> None:
+    policy = retryable_call(iam_client.get_policy, PolicyArn=policy_arn)["Policy"]
+    current_version = retryable_call(
+        iam_client.get_policy_version,
+        PolicyArn=policy_arn,
+        VersionId=policy["DefaultVersionId"],
+    )["PolicyVersion"]
+
+    current_document = _normalize_policy_document(current_version["Document"])
+    desired_document = _normalize_policy_document(policy_document)
+    if json.dumps(current_document, sort_keys=True) == json.dumps(desired_document, sort_keys=True):
+        return
+
+    versions = retryable_call(iam_client.list_policy_versions, PolicyArn=policy_arn)["Versions"]
+    nondefault_versions = sorted(
+        (version for version in versions if not version["IsDefaultVersion"]),
+        key=lambda version: version["CreateDate"],
+    )
+    if len(versions) >= 5 and nondefault_versions:
+        retryable_call(
+            iam_client.delete_policy_version,
+            PolicyArn=policy_arn,
+            VersionId=nondefault_versions[0]["VersionId"],
+        )
+
+    print(f"Updating policy {policy['PolicyName']}")
+    retryable_call(
+        iam_client.create_policy_version,
+        PolicyArn=policy_arn,
+        PolicyDocument=_serialize_policy_document(desired_document),
+        SetAsDefault=True,
+    )
+    time.sleep(10)
+
+
 def ensure_lambda_policies_and_attach(
     app: AmplifyProject,
     function: Mapping[str, str],
@@ -318,6 +363,8 @@ def ensure_lambda_policies_and_attach(
                 PolicyDocument=_serialize_policy_document(policy_doc),
             )
             time.sleep(10)
+        else:
+            _sync_managed_policy_document(iam_client, policy_arn, policy_doc)
 
     role_name = function["Role"].split("/")[-1]
     attached_policies = retryable_call(

{velocity_python-0.1.47 → velocity_python-0.1.48}/src/velocity/aws/handlers/context.py

@@ -12,6 +12,7 @@ from botocore.exceptions import ClientError
 import hashlib
 import velocity
 import velocity.db
+from velocity.aws.ssm_config import getenv as config_getenv
 from velocity.logging import get_logger
 
 engine = velocity.db.postgres.initialize()
@@ -21,6 +22,13 @@ cognito_client = boto3.client("cognito-idp")
 logger = get_logger("velocity.aws.handlers.context")
 
 
+def _get_work_queue_name() -> str:
+    queue_name = str(config_getenv("SqsWorkQueue", "") or "").strip()
+    if not queue_name:
+        raise KeyError("SqsWorkQueue")
+    return queue_name
+
+
 @engine.transaction
 class Context:
 
@@ -372,7 +380,7 @@ class Context:
         batch_id = str(uuid.uuid4())
         results = {"batch_id": batch_id}
         queue = boto3.resource("sqs").get_queue_by_name(
-            QueueName=os.environ["SqsWorkQueue"]
+            QueueName=_get_work_queue_name()
         )
         if isinstance(payload, dict):
             payload = [payload]

{velocity_python-0.1.47 → velocity_python-0.1.48/src/velocity_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.47
+Version: 0.1.48
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT