test for aws fialing persisting for ben

Author: commjoen

aws/.terraform.lock.hcl

@@ -137,8 +137,10 @@ else
 fi
 
 echo "App password is ${APP_PASSWORD}"
+echo "executing helm install of wrongsecrets"
 helm upgrade --install wrongsecrets ../helm/wrongsecrets-ctf-party \
   --set="balancer.env.K8S_ENV=aws" \
+  --set="balancer.tag=1.9.0alpha4-cloud" \
   --set="balancer.env.IRSA_ROLE=${IRSA_ROLE_ARN}" \
   --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${APP_PASSWORD}" \
   --set="balancer.env.REACT_APP_S3_BUCKET_URL=s3://${STATE_BUCKET}" \

aws/build-and-deploy-aws.sh

@@ -545,9 +545,9 @@ const createAWSDeploymentForTeam = async ({ team, passcodeHash }) => {
                     },
                   },
                 },
-                ...get('wrongsecrets.env', []),
+                // ...get('wrongsecrets.env', []),
               ],
-              envFrom: get('wrongsecrets.envFrom'),
+              // envFrom: get('wrongsecrets.envFrom'),
               ports: [
                 {
                   containerPort: 8080,
@@ -837,7 +837,7 @@ const createAzureDeploymentForTeam = async ({ team, passcodeHash }) => {
                     },
                   },
                 },
-                ...get('wrongsecrets.env', []),
+                // ...get('wrongsecrets.env', []),
               ],
               envFrom: get('wrongsecrets.envFrom'),
               ports: [
@@ -1191,7 +1191,7 @@ const createGCPDeploymentForTeam = async ({ team, passcodeHash }) => {
                     },
                   },
                 },
-                ...get('wrongsecrets.env', []),
+                //...get('wrongsecrets.env', []),
               ],
               envFrom: get('wrongsecrets.envFrom'),
               ports: [

aws/shared-state/.terraform.lock.hcl

@@ -295,7 +295,7 @@ async function createTeam(req, res) {
     res.status(500).send({ message: 'Failed to Create Instance' });
   }
   try {
-    logger.info(`Creating WrongSecrets Deployment for team '${team}'`);
+    logger.info(`Creating WrongSecrets Deployment for team '${team}' with k8s (no cloud)`);
     await createK8sDeploymentForTeam({ team, passcodeHash: hash });
     await createServiceForTeam(team);
   } catch (error) {
@@ -420,7 +420,7 @@ async function createAWSTeam(req, res) {
   }
 
   try {
-    logger.info(`Creating WrongSecrets Deployment for team '${team}'`);
+    logger.info(`Creating WrongSecrets Deployment for team '${team}' with AWS`);
     await createAWSDeploymentForTeam({ team, passcodeHash: hash });
     await createServiceForTeam(team);
   } catch (error) {
@@ -499,7 +499,7 @@ async function createAWSTeam(req, res) {
         passcode,
       });
   } catch (error) {
-    logger.error(`Error while creating deployment or service for team ${team}: ${error.message}`);
+    logger.error(`Error while creating deployment or service for team ${team} on AWS: ${error.message}`);
     res.status(500).send({ message: 'Failed to Create Instance' });
   }
 }
@@ -540,7 +540,7 @@ async function createAzureTeam(req, res) {
   }
 
   try {
-    logger.info(`Creating WrongSecrets Deployment for team '${team}'`);
+    logger.info(`Creating WrongSecrets Deployment for team '${team}' with Azure`);
     await createAzureDeploymentForTeam({ team, passcodeHash: hash });
     await createServiceForTeam(team);
   } catch (error) {
@@ -619,7 +619,7 @@ async function createAzureTeam(req, res) {
         passcode,
       });
   } catch (error) {
-    logger.error(`Error while creating deployment or service for team ${team}: ${error.message}`);
+    logger.error(`Error while creating deployment or service for team ${team} on Azure: ${error.message}`);
     res.status(500).send({ message: 'Failed to Create Instance' });
   }
 }
@@ -686,7 +686,7 @@ async function createGCPTeam(req, res) {
   }
 
   try {
-    logger.info(`Creating WrongSecrets Deployment for team '${team}'`);
+    logger.info(`Creating WrongSecrets Deployment for team '${team}' with GCP`);
     await createGCPDeploymentForTeam({ team, passcodeHash: hash });
     await createServiceForTeam(team);
   } catch (error) {
@@ -765,7 +765,7 @@ async function createGCPTeam(req, res) {
         passcode,
       });
   } catch (error) {
-    logger.error(`Error while creating deployment or service for team ${team}: ${error.message}`);
+    logger.error(`Error while creating deployment or service for team ${team} on GCP: ${error.message}`);
     res.status(500).send({ message: 'Failed to Create Instance' });
   }
 }

wrongsecrets-balancer/src/kubernetes.js

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "Apache-2.0",
   "dependencies": {
     "@formatjs/intl-utils": "^3.8.4",

wrongsecrets-balancer/src/teams/teams.js

@@ -156,13 +156,14 @@ function DeleteInstanceButton({ team }) {
 }
 
 export default function AdminPage() {
-  const [teams, setTeams] = useState([]);
+  const [teams, setTeams] = useState(updateAdminData());
   const { formatMessage, formatDate } = useIntl();
 
   function updateAdminData() {
     return axios
       .get(`/balancer/admin/all`)
       .then(({ data }) => {
+        console.log('getting all teams data')
         setTeams(data.instances);
       })
       .catch((err) => {