Change handleDeleteFile in app-web

services/app-web/src/s3/s3Amplify.ts

@@ -77,12 +77,49 @@ function newAmplifyS3Client(bucketConfig: S3BucketConfigType): S3ClientT {
  filename: string,
  bucket: BucketShortName
  ): Promise<void | S3Error> => {
+ // Construct the full key including the bucket prefix
+ const fullKey = `${bucketConfig[bucket]}/${filename}`
+ console.info(`Attempting to tag file as deleted: ${fullKey}`)
+ let metadata
+
  try {
- await Storage.remove(filename, {
- bucket: bucketConfig[bucket],
- })
+ const result = await Storage.getProperties(fullKey)
+ metadata = result.metadata
+ console.info('Successfully got file properties', metadata)
+ } catch (getPropertiesError) {
+ console.error('Error in getProperties:', getPropertiesError)
+ throw getPropertiesError
+ }
+
+ try {
+ // Add or update the 'deleted' tag
+ console.info('Preparing updated metadata')
+ const updatedMetadata = {
+ ...metadata,
+ deleted: 'true',
+ deletedAt: new Date().toISOString(),
+ }
+
+ // Update the file's metadata
+ console.info('Copying file to update metadata')
+ try {
+ await Storage.copy(
+ { key: fullKey },
+ { key: fullKey },
+ { metadata: updatedMetadata }
+ )
+ console.info('Successfully updated file metadata')
+ } catch (copyError) {
+ console.error('Error in Storage.copy:', copyError)
+ throw copyError
+ }
+
+ console.info(
+ `File ${filename} tagged as deleted in bucket ${bucket}`
+ )
  return
  } catch (err) {
+ console.error('Error in tagFileAsDeleted:', err)
  assertIsS3PutError(err)
  recordJSException(err)
  if (err.name === 'Error' && err.message === 'Network Error') {

services/uploads/serverless.yml

@@ -26,6 +26,7 @@ provider:
  - Effect: 'Allow'
  Action:
  - s3:GetObject
+ - s3:GetObjectAttributes
  - s3:GetObjectTagging
  - s3:PutObject
  - s3:PutObjectAcl
@@ -39,6 +40,14 @@ provider:
  - !Sub arn:aws:s3:::${self:service}-${sls:stage}-qa-${AWS::AccountId}/*
  - Effect: 'Allow'
  Action:
+ - s3:GetObject
+ - s3:GetObjectAttributes
+ - s3:GetObjectTagging
+ - s3:PutObject
+ - s3:PutObjectAcl
+ - s3:PutObjectTagging
+ - s3:PutObjectVersionTagging
+ - s3:DeleteObject
  - s3:ListBucket
  Resource:
  - !Sub arn:aws:s3:::${self:service}-${sls:stage}-uploads-${AWS::AccountId}