Always emit catalog field for serverless compute

lennartkats-db · lennartkats-db · commit 0088b28dc565 · 2025-11-02T01:25:39.000-07:00
diff --git a/acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff b/acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff
@@ -12,9 +12,10 @@
 @@ -5,8 +5,7 @@
      my_default_python_etl:
        name: my_default_python_etl
--      ## Serverless compute requires Unity Catalog
+-      # Serverless compute requires Unity Catalog
+-      catalog: ${var.catalog}
 +      ## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog:
-       # catalog: ${var.catalog}
++      # catalog: ${var.catalog}
        schema: ${var.schema}
 -      serverless: true
        root_path: "../src/my_default_python_etl"
diff --git a/acceptance/bundle/templates/default-python/serverless-customcatalog/output.txt b/acceptance/bundle/templates/default-python/serverless-customcatalog/output.txt
@@ -31,14 +31,12 @@ To get started, refer to the project README.md file and the documentation at htt
      permissions:
 --- [TESTROOT]/bundle/templates/default-python/serverless-customcatalog/../serverless/output/my_default_python/resources/my_default_python_etl.pipeline.yml
 +++ output/my_default_python/resources/my_default_python_etl.pipeline.yml
-@@ -5,6 +5,5 @@
+@@ -5,5 +5,4 @@
      my_default_python_etl:
        name: my_default_python_etl
--      ## Serverless compute requires Unity Catalog
--      # catalog: ${var.catalog}
-+      catalog: ${var.catalog}
+-      # Serverless compute requires Unity Catalog
+       catalog: ${var.catalog}
        schema: ${var.schema}
-       serverless: true
 --- [TESTROOT]/bundle/templates/default-python/serverless-customcatalog/../serverless/output/my_default_python/src/my_default_python_etl/explorations/sample_exploration.ipynb
 +++ output/my_default_python/src/my_default_python_etl/explorations/sample_exploration.ipynb
 @@ -38,5 +38,5 @@
diff --git a/acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python_etl.pipeline.yml b/acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python_etl.pipeline.yml
@@ -4,8 +4,8 @@ resources:
   pipelines:
     my_default_python_etl:
       name: my_default_python_etl
-      ## Serverless compute requires Unity Catalog
-      # catalog: ${var.catalog}
+      # Serverless compute requires Unity Catalog
+      catalog: ${var.catalog}
       schema: ${var.schema}
       serverless: true
       root_path: "../src/my_default_python_etl"
diff --git a/libs/template/templates/default/template/{{.project_name}}/resources/{{.project_name}}_etl.pipeline.yml.tmpl b/libs/template/templates/default/template/{{.project_name}}/resources/{{.project_name}}_etl.pipeline.yml.tmpl
@@ -10,9 +10,9 @@ resources:
            */}}
       name: {{.project_name}}_etl
 {{- if or (eq .default_catalog "") (eq .default_catalog "hive_metastore")}}
-  {{- if $serverless }}
-      ## Serverless compute requires Unity Catalog
-      # catalog: ${var.catalog}
+  {{- if $serverless}}
+      # Serverless compute requires Unity Catalog
+      catalog: ${var.catalog}
   {{- else}}
       ## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog:
       # catalog: ${var.catalog}
@@ -21,7 +21,7 @@ resources:
       catalog: ${var.catalog}
 {{- end}}
       schema: ${var.schema}
-{{- if $serverless }}
+{{- if $serverless}}
       serverless: true
 {{- end}}
       root_path: "../src/{{.project_name}}_etl"
diff --git a/libs/template/templates/default/template/{{.project_name}}/resources/{{.project_name}}_etl_pipeline.py.tmpl b/libs/template/templates/default/template/{{.project_name}}/resources/{{.project_name}}_etl_pipeline.py.tmpl
@@ -11,9 +11,9 @@ The main pipeline for {{.project_name}}
 {{- /* Note that pipeline names must be unique in a worskspace, so we use the project name as part as the name. */}}
         "name": "{{.project_name}}_etl",
 {{- if or (eq .default_catalog "") (eq .default_catalog "hive_metastore")}}
-  {{- if $serverless }}
-        ## Serverless compute requires Unity Catalog
-        # "catalog": "${var.catalog}",
+  {{- if $serverless}}
+        # Serverless compute requires Unity Catalog
+        "catalog": "${var.catalog}",
   {{- else}}
         ## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog:
         # "catalog": "${var.catalog}",
@@ -22,7 +22,7 @@ The main pipeline for {{.project_name}}
         "catalog": "${var.catalog}",
 {{- end}}
         "schema": "${var.schema}",
-{{- if $serverless }}
+{{- if $serverless}}
         "serverless": True,
 {{- end}}
         "root_path": "src/{{.project_name}}_etl",
