Improvement/fix lint (#32)

* Fix: Update styles in attributes * Fix: Update styles in libraries * Fix: Update styles in metadata.rb * Fix: Update styles in recipes * Fix: rename .rb into .rb.erb
redBorder · Jun 11, 2024 · 91f880b · 91f880b
1 parent 208cb02
commit 91f880b
Show file tree

Hide file tree

Showing 15 changed files with 430 additions and 395 deletions.
diff --git a/resources/attributes/default.rb b/resources/attributes/default.rb
@@ -1,86 +1,76 @@
 # require 'set' TODO: refactor to this
-#Default attributes
 
-#general
-default["redborder"]["cdomain"] = "redborder.cluster"
-default["redborder"]["organization_uuid"] = nil
-default["redborder"]["organizations"] = []
-default["redborder"]["locations"] = [
-                                      "namespace", "namespace_uuid", "organization", "organization_uuid", \
-                                      "service_provider", "service_provider_uuid", "deployment", \
-                                      "deployment_uuid", "market", "market_uuid", "campus", "campus_uuid", \
-                                      "building", "building_uuid", "floor", "floor_uuid"
-                                    ]
+# general
+default['redborder']['cdomain'] = 'redborder.cluster'
+default['redborder']['organization_uuid'] = nil
+default['redborder']['organizations'] = []
+default['redborder']['locations'] = %w(namespace namespace_uuid organization organization_uuid service_provider service_provider_uuid deployment deployment_uuid market market_uuid campus campus_uuid building building_uuid floor floor_uuid)
 
-default["redborder"]["proxy"]["insecure"] = true
+default['redborder']['proxy']['insecure'] = true
 
-#chef-client
-default["chef-client"]["interval"] = 300
-default["chef-client"]["splay"] = 100
-default["chef-client"]["options"] = ""
+# chef-client
+default['chef-client']['interval'] = 300
+default['chef-client']['splay'] = 100
+default['chef-client']['options'] = ''
 
-#kafka
-default["redborder"]["kafka"]["port"] = 9092
-default["redborder"]["kafka"]["logdir"] = "/var/log/kafka"
-default["redborder"]["kafka"]["host_index"] = 0
+# kafka
+default['redborder']['kafka']['port'] = 9092
+default['redborder']['kafka']['logdir'] = '/var/log/kafka'
+default['redborder']['kafka']['host_index'] = 0
 
-#zookeeper
-default["redborder"]["zookeeper"]["zk_hosts"] = ""
-default["redborder"]["zookeeper"]["port"] = 2181
+# zookeeper
+default['redborder']['zookeeper']['zk_hosts'] = ''
+default['redborder']['zookeeper']['port'] = 2181
 
 # memory
-default["redborder"]["memory_services"]    = {}
-#default["redborder"]["memory_services"]["kafka"]     = {"count" => 150, "memory" => 0,"max_limit" => 2097152}
-default["redborder"]["memory_services"]["kafka"]     = {"count" => 150, "memory" => 0,"max_limit" => 524288}
-default["redborder"]["memory_services"]["zookeeper"] = {"count" => 20, "memory" => 0}
-default["redborder"]["memory_services"]["chef-client"] = {"count" => 10, "memory" => 0}
-default["redborder"]["memory_services"]["http2k"] = {"count" => 10, "memory" => 0}
-default["redborder"]["memory_services"]["chef-server"] = {"count" => 10, "memory" => 0}
-default["redborder"]["memory_services"]["snmp"] = {"count" => 5, "memory" => 0, "max_limit" => 10000 }
-default["redborder"]["memory_services"]["redborder-monitor"] = {"count" => 5, "memory" => 0, "max_limit" => 20000 }
-default["redborder"]["memory_services"]["f2k"] = { "count" => 40, "memory" => 0 }
-default["redborder"]["memory_services"]["redborder-nmsp"] = {"count" => 10, "memory" => 0 }
-default["redborder"]["memory_services"]["n2klocd"] = {"count" => 10, "memory" => 0 }
-default["redborder"]["memory_services"]["k2http"] = {"count" => 10, "memory" => 0 }
+default['redborder']['memory_services'] = {}
+default['redborder']['memory_services']['kafka'] = { 'count': 150, 'memory': 0, 'max_limit': 524288 }
+default['redborder']['memory_services']['zookeeper'] = { 'count': 20, 'memory': 0 }
+default['redborder']['memory_services']['chef-client'] = { 'count': 10, 'memory': 0 }
+default['redborder']['memory_services']['http2k'] = { 'count': 10, 'memory': 0 }
+default['redborder']['memory_services']['chef-server'] = { 'count': 10, 'memory': 0 }
+default['redborder']['memory_services']['snmp'] = { 'count': 5, 'memory': 0, 'max_limit': 10000 }
+default['redborder']['memory_services']['redborder-monitor'] = { 'count': 5, 'memory': 0, 'max_limit': 20000 }
+default['redborder']['memory_services']['f2k'] = { 'count': 40, 'memory': 0 }
+default['redborder']['memory_services']['redborder-nmsp'] = { 'count': 10, 'memory': 0 }
+default['redborder']['memory_services']['n2klocd'] = { 'count': 10, 'memory': 0 }
+default['redborder']['memory_services']['k2http'] = { 'count': 10, 'memory': 0 }
 
 # exclude mem services, setting memory to 0 for each.
 default['redborder']['excluded_memory_services'] = ['chef-client']
 
-default["redborder"]["services"] = {}
-default["redborder"]["services"]["chef-client"]               = true
-default["redborder"]["services"]["kafka"]                     = true
-default["redborder"]["services"]["zookeeper"]                 = true
-default["redborder"]["services"]["rb-monitor"]                = true
-# default["redborder"]["services"]["geoip"]                     = true
-default["redborder"]["services"]["redborder-monitor"]         = true
-default["redborder"]["services"]["redborder-scanner"]         = true
-default["redborder"]["services"]["snmp"]                      = true
-default["redborder"]["services"]["f2k"]                       = true
-default["redborder"]["services"]["logstash"]                  = true
-default["redborder"]["services"]["pmacct"]                    = true
-default["redborder"]["services"]["rsyslog"]                   = true
-default["redborder"]["services"]["redborder-nmsp"]            = true
-default["redborder"]["services"]["redborder-ale"]             = true
-default["redborder"]["services"]["n2klocd"]                   = true
-default["redborder"]["services"]["radiusd"]                   = true
-default["redborder"]["services"]["k2http"]                    = true
-default["redborder"]["services"]["redborder-exporter"]        = true
-
-default["redborder"]["systemdservices"]["chef-client"]            = ["chef-client"]
-default["redborder"]["systemdservices"]["kafka"]                  = ["kafka"]
-default["redborder"]["systemdservices"]["zookeeper"]              = ["zookeeper"]
-# default["redborder"]["systemdservices"]["geoip"]                  = ["geoip"]
-default["redborder"]["systemdservices"]["redborder-monitor"]      = ["redborder-monitor"]
-default["redborder"]["systemdservices"]["redborder-scanner"]      = ["redborder-scanner"]
-default["redborder"]["systemdservices"]["snmp"]                   = ["snmpd"]
-default["redborder"]["systemdservices"]["f2k"]                    = ["f2k"]
-default["redborder"]["systemdservices"]["logstash"]               = ["logstash"]
-default["redborder"]["systemdservices"]["pmacct"]                 = ["sfacctd"]
-default["redborder"]["systemdservices"]["rsyslog"]                = ["rsyslog"]
-default["redborder"]["systemdservices"]["redborder-nmsp"]         = ["redborder-nmsp"]
-default["redborder"]["systemdservices"]["redborder-ale"]          = ["redborder-ale"]
-default["redborder"]["systemdservices"]["n2klocd"]                = ["n2klocd"]
-default["redborder"]["systemdservices"]["radiusd"]                = ["radiusd"]
-default["redborder"]["systemdservices"]["k2http"]                 = ["k2http"]
-default["redborder"]["systemdservices"]["redborder-exporter"]     = ["rb-exporter"]
+default['redborder']['services'] = {}
+default['redborder']['services']['chef-client'] = true
+default['redborder']['services']['kafka'] = true
+default['redborder']['services']['zookeeper'] = true
+default['redborder']['services']['rb-monitor'] = true
+default['redborder']['services']['redborder-monitor'] = true
+default['redborder']['services']['redborder-scanner'] = true
+default['redborder']['services']['snmp'] = true
+default['redborder']['services']['f2k'] = true
+default['redborder']['services']['logstash'] = true
+default['redborder']['services']['pmacct'] = true
+default['redborder']['services']['rsyslog'] = true
+default['redborder']['services']['redborder-nmsp'] = true
+default['redborder']['services']['redborder-ale'] = true
+default['redborder']['services']['n2klocd'] = true
+default['redborder']['services']['radiusd'] = true
+default['redborder']['services']['k2http'] = true
+default['redborder']['services']['redborder-exporter'] = true
 
+default['redborder']['systemdservices']['chef-client'] = ['chef-client']
+default['redborder']['systemdservices']['kafka'] = ['kafka']
+default['redborder']['systemdservices']['zookeeper'] = ['zookeeper']
+default['redborder']['systemdservices']['redborder-monitor'] = ['redborder-monitor']
+default['redborder']['systemdservices']['redborder-scanner'] = ['redborder-scanner']
+default['redborder']['systemdservices']['snmp'] = ['snmpd']
+default['redborder']['systemdservices']['f2k'] = ['f2k']
+default['redborder']['systemdservices']['logstash'] = ['logstash']
+default['redborder']['systemdservices']['pmacct'] = ['sfacctd']
+default['redborder']['systemdservices']['rsyslog'] = ['rsyslog']
+default['redborder']['systemdservices']['redborder-nmsp'] = ['redborder-nmsp']
+default['redborder']['systemdservices']['redborder-ale'] = ['redborder-ale']
+default['redborder']['systemdservices']['n2klocd'] = ['n2klocd']
+default['redborder']['systemdservices']['radiusd'] = ['radiusd']
+default['redborder']['systemdservices']['k2http'] = ['k2http']
+default['redborder']['systemdservices']['redborder-exporter'] = ['rb-exporter']
diff --git a/resources/libraries/get_namespaces.rb b/resources/libraries/get_namespaces.rb
@@ -1,14 +1,15 @@
-module Rb_proxy
-    module Helpers
-      def get_namespaces
-        namespaces = []
-        Chef::Role.list.keys.each do |rol|
-          ro = Chef::Role.load rol
-          if ro and ro.override_attributes["redborder"] and ro.override_attributes["redborder"]["namespace"] and ro.override_attributes["redborder"]["namespace_uuid"] and !ro.override_attributes["redborder"]["namespace_uuid"].empty?
-            namespaces.push(ro.override_attributes["redborder"]["namespace_uuid"])
-          end
-        end
-        namespaces.uniq
+module RbProxy
+  module Helpers
+    def get_namespaces
+      namespaces = []
+      Chef::Role.list.each_key do |rol|
+        ro = Chef::Role.load rol
+        next unless ro && ro.override_attributes['redborder'] && ro.override_attributes['redborder']['namespace'] && ro.override_attributes['redborder']['namespace_uuid'] && !ro.override_attributes['redborder']['namespace_uuid'].empty?
+
+        namespaces.push(ro.override_attributes['redborder']['namespace_uuid'])
       end
+
+      namespaces.uniq
     end
-  end
+  end
+end
diff --git a/resources/libraries/get_orgs.rb b/resources/libraries/get_orgs.rb
@@ -1,18 +1,16 @@
-module Rb_proxy
-    module Helpers
-      def get_orgs()
-
-        organizations = []
-
-        Chef::Role.list.keys.each do |m_key|
-          m = Chef::Role.load m_key
-          if !m.override_attributes["redborder"].nil? and !m.override_attributes["redborder"]["organization_uuid"].nil? and m.override_attributes["redborder"]["sensor_uuid"] == m.override_attributes["redborder"]["organization_uuid"]
-            organizations << m
-          end
-        end
-
-        organizations
-
+module RbProxy
+  module Helpers
+    def get_orgs
+      organizations = []
+
+      Chef::Role.list.each_key do |m_key|
+        m = Chef::Role.load m_key
+        next unless m.override_attributes['redborder'] && m.override_attributes['redborder']['organization_uuid'] && m.override_attributes['redborder']['sensor_uuid'] == m.override_attributes['redborder']['organization_uuid']
+
+        organizations << m
       end
+
+      organizations
     end
-end
+  end
+end
diff --git a/resources/libraries/get_sensors_all_info.rb b/resources/libraries/get_sensors_all_info.rb
@@ -1,18 +1,17 @@
-module Rb_proxy
-    module Helpers
-      def get_sensors_all_info()
-        sensors_info = {}
-        sensor_types = ["vault-sensor","flow-sensor","mse-sensor","scanner-sensor","meraki-sensor","ale-sensor", "device-sensor"]
-
-        sensor_types.each do |s_type|
-          sensors = search(:node, "role:#{s_type} AND redborder_parent_id:#{node["redborder"]["sensor_id"]}").sort
-
-          sensors_info[s_type] = []
-          sensors.each do |s|
-            sensors_info[s_type] << s
-          end
-        end
-        sensors_info
+module RbProxy
+  module Helpers
+    def get_sensors_all_info
+      sensors_info = {}
+      sensor_types = %w(vault-sensor flow-sensor mse-sensor scanner-sensor meraki-sensor ale-sensor device-sensor)
+
+      sensor_types.each do |s_type|
+        sensors = search(:node, "role:#{s_type} AND redborder_parent_id:#{node['redborder']['sensor_id']}").sort
+
+        sensors_info[s_type] = []
+        sensors.each { |s| sensors_info[s_type] << s }
       end
+
+      sensors_info
     end
   end
+end
diff --git a/resources/libraries/get_sensors_info.rb b/resources/libraries/get_sensors_info.rb
@@ -1,38 +1,43 @@
-module Rb_proxy
-    module Helpers
-      def get_sensors_info()
-        sensors_info = {}
-        sensor_types = ["vault-sensor","flow-sensor","mse-sensor","scanner-sensor","meraki-sensor","ale-sensor", "device-sensor"]
-        locations = node["redborder"]["locations"] rescue {}
-
-
-        sensor_types.each do |s_type|
-          sensors = search(:node, "role:#{s_type} AND redborder_parent_id:#{node["redborder"]["sensor_id"]}").sort
-          info = {}
-          found_sensor = false
-
-          sensors_info[s_type] = {}
-          sensors.each do |s|
-            found_sensor = true
-            info["name"] = s.name
-            info["ip"] = s["ipaddress"]
-            info["sensor_uuid"] = s["redborder"]["sensor_uuid"] if !s["redborder"]["sensor_uuid"].nil?
-            info["organization_uuid"] = s["redborder"]["organization_uuid"] if !s["redborder"]["organization_uuid"].nil?
-            info["megabytes_limit"] = s["redborder"]["megabytes_limit"] if !s["redborder"]["megabytes_limit"].nil?
-            info["index_partitions"] = s["redborder"]["index_partitions"] if !s["redborder"]["index_partitions"].nil?
-            info["index_replicas"] = s["redborder"]["index_replicas"] if !s["redborder"]["index_replicas"].nil?
-            info["sensors_mapping"] = s["redborder"]["sensors_mapping"] if !s["redborder"]["sensors_mapping"].nil?
-            info["locations"] = {}
-            locations.each do |loc|
-              if !s["redborder"][loc].nil?
-                info["locations"][loc] = s["redborder"][loc]
-              end
-            end
-            sensors_info[s_type][s.name] = info if found_sensor
+module RbProxy
+  module Helpers
+    def get_sensors_info
+      sensors_info = {}
+      sensor_types = %w(vault-sensor flow-sensor mse-sensor scanner-sensor meraki-sensor ale-sensor device-sensor)
+
+      locations = {}
+      if node['redborder'] && node['redborder']['locations']
+        locations = node['redborder']['locations']
+      end
+
+      sensor_types.each do |s_type|
+        sensors = search(:node, "role:#{s_type} AND redborder_parent_id:#{node['redborder']['sensor_id']}").sort
+        info = {}
+        found_sensor = false
+
+        sensors_info[s_type] = {}
+        sensors.each do |s|
+          found_sensor = true
+          info['name'] = s.name
+          info['ip'] = s['ipaddress']
+          info['sensor_uuid'] = s['redborder']['sensor_uuid'] if s['redborder']['sensor_uuid']
+          info['organization_uuid'] = s['redborder']['organization_uuid'] if s['redborder']['organization_uuid']
+          info['megabytes_limit'] = s['redborder']['megabytes_limit'] if s['redborder']['megabytes_limit']
+          info['index_partitions'] = s['redborder']['index_partitions'] if s['redborder']['index_partitions']
+          info['index_replicas'] = s['redborder']['index_replicas'] if s['redborder']['index_replicas']
+          info['sensors_mapping'] = s['redborder']['sensors_mapping'] if s['redborder']['sensors_mapping']
+          info['locations'] = {}
+
+          locations.each do |loc|
+            next unless s['redborder'][loc]
+
+            info['locations'][loc] = s['redborder'][loc]
           end
+
+          sensors_info[s_type][s.name] = info if found_sensor
         end
-        return sensors_info
       end
+
+      sensors_info
     end
   end
-  
+end
diff --git a/resources/libraries/in_hash.rb b/resources/libraries/in_hash.rb
@@ -1,15 +1,13 @@
 class Chef
-    class Recipe
-
-        def in_hash?(hash, *keys)                                                                                            
-        if hash[keys.first] && keys.size == 1
-            return true
-        elsif hash[keys.first] && hash[keys.first].is_a?(Hash)
-            in_hash? hash[keys.first], *keys[1..keys.size-1]
-        else
-            return false
-        end
-        end
-
+  class Recipe
+    def in_hash?(hash, *keys)
+      if hash[keys.first] && keys.size == 1
+        true
+      elsif hash[keys.first] && hash[keys.first].is_a?(Hash)
+        in_hash? hash[keys.first], *keys[1..keys.size - 1]
+      else
+        false
+      end
     end
-end
+  end
+end