Merge pull request #70 from stackql/feature/ja-updates

v1.9.1

Author: jeffreyaven

CHANGELOG.md

@@ -1,11 +1,9 @@
 # Changelog
 
-## 1.8.8 (2025-10-15)
+## 1.9.1 (2025-10-15)
 
+- added `--output-file` argument
 - Added performance enhancement query strategy
-
-## 1.8.7 (2025-10-14)
-
 - Added tab completion
 - Added enhanced logging decorators
 

examples/databricks/serverless/outputs/deployment.json

@@ -0,0 +1,9 @@
+{
+  "stack_name": "stackql-serverless",
+  "stack_env": "prd",
+  "databricks_workspace_name": "stackql-serverless-prd-workspace",
+  "databricks_workspace_id": "4014389171618363",
+  "databricks_deployment_name": "dbc-5a3a87f7-6914",
+  "databricks_workspace_status": "RUNNING",
+  "databricks_workspace_url": "https://dbc-5a3a87f7-6914.cloud.databricks.com"
+}

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

@@ -25,7 +25,9 @@ SELECT
 SELECT 
 '{{ workspace_name }}' AS databricks_workspace_name,
 workspace_id AS databricks_workspace_id,
-deployment_name AS databricks_deployment_name
+deployment_name AS databricks_deployment_name,
+workspace_status AS databricks_workspace_status,
+'https://' || deployment_name || '.cloud.databricks.com' AS databricks_workspace_url
 FROM databricks_account.provisioning.workspaces
 WHERE account_id = '{{ databricks_account_id }}'
 AND workspace_name = '{{ workspace_name }}'

examples/databricks/serverless/stackql_manifest.yml

@@ -381,7 +381,9 @@ resources:
     exports:
       - databricks_workspace_name
       - databricks_workspace_id
-      - databricks_deployment_name        
+      - databricks_deployment_name
+      - databricks_workspace_status
+      - databricks_workspace_url
 
   - name: databricks_account/workspace_group
     props:
@@ -489,4 +491,9 @@ resources:
       securable_type = 'external_location' AND
       deployment_name = '{{ databricks_deployment_name }}';
 
-
+exports:
+  - databricks_workspace_name
+  - databricks_workspace_id
+  - databricks_deployment_name
+  - databricks_workspace_status
+  - databricks_workspace_url

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='stackql-deploy',
-    version='1.8.8',
+    version='1.9.1',
     description='Model driven resource provisioning and deployment framework using StackQL.',
     long_description=readme,
     long_description_content_type='text/x-rst',

stackql_deploy/__init__.py

@@ -1 +1 @@
-__version__ = '1.8.8'
+__version__ = '1.9.1'

stackql_deploy/cli.py

@@ -162,10 +162,12 @@ def setup_command_context(
 @click.argument('stack_env')
 @add_common_options
 @add_stackql_kwarg_options
+@click.option('--output-file', default=None,
+              help='File path to write deployment outputs as JSON.')
 @click.pass_context
 def build(ctx, stack_dir, stack_env, log_level, env_file,
           env, dry_run, show_queries, on_failure,
-          custom_registry, download_dir ):
+          custom_registry, download_dir, output_file):
     """Create or update resources."""
 
     from .cmd.build import StackQLProvisioner
@@ -184,7 +186,7 @@ def build(ctx, stack_dir, stack_env, log_level, env_file,
                f"to environment: [{stack_env}]")
     print_unicode_box(message, BorderColor.YELLOW)
 
-    provisioner.run(dry_run, show_queries, on_failure)
+    provisioner.run(dry_run, show_queries, on_failure, output_file)
     click.echo("🎯 dry-run build complete" if dry_run
                else "🚀 build complete")
 
@@ -232,9 +234,11 @@ def teardown(ctx, stack_dir, stack_env, log_level, env_file,
 @click.argument('stack_env')
 @add_common_options
 @add_stackql_kwarg_options
+@click.option('--output-file', default=None,
+              help='File path to write deployment outputs as JSON.')
 @click.pass_context
 def test(ctx, stack_dir, stack_env, log_level, env_file,
-         env, dry_run, show_queries, on_failure, custom_registry, download_dir):
+         env, dry_run, show_queries, on_failure, custom_registry, download_dir, output_file):
     """Run test queries for the stack."""
 
     from .cmd.test import StackQLTestRunner
@@ -253,7 +257,7 @@ def test(ctx, stack_dir, stack_env, log_level, env_file,
                f"in environment: [{stack_env}]")
     print_unicode_box(message, BorderColor.YELLOW)
 
-    test_runner.run(dry_run, show_queries, on_failure)
+    test_runner.run(dry_run, show_queries, on_failure, output_file)
     click.echo(f"🔍 tests complete (dry run: {dry_run})")
 
 #

stackql_deploy/cmd/base.py

@@ -1,4 +1,6 @@
 # cmd/base.py
+import os
+import json
 from ..lib.utils import (
     perform_retries,
     run_stackql_command,
@@ -468,3 +470,67 @@ def run_command(self, command_query, command_retries, command_retry_delay, dry_r
                 )
         else:
             self.logger.info("command query not configured, skipping command...")
+
+    def process_stack_exports(self, dry_run, output_file=None):
+        """
+        Process root-level exports from manifest and write to JSON file
+        """
+        if not output_file:
+            return
+
+        self.logger.info("📦 processing stack exports...")
+
+        manifest_exports = self.manifest.get('exports', [])
+
+        if dry_run:
+            total_vars = len(manifest_exports) + 2  # +2 for stack_name and stack_env
+            self.logger.info(
+                f"📁 dry run: would export {total_vars} variables to {output_file} "
+                f"(including automatic stack_name and stack_env)"
+            )
+            return
+
+        # Collect data from global context
+        export_data = {}
+        missing_vars = []
+
+        # Always include stack_name and stack_env automatically
+        export_data['stack_name'] = self.stack_name
+        export_data['stack_env'] = self.stack_env
+
+        for var_name in manifest_exports:
+            # Skip stack_name and stack_env if they're explicitly listed (already added above)
+            if var_name in ('stack_name', 'stack_env'):
+                continue
+
+            if var_name in self.global_context:
+                value = self.global_context[var_name]
+                # Parse JSON strings back to their original type if they were serialized
+                try:
+                    if isinstance(value, str) and (value.startswith('[') or value.startswith('{')):
+                        value = json.loads(value)
+                except (json.JSONDecodeError, ValueError):
+                    # Keep as string if not valid JSON
+                    pass
+                export_data[var_name] = value
+            else:
+                missing_vars.append(var_name)
+
+        if missing_vars:
+            catch_error_and_exit(
+                f"exports failed: variables not found in context: {missing_vars}",
+                self.logger
+            )
+
+        # Ensure destination directory exists
+        dest_dir = os.path.dirname(output_file)
+        if dest_dir and not os.path.exists(dest_dir):
+            os.makedirs(dest_dir, exist_ok=True)
+
+        # Write JSON file
+        try:
+            with open(output_file, 'w') as f:
+                json.dump(export_data, f, indent=2)
+            self.logger.info(f"✅ exported {len(export_data)} variables to {output_file}")
+        except Exception as e:
+            catch_error_and_exit(f"failed to write exports file {output_file}: {e}", self.logger)

stackql_deploy/cmd/build.py

@@ -35,7 +35,7 @@ def process_script_resource(self, resource, dry_run, full_context):
             except Exception as e:
                 catch_error_and_exit(f"script failed: {e}", self.logger)
 
-    def run(self, dry_run, show_queries, on_failure):
+    def run(self, dry_run, show_queries, on_failure, output_file=None):
 
         start_time = datetime.datetime.now()
 
@@ -409,5 +409,8 @@ def run(self, dry_run, show_queries, on_failure):
                 elif type == 'query':
                     self.logger.info(f"✅ successfully exported variables for query in {resource['name']}")
 
+        # Process stack-level exports after all resources are deployed
+        self.process_stack_exports(dry_run, output_file)
+
         elapsed_time = datetime.datetime.now() - start_time
         self.logger.info(f"deployment completed in {elapsed_time}")

stackql_deploy/cmd/test.py

@@ -11,7 +11,7 @@
 from .base import StackQLBase
 
 class StackQLTestRunner(StackQLBase):
-    def run(self, dry_run, show_queries, on_failure):
+    def run(self, dry_run, show_queries, on_failure, output_file=None):
 
         start_time = datetime.datetime.now()
 
@@ -146,3 +146,7 @@ def run(self, dry_run, show_queries, on_failure):
 
         elapsed_time = datetime.datetime.now() - start_time
         self.logger.info(f"deployment completed in {elapsed_time}")
+
+        # Process stack-level exports if specified
+        if output_file:
+            self.process_stack_exports(dry_run, output_file)