Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion storage-resize-images/functions/__tests__/filters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ describe("shouldResize function", () => {

describe("Metadata Checks", () => {
test.each([
["already resized", { resizedImage: "true" }, logs.imageAlreadyResized],
["already resized (string)", { resizedImage: "true" }, logs.imageAlreadyResized],
["already resized (boolean)", { resizedImage: true }, logs.imageAlreadyResized],
[
"resizing failed previously",
{ resizeFailed: true },
Expand Down
9 changes: 8 additions & 1 deletion storage-resize-images/functions/src/filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,14 @@ export function shouldResize(object: ObjectMetadata): boolean {
return false;
}

if (object.metadata && object.metadata.resizedImage === "true") {
// Skip if this is a resized image we created previously. Some uploads may
// store custom metadata as a boolean (true) rather than string "true",
// so handle both to ensure idempotence.
if (
object.metadata &&
(object.metadata.resizedImage === "true" ||
(object.metadata as any).resizedImage === true)
) {
logs.imageAlreadyResized();
return false;
}
Expand Down
4 changes: 3 additions & 1 deletion storage-resize-images/functions/src/resize-image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ export const constructMetadata = (
contentType: imageContentType,
metadata: objectMetadata.metadata ? { ...objectMetadata.metadata } : {},
};
metadata.metadata.resizedImage = true;
// Mark resized images so the function can skip re-processing on finalize.
// Use string "true" for consistency with existing checks and metadata conventions.
metadata.metadata.resizedImage = "true";
if (config.cacheControlHeader) {
metadata.cacheControl = config.cacheControlHeader;
} else {
Expand Down
Loading