rollbar-notification-rules-generator 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d4d2186d8360cf8577ed75ab8037ddcd90ac998b77cb7b7c5803a8e78c6e64
-  data.tar.gz: 95e31245d3c6d273b1888e82ec84c75fc05628d03b7cbbd53d401d1d0b47b617
+  metadata.gz: fe4a75ed31e8bae4026c17a16bcee7b013e110191673d4557f4a635c77c08daa
+  data.tar.gz: 99b315f25a48a018df9aae2308d0cf0cc010371f6899c8b73fd5d611cde190a7
 SHA512:
-  metadata.gz: 0e3d15a47f9fe36caf190a0e859f75ef8bcb7ee799db31a77c55afbd3823d0caaebda20664d35df57f10c4c5bd52862048c7160118bca6e6cd3b4b2ce7659ca9
-  data.tar.gz: 2a71e00cdc373796f676d93e26d9b3c5b9166d805d6c7cf3037e426e3b9133e957953b6e6fd77abdb2f8e7ad9f8c2d4eac1930ec8ed9afec7d2877c57ef345c6
+  metadata.gz: 1e64c8ac68a6d9bc60d2f8f5e6edeced34b536a8b2c5ce732f813992a60277e89d75af2f73f96c507dbb294da04a0343f6d42e28dc67225152d5bdefd4d16d24
+  data.tar.gz: ea48d084b210f270e4808260718002214f4ff945704f35c3baa5e1726547fe7aeb973cfbaebac7e5c3a500421f98e27e98cdb2a0ecab31b0bc40e95c76048623

data/exe/rollbar-notification-rules-generator

@@ -3,7 +3,7 @@ require "optparse"
 
 require "rollbar/notification"
 
-Version = "0.2.3"
+Version = "0.2.4"
 FORMATS = %w[terraform text]
 
 opts = { format: "terraform" }

data/lib/rollbar/notification/condition/base.rb

@@ -38,6 +38,12 @@ module Rollbar
           [self.class, type, operation, value].hash
         end
 
+        # @param other [Base, Rate]
+        # @return [false]
+        def never_met_with?(other)
+          false
+        end
+
         # @return [String]
         def to_tf
           <<~TF

data/lib/rollbar/notification/condition/environment.rb

@@ -13,14 +13,21 @@ module Rollbar
           @type = "environment"
         end
 
+        # @param other [Base, Rate]
+        # @return [Boolean]
+        def never_met_with?(other)
+          self.class == other.class &&
+            self == other.build_complement_conditions.first
+        end
+
         # @return [String]
         def to_s
           "#{@type} #{@operation == "eq" ? "==" : "!="} #{@value}"
         end
 
-        # @return [Environment]
-        def build_complement_condition
-          self.class.new(@operation == "eq" ? "neq" : "eq", @value)
+        # @return [Array<Environment>]
+        def build_complement_conditions
+          [self.class.new(@operation == "eq" ? "neq" : "eq", @value)]
         end
       end
     end

data/lib/rollbar/notification/condition/path.rb

@@ -20,6 +20,8 @@ module Rollbar
           "exists" => "exists",
           "nexists" => "does not exist",
         }
+        # @return [Array<String>]
+        OPERATIONS_MET_ONLY_IF_PATH_EXISTS = %w[eq within nwithin regex nregex exists]
 
         attr_reader :path
 
@@ -44,6 +46,16 @@ module Rollbar
           [self.class, type, operation, value, path].hash
         end
 
+        # @param other [Base, Rate]
+        # @return [Boolean]
+        def never_met_with?(other)
+          return false if self.class != other.class || path != other.path
+          return true if operation == other.inverse_operation && value == other.value
+          return true if operation == "nexists" && OPERATIONS_MET_ONLY_IF_PATH_EXISTS.include?(other.operation)
+          return true if other.operation == "nexists" && OPERATIONS_MET_ONLY_IF_PATH_EXISTS.include?(operation)
+          false
+        end
+
         # @return [String]
         def to_tf
           <<~TF
@@ -58,13 +70,22 @@ module Rollbar
 
         # @return [String]
         def to_s
-          %Q{#{@type} #{@path} #{OPERATION_TO_TEXT[@operation]} "#{@value}"}
+          s = +%Q{#{@type} #{@path} #{OPERATION_TO_TEXT[@operation]}}
+          s << %Q{ "#{@value}"} unless @operation.end_with?("exists")
+          s
         end
 
-        # @return [Path]
-        def build_complement_condition
-          new_operation = @operation.start_with?("n") ? @operation.delete_prefix("n") : "n#{@operation}"
-          self.class.new(@path, new_operation, @value)
+        # @return [Array<Path>]
+        def build_complement_conditions
+          complement_cond = self.class.new(@path, inverse_operation, @value)
+          case @operation
+          when "within", "nwithin", "regex", "nregex"
+            # Neither "nwithin" nor "nregex" matches the condition if the path doesn't exist,
+            # so the complement condition of these operations equals (`complement_cond` OR nexists)
+            [complement_cond, self.class.new(@path, "nexists", "")]
+          else
+            [complement_cond]
+          end
         end
 
         # @param other [Base, Rate]
@@ -72,6 +93,11 @@ module Rollbar
         def redundant_to?(other)
           super && @path == other.path
         end
+
+        # @return [String]
+        def inverse_operation
+          @operation.start_with?("n") ? @operation.delete_prefix("n") : "n#{@operation}"
+        end
       end
     end
   end

data/lib/rollbar/notification/condition/rate.rb

@@ -25,6 +25,12 @@ module Rollbar
           @period = period
         end
 
+        # @param other [Base, Rate]
+        # @return [false]
+        def never_met_with?(other)
+          false
+        end
+
         # @return [String]
         def to_s
           "At least #{@count} occurrences within #{PERIOD_TO_TEXT[@period]}"

data/lib/rollbar/notification/condition/title.rb

@@ -20,15 +20,22 @@ module Rollbar
           @type = "title"
         end
 
+        # @param other [Base, Rate]
+        # @return [Boolean]
+        def never_met_with?(other)
+          self.class == other.class &&
+            self == other.build_complement_conditions.first
+        end
+
         # @return [String]
         def to_s
           %Q{#{@type} #{OPERATION_TO_TEXT[@operation]} "#{@value}"}
         end
 
-        # @return [Title]
-        def build_complement_condition
+        # @return [Array<Title>]
+        def build_complement_conditions
           new_operation = @operation.start_with?("n") ? @operation.delete_prefix("n") : "n#{@operation}"
-          self.class.new(new_operation, @value)
+          [self.class.new(new_operation, @value)]
         end
       end
     end

data/lib/rollbar/notification/rule.rb

@@ -19,8 +19,7 @@ module Rollbar
         conditions.each.with_index.any? do |condition, i|
           # NOTE: `@conditions[i + 1 ..]` cannot be nil but `|| []` is required to suppress the warning "'any?' may produce 'NoMethodError'"
           (conditions[i + 1 ..] || []).any? do |other|
-            next false unless condition.respond_to?(:build_complement_condition)
-            other == condition.build_complement_condition
+            condition.never_met_with?(other)
           end
         end
       end
@@ -140,7 +139,7 @@ module Rollbar
       def build_additional_conditions_set_for_subsequent_rules
         target_levels = level_condition&.target_level_values || Rollbar::Notification::Condition::Level::SUPPORTED_VALUES
 
-        conditions_with_complement = @conditions.select { |c| c.respond_to?(:build_complement_condition) }
+        conditions_with_complement = @conditions.select { |c| c.respond_to?(:build_complement_conditions) }
         return {} if conditions_with_complement.empty?
 
         # Build set of conditions for the complement condition
@@ -158,8 +157,10 @@ module Rollbar
         #   [cond1, cond2, not-cond3],
         #   [cond1, cond2, cond3, not-cond4],
         # ]
-        additional_conditions_set = conditions_with_complement.map.with_index do |cond, i|
-          [*conditions_with_complement[... i], cond.build_complement_condition]
+        additional_conditions_set = conditions_with_complement.flat_map.with_index do |cond, i|
+          cond.build_complement_conditions.map do |complement_cond|
+            [*conditions_with_complement[... i], complement_cond]
+          end
         end
 
         target_levels.zip([additional_conditions_set].cycle).to_h

data/rollbar-notification-rules-generator.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "rollbar-notification-rules-generator"
-  spec.version = `ruby -Ilib exe/rollbar-notification-rules-generator --version`.split(" ").last.chomp
+  spec.version = `RUBYOPT='' ruby -Ilib exe/rollbar-notification-rules-generator --version`.split(" ").last.chomp
   spec.authors = ["abicky"]
   spec.email = ["takeshi.arabiki@gmail.com"]
 

data/sig/defs.rbs

@@ -132,6 +132,9 @@ module Rollbar
 
         def hash: () -> Integer
 
+        # _@param_ `other`
+        def never_met_with?: ((Base | Rate) other) -> bool
+
         def to_tf: () -> String
 
         # _@param_ `other`
@@ -149,6 +152,7 @@ module Rollbar
       class Path < Rollbar::Notification::Condition::Base
         SUPPORTED_OPERATIONS: ::Array[String]
         OPERATION_TO_TEXT: ::Hash[String, String]
+        OPERATIONS_MET_ONLY_IF_PATH_EXISTS: ::Array[String]
 
         # _@param_ `path`
         # 
@@ -162,15 +166,20 @@ module Rollbar
 
         def hash: () -> Integer
 
+        # _@param_ `other`
+        def never_met_with?: ((Base | Rate) other) -> bool
+
         def to_tf: () -> String
 
         def to_s: () -> String
 
-        def build_complement_condition: () -> Path
+        def build_complement_conditions: () -> ::Array[Path]
 
         # _@param_ `other`
         def redundant_to?: ((Base | Rate) other) -> bool
 
+        def inverse_operation: () -> String
+
         attr_reader path: String
       end
 
@@ -184,6 +193,9 @@ module Rollbar
         # _@param_ `period`
         def initialize: (Integer count, Integer period) -> void
 
+        # _@param_ `other`
+        def never_met_with?: ((Base | Rate) other) -> bool
+
         def to_s: () -> String
 
         def to_tf: () -> String
@@ -221,9 +233,12 @@ module Rollbar
 
         def initialize: (String operation, String value) -> void
 
+        # _@param_ `other`
+        def never_met_with?: ((Base | Rate) other) -> bool
+
         def to_s: () -> String
 
-        def build_complement_condition: () -> Title
+        def build_complement_conditions: () -> ::Array[Title]
       end
 
       class Framework < Rollbar::Notification::Condition::Base
@@ -239,9 +254,12 @@ module Rollbar
 
         def initialize: (String operation, String value) -> void
 
+        # _@param_ `other`
+        def never_met_with?: ((Base | Rate) other) -> bool
+
         def to_s: () -> String
 
-        def build_complement_condition: () -> Environment
+        def build_complement_conditions: () -> ::Array[Environment]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar-notification-rules-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - abicky