Skip to content
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

Bug/2028 handle event 404 when trying to delete gracefully #2033

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Bug/2028 handle event 404 when trying to delete gracefully #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32cd4e2
#2028: handle event-not-found API error gracefully
JoernBerkefeld Jan 30, 2025
d3362af
#2028: remove Util.logBeta calls
JoernBerkefeld Jan 30, 2025
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
2 changes: 1 addition & 1 deletion @types/lib/metadataTypes/Event.d.ts.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion @types/lib/metadataTypes/Journey.d.ts.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 21 additions & 9 deletions lib/metadataTypes/Event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class Event extends MetadataType {
* @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
*/
static async retrieve(retrieveDir, _, __, key) {
Util.logBeta(this.definition.type);
try {
return await super.retrieveREST(
retrieveDir,
Expand Down Expand Up @@ -87,7 +86,6 @@ class Event extends MetadataType {
* @returns {Promise.<MetadataTypeItemObj>} Promise of metadata
*/
static async retrieveAsTemplate(templateDir, name, templateVariables) {
Util.logBeta(this.definition.type);
const res = await this.client.rest.get(
'/interaction/v1/eventDefinitions?name=' + encodeURIComponent(name)
);
Expand Down Expand Up @@ -141,13 +139,27 @@ class Event extends MetadataType {
* @param {string} key Identifier of item
* @returns {Promise.<boolean>} deletion success status
*/
static deleteByKey(key) {
Util.logBeta(this.definition.type);
return super.deleteByKeyREST(
'/interaction/v1/eventDefinitions/key:' + encodeURIComponent(key),
key,
false
);
static async deleteByKey(key) {
let response = false;
try {
response = await super.deleteByKeyREST(
'/interaction/v1/eventDefinitions/key:' + encodeURIComponent(key),
key,
true
);
Util.logger.info(` - deleted ${this.definition.type}: ${key}`);
} catch (ex) {
if (ex.code === 30000) {
Util.logger.warn(
` ☇ skipping deletion of ${this.definition.type} ${key}: not found on server`
);
} else {
Util.logger.errorStack(ex, ` - Deleting ${this.definition.type} '${key}' failed`);
}

return false;
}
return response;
}

/**
Expand Down
6 changes: 1 addition & 5 deletions lib/metadataTypes/Journey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ class Journey extends MetadataType {
*/
static async retrieve(retrieveDir, _, __, key) {
const extrasDefault = 'activities';
if (retrieveDir) {
// only print this during retrieve, not during retrieveForCache
Util.logBeta(this.definition.type);
}

let singleKey = '';
let mode = 'all';
Expand Down Expand Up @@ -318,7 +314,7 @@ class Journey extends MetadataType {
}

/**
* Deploys metadata - merely kept here to be able to print {@link Util.logBeta} once per deploy
* Deploys metadata
*
* @param {MetadataTypeMap} metadataMap metadata mapped by their keyField
* @param {string} deployDir directory where deploy metadata are saved
Expand Down
Loading