From ce98fda5aa370584e76b260a5891f03c47ccfd4a Mon Sep 17 00:00:00 2001
From: John Fucking Wick <34117229+Ubisoft-potato@users.noreply.github.com>
Date: Wed, 23 Oct 2024 04:32:53 +0000
Subject: [PATCH] chore: delete mysql data after e2e test

---
 DEVELOPMENT.md                 |  4 ++--
 Makefile                       | 15 +++++++++++----
 manifests/localenv/values.yaml |  5 +++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index a9b2912ee..88dc120cf 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -77,7 +77,7 @@ Please note that you only need to create them once.
 WEB_GATEWAY_URL=web-gateway.bucketeer.io \
 WEB_GATEWAY_CERT_PATH=/workspaces/bucketeer/tools/dev/cert/tls.crt \
 SERVICE_TOKEN_PATH=/workspaces/bucketeer/tools/dev/cert/service-token \
-API_KEY_NAME="e2e-test-$$(date +%s)-client" \
+API_KEY_NAME="e2e-test-$(date +%s)-client" \
 API_KEY_PATH=/workspaces/bucketeer/tools/dev/cert/api_key_client \
 API_KEY_ROLE=SDK_CLIENT \
 ENVIRONMENT_NAMESPACE=e2e \
@@ -88,7 +88,7 @@ make create-api-key
 WEB_GATEWAY_URL=web-gateway.bucketeer.io \
 WEB_GATEWAY_CERT_PATH=/workspaces/bucketeer/tools/dev/cert/tls.crt \
 SERVICE_TOKEN_PATH=/workspaces/bucketeer/tools/dev/cert/service-token \
-API_KEY_NAME="e2e-test-$$(date +%s)-server" \
+API_KEY_NAME="e2e-test-$(date +%s)-server" \
 API_KEY_PATH=/workspaces/bucketeer/tools/dev/cert/api_key_server \
 API_KEY_ROLE=SDK_SERVER \
 ENVIRONMENT_NAMESPACE=e2e \
diff --git a/Makefile b/Makefile
index d8f07af31..d0ebadb12 100644
--- a/Makefile
+++ b/Makefile
@@ -199,12 +199,13 @@ build-migration-chart:
 
 .PHONY: delete-e2e-data-mysql
 delete-e2e-data-mysql:
-	go run ./hack/delete-e2e-data-mysql delete \
+	make -C hack/delete-e2e-data-mysql clean build
+	./hack/delete-e2e-data-mysql/delete-e2e-data-mysql delete \
 		--mysql-user=${MYSQL_USER} \
 		--mysql-pass=${MYSQL_PASS} \
-		--mysql-host=mysql-${ENV}.bucketeer.private \
-		--mysql-port=3306 \
-		--mysql-db-name=master \
+		--mysql-host=${MYSQL_HOST} \
+		--mysql-port=${MYSQL_PORT} \
+		--mysql-db-name=${MYSQL_DB_NAME} \
 		--test-id=${TEST_ID} \
 		--no-profile \
 		--no-gcp-trace-enabled
@@ -262,6 +263,12 @@ e2e:
 		-service-token=${SERVICE_TOKEN_PATH} \
 		-environment-namespace=${ENVIRONMENT_NAMESPACE} \
 		-test-id=${TEST_ID}
+	MYSQL_USER=bucketeer \
+	MYSQL_PASS=bucketeer \
+	MYSQL_HOST=$$(minikube ip) \
+	MYSQL_PORT=32000 \
+	MYSQL_DB_NAME=bucketeer \
+	make -C ./ delete-e2e-data-mysql
 
 .PHONY: update-copyright
 update-copyright:
diff --git a/manifests/localenv/values.yaml b/manifests/localenv/values.yaml
index 84ff275a8..7fd2b03a1 100644
--- a/manifests/localenv/values.yaml
+++ b/manifests/localenv/values.yaml
@@ -31,6 +31,11 @@ mysql:
     database: "bucketeer"
     username: "bucketeer"
     password: "bucketeer"
+  primary:
+   service:
+     type: NodePort
+     nodePorts:
+       mysql: 32000
 
 bq:
   project: bucketeer-test