Move file read logic into function

Author: dsubak

src/ol_infrastructure/applications/jupyterhub/__main__.py

@@ -1,7 +1,5 @@
 """JupyterHub application deployment for MIT Open Learning."""
 
-from pathlib import Path
-
 from pulumi import Config, StackReference
 from pulumi_aws import ec2
 
@@ -157,8 +155,9 @@
 )
 jupyterhub_db = OLAmazonDB(jupyterhub_db_config)
 
+# Use same physical DB instance
 jupyterhub_authoring_db_config = OLPostgresDBConfig(
-    instance_name=f"jupyterhub-db-{stack_info.env_suffix}",  # Use same physical DB instance
+    instance_name=f"jupyterhub-db-{stack_info.env_suffix}",
     password=rds_password,
     subnet_group_name=target_vpc["rds_subnet"],
     security_groups=[jupyterhub_db_security_group],
@@ -183,24 +182,6 @@
     cluster_stack.require_output("namespaces").apply(
         lambda ns, namespace=namespace: check_cluster_namespace(namespace, ns)
     )
-    # Need to decide if this is the best way to handle
-    # these overrides/revisit values merged into helm charts
-    # Can pull into function and remove params
-    menu_override = (
-        Path(__file__)
-        .parent.joinpath(deployment_config["menu_override_file"])
-        .read_text()
-    )
-    disabled_extensions = (
-        Path(__file__)
-        .parent.joinpath(deployment_config["disabled_extension_file"])
-        .read_text()
-    )
-    dynamic_image_config = (
-        Path(__file__)
-        .parent.joinpath(deployment_config["extra_config_file"])
-        .read_text()
-    )
     jupyterhub_deployment = provision_jupyterhub_deployment(
         stack_info=stack_info,
         jupyterhub_deployment_config=deployment_config,
@@ -211,7 +192,4 @@
         application_labels=application_labels,
         k8s_global_labels=k8s_global_labels,
         extra_images=EXTRA_IMAGES,
-        menu_override_json=menu_override,
-        disabled_extensions_json=disabled_extensions,
-        extra_config=dynamic_image_config,
     )

src/ol_infrastructure/applications/jupyterhub/deployment.py

@@ -49,16 +49,30 @@ def provision_jupyterhub_deployment(  # noqa: PLR0913
     application_labels: dict[str, str],
     k8s_global_labels: dict[str, str],
     extra_images: dict[str, dict[str, str]] | None = None,
-    menu_override_json: str | None = None,
-    disabled_extensions_json: str | None = None,
-    extra_config: str | None = None,
 ) -> kubernetes.helm.v3.Release:
     base_name = jupyterhub_deployment_config["name"]
     domain_name = jupyterhub_deployment_config["domain"]
     namespace = jupyterhub_deployment_config["namespace"]
     env_name = f"{stack_info.env_suffix}"
     db_name_normalized = base_name.replace("-", "_")
 
+    # Read configuration files from paths in deployment config
+    menu_override_json = (
+        Path(__file__)
+        .parent.joinpath(jupyterhub_deployment_config["menu_override_file"])
+        .read_text()
+    )
+    disabled_extensions_json = (
+        Path(__file__)
+        .parent.joinpath(jupyterhub_deployment_config["disabled_extension_file"])
+        .read_text()
+    )
+    extra_config = (
+        Path(__file__)
+        .parent.joinpath(jupyterhub_deployment_config["extra_config_file"])
+        .read_text()
+    )
+
     # Derive common configuration values
     apisix_ingress_class = (
         jupyterhub_deployment_config.get("apisix_ingress_class") or "apisix"