Merge remote-tracking branch 'origin/master' into nightly

overhangio · Aug 19, 2023 · 633933e · 633933e
2 parents 6a69e30 + 80e8538
commit 633933e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/20230819_081659_regis.md b/changelog.d/20230819_081659_regis.md
@@ -0,0 +1 @@
+- [Bugfix] Fix superset database name in user creation with `do cairn-createuser`. (by @regisb)
diff --git a/tutorcairn/templates/cairn/build/cairn-superset/cairn/ctl.py b/tutorcairn/templates/cairn/build/cairn-superset/cairn/ctl.py
@@ -77,7 +77,7 @@ def main():
         "--database",
         help=(
             "Name of the Superset database to which the objects should be linked."
-            " By default, this will be the same as the username."
+            " By default, this will be the 'openedx-<username>'."
         ),
     )
     parser_dashboards.add_argument("username")
@@ -92,7 +92,7 @@ def main():
 # but the "create-user" command fails if the user already exists.
 def bootstrap_user(args):
     # Bootstrap database
-    database_name = args.db or args.username
+    database_name = args.db or f"openedx-{args.username}"
     cairn_bootstrap.create_superset_db(args.username, database_name)
 
     # Get or create user
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Bugfix] Fix superset database name in user creation with `do cairn-createuser`. (by @regisb)