kennel 1.47.0 → 1.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93854917f3c33bf9384862c47699e239045a9f1e85ad97e5622b1ea83e4ad13
-  data.tar.gz: f570f7949f98046ca6bdf28e463ce50fcbd2759155805d8de8ab0ddc1cb21cf4
+  metadata.gz: 9283bb5d1301a656e0c1ca896ad6fb8bc91ecfedd621722ce9e3b6a50055e34e
+  data.tar.gz: fc1a556ee6e1a658da97b9a59792d6c7c789c834beae5cba39b8447a04818fe3
 SHA512:
-  metadata.gz: 07154d3128ef64dc3b3d4e0aa7971e071e9498a6d4784bede12c5588cac6dcd7b535a6dce7dfce6bbbbee30fe5edae2dc5ec5fc9236a5de725339af3aefd9cf4
-  data.tar.gz: ea83dad0e6d4b1a42877cf42958f410e29dc985677fc08ad61cbfce95804609df825a214c93c849b15cf7b18e3faf8278779ebf77c2b6cc46dc496cc8250d000
+  metadata.gz: ecc7e11d744f0a87941759927ef1e8d79b3b9ebccaf759c8c15c43ff7d7ef8524d38b4b488035d647a67b0841392f17c1c197cadf86d511ac72a2e118ba3d589
+  data.tar.gz: df0c1b18c9f82a8bd50f717f84f63d80a33aec84668bcbde144ab944359b0bee65295bd712d2457da9453ff2fdb07d8d16721baed947afb88d088f575cb7ab4a

data/lib/kennel.rb

@@ -19,7 +19,6 @@ require "kennel/models/base"
 
 # parts
 require "kennel/models/monitor"
-require "kennel/models/dash"
 require "kennel/models/dashboard"
 
 # settings

data/lib/kennel/syncer.rb

@@ -75,10 +75,6 @@ module Kennel
           actual.each do |a|
             id = a.fetch(:id)
             e = matching_expected(a)
-
-            # check correct class, since we will have multiple actuals for each flavor (dash/screen/dashboard)
-            next if e && e.class.api_resource != a[:api_resource]
-
             if e && @expected.delete(e)
               fill_details(a, cache) if e.class::API_LIST_INCOMPLETE
               diff = e.diff(a)

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.47.0"
+  VERSION = "1.48.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.47.0
+  version: 1.48.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -65,7 +65,6 @@ files:
 - lib/kennel/github_reporter.rb
 - lib/kennel/importer.rb
 - lib/kennel/models/base.rb
-- lib/kennel/models/dash.rb
 - lib/kennel/models/dashboard.rb
 - lib/kennel/models/monitor.rb
 - lib/kennel/models/project.rb

data/lib/kennel/models/dash.rb

@@ -1,122 +0,0 @@
-# frozen_string_literal: true
-module Kennel
-  module Models
-    class Dash < Base
-      include TemplateVariables
-      include OptionalValidations
-
-      API_LIST_INCOMPLETE = true
-      SUPPORTED_GRAPH_OPTIONS = [:events, :markers, :precision].freeze
-      READONLY_ATTRIBUTES = (Base::READONLY_ATTRIBUTES + [:resource, :created_by, :read_only, :new_id]).freeze
-      DEFINITION_DEFAULTS = { autoscale: true }.freeze
-      DASH_DEFAULTS = { template_variables: [] }.freeze
-
-      settings :id, :title, :description, :graphs, :kennel_id, :definitions
-
-      defaults(
-        id: -> { nil },
-        description: -> { "" },
-        definitions: -> { [] },
-        graphs: -> { [] },
-        template_variables: -> { [] }
-      )
-
-      attr_reader :project
-
-      def initialize(project, *args)
-        @project = project
-        super(*args)
-      end
-
-      def self.api_resource
-        "dash"
-      end
-
-      def as_json
-        return @json if @json
-        @json = {
-          id: id,
-          title: "#{title}#{LOCK}",
-          description: description,
-          template_variables: render_template_variables,
-          graphs: render_graphs
-        }
-
-        validate_json(@json) if validate
-
-        @json
-      end
-
-      def self.normalize(expected, actual)
-        super
-
-        actual[:template_variables] ||= [] # is nil when it never had template variables
-        ignore_default expected, actual, DASH_DEFAULTS
-
-        graphs = actual[:graphs] || []
-
-        graphs.each { |g| g[:definition].delete(:status) }
-
-        ignore_request_defaults expected, actual, :graphs, :definition
-
-        graphs.each_with_index do |a_g, i|
-          a_d = a_g[:definition]
-          e_d = expected.dig(:graphs, i, :definition) || {}
-          ignore_default e_d, a_d, DEFINITION_DEFAULTS
-        end
-      end
-
-      def url(id)
-        Utils.path_to_url "/dash/#{id}"
-      end
-
-      private
-
-      def validate_json(data)
-        super
-
-        validate_template_variables data, :graphs
-
-        # check for fields that are unsettable
-        data[:graphs].each do |g|
-          if g[:definition].key?(:status)
-            invalid! "remove definition status, it is unsettable and will always produce a diff"
-          end
-        end
-      end
-
-      def render_graphs
-        definitions.map do |title, viz, type, queries, options = {}, ignored = nil|
-          # validate inputs
-          if ignored || (!title || !viz || !queries || !options.is_a?(Hash))
-            raise ArgumentError, "Expected exactly 5 arguments for each definition (title, viz, type, queries, options)"
-          end
-          if options.each_key.any? { |k| !SUPPORTED_GRAPH_OPTIONS.include?(k) }
-            raise ArgumentError, "Supported options are: #{SUPPORTED_GRAPH_OPTIONS.map(&:inspect).join(", ")}"
-          end
-
-          # build graph
-          requests = Array(queries).map do |q|
-            request = { q: q }
-            request[:type] = type if type
-            request
-          end
-
-          graph = { title: title, definition: { viz: viz, requests: requests } }
-
-          # whitelist options that can be passed in, so we are flexible in the future
-          SUPPORTED_GRAPH_OPTIONS.each do |key|
-            graph[:definition][key] = options[key] if options[key]
-          end
-
-          # set default values so users do not have to pass them all the time
-          if viz == "query_value"
-            graph[:definition][:precision] ||= 2
-          end
-
-          graph
-        end + graphs
-      end
-    end
-  end
-end