2.0.4 wip

Author: jeffreyaven

examples/databricks/serverless/resources/OLD/databricks_account/update_group_membership.iql

@@ -3,4 +3,4 @@ update databricks_account.iam.groups
 set schemas = '["urn:ietf:params:scim:api:messages:2.0:PatchOp"]',
 Operations = '[{"op": "replace", "path": "members", "value": {{ databricks_workspace_group_members }} }]'
 WHERE account_id = '{{ databricks_account_id }}'
-AND id = '{{ databricks_group_id }}';
+AND id = '{{ databricks_group_id }}';

examples/databricks/serverless/resources/databricks_account/get_users.iql

@@ -0,0 +1,6 @@
+/*+ exports, retries=3, retry_delay=5 */
+SELECT
+JSON_GROUP_ARRAY(JSON_OBJECT('value', id)) as databricks_workspace_group_members
+FROM databricks_account.iam.account_users
+WHERE account_id = '{{ databricks_account_id }}'
+AND userName in {{ users | sql_list }};

examples/databricks/serverless/resources/databricks_account/update_group_membership.iql

@@ -0,0 +1,6 @@
+/*+ command */
+update databricks_account.iam.account_groups 
+set schemas = '["urn:ietf:params:scim:api:messages:2.0:PatchOp"]',
+Operations = '[{"op": "replace", "path": "members", "value": {{ databricks_workspace_group_members }} }]'
+WHERE account_id = '{{ databricks_account_id }}'
+AND id = '{{ databricks_group_id }}';

examples/databricks/serverless/resources/databricks_account/workspace_assignment.iql

@@ -0,0 +1,30 @@
+/*+ createorupdate */
+REPLACE databricks_account.iam.workspace_assignment
+SET 
+permissions = '["ADMIN"]'
+WHERE 
+account_id = '{{ databricks_account_id }}'
+AND workspace_id = '{{ workspace_id }}'
+AND principal_id = '{{ databricks_group_id }}'
+RETURNING
+error,
+permissions,
+principal;
+
+
+/*+ statecheck, retries=5, retry_delay=10 */
+SELECT COUNT(*) as count
+FROM databricks_account.iam.workspace_assignment
+WHERE
+account_id = '{{ databricks_account_id }}'
+AND workspace_id = '{{ workspace_id }}'
+AND JSON_EXTRACT(principal, '$.principal_id') = {{ databricks_group_id }}
+AND permissions LIKE '%ADMIN%';
+
+
+/*+ delete */
+DELETE FROM databricks_account.iam.workspace_assignment
+WHERE account_id = '{{ databricks_account_id }}'
+AND workspace_id = '{{ workspace_id }}'
+AND principal_id = '{{ databricks_group_id }}'
+;

examples/databricks/serverless/stackql_manifest.yml

@@ -288,22 +288,23 @@ resources:
       - databricks_group_id
       - display_name
 
-  # - name: databricks_account/get_users
-  #   type: query
-  #   props:
-  #   - name: users
-  #     value: 
-  #       - "javen@stackql.io"
-  #       - "krimmer@stackql.io"
-  #   exports:
-  #     - databricks_workspace_group_members  
+  - name: get_databricks_users
+    file: databricks_account/get_users.iql
+    type: query
+    props:
+    - name: users
+      value: 
+        - "javen@stackql.io"
+        - "krimmer@stackql.io"
+    exports:
+      - databricks_workspace_group_members  
 
-  # - name: databricks_account/update_group_membership
-  #   type: command
-  #   props: []
+  - name: databricks_account/update_group_membership
+    type: command
+    props: []
 
-  # - name: databricks_account/workspace_permission_assignments
-  #   props: []
+  - name: databricks_account/workspace_assignment
+    props: []
 
   # - name: databricks_workspace/storage_credential
   #   props:

src/commands/build.rs

@@ -90,9 +90,9 @@ pub fn execute(matches: &ArgMatches) {
     );
 
     if is_dry_run {
-        println!("dry-run build complete");
+        print_unicode_box("dry-run build complete", BorderColor::Green);
     } else {
-        println!("build complete");
+        print_unicode_box("build complete", BorderColor::Green);
     }
 
     stop_local_server();
@@ -239,14 +239,19 @@ fn run_build(
         // this.* fields into full_context.
         let mut exports_query_str: Option<String> = None;
 
-        // Handle query type with no exports
-        if res_type == "query" && exports_query_str.is_none() {
+        // Handle query type: render exports eagerly (query types don't
+        // have exists/statecheck so there's no this.* deferral needed).
+        if res_type == "query" {
             if let Some(ref iq) = inline_query {
                 exports_query_str = Some(iq.clone());
             } else {
-                catch_error_and_exit(
-                    "Inline sql must be supplied or an iql file must be present with an 'exports' anchor for query type resources.",
-                );
+                exports_query_str =
+                    render_exports!(runner, resource_queries, resource, &full_context);
+                if exports_query_str.is_none() {
+                    catch_error_and_exit(
+                        "Inline sql must be supplied or an iql file must be present with an 'exports' anchor for query type resources.",
+                    );
+                }
             }
         }
 

src/commands/teardown.rs

@@ -78,7 +78,11 @@ pub fn execute(matches: &ArgMatches) {
         &format!("{:?}", on_failure_val),
     );
 
-    println!("teardown complete (dry run: {})", is_dry_run);
+    if is_dry_run {
+        print_unicode_box("dry-run teardown complete", BorderColor::Green);
+    } else {
+        print_unicode_box("teardown complete", BorderColor::Green);
+    }
 
     stop_local_server();
 }

src/commands/test.rs

@@ -89,7 +89,11 @@ pub fn execute(matches: &ArgMatches) {
         output_file.map(|s| s.as_str()),
     );
 
-    println!("tests complete (dry run: {})", is_dry_run);
+    if is_dry_run {
+        print_unicode_box("dry-run tests complete", BorderColor::Green);
+    } else {
+        print_unicode_box("tests complete", BorderColor::Green);
+    }
 
     stop_local_server();
 }

src/core/templating.rs

@@ -294,8 +294,7 @@ pub fn render_query(
     let expanded = match preprocess_this_prefix(template, res_name) {
         Ok(t) => t,
         Err(e) => {
-            error!("[{}] [{}] {}", res_name, anchor, e);
-            process::exit(1);
+            crate::core::utils::catch_error_and_exit(&format!("[{}] [{}] {}", res_name, anchor, e));
         }
     };
 
@@ -348,7 +347,10 @@ pub fn render_query(
                 ctx.keys().collect::<Vec<_>>()
             );
 
-            process::exit(1);
+            crate::core::utils::catch_error_and_exit(&format!(
+                "Failed to render query for [{}] [{}]",
+                res_name, anchor
+            ));
         }
     }
 }

src/core/utils.rs

@@ -21,7 +21,10 @@ pub fn catch_error_and_exit(msg: &str) -> ! {
     error!("{}", msg);
     // Stop the local server before exiting to avoid stale sessions
     crate::utils::server::stop_local_server();
-    eprintln!("stackql-deploy operation failed");
+    crate::utils::display::print_unicode_box(
+        "stackql-deploy operation failed",
+        crate::utils::display::BorderColor::Red,
+    );
     process::exit(1);
 }