Merge branch 'main' into fix/cloud-tasks-tests

Author: angelcaamal

security-center/snippets/package.json

@@ -9,7 +9,7 @@
     "node": ">=16.0.0"
   },
   "scripts": {
-    "test": "c8 mocha -p -j 2 --recursive --timeout 6000000 system-test/"
+    "test": "c8 mocha --recursive --timeout 6000000 system-test/"
   },
   "license": "Apache-2.0",
   "dependencies": {

security-center/snippets/system-test/management_api/securityHealthAnalyticsCustomModule.test.js

@@ -33,9 +33,9 @@ const customModuleDisplayName =
 describe('security health analytics custom module', async () => {
   let data;
   const sharedModuleIds = [];
+  const client = new SecurityCenterManagementClient();
 
   before(async () => {
-    const client = new SecurityCenterManagementClient();
     const EnablementState =
       protos.google.cloud.securitycentermanagement.v1
         .SecurityHealthAnalyticsCustomModule.EnablementState;
@@ -44,7 +44,8 @@ describe('security health analytics custom module', async () => {
     const parent = `organizations/${organizationId}/locations/${locationId}`;
     const name = `organizations/${organizationId}/locations/${locationId}/securityHealthAnalyticsCustomModules/custom_module`;
     const expr = {
-      expression: `has(resource.rotationPeriod) && (resource.rotationPeriod > duration('2592000s'))`,
+      expression:
+        "has(resource.rotationPeriod) && (resource.rotationPeriod > duration('2592000s'))",
     };
     const resourceSelector = {
       resourceTypes: ['cloudkms.googleapis.com/CryptoKey'],
@@ -63,36 +64,59 @@ describe('security health analytics custom module', async () => {
       customConfig: customConfig,
     };
 
-    try {
-      await new Promise(resolve => setTimeout(resolve, 3000));
-      const [createResponse] =
-        await client.createSecurityHealthAnalyticsCustomModule({
-          parent: parent,
-          securityHealthAnalyticsCustomModule:
-            securityHealthAnalyticsCustomModule,
-        });
-      // extracts the custom module ID from the full name
-      const customModuleId = createResponse.name.split('/').pop();
-      data = {
-        orgId: organizationId,
-        customModuleId: customModuleId,
-        customModuleName: createResponse.displayName,
-      };
-      console.log(
-        'SecurityHealthAnalyticsCustomModule created : %j',
-        createResponse
-      );
-    } catch (error) {
-      console.error(
-        'Error creating SecurityHealthAnalyticsCustomModule:',
-        error
+    let createResponse;
+    const maxAttempts = 5;
+    let attempt = 0;
+    while (attempt < maxAttempts) {
+      try {
+        await new Promise(resolve => setTimeout(resolve, 3000));
+        const [createSecurityResponse] =
+          await client.createSecurityHealthAnalyticsCustomModule({
+            parent: parent,
+            securityHealthAnalyticsCustomModule:
+              securityHealthAnalyticsCustomModule,
+          });
+        createResponse = createSecurityResponse;
+        break;
+      } catch (error) {
+        if (error.code === 10) {
+          attempt++;
+          console.log(
+            `Concurrent modification detected. Retrying creation (attempt ${attempt}/${maxAttempts})...`
+          );
+          await new Promise(resolve =>
+            setTimeout(resolve, Math.pow(2, attempt) * 1000)
+          );
+        } else {
+          console.error(
+            'Fatal error creating SecurityHealthAnalyticsCustomModule:',
+            error
+          );
+          throw error;
+        }
+      }
+    }
+
+    if (!createResponse) {
+      throw new Error(
+        `Timeout: Failed to create custom module after ${maxAttempts} attempts due to concurrent modifications.`
       );
     }
+
+    // extracts the custom module ID from the full name
+    const customModuleId = createResponse.name.split('/').pop();
+    data = {
+      orgId: organizationId,
+      customModuleId: customModuleId,
+      customModuleName: createResponse.displayName,
+    };
+    console.log(
+      'SecurityHealthAnalyticsCustomModule created : %j',
+      createResponse
+    );
   });
 
   after(async () => {
-    const client = new SecurityCenterManagementClient();
-
     if (sharedModuleIds.length > 0) {
       for (const moduleId of sharedModuleIds) {
         const name = `organizations/${organizationId}/locations/${locationId}/securityHealthAnalyticsCustomModules/${moduleId}`;
@@ -112,9 +136,11 @@ describe('security health analytics custom module', async () => {
         }
       }
     }
+    await client.close();
   });
 
-  it('create security health analytics custom module', done => {
+  it('create security health analytics custom module', function (done) {
+    this.retries(3);
     const output = exec(
       `node management_api/createSecurityHealthAnalyticsCustomModule.js ${data.orgId} ${data.customModuleName} ${locationId}`
     );

security-center/snippets/system-test/v2/muterule.test.js

@@ -46,9 +46,15 @@ describe('Client with mute rule V2', async () => {
       },
     };
 
-    const [muteConfigResponse] = await client
-      .createMuteConfig(createMuteRuleRequest)
-      .catch(error => console.error(error));
+    let muteConfigResponse;
+    try {
+      [muteConfigResponse] = await client.createMuteConfig(
+        createMuteRuleRequest
+      );
+    } catch (error) {
+      console.error('API Error during createMuteConfig:', error);
+      throw error;
+    }
 
     const muteConfigId = muteConfigResponse.name.split('/')[5];
 

security-center/snippets/system-test/v2/notifications.test.js

@@ -40,20 +40,16 @@ describe('Client with Notifications v2', async () => {
   let data;
 
   before(async () => {
-    const configId = 'notif-config-test-node-create-' + uuidv1();
-    topicName = 'notifications-sample-topic';
+    const uuidSuffix = uuidv1();
+    const configId = 'notif-config-test-node-create-' + uuidSuffix;
+    topicName = 'notifications-sample-topic' + uuidSuffix;
     parent = `projects/${projectId}/locations/${location}`;
     pubsubTopic = `projects/${projectId}/topics/${topicName}`;
 
     client = new SecurityCenterClient();
 
     pubSubClient = new PubSub();
-    // A previous test failure can result the topic hanging around
-    try {
-      await pubSubClient.topic(topicName).delete();
-    } catch {
-      // Ignore if the topic doesn't already exist
-    }
+
     await pubSubClient.createTopic(topicName);
 
     const notificationConfig = {
@@ -80,10 +76,24 @@ describe('Client with Notifications v2', async () => {
   });
 
   after(async () => {
+    // Delete notification config to prevent resource leaks
+    if (data && data.notificationName) {
+      try {
+        await client.deleteNotificationConfig({
+          name: data.notificationName,
+        });
+      } catch (error) {
+        console.warn(
+          `Could not delete Notification Config: ${data.notificationName}`,
+          error
+        );
+      }
+    }
+    // Delete topic during cleanup
     try {
       await pubSubClient.topic(topicName).delete();
-    } catch {
-      // Ignore if the topic doesn't exist
+    } catch (error) {
+      console.warn(`Could not delete PubSub topic: ${topicName}`, error);
     }
   });