fi

Author: devksingh4

src/api/functions/cache.ts

@@ -63,27 +63,30 @@ export async function atomicIncrementCacheCounter(
   returnOld: boolean = false,
   expiresAt?: number,
 ): Promise<number> {
-  const response = await dynamoClient.send(
-    new UpdateItemCommand({
-      TableName: genericConfig.CacheDynamoTableName,
-      Key: marshall(
-        {
-          primaryKey: key,
-          expireAt: expiresAt,
-        },
-        { removeUndefinedValues: true },
-      ),
-      UpdateExpression: "ADD #counterValue :increment",
-      ExpressionAttributeNames: {
-        "#counterValue": "counterValue",
-      },
-      ExpressionAttributeValues: marshall({
-        ":increment": amount,
-      }),
-      ReturnValues: returnOld ? "UPDATED_OLD" : "UPDATED_NEW",
-    }),
-  );
+  const updateExpressions: string[] = ["ADD #counterValue :increment"];
+  const expressionAttributeNames: { [key: string]: string } = {
+    "#counterValue": "counterValue",
+  };
+  const expressionAttributeValues: { [key: string]: any } = {
+    ":increment": amount,
+  };
+  if (expiresAt) {
+    updateExpressions.unshift("SET #expireAt = :expireAt");
+    expressionAttributeNames["#expireAt"] = "expireAt";
+    expressionAttributeValues[":expireAt"] = expiresAt.toString();
+  }
 
+  const command = new UpdateItemCommand({
+    TableName: genericConfig.CacheDynamoTableName,
+    Key: marshall({
+      primaryKey: key,
+    }),
+    UpdateExpression: updateExpressions.join(" "),
+    ExpressionAttributeNames: expressionAttributeNames,
+    ExpressionAttributeValues: marshall(expressionAttributeValues),
+    ReturnValues: returnOld ? "UPDATED_OLD" : "UPDATED_NEW",
+  });
+  const response = await dynamoClient.send(command);
   if (!response.Attributes) {
     return returnOld ? 0 : amount;
   }

terraform/envs/qa/main.tf

@@ -56,15 +56,15 @@ module "origin_verify" {
   ProjectId = var.ProjectId
 }
 
-module "ttl_archiver" {
-  depends_on       = [module.dynamo]
-  source           = "../../modules/archival"
-  ProjectId        = var.ProjectId
-  RunEnvironment   = "dev"
-  LogRetentionDays = var.LogRetentionDays
-  BucketPrefix     = local.bucket_prefix
-  MonitorTables    = ["${var.ProjectId}-room-requests", "${var.ProjectId}-room-requests-status"]
-}
+# module "ttl_archiver" {
+#   depends_on       = [module.dynamo]
+#   source           = "../../modules/archival"
+#   ProjectId        = var.ProjectId
+#   RunEnvironment   = "dev"
+#   LogRetentionDays = var.LogRetentionDays
+#   BucketPrefix     = local.bucket_prefix
+#   MonitorTables    = ["${var.ProjectId}-room-requests", "${var.ProjectId}-room-requests-status"]
+# }
 
 resource "aws_cloudfront_key_value_store" "linkry_kv" {
   name = "${var.ProjectId}-cloudfront-linkry-kv"

terraform/modules/archival/main.tf

@@ -117,18 +117,15 @@ resource "aws_iam_policy" "archive_policy" {
         {
           Effect = "Allow"
           Action = [
-            "s3:PutObject",
-            "s3:PutObjectAcl",
-            "s3:DeleteObject",
-            "s3:AbortMultipartUpload"
+            "s3:AbortMultipartUpload",
+            "s3:GetBucketLocation",
+            "s3:GetObject",
+            "s3:ListBucket",
+            "s3:ListBucketMultipartUploads",
+            "s3:PutObject"
           ]
-          Resource = "arn:aws:s3:::${aws_s3_bucket.this.id}/*"
+          Resource = ["arn:aws:s3:::${aws_s3_bucket.this.id}/*", "arn:aws:s3:::${aws_s3_bucket.this.id}"]
         },
-        {
-          Effect   = "Allow"
-          Action   = ["s3:ListBucketMultipartUploads"]
-          Resource = "arn:aws:s3:::${aws_s3_bucket.this.id}"
-        }
       ]
     )
   })