Fix e2e hyperdrive cleanup + logging (#8941)

* fix e2e cleanup

* Apply suggestions from code review

Co-authored-by: Carmen Popoviciu <[email protected]>

---------

Co-authored-by: Edmund Hung <[email protected]>
Co-authored-by: Carmen Popoviciu <[email protected]>

Author: 3 people

tools/e2e/common.ts

@@ -94,7 +94,7 @@ const apiFetch = async (
 		return json.result;
 	} catch (e) {
 		if (failSilently) {
-			return;
+			return false;
 		}
 		if (e instanceof ApiError) {
 			console.error(e.url, e.init);
@@ -134,7 +134,7 @@ export const listTmpE2EProjects = async () => {
 };
 
 export const deleteProject = async (project: string) => {
-	await apiFetch(
+	return await apiFetch(
 		`/pages/projects/${project}`,
 		{
 			method: "DELETE",
@@ -156,7 +156,7 @@ export const listTmpE2EWorkers = async () => {
 };
 
 export const deleteWorker = async (id: string) => {
-	await apiFetch(
+	return await apiFetch(
 		`/workers/scripts/${id}`,
 		{
 			method: "DELETE",
@@ -193,7 +193,7 @@ export const listTmpKVNamespaces = async () => {
 };
 
 export const deleteKVNamespace = async (id: string) => {
-	await apiFetch(
+	return await apiFetch(
 		`/storage/kv/namespaces/${id}`,
 		{
 			method: "DELETE",
@@ -231,7 +231,7 @@ export const listTmpDatabases = async () => {
 };
 
 export const deleteDatabase = async (id: string) => {
-	await apiFetch(
+	return await apiFetch(
 		`/d1/database/${id}`,
 		{
 			method: "DELETE",
@@ -269,7 +269,7 @@ export const listHyperdriveConfigs = async () => {
 };
 
 export const deleteHyperdriveConfig = async (id: string) => {
-	await apiFetch(
+	return await apiFetch(
 		`/hyperdrive/configs/${id}`,
 		{
 			method: "DELETE",

tools/e2e/e2eCleanup.ts

@@ -1,6 +1,7 @@
 import {
 	deleteCertificate,
 	deleteDatabase,
+	deleteHyperdriveConfig,
 	deleteKVNamespace,
 	deleteProject,
 	deleteWorker,
@@ -34,67 +35,62 @@ async function run() {
 	const kvNamespacesToDelete = await listTmpKVNamespaces();
 	for (const kvNamespace of kvNamespacesToDelete) {
 		console.log("Deleting KV namespace: " + kvNamespace.title);
-		await deleteKVNamespace(kvNamespace.id);
+		(await deleteKVNamespace(kvNamespace.id))
+			? console.log(`Successfully deleted KV namespace ${kvNamespace.id}`)
+			: console.log(`Failed to delete KV namespace ${kvNamespace.id}`);
 	}
 
 	if (kvNamespacesToDelete.length === 0) {
 		console.log(`No KV namespaces to delete.`);
-	} else {
-		console.log(
-			`Successfully deleted ${kvNamespacesToDelete.length} KV namespaces`
-		);
 	}
 
 	const projectsToDelete = await listTmpE2EProjects();
 
 	for (const project of projectsToDelete) {
 		console.log("Deleting Pages project: " + project.name);
-		await deleteProject(project.name);
+		(await deleteProject(project.name))
+			? console.log(`Successfully deleted project ${project.name}`)
+			: console.log(`Failed to delete project ${project.name}`);
 	}
 
 	if (projectsToDelete.length === 0) {
 		console.log(`No projects to delete.`);
-	} else {
-		console.log(`Successfully deleted ${projectsToDelete.length} projects`);
 	}
 
 	const workersToDelete = await listTmpE2EWorkers();
 
 	for (const worker of workersToDelete) {
 		console.log("Deleting worker: " + worker.id);
-		await deleteWorker(worker.id);
+		(await deleteWorker(worker.id))
+			? console.log(`Successfully deleted Worker ${worker.id}`)
+			: console.log(`Failed to delete Worker ${worker.id}`);
 	}
 
 	if (workersToDelete.length === 0) {
 		console.log(`No workers to delete.`);
-	} else {
-		console.log(`Successfully deleted ${workersToDelete.length} workers`);
 	}
 
 	const d1DatabasesToDelete = await listTmpDatabases();
 	for (const db of d1DatabasesToDelete) {
 		console.log("Deleting D1 database: " + db.name);
-		await deleteDatabase(db.uuid);
+		(await deleteDatabase(db.uuid))
+			? console.log(`Successfully deleted D1 database ${db.uuid}`)
+			: console.log(`Failed to delete D1 database ${db.uuid}`);
 	}
 	if (d1DatabasesToDelete.length === 0) {
 		console.log(`No D1 databases to delete.`);
-	} else {
-		console.log(
-			`Successfully deleted ${d1DatabasesToDelete.length} D1 databases`
-		);
 	}
 
 	const hyperdriveConfigsToDelete = await listHyperdriveConfigs();
 	for (const config of hyperdriveConfigsToDelete) {
 		console.log("Deleting Hyperdrive configs: " + config.id);
-		await deleteDatabase(config.id);
+
+		(await deleteHyperdriveConfig(config.id))
+			? console.log(`Successfully deleted Hyperdrive config ${config.id}`)
+			: console.log(`Failed to delete Hyperdrive config ${config.id}`);
 	}
 	if (hyperdriveConfigsToDelete.length === 0) {
 		console.log(`No Hyperdrive configs to delete.`);
-	} else {
-		console.log(
-			`Successfully deleted ${hyperdriveConfigsToDelete.length} hyperdrive configs`
-		);
 	}
 
 	const mtlsCertificates = await listCertificates();