Skip to content

Clarify cloud database variable names #3004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamtheturtle merged 1 commit into from
Feb 22, 2026
Merged

Clarify cloud database variable names #3004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 39 additions & 33 deletions admin/create_secrets_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
)


def _create_and_get_database_details(
def _create_and_get_cloud_database_details(
driver: "WebDriver",
email_address: str,
password: str,
license_name: str,
database_name: str,
cloud_license_name: str,
cloud_database_name: str,
) -> "DatabaseDict":
"""Create a cloud database and get its details.

Expand All @@ -40,17 +40,19 @@ def _create_and_get_database_details(
password=password,
)
vws_web_tools.wait_for_logged_in(driver=driver)
vws_web_tools.create_license(driver=driver, license_name=license_name)
vws_web_tools.create_license(
driver=driver, license_name=cloud_license_name
)

vws_web_tools.create_cloud_database(
driver=driver,
database_name=database_name,
license_name=license_name,
database_name=cloud_database_name,
license_name=cloud_license_name,
)

return vws_web_tools.get_database_details(
driver=driver,
database_name=database_name,
database_name=cloud_database_name,
)


Expand All @@ -74,19 +76,19 @@ def _create_and_get_vumark_details(


def _generate_secrets_file_content(
database_details: "DatabaseDict",
cloud_database_details: "DatabaseDict",
vumark_details: "VuMarkDatabaseDict",
inactive_database_details: "DatabaseDict",
vumark_target_id: str,
) -> str:
"""Generate the content of a secrets file."""
return textwrap.dedent(
text=f"""\
VUFORIA_TARGET_MANAGER_DATABASE_NAME={database_details["database_name"]}
VUFORIA_SERVER_ACCESS_KEY={database_details["server_access_key"]}
VUFORIA_SERVER_SECRET_KEY={database_details["server_secret_key"]}
VUFORIA_CLIENT_ACCESS_KEY={database_details["client_access_key"]}
VUFORIA_CLIENT_SECRET_KEY={database_details["client_secret_key"]}
VUFORIA_TARGET_MANAGER_DATABASE_NAME={cloud_database_details["database_name"]}
VUFORIA_SERVER_ACCESS_KEY={cloud_database_details["server_access_key"]}
VUFORIA_SERVER_SECRET_KEY={cloud_database_details["server_secret_key"]}
VUFORIA_CLIENT_ACCESS_KEY={cloud_database_details["client_access_key"]}
VUFORIA_CLIENT_SECRET_KEY={cloud_database_details["client_secret_key"]}

INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME={inactive_database_details["database_name"]}
INACTIVE_VUFORIA_SERVER_ACCESS_KEY={inactive_database_details["server_access_key"]}
Expand Down Expand Up @@ -126,8 +128,8 @@ def _create_and_get_inactive_database_details(
driver: "WebDriver",
email_address: str,
password: str,
license_name: str,
database_name: str,
cloud_license_name: str,
cloud_database_name: str,
) -> "DatabaseDict":
"""Create a cloud database, get its details, then delete the license to
make it inactive.
Expand All @@ -138,18 +140,22 @@ def _create_and_get_inactive_database_details(
password=password,
)
vws_web_tools.wait_for_logged_in(driver=driver)
vws_web_tools.create_license(driver=driver, license_name=license_name)
vws_web_tools.create_license(
driver=driver, license_name=cloud_license_name
)
vws_web_tools.create_cloud_database(
driver=driver,
database_name=database_name,
license_name=license_name,
database_name=cloud_database_name,
license_name=cloud_license_name,
)
database_details = vws_web_tools.get_database_details(
cloud_database_details = vws_web_tools.get_database_details(
driver=driver,
database_name=database_name,
database_name=cloud_database_name,
)
vws_web_tools.delete_license(
driver=driver, license_name=cloud_license_name
)
vws_web_tools.delete_license(driver=driver, license_name=license_name)
return database_details
return cloud_database_details


def _create_vuforia_resource_names() -> tuple[str, str, str, str]:
Expand All @@ -158,8 +164,8 @@ def _create_vuforia_resource_names() -> tuple[str, str, str, str]:
format="%Y-%m-%d-%H-%M-%S",
)
return (
f"my-license-{time}",
f"my-database-{time}",
f"my-cloud-license-{time}",
f"my-cloud-database-{time}",
f"my-vumark-database-{time}",
f"my-vumark-template-{time}",
)
Expand All @@ -180,8 +186,8 @@ def main() -> None:
driver=inactive_driver,
email_address=email_address,
password=password,
license_name=f"my-inactive-license-{time}",
database_name=f"my-inactive-database-{time}",
cloud_license_name=f"my-inactive-cloud-license-{time}",
cloud_database_name=f"my-inactive-cloud-database-{time}",
)
inactive_driver.quit()

Expand All @@ -199,20 +205,20 @@ def main() -> None:
file = files_to_create[-1]
sys.stdout.write(f"Creating database {file.name}\n")
(
license_name,
database_name,
cloud_license_name,
cloud_database_name,
vumark_database_name,
vumark_template_name,
) = _create_vuforia_resource_names()

try:
sys.stdout.write("Creating database details\n")
database_details = _create_and_get_database_details(
sys.stdout.write("Creating cloud database details\n")
cloud_database_details = _create_and_get_cloud_database_details(
driver=driver,
email_address=email_address,
password=password,
license_name=license_name,
database_name=database_name,
cloud_license_name=cloud_license_name,
cloud_database_name=cloud_database_name,
)
sys.stdout.write("Creating VuMark database details\n")
vumark_details = _create_and_get_vumark_details(
Expand All @@ -235,7 +241,7 @@ def main() -> None:
driver = None

file_contents = _generate_secrets_file_content(
database_details=database_details,
cloud_database_details=cloud_database_details,
vumark_details=vumark_details,
inactive_database_details=inactive_database_details,
vumark_target_id=vumark_target_id,
Expand Down