Skip to content

ASSETS-8997 add support for serviceoverload rendition_failed reason #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adamcin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ASSETS-8997 add support for serviceoverload rendition_failed reason #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const {
SourceFormatUnsupportedError,
SourceUnsupportedError,
SourceCorruptError,
RenditionTooLarge
RenditionTooLarge,
ServiceOverLoadError
Copy link
Copy Markdown
Member

@tmathern tmathern May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See note from adobe/asset-compute-commons#71, which may lead to changes here.

} = require('@adobe/asset-compute-commons');

// -----------------------< exports >-----------------------------------
Expand All @@ -38,5 +39,6 @@ module.exports = {
SourceFormatUnsupportedError,
SourceUnsupportedError,
SourceCorruptError,
RenditionTooLarge
RenditionTooLarge,
ServiceOverLoadError
};
2 changes: 2 additions & 0 deletions lib/shell/shellscript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ function newScriptError(err, errorFile) {
return new errors.SourceFormatUnsupportedError(errJson.message || err.message || err);
case errors.Reason.SourceUnsupported:
return new errors.SourceUnsupportedError(errJson.message || err.message || err);
case errors.Reason.ServiceOverLoad:
return new errors.ServiceOverLoadError(errJson.message || err.message || err);
default:
return new errors.GenericError(errJson.message || err.message || err, `${Action.name}_shellScript`);
}
Expand Down
14 changes: 14 additions & 0 deletions test/shellscript.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,20 @@ describe("api.js (shell)", () => {
);
});

it("should handle error.json - ServiceOverLoad instanceof ClientError", async () => {
createScript("worker.sh", `
echo '{ "reason": "ServiceOverLoad", "message": "too many requests" }' > $errorfile
exit 1
`);
const scriptWorker = new ShellScriptWorker(testUtil.simpleParams());

await assert.rejects(
scriptWorker.processWithScript(mockSource(), mockRendition()),
// check that instanceof works
err => err instanceof ClientError
);
});

it("should handle error.json - malformed json", async () => {
createScript("worker.sh", `
echo '{ "message": MALFORMED' > $errorfile
Expand Down