flapjack-diner 2.0.0b1 → 2.0.0.pre.alpha.1

data/flapjack-diner.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Flapjack::Diner::VERSION
 
-  gem.add_dependency('httparty', '= 0.13.5')
+  gem.add_dependency('httparty', '>= 0.10')
   gem.add_dependency('json', '>= 1.7.7')
 end

data/lib/flapjack-diner.rb

@@ -1,75 +1,45 @@
 require 'httparty'
 require 'json'
 
-require 'flapjack-diner/log_formatter'
 require 'flapjack-diner/version'
 require 'flapjack-diner/argument_validator'
-require 'flapjack-diner/index_range'
 
-require 'flapjack-diner/resources'
-require 'flapjack-diner/relationships'
-require 'flapjack-diner/tools'
-
-# HTTParty master contains a non-hacky way of doing this, but 0.13.5 doesn't
-module HTTParty
-  module Logger
-    def self.build(logger, level, formatter)
-      level ||= :info
-      formatter ||= :apache
-
-      case formatter
-      when :'flapjack-diner'
-        Flapjack::Diner::LogFormatter.new(logger, level)
-      when :curl
-        Logger::CurlLogger.new(logger, level)
-      else
-        Logger::ApacheLogger.new(logger, level)
-      end
-    end
-  end
+%w(checks contacts events maintenance_periods media metrics rules
+   states statistics tags relationships).each do |resource|
+  require "flapjack-diner/resources/#{resource}"
 end
 
+require 'flapjack-diner/tools'
+
 # NB: clients will need to handle any exceptions caused by,
 # e.g., network failures or non-parseable JSON data.
+
 module Flapjack
 
   # Top level module for Flapjack::Diner API consumer.
   module Diner
-    UUID_RE = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
-
     include HTTParty
     format :json
 
-    class << self
-      attr_accessor :return_keys_as_strings
-
-      # redefine HTTParty logger methods for getter/setter style
-      alias :original_logger :logger
-      def logger=(lgr)
-        original_logger(lgr, :info, :'flapjack-diner')
-      end
-      def logger
-        default_options[:logger]
-      end
-
-      def output
-        return if !instance_variable_defined?('@response') || @response.nil?
-        @response.output
-      end
-
-      def context
-        return if !instance_variable_defined?('@response') || @response.nil?
-        @response.context
-      end
+    UUID_RE = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
 
-      def error
-        return if !instance_variable_defined?('@response') || @response.nil?
-        @response.error
-      end
+    class << self
+      attr_accessor :logger, :return_keys_as_strings
+
+      include Flapjack::Diner::Resources::Checks
+      include Flapjack::Diner::Resources::Contacts
+      include Flapjack::Diner::Resources::Events
+      include Flapjack::Diner::Resources::MaintenancePeriods
+      include Flapjack::Diner::Resources::Media
+      include Flapjack::Diner::Resources::Metrics
+      include Flapjack::Diner::Resources::Rules
+      include Flapjack::Diner::Resources::States
+      include Flapjack::Diner::Resources::Statistics
+      include Flapjack::Diner::Resources::Tags
+
+      include Flapjack::Diner::Resources::Relationships
+
+      include Flapjack::Diner::Tools
     end
-
-    include Flapjack::Diner::Resources
-    include Flapjack::Diner::Relationships
-    include Flapjack::Diner::Tools
   end
 end

data/lib/flapjack-diner/argument_validator.rb

@@ -111,6 +111,14 @@ module Flapjack
       end
     end
 
+    def singular_link(*elements)
+      elements.each do |element|
+        target = @query[element]
+        next if target.nil? || (target.is_a?(String) && !target.empty?)
+        @errors << "'#{target}' association must be a String ID."
+      end
+    end
+
     def singular_link_uuid(*elements)
       elements.each do |element|
         target = @query[element]
@@ -120,6 +128,15 @@ module Flapjack
       end
     end
 
+    def multiple_link(*elements)
+      elements.each do |element|
+        target = @query[element]
+        next if target.nil? || (target.is_a?(Array) &&
+          target.all? {|t| t.is_a?(String) && !t.empty? })
+        @errors << "'#{target}' association must be an Array of String IDs."
+      end
+    end
+
     def multiple_link_uuid(*elements)
       elements.each do |element|
         target = @query[element]

data/lib/flapjack-diner/resources/checks.rb

@@ -0,0 +1,52 @@
+require 'httparty'
+require 'json'
+require 'uri'
+
+require 'flapjack-diner/version'
+require 'flapjack-diner/argument_validator'
+
+module Flapjack
+  module Diner
+    module Resources
+      module Checks
+        def create_checks(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => :uuid
+            validate :query => :name, :as => [:required, :non_empty_string]
+            validate :query => :enabled, :as => :boolean
+            validate :query => :tags, :as => :multiple_link
+          end
+          perform_post(:checks, '/checks', data)
+        end
+
+        def checks(*args)
+          ids, data = unwrap_uuids(*args), unwrap_data(*args)
+          validate_params(data) do
+            validate :query => [:fields, :sort, :include], :as => :string_or_array_of_strings
+            validate :query => :filter, :as => :hash
+            validate :query => [:page, :per_page], :as => :positive_integer
+          end
+          perform_get('/checks', ids, data)
+        end
+
+        def update_checks(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => [:required, :uuid]
+            validate :query => :name, :as => :non_empty_string
+            validate :query => :enabled, :as => :boolean
+            validate :query => :tags, :as => :multiple_link
+          end
+          perform_patch(:checks, "/checks", data)
+        end
+
+        def delete_checks(*ids)
+          raise "'delete_checks' requires at least one check id " \
+                'parameter' if ids.nil? || ids.empty?
+          perform_delete(:checks, '/checks', *ids)
+        end
+      end
+    end
+  end
+end

data/lib/flapjack-diner/resources/contacts.rb

@@ -0,0 +1,54 @@
+require 'httparty'
+require 'json'
+require 'uri'
+
+require 'flapjack-diner/version'
+require 'flapjack-diner/argument_validator'
+
+module Flapjack
+  module Diner
+    module Resources
+      module Contacts
+        def create_contacts(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => :uuid
+            validate :query => :name, :as => [:required, :non_empty_string]
+            validate :query => :timezone, :as => :non_empty_string
+          end
+          # FIXME validate timezone string, if it's possible to do
+          # this without an extra gem dependency
+          perform_post(:contacts, '/contacts', data)
+        end
+
+        def contacts(*args)
+          ids, data = unwrap_uuids(*args), unwrap_data(*args)
+          validate_params(data) do
+            validate :query => [:fields, :sort, :include], :as => :string_or_array_of_strings
+            validate :query => :filter, :as => :hash
+            validate :query => [:page, :per_page], :as => :positive_integer
+          end
+          perform_get('/contacts', ids, data)
+        end
+
+        def update_contacts(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => [:required, :uuid]
+            validate :query => [:name, :timezone], :as => :non_empty_string
+          end
+          # FIXME validate timezone string, if it's possible to do
+          # this without an extra gem dependency
+          perform_patch(:contacts, "/contacts", data)
+        end
+
+        def delete_contacts(*ids)
+          raise "'delete_contacts' requires at least one contact id " \
+                'parameter' if ids.nil? || ids.empty?
+          perform_delete(:contacts, '/contacts', *ids)
+        end
+
+      end
+    end
+  end
+end

data/lib/flapjack-diner/resources/events.rb

@@ -0,0 +1,54 @@
+require 'httparty'
+require 'json'
+require 'uri'
+
+require 'flapjack-diner/version'
+require 'flapjack-diner/argument_validator'
+
+module Flapjack
+  module Diner
+    module Resources
+      module Events
+        def create_acknowledgements(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :duration, :as => :positive_integer
+            validate :query => :summary, :as => :non_empty_string
+            validate :query => :check, :as => :singular_link_uuid
+            validate :query => :tag, :as => :singular_link
+          end
+          _events_validate_association(data, 'acknowledgement')
+          perform_post(:acknowledgements, "/acknowledgements", data)
+        end
+
+        def create_test_notifications(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :summary, :as => :non_empty_string
+            validate :query => :check, :as => :singular_link_uuid
+            validate :query => :tag, :as => :singular_link
+          end
+          _events_validate_association(data, 'test notification')
+          perform_post(:test_notifications, "/test_notifications", data)
+        end
+
+        private
+
+        def _events_validate_association(data, type)
+          case data
+          when Array
+            data.each do |d|
+              unless d.has_key?(:check) || d.has_key?(:tag)
+                raise ArgumentError.new("Check or tag association must be provided for all #{type}s")
+              end
+            end
+          when Hash
+            unless data.has_key?(:check) || data.has_key?(:tag)
+              raise ArgumentError.new("Check or tag association must be provided for #{type}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/flapjack-diner/resources/maintenance_periods.rb

@@ -0,0 +1,76 @@
+require 'httparty'
+require 'json'
+require 'uri'
+
+require 'flapjack-diner/version'
+require 'flapjack-diner/argument_validator'
+
+module Flapjack
+  module Diner
+    module Resources
+      module MaintenancePeriods
+
+        def create_scheduled_maintenances(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => :uuid
+            validate :query => :start_time, :as => [:required, :time]
+            validate :query => :end_time,   :as => [:required, :time]
+            validate :query => :summary,    :as => :non_empty_string
+            validate :query => :check, :as => :singular_link_uuid
+            validate :query => :tag, :as => :singular_link
+          end
+          _maintenance_periods_validate_association(data, 'scheduled maintenance period')
+          perform_post(:scheduled_maintenances, '/scheduled_maintenances', data)
+        end
+
+        def update_scheduled_maintenances(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => [:required, :uuid]
+            validate :query => [:start_time, :end_time], :as => :time
+          end
+          perform_patch(:scheduled_maintenances, '/scheduled_maintenances',
+                        data)
+        end
+
+        def update_unscheduled_maintenances(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => [:required, :uuid]
+            validate :query => :end_time, :as => :time
+          end
+          perform_patch(:unscheduled_maintenances, '/unscheduled_maintenances',
+                        data)
+        end
+
+        def delete_scheduled_maintenances(*ids)
+          if ids.nil? || ids.empty?
+            raise "'delete_scheduled_maintenances' requires " \
+                  "at least one scheduled maintenance id parameter"
+          end
+          perform_delete(:scheduled_maintenances, '/scheduled_maintenances',
+            *ids)
+        end
+
+        private
+
+        def _maintenance_periods_validate_association(data, type)
+          case data
+          when Array
+            data.each do |d|
+              unless d.has_key?(:check) || d.has_key?(:tag)
+                raise ArgumentError.new("Check or tag association must be provided for all #{type}s")
+              end
+            end
+          when Hash
+            unless data.has_key?(:check) || data.has_key?(:tag)
+              raise ArgumentError.new("Check or tag association must be provided for #{type}")
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/flapjack-diner/resources/media.rb

@@ -0,0 +1,75 @@
+require 'httparty'
+require 'json'
+require 'uri'
+
+require 'flapjack-diner/version'
+require 'flapjack-diner/argument_validator'
+
+module Flapjack
+  module Diner
+    module Resources
+      module Media
+        def create_media(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => :uuid
+            validate :query => :transport, :as => [:non_empty_string, :required]
+            validate :query => [:address, :pagerduty_subdomain,
+                                :pagerduty_token], :as => :non_empty_string
+            validate :query => [:interval, :rollup_threshold,
+                                :pagerduty_ack_duration], :as => :positive_integer
+            validate :query => :contact, :as => [:singular_link_uuid, :required]
+            validate :query => :rules, :as => :multiple_link_uuid
+          end
+          perform_post(:media, "/media", data)
+        end
+
+        def media(*args)
+          ids, data = unwrap_uuids(*args), unwrap_data(*args)
+          validate_params(data) do
+            validate :query => [:fields, :sort, :include], :as => :string_or_array_of_strings
+            validate :query => :filter,  :as => :hash
+            validate :query => [:page, :per_page], :as => :positive_integer
+          end
+          perform_get('/media', ids, data)
+        end
+
+        def update_media(*args)
+          data = unwrap_data(*args)
+          validate_params(data) do
+            validate :query => :id, :as => [:uuid, :required]
+            validate :query => [:address, :pagerduty_subdomain,
+                                :pagerduty_token], :as => :non_empty_string
+            validate :query => [:interval, :rollup_threshold,
+                                :pagerduty_ack_duration], :as => :positive_integer
+            validate :query => :rules, :as => :multiple_link_uuid
+          end
+          perform_patch(:media, "/media", data)
+        end
+
+        def delete_media(*ids)
+          raise "'delete_media' requires at least one medium id " \
+                'parameter' if ids.nil? || ids.empty?
+          perform_delete(:media, '/media', *ids)
+        end
+
+        private
+
+        def _media_validate_association(data)
+          case data
+          when Array
+            data.each do |d|
+              unless d.has_key?(:contact)
+                raise ArgumentError.new("Contact association must be provided for all media")
+              end
+            end
+          when Hash
+            unless data.has_key?(:contact)
+              raise ArgumentError.new("Contact association must be provided for medium")
+            end
+          end
+        end
+      end
+    end
+  end
+end