Release 4.0.1

* Task: https://redmine.redborder.lan/issues/17621

* fix rbcli service command
---------

Co-authored-by: nilsver <[email protected]>
Co-authored-by: nilsver <[email protected]>

Author: dcastro-redBorder

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-rb-proxy CHANGELOG
 ===============
 
+## 4.0.1
+
+  - nilsver
+    - [a4a0af5] fix rbcli service command
+
 ## 4.0.0
 
   - Miguel Negrón

resources/libraries/proxy_services.rb

@@ -19,6 +19,21 @@ def proxy_services
         end
       end
 
+      begin
+        file_services = JSON.parse(File.read('/etc/redborder/services.json'))
+      rescue Errno::ENOENT, JSON::ParserError => e
+        Chef::Log.warn("Error loading services from file: #{e.message}")
+        file_services = {}
+      end
+
+      systemd_services = node.attributes['redborder']['systemdservices']
+      systemd_services.each do |service_name, systemd_name|
+        sys_name = systemd_name.join(',')
+        if file_services.key?(sys_name)
+          proxy_services[service_name] = file_services[sys_name]
+        end
+      end
+
       proxy_services
     end
   end

resources/libraries/update_hosts_file.rb

@@ -1,5 +1,7 @@
 module RbProxy
   module Helpers
+    require 'resolv'
+
     def read_hosts_file
       hosts_hash = Hash.new { |hash, key| hash[key] = [] }
       File.readlines('/etc/hosts').each do |line|
@@ -13,9 +15,15 @@ def read_hosts_file
     end
 
     def update_hosts_file
-      manager_registration_ip = node['redborder']['manager_registration_ip'] if node['redborder'] && node['redborder']['manager_registration_ip']
-
-      return unless manager_registration_ip
+      unless node.dig('redborder', 'resolve_host')
+        domain_name = node.dig('redborder', 'manager_registration_ip')
+        return if domain_name.nil?
+        resolved_ip = manager_to_ip(domain_name)
+        return if resolved_ip.nil?
+        node.normal['redborder']['resolve_host'] = resolved_ip
+      end
+      manager_registration_ip = node.dig('redborder', 'resolve_host')
+      # Up until here, we resolved and stored the ip for /etc/hosts only if necessary
 
       running_services = node['redborder']['systemdservices'].values.flatten if node['redborder']['systemdservices']
       databags = Chef::DataBag.load('rBglobal').keys.grep(/^ipvirtual-external-/).map { |bag| bag.sub('ipvirtual-external-', '') }
@@ -53,5 +61,16 @@ def update_hosts_file
       end
       hosts_entries
     end
+
+    def manager_to_ip(str)
+      ipv4_regex = /\A(\d{1,3}\.){3}\d{1,3}\z/
+      ipv6_regex = /\A(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}\z/
+      dns_regex  = /\A[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+\z/
+
+      return str if str.match?(ipv4_regex) || str.match?(ipv6_regex)
+      return Resolv.getaddress(str).to_s if str.match?(dns_regex)
+
+      nil
+    end
   end
 end

resources/metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder proxy'
-version          '4.0.0'
+version          '4.0.1'
 
 depends 'rb-common'
 depends 'rb-selinux'

resources/recipes/prepare_system.rb

@@ -90,13 +90,15 @@
 end
 
 # Build service list for rbcli
-services = node['redborder']['services'] || []
-systemd_services = node['redborder']['systemdservices'] || []
-service_enablement = {}
+unless File.exist?('/etc/redborder/services.json')
+  services = node['redborder']['services'] || []
+  systemd_services = node['redborder']['systemdservices'] || []
+  service_enablement = {}
 
-systemd_services.each do |service_name, systemd_name|
-  service_enablement[systemd_name.first] = services[service_name]
-end
+  systemd_services.each do |service_name, systemd_name|
+    service_enablement[systemd_name.first] = services[service_name]
+  end
 
-Chef::Log.info('Saving services enablement into /etc/redborder/services.json')
-File.write('/etc/redborder/services.json', JSON.pretty_generate(service_enablement))
+  Chef::Log.info('Saving services enablement into /etc/redborder/services.json')
+  File.write('/etc/redborder/services.json', JSON.pretty_generate(service_enablement))
+end