fix all the last items for testing and layouts

Author: commjoen

wrongsecrets-balancer/src/kubernetes.js

@@ -2072,15 +2072,15 @@ const getJuiceShopInstances = () => {
       limit: 200,
     })
     .catch((error) => {
-      logger.info("error for getJuiceShopInstances: {}", error);
+      logger.info('error for getJuiceShopInstances: {}', error);
       throw new Error(error.response.body.message);
     });
 };
 
 const updateLastRequestTimestampForTeam = (teamname) => {
   const options = { headers: { 'Content-type': PatchUtils.PATCH_FORMAT_JSON_MERGE_PATCH } };
-  return k8sAppsApi.patchNamespacedDeployment(
-    {
+  return k8sAppsApi
+    .patchNamespacedDeployment({
       name: `t-${teamname}-wrongsecrets`,
       namespace: `t-${teamname}`,
       body: {
@@ -2092,12 +2092,11 @@ const updateLastRequestTimestampForTeam = (teamname) => {
         },
       },
       options: options,
-    },
-    ).catch((error) => {
-      logger.info("error for updateLastRequestTimestampForTeam: {}", error);
+    })
+    .catch((error) => {
+      logger.info('error for updateLastRequestTimestampForTeam: {}', error);
       throw new Error(error.response.body.message);
-    }
-  );
+    });
 };
 
 const changePasscodeHashForTeam = async (teamname, passcodeHash) => {

wrongsecrets-balancer/src/teams/teams.js

@@ -934,46 +934,46 @@ router.get('/:team/wait-till-ready', validator.params(paramsSchema), awaitReadin
 
 module.exports = router;
 
-const listInstances = async (req, res) => {
-  try {
-    logger.info('Listing all team instances');
-
-    const instances = await getJuiceShopInstances();
-
-    // Fix: Check if instances and instances.body exist
-    if (!instances || !instances.body || !instances.body.items) {
-      logger.warn('No instances found or invalid response structure');
-      return res.status(200).json({
-        items: [],
-      });
-    }
-
-    const teams = instances.body.items
-      .filter((deployment) => deployment.metadata.labels.app === 'wrongsecrets')
-      .map((deployment) => {
-        const team = deployment.metadata.labels.team;
-        const annotations = deployment.metadata.annotations || {};
-
-        return {
-          team,
-          name: deployment.metadata.name,
-          ready: deployment.status?.readyReplicas > 0,
-          createdAt: new Date(deployment.metadata.creationTimestamp),
-          lastConnect: new Date(
-            parseInt(annotations['wrongsecrets-ctf-party/lastRequest']) ||
-              deployment.metadata.creationTimestamp
-          ),
-        };
-      });
-
-    res.status(200).json({
-      items: teams,
-    });
-  } catch (error) {
-    logger.error('Error listing instances:', error.message);
-    res.status(500).json({
-      error: 'Failed to list instances',
-      message: error.message,
-    });
-  }
-};
+// const listInstances = async (req, res) => {
+//   try {
+//     logger.info('Listing all team instances');
+
+//     const instances = await getJuiceShopInstances();
+
+//     // Fix: Check if instances and instances.body exist
+//     if (!instances || !instances.body || !instances.body.items) {
+//       logger.warn('No instances found or invalid response structure');
+//       return res.status(200).json({
+//         items: [],
+//       });
+//     }
+
+//     const teams = instances.body.items
+//       .filter((deployment) => deployment.metadata.labels.app === 'wrongsecrets')
+//       .map((deployment) => {
+//         const team = deployment.metadata.labels.team;
+//         const annotations = deployment.metadata.annotations || {};
+
+//         return {
+//           team,
+//           name: deployment.metadata.name,
+//           ready: deployment.status?.readyReplicas > 0,
+//           createdAt: new Date(deployment.metadata.creationTimestamp),
+//           lastConnect: new Date(
+//             parseInt(annotations['wrongsecrets-ctf-party/lastRequest']) ||
+//               deployment.metadata.creationTimestamp
+//           ),
+//         };
+//       });
+
+//     res.status(200).json({
+//       items: teams,
+//     });
+//   } catch (error) {
+//     logger.error('Error listing instances:', error.message);
+//     res.status(500).json({
+//       error: 'Failed to list instances',
+//       message: error.message,
+//     });
+//   }
+// };

wrongsecrets-balancer/src/teams/teams.test.js

@@ -120,14 +120,12 @@ test('create team fails when max instances is reached', async () => {
   });
   getJuiceShopInstances.mockImplementation(async () => {
     return {
-      body: {
         items: [
           1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9,
           10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8,
           9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7,
           8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
         ],
-      },
     };
   });