Merge pull request #8891 from achouhan09/event-fix

Added a fix for event handling of different errors and specialy InternalError

Author: achouhan09

src/cmd/manage_nsfs.js

@@ -98,11 +98,16 @@ async function main(argv = minimist(process.argv.slice(2))) {
         }
     } catch (err) {
         dbg.log1('NSFS Manage command: exit on error', err.stack || err);
-        const manage_err = ((err instanceof ManageCLIError) && err) ||
-            new ManageCLIError({
-                ...(ManageCLIError.FS_ERRORS_TO_MANAGE[err.code] ||
-                ManageCLIError.RPC_ERROR_TO_MANAGE[err.rpc_code] ||
-                ManageCLIError.InternalError), cause: err });
+        const manage_err = ((err instanceof ManageCLIError) && err) || (() => {
+            try {
+                throw_cli_error({
+                    ...(ManageCLIError.FS_ERRORS_TO_MANAGE[err.code] ||
+                    ManageCLIError.RPC_ERROR_TO_MANAGE[err.rpc_code] ||
+                    ManageCLIError.InternalError), // fallback to InternalError and record the event
+                    cause: err
+                });
+            } catch (e) { return e; }
+        })();
         process.stdout.write(manage_err.to_string() + '\n', () => {
             process.exit(1);
         });

src/manage_nsfs/manage_nsfs_cli_errors.js

@@ -579,12 +579,13 @@ const NSFS_CLI_ERROR_EVENT_MAP = {
     AccountNameAlreadyExists: NoobaaEvent.ACCOUNT_ALREADY_EXISTS,
     AccountDeleteForbiddenHasBuckets: NoobaaEvent.ACCOUNT_DELETE_FORBIDDEN,
     BucketAlreadyExists: NoobaaEvent.BUCKET_ALREADY_EXISTS,
-    BucketSetForbiddenBucketOwnerNotExists: NoobaaEvent.UNAUTHORIZED, // GAP - add event
-    BucketSetForbiddenBucketOwnerIsIAMAccount: NoobaaEvent.UNAUTHORIZED, // // GAP - add event
+    BucketSetForbiddenBucketOwnerNotExists: NoobaaEvent.BUCKET_OWNER_NOT_EXISTS,
+    BucketSetForbiddenBucketOwnerIsIAMAccount: NoobaaEvent.BUCKET_OWNER_IS_IAM_ACCOUNT,
     LoggingExportFailed: NoobaaEvent.LOGGING_FAILED,
     UpgradeFailed: NoobaaEvent.CONFIG_DIR_UPGRADE_FAILED,
     LifecycleFailed: NoobaaEvent.LIFECYCLE_FAILED,
-    LifecycleWorkerReachedTimeout: NoobaaEvent.LIFECYCLE_TIMEOUT
+    LifecycleWorkerReachedTimeout: NoobaaEvent.LIFECYCLE_TIMEOUT,
+    InternalError: NoobaaEvent.INTERNAL_ERROR
 };
 
 exports.ManageCLIError = ManageCLIError;

src/manage_nsfs/manage_nsfs_events_utils.js

@@ -292,6 +292,26 @@ NoobaaEvent.BUCKET_ALREADY_EXISTS = Object.freeze({
     severity: 'ERROR',
     state: 'HEALTHY',
 });
+NoobaaEvent.BUCKET_OWNER_NOT_EXISTS = Object.freeze({
+    event_code: 'bucket_owner_not_exists',
+    message: 'Bucket owner does not exist',
+    description: 'The specified bucket owner does not exist in the system',
+    entity_type: 'NODE',
+    event_type: 'ERROR',
+    scope: 'NODE',
+    severity: 'ERROR',
+    state: 'HEALTHY'
+});
+NoobaaEvent.BUCKET_OWNER_IS_IAM_ACCOUNT = Object.freeze({
+    event_code: 'bucket_owner_is_iam_account',
+    message: 'The bucket owner is an IAM account',
+    description: 'The specified bucket owner is an IAM account. Please set a root account as the bucket owner',
+    entity_type: 'NODE',
+    event_type: 'ERROR',
+    scope: 'NODE',
+    severity: 'ERROR',
+    state: 'HEALTHY'
+});
 NoobaaEvent.UNAUTHORIZED = Object.freeze({
     event_code: 'noobaa_bucket_access_unauthorized',
     message: 'Bucket is not accessible with current access rights ',