Merge branch 'main' into feat-update-proxy

OWASP · May 3, 2023 · 0596de8 · 0596de8
2 parents 7b44ed9 + 66c4d45
commit 0596de8
Show file tree

Hide file tree

Showing 16 changed files with 208 additions and 148 deletions.
diff --git a/aws/.terraform.lock.hcl b/aws/.terraform.lock.hcl
diff --git a/aws/README.md b/aws/README.md
@@ -135,19 +135,19 @@ The documentation below is auto-generated to give insight on what's created via
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.61.0 |
-| <a name="provider_http"></a> [http](#provider\_http) | 3.2.1 |
-| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.65.0 |
+| <a name="provider_http"></a> [http](#provider\_http) | 3.3.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.16.0 |
 | <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.16.0 |
-| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.12.0 |
+| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.13.1 |
 | <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.16.0 |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.19.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 4.0.1 |
 
 ## Resources
 

diff --git a/aws/main.tf b/aws/main.tf
@@ -37,7 +37,7 @@ data "aws_availability_zones" "available" {}
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 3.19.0"
+  version = "~> 4.0.1"
 
   name                 = "${var.cluster_name}-vpc"
   cidr                 = local.vpc_cidr
@@ -62,7 +62,7 @@ module "vpc" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "19.12.0"
+  version = "19.13.1"
 
   cluster_name    = var.cluster_name
   cluster_version = var.cluster_version

diff --git a/build-an-deploy.sh b/build-an-deploy.sh
@@ -10,6 +10,7 @@ source ./scripts/check-available-commands.sh
 checkCommandsAvailable helm docker kubectl yq
 
 version="$(uuidgen)"
+eval $(minikube docker-env)
 docker login
 WRONGSECRETS_IMAGE=$(cat helm/wrongsecrets-ctf-party/values.yaml| yq '.wrongsecrets.image')
 WRONGSECRETS_TAG=$(cat helm/wrongsecrets-ctf-party/values.yaml| yq '.wrongsecrets.tag')

diff --git a/build-and-deploy-container-minikube.sh b/build-and-deploy-container-minikube.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+source ./scripts/check-available-commands.sh
+checkCommandsAvailable helm docker kubectl yq minikube
+
+minikube delete
+minikube start  --cpus=6 --memory=8000MB --network-plugin=cni --cni=calico --driver=docker --kubernetes-version=1.25.6
+eval $(minikube docker-env)
+./build-an-deploy-container.sh
+
+sleep 5
+
+echo "let's go!"
+
+kubectl port-forward service/wrongsecrets-balancer 3000:3000
diff --git a/build-and-deploy-minikube.sh b/build-and-deploy-minikube.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+source ./scripts/check-available-commands.sh
+checkCommandsAvailable helm docker kubectl yq minikube
+
+minikube delete
+minikube start  --cpus=6 --memory=8000MB --network-plugin=cni --cni=calico --driver=docker --kubernetes-version=1.25.6
+eval $(minikube docker-env)
+./build-an-deploy.sh
+
+sleep 15
+
+echo "let's go!"
+
+kubectl port-forward service/wrongsecrets-balancer 3000:3000
diff --git a/cleaner/package-lock.json b/cleaner/package-lock.json
diff --git a/cleaner/package.json b/cleaner/package.json
@@ -16,10 +16,10 @@
     "winston": "^3.8.2"
   },
   "devDependencies": {
-    "eslint": "^8.37.0",
+    "eslint": "^8.39.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.5.0",
-    "prettier": "^2.8.7"
+    "prettier": "^2.8.8"
   },
   "overrides": {
     "@kubernetes/client-node": {

diff --git a/helm/wrongsecrets-ctf-party/values.yaml b/helm/wrongsecrets-ctf-party/values.yaml
@@ -108,7 +108,7 @@ wrongsecrets:
   maxInstances: 500
   # -- Wrongsecrets Image to use
   image: jeroenwillemsen/wrongsecrets
-  tag: 1.6.0-no-vault
+  tag: 1.6.3-no-vault
   # -- Change the key when hosting a CTF event. This key gets used to generate the challenge flags. See: https://github.com/OWASP/wrongsecrets#ctf
   ctfKey: "[email protected]!9uR_K!NfkkTr"
   # -- Specify a custom Juice Shop config.yaml. See the JuiceShop Config Docs for more detail: https://pwning.owasp-juice.shop/part1/customization.html#yaml-configuration-file