feat: support for site's restore and resinstall operations for manage…

…d database service
frappe · May 28, 2024 · 2ecbe00 · 2ecbe00
1 parent 1a1111c
commit 2ecbe00
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/press/agent.py b/press/agent.py
@@ -117,11 +117,20 @@ def new_site(self, site):
 
 	def reinstall_site(self, site):
 		database_server = frappe.db.get_value("Bench", site.bench, "database_server")
-		data = {
-			"mariadb_root_password": get_decrypted_password(
+
+		mariadb_root_password = (
+			site.get_password("db_password")
+			if site.managed_database
+			else get_decrypted_password(
 				"Database Server", database_server, "mariadb_root_password"
-			),
+			)
+		)
+
+		data = {
+			"mariadb_root_user": site.db_user,
+			"mariadb_root_password": mariadb_root_password,
 			"admin_password": site.get_password("admin_password"),
+			"managed_database": site.managed_database,
 		}
 
 		return self.create_agent_job(
@@ -141,16 +150,23 @@ def restore_site(self, site: "Site", skip_failing_patches=False):
 			public_link = frappe.get_doc("Remote File", site.remote_public_file).download_link
 		if site.remote_private_file:
 			private_link = frappe.get_doc("Remote File", site.remote_private_file).download_link
+
+		if site.managed_database:
+			mariadb_root_password = site.get_password("db_password")
+		else:
+			mariadb_root_password = get_decrypted_password(
+				"Database Server", database_server, "mariadb_root_password"
+			)
 		data = {
 			"apps": apps,
-			"mariadb_root_password": get_decrypted_password(
-				"Database Server", database_server, "mariadb_root_password"
-			),
+			"mariadb_root_password": mariadb_root_password,
 			"admin_password": site.get_password("admin_password"),
 			"database": frappe.get_doc("Remote File", site.remote_database_file).download_link,
 			"public": public_link,
 			"private": private_link,
 			"skip_failing_patches": skip_failing_patches,
+			"managed_database": site.managed_database,
+			"mariadb_root_user": site.db_user,
 		}
 
 		return self.create_agent_job(

diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py
@@ -426,7 +426,7 @@ def update_config_preview(self):
 		self.config = json.dumps(new_config, indent=4)
 
 	def _get_managed_db_config(self):
-		if self.db_host and self.db_user and self.db_password:
+		if self.managed_database:
 			return {
 				"managed_database": self.managed_database,
 				"db_host": self.db_host,