rollbar-notification-rules-generator 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7741d04c00243c59a3451ae2626619c1950012aae49833d0354e65a378312eb9
-  data.tar.gz: 2295ce6a7e025b9f51b9080bc3e39e87fbcdafdbe1798f5a7621a1078be85a96
+  metadata.gz: b69971ea33eb831637b2fbc7170b01dd6cce53e45f02d6f0b2c45c019900ed5a
+  data.tar.gz: 43b362b542727d83795bbc5efd0f9f219a224e0f2030d3579be755e97477f111
 SHA512:
-  metadata.gz: 7b43b62215e964fbe5e3790ba57573c1a93ed56745ee1eb6adabc2add13cfde0a23decb78d0289e78fb92f97b30a47623839780cbe8ac330153f047bcb2d999d
-  data.tar.gz: d2ee76d26ae45c3be12dcd972cc7d69b6fcd8c72d6dd96a922b364b601be90fa958609d8971cf6056bafc23ceca8cdec51611ec24bf2255a0a262c5d623fd46e
+  metadata.gz: f61baf0e620d426b92f9bcd5ea00709969d1b183febcbfe0f4cc8b9f288f2f23e33d4aea71d8e4a0357eb441b4a111ebbdfd40b45e54d37df971ff475df061ec
+  data.tar.gz: 0baee819bff11502752157d296a978a5a50e48f2e9efcaac4593a9820e192fe3801c2cafa1566857f12dc2b2df98fcd8e570fd17c8b760548a1c893effd48bc4

data/README.md

@@ -88,10 +88,12 @@ Usage: rollbar-notification-rules-generator [options] <input>
         --format FORMAT              terraform|text (default: terraform)
 ```
 
-The input file is in YAML format like the following: 
+The input file is in YAML format like the following:
 
 ```yaml
 channel: "slack" # slack or pagerduty
+# This optional value is used as the namespace of Terraform resources.
+terraform_provider: foo_
 # This optional value is used as provider meta-argument of Terraform.
 terraform_provider: rollbar.alias_value
 # You can define variables, and they are expanded with the syntax "${{ var.variable_name }}".

data/lib/rollbar/notification/channel.rb

@@ -4,16 +4,20 @@ require "rollbar/notification/trigger"
 module Rollbar
   class Notification
     class Channel
-      SUPPORTED_CHANNELS = %w[slack pagerduty]
+      CHANNEL_TO_TEXT = {
+        "slack" => "Slack",
+        "pagerduty" => "PagerDuty",
+      }
 
       # @param channel [String]
       # @param triggers [Hash{String => Array<Hash>}]
       # @param variables [Hash{String => String}]
       def initialize(channel, triggers, variables)
-        unless SUPPORTED_CHANNELS.include?(channel)
+        unless CHANNEL_TO_TEXT.include?(channel)
           raise ArgumentError, "Unsupported channel: #{channel}"
         end
 
+        @channel = channel
         @triggers = triggers.map do |trigger, rules|
           Rollbar::Notification::Trigger.new(channel, trigger, rules, variables)
         end
@@ -21,12 +25,12 @@ module Rollbar
 
       # @return [String]
       def to_s
-        @triggers.map(&:to_s).join.chomp
+        "# #{CHANNEL_TO_TEXT.fetch(@channel)}\n#{@triggers.map(&:to_s).join.chomp}"
       end
 
       # @param provider [String]
-      def to_tf(provider)
-        @triggers.map { |t| t.to_tf(provider) }.join("\n")
+      def to_tf(provider, namespace)
+        @triggers.map { |t| t.to_tf(provider, namespace) }.join("\n")
       end
     end
   end

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

@@ -17,6 +17,20 @@ module Rollbar
           @value = value
         end
 
+        # @param other [Object]
+        # @return [Boolean]
+        def ==(other)
+          self.class == other.class &&
+            type == other.type &&
+            operation == other.operation &&
+            value == other.value
+        end
+        alias :eql? :==
+
+        def hash
+          [self.class, type, operation, value].hash
+        end
+
         def to_tf
           <<~TF
             filters {

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

@@ -28,6 +28,18 @@ module Rollbar
           @path = path
         end
 
+        # @param other [Object]
+        # @return [Boolean]
+        def ==(other)
+          super && path == other.path
+        end
+        alias :eql? :==
+
+        def hash
+          [self.class, type, operation, value, path].hash
+        end
+
+
         def to_tf
           <<~TF
             filters {

data/lib/rollbar/notification/rule.rb

@@ -40,14 +40,32 @@ module Rollbar
         super
       end
 
+      # @param other [Object]
+      # @return [Boolean]
+      def ==(other)
+        self.class == other.class &&
+          conditions == other.conditions &&
+          configs == other.configs
+      end
+
       # @return [Rule]
       def remove_redundant_conditions!
+        @conditions.uniq!
         @conditions.delete_if do |condition|
           @conditions.any? { |other| condition.redundant_to?(other) }
         end
         self
       end
 
+      def never_met?
+        @conditions.each.with_index.any? do |condition, i|
+          @conditions[i + 1 ..].any? do |other|
+            next false unless condition.respond_to?(:build_complement_condition)
+            other == condition.build_complement_condition
+          end
+        end
+      end
+
       # @param old_condition [Condition::Base]
       # @param new_condition [Condition::Base]
       # @return [Rule]
@@ -101,37 +119,33 @@ module Rollbar
       # @param new_conditions [Condition::Base, Array<Condition::Base>]
       # @return [Rule]
       def add_conditions!(new_conditions)
-        Array(new_conditions).each do |new_condition|
-          @conditions << new_condition
-        end
+        @conditions.concat(Array(new_conditions))
         self
       end
 
-      # @return [Hash{String => Array<Condition::Base>}]
+      # @return [Hash{String => Array<Array<Condition::Base>>}]
       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) }
         return {} if conditions_with_complement.empty?
 
-        if conditions_with_complement.size == 1
-          additional_conditions = [[conditions_with_complement.first.build_complement_condition]]
-        else
-          # [cond1, cond2, cond3]
-          # => [
-          #     [cond1, cond2, not-cond3],
-          #     [cond1, not-cond2, cond3],
-          #     [cond1, not-cond2, not-cond3],
-          #     [not-cond1, cond2, cond3],
-          #     [not-cond1, cond2, not-cond3],
-          #     [not-cond1, not-cond2, cond3],
-          #     [not-cond1, not-cond2, not-cond3],
-          #   ]
-          additional_conditions = conditions_with_complement.map do |condition|
-            [condition, condition.build_complement_condition]
-          end.reduce(&:product).map(&:flatten) - [conditions_with_complement]
+        # [cond1, cond2, cond3]
+        # => [
+        #     [cond1, cond2, not-cond3],
+        #     [cond1, not-cond2, cond3],
+        #     [cond1, not-cond2, not-cond3],
+        #     [not-cond1, cond2, cond3],
+        #     [not-cond1, cond2, not-cond3],
+        #     [not-cond1, not-cond2, cond3],
+        #     [not-cond1, not-cond2, not-cond3],
+        #   ]
+        first_cond, *other_conds = conditions_with_complement.map do |condition|
+          [condition, condition.build_complement_condition]
         end
-        target_levels.zip([additional_conditions].cycle).to_h
+        additional_conditions_set = first_cond.product(*other_conds) - [conditions_with_complement]
+
+        target_levels.zip([additional_conditions_set].cycle).to_h
       end
 
       private

data/lib/rollbar/notification/trigger.rb

@@ -71,13 +71,13 @@ module Rollbar
         str
       end
 
-      def to_tf(provider)
+      def to_tf(provider, namespace)
         i = -1
         build_mutually_exclusive_rules.flat_map do |rule|
           rule.configs.map do |config|
             i += 1
             TF_TEMPLATE.result_with_hash({
-              resource_name: "#{@channel}_#{@name}_#{i}",
+              resource_name: "#{namespace}#{@channel}_#{@name}_#{i}",
               provider: provider,
               channel: @channel,
               trigger: @name,
@@ -102,9 +102,12 @@ module Rollbar
               new_rules << new_rule
             else
               additional_conditions_set.each do |additional_conditions|
-                new_rules << new_rule.dup
-                               .add_conditions!(additional_conditions)
-                               .remove_redundant_conditions!
+                new_rule_with_additional_conds = new_rule.dup
+                  .add_conditions!(additional_conditions)
+                  .remove_redundant_conditions!
+                unless new_rule_with_additional_conds.never_met?
+                  new_rules << new_rule_with_additional_conds
+                end
               end
             end
           end
@@ -114,7 +117,15 @@ module Rollbar
             highest_lowest_target_level = lowest_target_level
           end
           level_value_to_additional_conditions_set.merge!(rule.build_additional_conditions_set_for_subsequent_rules) do |_, v1, v2|
-            v1.product(v2).map(&:flatten)
+            additional_conditions_set = v1.product(v2).map(&:flatten)
+
+            additional_conditions_set.reject! do |conditions|
+              conditions.each.with_index.any? do |condition, i|
+                conditions[i + 1 ..].any? { |other| other == condition.build_complement_condition }
+              end
+            end
+
+            additional_conditions_set
           end
         end
 

data/lib/rollbar/notification.rb

@@ -5,11 +5,6 @@ require "rollbar/notification/channel"
 
 module Rollbar
   class Notification
-    CHANNEL_TO_TEXT = {
-      "slack" => "Slack",
-      "pagerduty" => "PagerDuty",
-    }
-
     # @param config_file [String]
     def initialize(config_file)
       @config = YAML.load_file(config_file)
@@ -22,12 +17,12 @@ module Rollbar
 
     # @return [String]
     def to_s
-      "# #{CHANNEL_TO_TEXT.fetch(@config.fetch("channel"))}\n#{@channel.to_s}"
+      @channel.to_s
     end
 
     # @return [String]
     def to_tf
-      @channel.to_tf(@config["terraform_provider"])
+      @channel.to_tf(@config["terraform_provider"], @config["terraform_namespace"])
     end
   end
 end

data/rollbar-notification-rules-generator.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "rollbar-notification-rules-generator"
-  spec.version = "0.2.0"
+  spec.version = "0.2.2"
   spec.authors = ["abicky"]
   spec.email = ["takeshi.arabiki@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar-notification-rules-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - abicky
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies: []
 description: This tool generates Rollbar notification rules that are mutually exclusive
   from a simple YAML file.