diff --git a/s3/s3.go b/s3/s3.go index 2c5eab9fb3d1589be018717d8d695cc4c81c6e36..11c9c7a0da980a223a99e29423b37c17d27fe6db 100644 --- a/s3/s3.go +++ b/s3/s3.go @@ -30,7 +30,7 @@ type S3UploadResponse struct { type S3UploadSettings struct { MimeType MIMEType RetrieveSignedUrl bool - ExpiryDuration *time.Duration + ExpiryDuration *time.Duration // Used to set expiry datetime of download links. NB: does not affect deletion of object from S3 bucket. AddContentDisposition bool FileName string } @@ -112,6 +112,7 @@ func (s SessionWithHelpers) UploadWithSettings(data []byte, bucket, fileName str Body: bytes.NewReader(data), } + // This sets the expiry date of the download link, not the deletion date of the object in the bucket. if settings.ExpiryDuration != nil { expiry := time.Now().Add(*settings.ExpiryDuration) putInput.Expires = &expiry @@ -142,25 +143,6 @@ func (s SessionWithHelpers) UploadWithSettings(data []byte, bucket, fileName str return "", nil } -func (s SessionWithHelpers) UploadWith1DayExpiry(data []byte, bucket, fileName string, mimeType MIMEType, shouldDownloadInsteadOfOpen bool) (string, error) { - if mimeType == "" { - mimeType = getTypeForFilename(fileName) - } - - expiry := 24 * time.Hour - signedUrl, err := s.UploadWithSettings(data, bucket, fileName, S3UploadSettings{ - MimeType: mimeType, - RetrieveSignedUrl: true, - ExpiryDuration: &expiry, - AddContentDisposition: shouldDownloadInsteadOfOpen, - }) - if err != nil { - return "", err - } - - return signedUrl, nil -} - // GetSignedDownloadURL gets a signed download URL for the duration. If scv is nil, a new session will be created. func (s SessionWithHelpers) GetSignedDownloadURL(bucket string, fileName string, duration time.Duration, headers ...map[string]string) (string, error) { getInput := &s3.GetObjectInput{