clear up config

Author: bpmct

registry/coder/modules/jupyterlab/README.md

@@ -1,4 +1,4 @@
----
+o---
 display_name: JupyterLab
 description: A module that adds JupyterLab in your Coder template.
 icon: ../../../../.icons/jupyter.svg
@@ -23,15 +23,8 @@ module "jupyterlab" {
 
 ## Configuration
 
-You can customize JupyterLab server settings by providing a JSON configuration:
-
-The `config` parameter accepts a map of configuration settings that will be written to `~/.jupyter/jupyter_server_config.json` before JupyterLab starts. This allows you to configure any JupyterLab server settings according to the [JupyterLab configuration documentation](https://jupyter-server.readthedocs.io/en/latest/users/configuration.html).
-
-### Frame Embedding Configuration
-
-To allow JupyterLab to be embedded in Coder's iframe:
+JupyterLab is automatically configured to work with Coder's iframe embedding. For advanced configuration, you can use the `config` parameter to provide additional JupyterLab server settings according to the [JupyterLab configuration documentation](https://jupyter-server.readthedocs.io/en/latest/users/configuration.html).
 
-**Set Content-Security-Policy for iframe embedding in Coder:**
 ```tf
 module "jupyterlab" {
   count    = data.coder_workspace.me.start_count
@@ -40,11 +33,14 @@ module "jupyterlab" {
   agent_id = coder_agent.example.id
   config = {
     ServerApp = {
+      # Required for Coder Tasks iFrame embedding - do not remove
       tornado_settings = {
         headers = {
           "Content-Security-Policy" = "frame-ancestors 'self' ${data.coder_workspace.me.access_url}"
         }
       }
+      # Your additional configuration here
+      root_dir = "/workspace/notebooks"
     }
   }
 }

registry/coder/modules/jupyterlab/main.tf

@@ -13,8 +13,21 @@ data "coder_workspace" "me" {}
 data "coder_workspace_owner" "me" {}
 
 locals {
-  config_json = jsonencode(var.config)
-  config_b64 = length(var.config) > 0 ? base64encode(local.config_json) : ""
+  # Fallback config with CSP for Coder iframe embedding when user config is empty
+  csp_fallback_config = {
+    ServerApp = {
+      tornado_settings = {
+        headers = {
+          "Content-Security-Policy" = "frame-ancestors 'self' ${data.coder_workspace.me.access_url}"
+        }
+      }
+    }
+  }
+  
+  # Use user config if provided, otherwise fallback to CSP config
+  config_to_use = length(var.config) == 0 ? local.csp_fallback_config : var.config
+  config_json = jsonencode(local.config_to_use)
+  config_b64 = base64encode(local.config_json)
 }
 
 # Add required variables for your modules and remove any unneeded variables
@@ -69,7 +82,6 @@ variable "config" {
 }
 
 resource "coder_script" "jupyterlab_config" {
-  count              = length(var.config) > 0 ? 1 : 0
   agent_id           = var.agent_id
   display_name       = "JupyterLab Config"
   icon               = "/icon/jupyter.svg"