diff --git a/src/apps.js b/src/apps.js index 4df7e2b44..f6df8ee94 100644 --- a/src/apps.js +++ b/src/apps.js @@ -768,7 +768,9 @@ function install(data, user, auditSource, callback) { enableAutomaticUpdate: enableAutomaticUpdate, robotsTxt: robotsTxt, alternateDomains: alternateDomains, - env: env + env: env, + label: label, + tags: tags }; appdb.add(appId, appStoreId, manifest, location, domain, translatePortBindings(portBindings, manifest), data, function (error) { @@ -790,7 +792,8 @@ function install(data, user, auditSource, callback) { scheduleTask(appId, { restoreConfig }, { installationState: exports.ISTATE_PENDING_INSTALL }, function (error, result) { if (error) return callback(error); - eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, app: result }); + const newApp = _.extend({ fqdn: domains.fqdn(location, domainObject) }, data, { appStoreId, manifest, location, domain, portBindings }); + eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, app: newApp, taskId: result.taskId }); callback(null, { id : appId, taskId: result.taskId }); }); @@ -934,7 +937,7 @@ function configure(appId, data, user, auditSource, callback) { if (error && error.reason === AppsError.ALREADY_EXISTS) error = getDuplicateErrorDetails(error.message, location, domainObject, portBindings, data.alternateDomains); if (error) return callback(error); - eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: result }); + eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: app, config: values, taskId: result.taskId }); callback(null, { taskId: result.taskId }); }); @@ -1009,7 +1012,7 @@ function update(appId, data, auditSource, callback) { scheduleTask(appId, { updateConfig: updateConfig }, { installationState: exports.ISTATE_PENDING_UPDATE }, function (error, result) { if (error) return callback(error); - eventlog.add(eventlog.ACTION_APP_UPDATE, auditSource, { appId: appId, toManifest: manifest, fromManifest: app.manifest, force: data.force, app: app }); + eventlog.add(eventlog.ACTION_APP_UPDATE, auditSource, { appId: appId, toManifest: manifest, fromManifest: app.manifest, force: data.force, app: app, taskId: result.taskId }); // clear update indicator, if update fails, it will come back through the update checker updateChecker.resetAppUpdateInfo(appId); @@ -1109,7 +1112,7 @@ function restore(appId, data, auditSource, callback) { scheduleTask(appId, { restoreConfig }, values, function (error, result) { if (error) return callback(error); - eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { app: app, backupId: backupInfo.id, fromManifest: app.manifest, toManifest: backupInfo.manifest }); + eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { app: app, backupId: backupInfo.id, fromManifest: app.manifest, toManifest: backupInfo.manifest, taskId: result.taskId }); callback(null, { taskId: result.taskId }); }); @@ -1170,7 +1173,7 @@ function clone(appId, data, user, auditSource, callback) { if (!backupInfo.manifest) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore config')); - const manifest = backupInfo.manifest; + const manifest = backupInfo.manifest, appStoreId = app.appStoreId; // re-validate because this new box version may not accept old configs error = checkManifestConstraints(manifest); @@ -1206,7 +1209,7 @@ function clone(appId, data, user, auditSource, callback) { env: app.env }; - appdb.add(newAppId, app.appStoreId, manifest, location, domain, translatePortBindings(portBindings, manifest), data, function (error) { + appdb.add(newAppId, appStoreId, manifest, location, domain, translatePortBindings(portBindings, manifest), data, function (error) { if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error.message, location, domainObject, portBindings, [])); if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error)); @@ -1218,7 +1221,8 @@ function clone(appId, data, user, auditSource, callback) { scheduleTask(newAppId, { restoreConfig }, { installationState: exports.ISTATE_PENDING_CLONE }, function (error, result) { if (error) return callback(error); - eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, oldApp: app, newApp: result }); + const newApp = _.extend({}, data, { appStoreId, manifest, location, domain, portBindings }); + eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, oldApp: app, newApp: newApp, taskId: result.taskId }); callback(null, { id: newAppId, taskId: result.taskId }); }); @@ -1250,7 +1254,7 @@ function uninstall(appId, auditSource, callback) { scheduleTask(appId, { /* args */ }, { installationState: exports.ISTATE_PENDING_UNINSTALL }, function (error, result) { if (error) return callback(error); - eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId, app: result }); + eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId, app: app, taskId: result.taskId }); callback(null, { taskId: result.taskId }); });