bundle: add genie_space resource for direct deploy

acceptance/bundle/generate/genie_space/databricks.yml

@@ -0,0 +1,2 @@
+bundle:
+  name: genie-space-generate

acceptance/bundle/generate/genie_space/genie_space.json.tmpl

@@ -0,0 +1,7 @@
+{
+    "title": "test genie space",
+    "description": "test description",
+    "parent_path": "/Workspace/test-$UNIQUE_NAME",
+    "warehouse_id": "test-warehouse-id",
+    "serialized_space": "{\"tables\":[],\"questions\":[]}"
+}

acceptance/bundle/generate/genie_space/out/genie_space/test_genie_space.geniespace.json

@@ -0,0 +1,4 @@
+{
+  "questions": [],
+  "tables": []
+}

acceptance/bundle/generate/genie_space/out/resource/test_genie_space.genie_space.yml

@@ -0,0 +1,8 @@
+resources:
+  genie_spaces:
+    test_genie_space:
+      title: "test genie space"
+      warehouse_id: test-warehouse-id
+      file_path: ../genie_space/test_genie_space.geniespace.json
+      description: test description
+      parent_path: /Workspace/test-[UNIQUE_NAME]

acceptance/bundle/generate/genie_space/output.txt

@@ -0,0 +1,6 @@
+
+>>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
+
+>>> [CLI] bundle generate genie-space --existing-id [GENIE_SPACE_ID] --genie-space-dir out/genie_space --resource-dir out/resource
+Writing genie space to out/genie_space/test_genie_space.geniespace.json
+Writing configuration to out/resource/test_genie_space.genie_space.yml

acceptance/bundle/generate/genie_space/script

@@ -0,0 +1,8 @@
+trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
+
+# create a genie space to import
+envsubst < genie_space.json.tmpl > genie_space.json
+genie_space_id=$($CLI genie create-space --json @genie_space.json | jq -r '.space_id')
+rm genie_space.json
+
+trace $CLI bundle generate genie-space --existing-id $genie_space_id --genie-space-dir out/genie_space --resource-dir out/resource

acceptance/bundle/generate/genie_space/test.toml

@@ -0,0 +1,10 @@
+[[Repls]]
+Old = '\\\\'
+New = '/'
+
+[[Repls]]
+Old = "[0-9a-f]{32}"
+New = "[GENIE_SPACE_ID]"
+
+[Env]
+MSYS_NO_PATHCONV = "1"

acceptance/bundle/help/bundle-generate/output.txt

@@ -30,6 +30,7 @@ Available Commands:
   alert       Generate configuration for an alert
   app         Generate bundle configuration for a Databricks app
   dashboard   Generate configuration for a dashboard
+  genie-space Generate configuration for a Genie space
   job         Generate bundle configuration for a job
   pipeline    Generate bundle configuration for a pipeline
 

acceptance/bundle/refschema/out.fields.txt

@@ -729,6 +729,24 @@ resources.external_locations.*.grants[*]	catalog.PrivilegeAssignment	ALL
 resources.external_locations.*.grants[*].principal	string	ALL
 resources.external_locations.*.grants[*].privileges	[]catalog.Privilege	ALL
 resources.external_locations.*.grants[*].privileges[*]	catalog.Privilege	ALL
+resources.genie_spaces.*.description	string	ALL
+resources.genie_spaces.*.file_path	string	INPUT
+resources.genie_spaces.*.id	string	INPUT
+resources.genie_spaces.*.lifecycle	resources.Lifecycle	INPUT
+resources.genie_spaces.*.lifecycle.prevent_destroy	bool	INPUT
+resources.genie_spaces.*.modified_status	string	INPUT
+resources.genie_spaces.*.parent_path	string	ALL
+resources.genie_spaces.*.serialized_space	any	ALL
+resources.genie_spaces.*.space_id	string	ALL
+resources.genie_spaces.*.title	string	ALL
+resources.genie_spaces.*.url	string	INPUT
+resources.genie_spaces.*.warehouse_id	string	ALL
+resources.genie_spaces.*.permissions.object_id	string	ALL
+resources.genie_spaces.*.permissions[*]	dresources.StatePermission	ALL
+resources.genie_spaces.*.permissions[*].group_name	string	ALL
+resources.genie_spaces.*.permissions[*].level	iam.PermissionLevel	ALL
+resources.genie_spaces.*.permissions[*].service_principal_name	string	ALL
+resources.genie_spaces.*.permissions[*].user_name	string	ALL
 resources.jobs.*.budget_policy_id	string	ALL
 resources.jobs.*.continuous	*jobs.Continuous	ALL
 resources.jobs.*.continuous.pause_status	jobs.PauseStatus	ALL

acceptance/bundle/resources/genie_spaces/inline/databricks.yml.tmpl

@@ -0,0 +1,22 @@
+bundle:
+  name: deploy-genie-space-inline-$UNIQUE_NAME
+
+resources:
+  genie_spaces:
+    sales_analytics:
+      title: "Sales Analytics Inline Genie"
+      description: "Inline serialized_space test"
+      warehouse_id: "test-warehouse-id"
+      parent_path: /Users/$CURRENT_USER_NAME
+      serialized_space:
+        version: 1
+        config:
+          sample_questions:
+            - id: "sq-001"
+              question: ["What is the total revenue?"]
+        data_sources:
+          tables:
+            - identifier: "main.sales.orders"
+              column_configs:
+                - column_name: "amount"
+                  get_example_values: true

acceptance/bundle/resources/genie_spaces/inline/out.plan.json

@@ -0,0 +1,33 @@
+{
+  "plan_version": 2,
+  "cli_version": "[DEV_VERSION]",
+  "lineage": "[UUID]",
+  "serial": 1,
+  "plan": {
+    "resources.genie_spaces.sales_analytics": {
+      "action": "skip",
+      "remote_state": {
+        "description": "Inline serialized_space test",
+        "etag": "1",
+        "serialized_space": "{\"config\":{\"sample_questions\":[{\"id\":\"sq-001\",\"question\":[\"What is the total revenue?\"]}]},\"data_sources\":{\"tables\":[{\"column_configs\":[{\"column_name\":\"amount\",\"get_example_values\":true}],\"identifier\":\"main.sales.orders\"}]},\"version\":1}",
+        "space_id": "[GENIE_SPACE_ID]",
+        "title": "Sales Analytics Inline Genie",
+        "warehouse_id": "test-warehouse-id"
+      },
+      "changes": {
+        "etag": {
+          "action": "skip",
+          "reason": "custom",
+          "old": "1",
+          "remote": "1"
+        },
+        "parent_path": {
+          "action": "skip",
+          "reason": "input_only",
+          "old": "/Workspace/Users/[USERNAME]",
+          "new": "/Workspace/Users/[USERNAME]"
+        }
+      }
+    }
+  }
+}

acceptance/bundle/resources/genie_spaces/inline/output.txt

@@ -0,0 +1,17 @@
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> [CLI] bundle plan -o json
+
+>>> [CLI] bundle destroy --auto-approve
+The following resources will be deleted:
+  delete resources.genie_spaces.sales_analytics
+
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default
+
+Deleting files...
+Destroy complete!

acceptance/bundle/resources/genie_spaces/inline/script

@@ -0,0 +1,18 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
+cleanup() {
+    trace $CLI bundle destroy --auto-approve
+}
+trap cleanup EXIT
+
+trace $CLI bundle deploy
+GENIE_SPACE_ID=$($CLI bundle summary --output json | jq -r '.resources.genie_spaces.sales_analytics.id')
+
+# Capture the genie space ID as a replacement.
+echo "$GENIE_SPACE_ID:GENIE_SPACE_ID" >> ACC_REPLS
+
+# Plan after deploy must be drift-free aside from input_only fields.
+# Without normalization the inline serialized_space leaves a map in the
+# config struct while state holds a string, and structdiff reports false
+# drift on every plan.
+trace $CLI bundle plan -o json > out.plan.json

acceptance/bundle/resources/genie_spaces/inline/test.toml

@@ -0,0 +1,6 @@
+Local = true
+RecordRequests = false
+
+Ignore = [
+    "databricks.yml",
+]

acceptance/bundle/resources/genie_spaces/parent_path_recreate/databricks.yml.tmpl

@@ -0,0 +1,10 @@
+bundle:
+  name: recreate-genie-space-$UNIQUE_NAME
+
+resources:
+  genie_spaces:
+    recreate_target:
+      title: "Recreate Target"
+      warehouse_id: "test-warehouse-id"
+      parent_path: PARENT_PATH_PLACEHOLDER
+      serialized_space: "{}"

acceptance/bundle/resources/genie_spaces/parent_path_recreate/output.txt

@@ -0,0 +1,21 @@
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-genie-space-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+=== Plan after changing parent_path should show recreate
+>>> [CLI] bundle plan
+recreate genie_spaces.recreate_target
+
+Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged
+
+>>> [CLI] bundle destroy --auto-approve
+The following resources will be deleted:
+  delete resources.genie_spaces.recreate_target
+
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-genie-space-[UNIQUE_NAME]/default
+
+Deleting files...
+Destroy complete!

acceptance/bundle/resources/genie_spaces/parent_path_recreate/script

@@ -0,0 +1,14 @@
+cleanup() {
+    trace $CLI bundle destroy --auto-approve
+}
+trap cleanup EXIT
+
+# Deploy with the original parent_path.
+envsubst < databricks.yml.tmpl | sed "s|PARENT_PATH_PLACEHOLDER|/Users/$CURRENT_USER_NAME/genie-old|" > databricks.yml
+trace $CLI bundle deploy
+
+# Change parent_path. parent_path is recreate_on_changes in resources.yml,
+# so the plan should show a recreate (delete + create) rather than an update.
+envsubst < databricks.yml.tmpl | sed "s|PARENT_PATH_PLACEHOLDER|/Users/$CURRENT_USER_NAME/genie-new|" > databricks.yml
+title "Plan after changing parent_path should show recreate"
+trace $CLI bundle plan

acceptance/bundle/resources/genie_spaces/parent_path_recreate/test.toml

@@ -0,0 +1,6 @@
+Local = true
+RecordRequests = false
+
+Ignore = [
+    "databricks.yml",
+]

acceptance/bundle/resources/genie_spaces/simple/databricks.yml.tmpl

@@ -0,0 +1,11 @@
+bundle:
+  name: deploy-genie-space-test-$UNIQUE_NAME
+
+resources:
+  genie_spaces:
+    sales_analytics:
+      title: "Sales Analytics Genie"
+      description: "AI assistant for sales data analysis"
+      warehouse_id: "test-warehouse-id"
+      parent_path: /Users/$CURRENT_USER_NAME
+      file_path: "sales_analytics.geniespace.json"

acceptance/bundle/resources/genie_spaces/simple/out.plan.json

@@ -0,0 +1,33 @@
+{
+  "plan_version": 2,
+  "cli_version": "[DEV_VERSION]",
+  "lineage": "[UUID]",
+  "serial": 7,
+  "plan": {
+    "resources.genie_spaces.sales_analytics": {
+      "action": "skip",
+      "remote_state": {
+        "description": "AI assistant for sales data analysis",
+        "etag": "1",
+        "serialized_space": "{\n  \"benchmarks\": {\n    \"questions\": [\n      {\n        \"answer\": [\n          {\n            \"content\": [\n              \"SELECT\\n\",\n              \"  name,\\n\",\n              \"  country\\n\",\n              \"FROM main.default.countries\\n\",\n              \"ORDER BY name\"\n            ],\n            \"format\": \"SQL\"\n          }\n        ],\n        \"id\": \"[NUMID]\",\n        \"question\": [\n          \"Show all names and countries\"\n        ]\n      }\n    ]\n  },\n  \"config\": {\n    \"sample_questions\": [\n      {\n        \"id\": \"[NUMID]\",\n        \"question\": [\n          \"List the names and countries\"\n        ]\n      },\n      {\n        \"id\": \"[NUMID]\",\n        \"question\": [\n          \"Which names are in Canada?\"\n        ]\n      }\n    ]\n  },\n  \"data_sources\": {\n    \"tables\": [\n      {\n        \"column_configs\": [\n          {\n            \"column_name\": \"country\",\n            \"enable_entity_matching\": true,\n            \"enable_format_assistance\": true\n          },\n          {\n            \"column_name\": \"name\",\n            \"enable_entity_matching\": true,\n            \"enable_format_assistance\": true\n          }\n        ],\n        \"identifier\": \"main.default.countries\"\n      }\n    ]\n  },\n  \"instructions\": {\n    \"example_question_sqls\": [\n      {\n        \"id\": \"[NUMID]\",\n        \"question\": [\n          \"List the names and countries\"\n        ],\n        \"sql\": [\n          \"SELECT\\n\",\n          \"  name,\\n\",\n          \"  country\\n\",\n          \"FROM main.default.countries\\n\",\n          \"ORDER BY name\"\n        ]\n      }\n    ],\n    \"text_instructions\": [\n      {\n        \"content\": [\n          \"This genie space answers simple questions about people and their countries.\\n\",\n          \"Use only the main.default.countries table.\\n\",\n          \"Prefer returning the name and country columns directly.\"\n        ],\n        \"id\": \"[NUMID]\"\n      }\n    ]\n  },\n  \"version\": 2\n}\n",
+        "space_id": "[GENIE_SPACE_ID]",
+        "title": "Sales Analytics Genie",
+        "warehouse_id": "test-warehouse-id"
+      },
+      "changes": {
+        "etag": {
+          "action": "skip",
+          "reason": "custom",
+          "old": "1",
+          "remote": "1"
+        },
+        "parent_path": {
+          "action": "skip",
+          "reason": "input_only",
+          "old": "/Workspace/Users/[USERNAME]",
+          "new": "/Workspace/Users/[USERNAME]"
+        }
+      }
+    }
+  }
+}

acceptance/bundle/resources/genie_spaces/simple/output.txt

@@ -0,0 +1,24 @@
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> [CLI] genie get-space [GENIE_SPACE_ID]
+{
+  "title": "Sales Analytics Genie",
+  "description": "AI assistant for sales data analysis",
+  "warehouse_id": "test-warehouse-id"
+}
+
+>>> [CLI] bundle plan -o json
+
+>>> [CLI] bundle destroy --auto-approve
+The following resources will be deleted:
+  delete resources.genie_spaces.sales_analytics
+
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default
+
+Deleting files...
+Destroy complete!