Merge pull request #75 from databricks-industry-solutions/feat/deployment_update

Feat/deployment update

Author: eliswanson-db

.gitignore

@@ -145,6 +145,7 @@ dist/
 *.tmp
 
 # Deployment temporary files
+databricks.yml
 databricks_final.yml
 databricks_final.yml.tmp
 #app/deploying_user.yml #cannot be ignored because asset bundles obey gitignore

databricks.yml

@@ -6,7 +6,7 @@ include:
   - resources/jobs/metagen.job.yml
   - resources/jobs/sync_reviews.job.yml
   # Uncomment the line below to deploy integration tests:
-  #- resources/jobs/integration_tests.job.yml
+  # - resources/jobs/integration_tests.job.yml
   - resources/apps/*.yml
   - benchmarks/resources/jobs/benchmarks/*.yml
   - variables.yml
@@ -24,15 +24,15 @@ targets:
     mode: development
     default: true
     workspace:
-      host: <host url here>
+      host: https://e2-demo-field-eng.cloud.databricks.com
     permissions:
       - user_name: ${var.deploying_user}
         level: CAN_MANAGE
 
   prod:
     mode: production
     workspace:
-      host: <host url here>
+      host: https://e2-demo-field-eng.cloud.databricks.com
       root_path: ${var.current_working_directory}
     permissions:
       - user_name: ${var.current_user}

databricks.yml.template

@@ -0,0 +1,42 @@
+bundle:
+  name: dbxmetagen
+  databricks_cli_version: ">=0.234.*"
+
+include:
+  - resources/jobs/metagen.job.yml
+  - resources/jobs/sync_reviews.job.yml
+  # Uncomment the line below to deploy integration tests:
+  # - resources/jobs/integration_tests.job.yml
+  - resources/apps/*.yml
+  - benchmarks/resources/jobs/benchmarks/*.yml
+  - variables.yml
+  - variables.advanced.yml
+  - resources/app_variables.yml
+
+artifacts:
+  default:
+    type: whl
+    build: poetry build
+    path: .
+
+targets:
+  dev:
+    mode: development
+    default: true
+    workspace:
+      host: __DATABRICKS_HOST__
+    permissions:
+      - user_name: ${var.deploying_user}
+        level: CAN_MANAGE
+
+  prod:
+    mode: production
+    workspace:
+      host: __DATABRICKS_HOST__
+      root_path: ${var.current_working_directory}
+    permissions:
+      - user_name: ${var.current_user}
+        level: CAN_MANAGE
+    run_as:
+      user_name: ${var.current_user}
+

deploy.sh

@@ -346,8 +346,8 @@ if ! command -v databricks &> /dev/null; then
     exit 1
 fi
 
-if [ ! -f "databricks.yml" ]; then
-    echo "Error: databricks.yml not found. Run from the dbxmetagen directory."
+if [ ! -f "databricks.yml.template" ]; then
+    echo "Error: databricks.yml.template not found. Run from the dbxmetagen directory."
     exit 1
 fi
 
@@ -385,6 +385,15 @@ fi
 HOST_URL=$DATABRICKS_HOST
 TARGET=$TARGET
 
+# Generate databricks.yml from template
+echo "Generating databricks.yml from template..."
+if [ ! -f "databricks.yml.template" ]; then
+    echo "Error: databricks.yml.template not found"
+    exit 1
+fi
+sed "s|__DATABRICKS_HOST__|${DATABRICKS_HOST}|g" databricks.yml.template > databricks.yml
+echo "Generated databricks.yml with host: ${DATABRICKS_HOST}"
+
 if [ -f "variables.bkp" ]; then
     echo "Restoring variables.yml from backup..."
     mv variables.bkp variables.yml