databricks 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fa10746d84fcd9135f2b811ae8f48509fde3ef567fa87b914c337a0881d7e9e
-  data.tar.gz: 8cedbeb212e416c99d84fc0f5f53ec609e0510f021af5142c550a7272d0b1a79
+  metadata.gz: 4459669b73b6119b98edbf5cbc090da4737c3ff81f07a5facee4ea9082f184b9
+  data.tar.gz: 4385d46df3c43d914ac510a82d61fc256d90dbe4896dd6d94aa5377340829edf
 SHA512:
-  metadata.gz: 18cda5b9682e863158015c018fa1941b135421feac1361c6a8714dd51d82f484010d7cce4538d9dd04fcd91f494c486a78ba155824e9c1dcede212849a45730a
-  data.tar.gz: dd5c5fea89ab21a638e88ea16665722457fbfa2d48811f7cdba6228927a2293338611003a611b1880035c5f5782911d200f7ce954f21c3bfd41c487107799bdd
+  metadata.gz: fddff3e968fe272ced9363f5762861943f277dee5f73897432c4d272d739b031aac2b97871bcba43d3ef161d3a0b76b00b739b86898e062647497160f608557b
+  data.tar.gz: fb72364cade4b589374f4050341271bff45f80c19e8d0bb4b4325a3fa29c3475400049585e80d303c230d1edf77684c72326423e7eacb691c9bc5fa68c39fcd6

data/lib/databricks/resource.rb

@@ -15,6 +15,10 @@ module Databricks
       post_json
     ]
 
+    # Get an accessor on all properties of this resource
+    # Hash< Symbol, Object >
+    attr_reader :properties
+
     # Declare sub-resources accessors.
     # This will make sure this resource has methods named after the sub-resources identifiers.
     #
@@ -42,20 +46,27 @@ module Databricks
       @properties = {}
     end
 
-    # Add/replace properties for this resource
+    # Add/replace properties for this resource.
+    # Properties will be deep-symbolized.
     #
     # Parameters::
-    # * *properties* (Hash<Symbol,Object>): Properties for this resource
-    def add_properties(properties)
+    # * *properties* (Hash<Symbol or String,Object>): Properties for this resource
+    # * *replace* (Boolean): Should we replace properties instead of merging them? [default: false]
+    def add_properties(properties, replace: false)
+      symbolized_properties = deep_symbolize(properties)
       # Define getters for properties
-      (properties.keys - @properties.keys).each do |property_name|
+      (symbolized_properties.keys - @properties.keys).each do |property_name|
         if self.respond_to?(property_name)
           raise "Can't define a property named #{property_name} - It's already used."
         else
           define_singleton_method(property_name) { @properties[property_name] }
         end
       end
-      @properties.merge!(properties)
+      if replace
+        @properties = symbolized_properties
+      else
+        @properties.merge!(symbolized_properties)
+      end
     end
 
     # Return a simple string representation of this resource
@@ -88,10 +99,34 @@ module Databricks
     def new_resource(resource_name, properties = {})
       require "#{__dir__}/resources/#{resource_name}.rb"
       resource = Resources.const_get(resource_name.to_s.split('_').collect(&:capitalize).join.to_sym).new(@connector)
-      resource.add_properties(properties.transform_keys(&:to_sym))
+      resource.add_properties(properties)
       resource
     end
 
+    private
+
+    # Deep-symbolize a JSON object
+    #
+    # Parameters::
+    # * *json* (Object): The JSON object
+    # Result::
+    # * Object: Symbolized JSON object
+    def deep_symbolize(json)
+      case json
+      when Hash
+        Hash[json.map do |k, v|
+          [
+            k.is_a?(String) ? k.to_sym : k,
+            deep_symbolize(v)
+          ]
+        end]
+      when Array
+        json.map { |e| deep_symbolize(e) }
+      else
+        json
+      end
+    end
+
   end
 
 end

data/lib/databricks/resources/job.rb

@@ -4,6 +4,27 @@ module Databricks
 
     class Job < Resource
 
+      # Reset properties of this job.
+      #
+      # Parameters::
+      # * *properties* (Hash<Symbol,Object>): New job's properties
+      def reset(**properties)
+        # Make sure we don't change its ID
+        post_json(
+          'jobs/reset',
+          {
+            job_id: job_id,
+            new_settings: properties
+          }
+        )
+        add_properties(properties.merge(job_id: job_id), replace: true)
+      end
+
+      # Delete this job
+      def delete
+        post_json('jobs/delete', { job_id: job_id })
+      end
+
     end
 
   end

data/lib/databricks/resources/jobs.rb

@@ -11,7 +11,21 @@ module Databricks
       # Result::
       # * Array<Job>: List of jobs information
       def list
-        (get_json('jobs/list')['jobs'] || []).map { |properties| new_resource(:job, properties) }
+        (get_json('jobs/list')['jobs'] || []).map do |properties|
+          # The settings property should be merged at root
+          new_resource(:job, properties.merge(properties.delete('settings')))
+        end
+      end
+
+      # Get a job based on its job_id
+      #
+      # Parameters::
+      # * *job_id* (String): The job id to get
+      # Result::
+      # * Job: The job
+      def get(job_id)
+        properties = get_json('jobs/get', { job_id: job_id })
+        new_resource(:job, properties.merge(properties.delete('settings')))
       end
 
       # Create a new job.

data/lib/databricks/version.rb

@@ -1,5 +1,5 @@
 module Databricks
 
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: databricks
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client