cfn-guardian 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b64db0c4a4a45a9432c2cf750ac07b2600b54938e080fc24e3a50201144bfaa
-  data.tar.gz: 8e6561a49bd7be8d9185fd64f55e6d3d1842683e325c6c12b6c61ebad1058e43
+  metadata.gz: d581e6ce59e93bd98f1b542df4c5a9fb40d701b6d9d63db76388ab31c173a6c5
+  data.tar.gz: ae4f1428fb07d69a9005c62dbebad1e426a73f5025f916d3374218e6f2bf84c4
 SHA512:
-  metadata.gz: 4585cdc22260486afe530c5abd07f490d4d71a1a63f435d64e1bdc964ebb175a852b9d45af9b6ada79ee025bde0c7df88c1352ef2fc5bb799f507553186b3377
-  data.tar.gz: eca47bd9aab11dc4888e29aa7a4992512344db581ad06455d4283ec7009d1998a46dcb122191b37d5e300c60a6ee28bf0979a0c6a6c2cfc8281fe785b34ebafe
+  metadata.gz: f7bd308a2c4c7a8c8b44b88ceaad2c19a0f98911935eec52017987f0130e4299bf6dccf8b89d772d2797b7a610a696ed3bbf8ab7f79eb9a6782f8ee85f5d4dba
+  data.tar.gz: 0d69278f70848411b4e1baf8d495fa56bf858d67923f25888257bb12b9a806e13bcf5c2dc2cd23401c2df2435b4cee9b6416161e400c281c025c41c6efdf4d6c

data/README.md

@@ -496,7 +496,7 @@ Resources:
     # optionally set a file to check its existence and test the time it takes to get the file
     File: file.txt
     # optionally check for a regex match pattern in the body of the file
-    FileRegexMatch: ok
+    FileBodyMatch: ok
 ```
 
 #### InternalSFTP
@@ -525,7 +525,7 @@ Resources:
       PrivateKey: /ssm/path/privatekey
       PrivateKeyPass: /ssm/path/privatekey/password
       File: file.txt
-      FileRegexMatch: ok
+      FileBodyMatch: ok
 ```
 
 #### TLS

data/lib/cfnguardian/models/alarm.rb

@@ -207,6 +207,12 @@ module CfnGuardian
       end
     end
 
+    class InternalHttpAlarm < HttpAlarm
+      def initialize(resource)
+        super(resource)
+      end
+    end
+
     class PortAlarm < Alarm
       def initialize(resource)
         super(resource)
@@ -218,6 +224,12 @@ module CfnGuardian
         @evaluation_periods = 2
       end
     end
+
+    class InternalPortAlarm < PortAlarm
+      def initialize(resource)
+        super(resource)
+      end
+    end
     
     class SslAlarm < Alarm
       def initialize(resource)
@@ -228,6 +240,12 @@ module CfnGuardian
         @comparison_operator = 'LessThanThreshold'
       end
     end
+
+    class InternalSslAlarm < SslAlarm
+      def initialize(resource)
+        super(resource)
+      end
+    end
     
     class NrpeAlarm < Alarm
       def initialize(resource,environment)
@@ -335,6 +353,12 @@ module CfnGuardian
         @dimensions = { Host: resource['Id'], User: resource['User'] }
       end
     end
+
+    class InternalSFTPAlarm < SFTPAlarm
+      def initialize(resource)
+        super(resource)
+      end
+    end
     
     class TLSAlarm < Alarm
       def initialize(resource)

data/lib/cfnguardian/resources/internal_http.rb

@@ -3,25 +3,25 @@ require 'digest/md5'
 module CfnGuardian::Resource
   class InternalHttp < Base
     
-    def initialize(resource)
-      super(resource)
+    def initialize(resource, override_group = nil)
+      super(resource, override_group)
       @resource_list = resource['Hosts']
       @environment = resource['Environment']
     end
     
     def default_alarms    
       @resource_list.each do |host|
-        alarm = CfnGuardian::Models::HttpAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalHttpAlarm.new(host)
         alarm.name = 'EndpointAvailable'
         alarm.metric_name = 'Available'
         @alarms.push(alarm)
         
-        alarm = CfnGuardian::Models::HttpAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalHttpAlarm.new(host)
         alarm.name = 'EndpointStatusCodeMatch'
         alarm.metric_name = 'StatusCodeMatch'
         @alarms.push(alarm)
               
-        alarm = CfnGuardian::Models::HttpAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalHttpAlarm.new(host)
         alarm.name = 'EndpointTimeTaken'
         alarm.comparison_operator = 'GreaterThanThreshold'
         alarm.metric_name = 'TimeTaken'
@@ -32,20 +32,20 @@ module CfnGuardian::Resource
         @alarms.push(alarm)
         
         if host.has_key?('BodyRegex')
-          alarm = CfnGuardian::Models::HttpAlarm.new(host)
+          alarm = CfnGuardian::Models::InternalHttpAlarm.new(host)
           alarm.name = 'EndpointBodyRegexMatch'
           alarm.metric_name = 'ResponseBodyRegexMatch'
           @alarms.push(alarm)
         end
         
         if host.has_key?('Ssl') && host['Ssl']
-          alarm = CfnGuardian::Models::SslAlarm.new(host)
+          alarm = CfnGuardian::Models::InternalSslAlarm.new(host)
           alarm.name = 'ExpiresInDaysCritical'
           alarm.metric_name = 'ExpiresInDays'
           alarm.threshold = 5
           @alarms.push(alarm)
           
-          alarm = CfnGuardian::Models::SslAlarm.new(host)
+          alarm = CfnGuardian::Models::InternalSslAlarm.new(host)
           alarm.name = 'ExpiresInDaysTask'
           alarm.metric_name = 'ExpiresInDays'
           alarm.threshold = 30

data/lib/cfnguardian/resources/internal_port.rb

@@ -1,20 +1,20 @@
 module CfnGuardian::Resource
   class InternalPort < Base
     
-    def initialize(resource)
-      super(resource)
+    def initialize(resource, override_group = nil)
+      super(resource, override_group)
       @resource_list = resource['Hosts']
       @environment = resource['Environment']
     end
     
     def default_alarms    
       @resource_list.each do |host|
-        alarm = CfnGuardian::Models::PortAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalPortAlarm.new(host)
         alarm.name = 'EndpointAvailable'
         alarm.metric_name = 'Available'
         @alarms.push(alarm)
         
-        alarm = CfnGuardian::Models::PortAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalPortAlarm.new(host)
         alarm.name = 'EndpointTimeTaken'
         alarm.metric_name = 'TimeTaken'
         @alarms.push(alarm)

data/lib/cfnguardian/resources/internal_sftp.rb

@@ -1,20 +1,20 @@
 module CfnGuardian::Resource
   class InternalSFTP < Base
     
-    def initialize(resource)
-      super(resource)
+    def initialize(resource, override_group = nil)
+      super(resource, override_group)
       @resource_list = resource['Hosts']
       @environment = resource['Environment']
     end
     
     def default_alarms
       @resource_list.each do |host|
-        alarm = CfnGuardian::Models::SFTPAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalSFTPAlarm.new(host)
         alarm.name = 'Available'
         alarm.metric_name = 'Available'
         @alarms.push(alarm)
         
-        alarm = CfnGuardian::Models::SFTPAlarm.new(host)
+        alarm = CfnGuardian::Models::InternalSFTPAlarm.new(host)
         alarm.name = 'ConnectionTime'
         alarm.metric_name = 'ConnectionTime'
         alarm.comparison_operator = 'GreaterThanThreshold'
@@ -23,12 +23,12 @@ module CfnGuardian::Resource
         @alarms.push(alarm)
         
         if host.has_key?('File')
-          alarm = CfnGuardian::Models::SFTPAlarm.new(host)
+          alarm = CfnGuardian::Models::InternalSFTPAlarm.new(host)
           alarm.name = 'FileExists'
           alarm.metric_name = 'FileExists'
           @alarms.push(alarm)
         
-          alarm = CfnGuardian::Models::SFTPAlarm.new(host)
+          alarm = CfnGuardian::Models::InternalSFTPAlarm.new(host)
           alarm.name = 'FileGetTime'
           alarm.metric_name = 'FileGetTime'
           alarm.comparison_operator = 'GreaterThanThreshold'
@@ -36,8 +36,8 @@ module CfnGuardian::Resource
           alarm.threshold = 1000
           @alarms.push(alarm)
           
-          if host.has_key?('FileRegexMatch')
-            alarm = CfnGuardian::Models::SFTPAlarm.new(host)
+          if host.has_key?('FileBodyMatch')
+            alarm = CfnGuardian::Models::InternalSFTPAlarm.new(host)
             alarm.name = 'FileBodyMatch'
             alarm.metric_name = 'FileBodyMatch'
             @alarms.push(alarm)

data/lib/cfnguardian/resources/log_group.rb

@@ -1,8 +1,8 @@
 module CfnGuardian::Resource
   class LogGroup < Base
     
-    def initialize(resource)
-      super(resource)
+    def initialize(resource, override_group = nil)
+      super(resource, override_group)
       @resource_list = resource['MetricFilters']
     end
     

data/lib/cfnguardian/resources/sftp.rb

@@ -29,7 +29,7 @@ module CfnGuardian::Resource
         alarm.threshold = 1000
         @alarms.push(alarm)
         
-        if @resource.has_key?('FileRegexMatch')
+        if @resource.has_key?('FileBodyMatch')
           alarm = CfnGuardian::Models::SFTPAlarm.new(@resource)
           alarm.name = 'FileBodyMatch'
           alarm.metric_name = 'FileBodyMatch'

data/lib/cfnguardian/resources/sql.rb

@@ -4,8 +4,8 @@ require 'cfnguardian/string'
 module CfnGuardian::Resource
   class Sql < Base
     
-    def initialize(resource)
-      super(resource)
+    def initialize(resource, override_group = nil)
+      super(resource, override_group)
       @resource_list = resource['Hosts']
       @environment = resource['Environment']
     end

data/lib/cfnguardian/version.rb

@@ -1,4 +1,4 @@
 module CfnGuardian
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
   CHANGE_SET_VERSION = VERSION.gsub('.', '-').freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-guardian
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Guslington
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -289,7 +289,7 @@ metadata:
   homepage_uri: https://github.com/base2Services/cfn-guardian
   source_code_uri: https://github.com/base2Services/cfn-guardian
   changelog_uri: https://github.com/base2Services/cfn-guardian
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,9 +304,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Manages AWS cloudwatch alarms with default templates using cloudformation
 test_files: []