From ce7118addac872cb410408f3d52832c854e05794 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Fri, 14 Jun 2024 17:25:52 +0100
Subject: [PATCH 01/15] add missing file of zeromq

---
 spec/configuration/ale_spec.rb | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/spec/configuration/ale_spec.rb b/spec/configuration/ale_spec.rb
index 716da95..63af867 100644
--- a/spec/configuration/ale_spec.rb
+++ b/spec/configuration/ale_spec.rb
@@ -3,9 +3,33 @@
 require 'spec_helper'
 set :os, family: 'redhat', release: '9', arch: 'x86_64'
 
-# TODO: only do it if ale  is enabled
-describe 'Check ale config' do
-  describe file('/etc/redborder-ale/schema.pb.rb') do
+is_package_installed = package('redborder-ale').installed?
+
+if is_package_installed
+  describe 'Check ale config' do
+    describe file('/etc/redborder-ale/schema.pb.rb') do
+      it { should exist }
+      it { should be_file }
+    end
+
+    describe file('/etc/redborder-ale/config.yml') do
+      it { should exist }
+      it { should be_file }
+    end
+
+    describe file('/etc/redborder-ale/rb_ale_aps.conf') do
+      it { should exist }
+      it { should be_file }
+    end
+
+    # Additional dependencies
+    describe file('/usr/lib64/libzmq.so') do
+      it { should exist }
+      it { should be_file }
+    end
+  end
+
+  describe file('/var/rb-ale/bin/rb_ale.rb') do
     it { should exist }
     it { should be_file }
   end

From cbdb0cf48b10cb1c8052a86dbe50c858f30b5acf Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Mon, 17 Jun 2024 08:57:32 +0100
Subject: [PATCH 02/15] dependency check of package zeromq-devel

---
 spec/configuration/ale_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/configuration/ale_spec.rb b/spec/configuration/ale_spec.rb
index 63af867..0907efd 100644
--- a/spec/configuration/ale_spec.rb
+++ b/spec/configuration/ale_spec.rb
@@ -27,6 +27,10 @@
       it { should exist }
       it { should be_file }
     end
+
+    describe package('zeromq-devel') do
+      it { should be_installed }
+    end
   end
 
   describe file('/var/rb-ale/bin/rb_ale.rb') do

From 988b6e47aa71f8cc37e64ab0b4fcef354845de9e Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Mon, 17 Jun 2024 09:23:57 +0100
Subject: [PATCH 03/15] conditional to every configuration and service is
 conditional also and has no port

---
 spec/configuration/ale_spec.rb | 34 +++++++++++++--------------
 spec/services/ale_spec.rb      | 43 ++++++++++------------------------
 2 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/spec/configuration/ale_spec.rb b/spec/configuration/ale_spec.rb
index 0907efd..c74db11 100644
--- a/spec/configuration/ale_spec.rb
+++ b/spec/configuration/ale_spec.rb
@@ -47,25 +47,25 @@
     it { should exist }
     it { should be_file }
   end
-end
 
-describe file('/var/rb-ale/bin/rb_ale.rb') do
-  it { should exist }
-  it { should be_file }
-  it { should be_executable.by(:owner) }
-  it { should be_executable.by(:group) }
-  its(:content) { should match(%r{^(\s*#.*|)#!/usr/bin/env\s+ruby.*$}) }
-end
+  describe file('/var/rb-ale/bin/rb_ale.rb') do
+    it { should exist }
+    it { should be_file }
+    it { should be_executable.by(:owner) }
+    it { should be_executable.by(:group) }
+    its(:content) { should match(%r{^(\s*#.*|)#!/usr/bin/env\s+ruby.*$}) }
+  end
 
-describe file('/usr/bin/rb_scan_ale.rb') do
-  it { should exist }
-  it { should be_file }
-  it { should be_executable.by(:owner) }
-  it { should be_executable.by(:group) }
-end
+  describe file('/usr/bin/rb_scan_ale.rb') do
+    it { should exist }
+    it { should be_file }
+    it { should be_executable.by(:owner) }
+    it { should be_executable.by(:group) }
+  end
 
-describe 'Redborder-Ale user config' do
-  describe command('sudo -u redborder-ale bash -lc "ruby -v"') do
-    its(:stdout) { should match(/ruby 2.7.5/) }
+  describe 'Redborder-Ale user config' do
+    describe command('sudo -u redborder-ale bash -lc "ruby -v"') do
+      its(:stdout) { should match(/ruby 2.7.5/) }
+    end
   end
 end
diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index 43ec3b1..25016a3 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -5,39 +5,22 @@
 set :os, family: 'redhat', release: '9', arch: 'x86_64'
 
 service = 'redborder-ale'
-package = 'redborder-ale'
 
-describe "Checking packages for #{service}..." do
-    describe package(package) do
-      before do
-        skip("#{package} is not installed, skipping...") unless package(package).installed?
-      end
-
-      it 'is expected to be installed' do
-        expect(package(package).installed?).to be true
-      end
-    end
-end
+is_package_installed = package('redborder-ale').installed?
 
-service_status = command("systemctl is-enabled #{service}").stdout.strip
-describe "Checking #{service_status} service for #{service}..." do
-  describe service(service) do
-    if service_status == 'enabled'
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
-
-if service_status == 'disabled'
+if is_package_installed
+  service_status = command("systemctl is-enabled #{service}").stdout.strip
   describe "Checking #{service_status} service for #{service}..." do
-    describe service(service) do
-      it { should_not be_enabled }
-      it { should_not be_running }
-    end
-
-    describe port(port) do
-      it { should_not be_listening }
+    if service_status == 'enabled'
+      describe service(service) do
+        it { should be_enabled }
+        it { should be_running }
+      end
+    elsif service_status == 'disabled'
+      describe service(service) do
+        it { should_not be_enabled }
+        it { should_not be_running }
+      end
     end
   end
 end

From 98f77b9747844191ec8cbea07c3e21188bc69fe3 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Tue, 25 Jun 2024 16:06:25 +0100
Subject: [PATCH 04/15] simplify ale pkg and service check. Removed ruby path
 checking because not working

---
 spec/services/ale_spec.rb | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index d3f1a7a..efc8acd 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -4,45 +4,35 @@
 require 'set'
 set :os, family: 'redhat', release: '9', arch: 'x86_64'
 
-service = 'redborder-ale'
+service = pkg = 'redborder-ale'
 
 describe "Checking packages for #{service}..." do
-  describe package(package) do
+  describe package(pkg) do
     before do
-      skip("#{package} is not installed, skipping...") unless package(package).installed?
+      skip("#{pkg} is not installed, skipping...") unless package(pkg).installed?
     end
 
     it 'is expected to be installed' do
-      expect(package(package).installed?).to be true
+      expect(package(pkg).installed?).to be true
     end
   end
 end
 
 service_status = command("systemctl is-enabled #{service}").stdout.strip
 describe "Checking #{service_status} service for #{service}..." do
-  describe service(service) do
-    if service_status == 'enabled'
+  if service_status == 'enabled'
+    describe service(service) do
       it { should be_enabled }
       it { should be_running }
     end
-  end
-end
-
-describe 'Redborder-ale is using correct ruby setup' do
-  if service_status == 'enabled'
-    describe command('sudo -u redborder-ale which ruby') do
-      its(:stdout) { should match %r{/usr/lib/rvm/rubies/ruby-2.7.5/bin/ruby} }
-    end
   elsif service_status == 'disabled'
-    describe "Checking #{service_status} service for #{service}..." do
-      describe service(service) do
-        it { should_not be_enabled }
-        it { should_not be_running }
-      end
+    describe service(service) do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
 
-      describe port(port) do
-        it { should_not be_listening }
-      end
+    describe port(port) do
+      it { should_not be_listening }
     end
   end
 end

From 7928e000e2d33a4e00b90aedda3a0c9ae62ac225 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 11 Jul 2024 10:25:19 +0100
Subject: [PATCH 05/15] consul tests fixed when no existing service is called

---
 spec/services/consul_spec.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/services/consul_spec.rb b/spec/services/consul_spec.rb
index be324de..c40de91 100644
--- a/spec/services/consul_spec.rb
+++ b/spec/services/consul_spec.rb
@@ -40,9 +40,13 @@
       it { should be_listening }
     end
 
-    describe 'Registered in consul' do
+    # Use this block to test other services that need to be registered in consul
+    describe "#{service} Registered in consul" do 
       service_json_cluster = command("curl -s #{api_endpoint}/catalog/service/#{service} | jq -c 'group_by(.ID)[]'")
       service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
+      it "API response for #{service} should not be empty" do
+        expect(service_json_cluster).not_to be_empty
+      end
       health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
       health_cluster = health_cluster.stdout.chomp.split("\n")
       service_and_health = service_json_cluster.zip(health_cluster)

From 8f6daf15c80e57c38ea821a556a49ccc6c92c883 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 11 Jul 2024 10:29:06 +0100
Subject: [PATCH 06/15] ale checking consul

---
 spec/services/ale_spec.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index efc8acd..85daef4 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -35,4 +35,25 @@
       it { should_not be_listening }
     end
   end
+
+  describe 'Redborder-ale is registered in consul' do
+    if service_status == 'enabled'
+      describe "#{service} Registered in consul" do 
+        service_json_cluster = command("curl -s #{api_endpoint}/catalog/service/#{service} | jq -c 'group_by(.ID)[]'")
+        service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
+        it "API response for #{service} should not be empty" do
+          expect(service_json_cluster).not_to be_empty
+        end
+        health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
+        health_cluster = health_cluster.stdout.chomp.split("\n")
+        service_and_health = service_json_cluster.zip(health_cluster)
+        service_and_health.each do |service, health|
+        registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
+          it 'Should be registered and enabled' do
+            expect(registered).to be true
+          end
+        end
+      end
+    end
+  end
 end

From 6b0d66c5856e39642a3c47faca18e2c6aabcbcad Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 11 Jul 2024 10:41:15 +0100
Subject: [PATCH 07/15] moving variable into the describe

---
 spec/services/ale_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index 85daef4..02b8ba5 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -48,8 +48,8 @@
         health_cluster = health_cluster.stdout.chomp.split("\n")
         service_and_health = service_json_cluster.zip(health_cluster)
         service_and_health.each do |service, health|
-        registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
           it 'Should be registered and enabled' do
+            registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
             expect(registered).to be true
           end
         end

From cb4ff1b424df895cbf850be5823aa2dd9106d14f Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 11 Jul 2024 12:59:03 +0100
Subject: [PATCH 08/15] lint

---
 spec/services/ale_spec.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index 02b8ba5..9686e50 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -35,23 +35,23 @@
       it { should_not be_listening }
     end
   end
+end
 
-  describe 'Redborder-ale is registered in consul' do
-    if service_status == 'enabled'
-      describe "#{service} Registered in consul" do 
-        service_json_cluster = command("curl -s #{api_endpoint}/catalog/service/#{service} | jq -c 'group_by(.ID)[]'")
-        service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
-        it "API response for #{service} should not be empty" do
-          expect(service_json_cluster).not_to be_empty
-        end
-        health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
-        health_cluster = health_cluster.stdout.chomp.split("\n")
-        service_and_health = service_json_cluster.zip(health_cluster)
-        service_and_health.each do |service, health|
-          it 'Should be registered and enabled' do
-            registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
-            expect(registered).to be true
-          end
+describe 'Redborder-ale is registered in consul' do
+  if service_status == 'enabled'
+    describe "#{service} Registered in consul" do
+      service_json_cluster = command("curl -s #{api_endpoint}/catalog/service/#{service} | jq -c 'group_by(.ID)[]'")
+      service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
+      it "API response for #{service} should not be empty" do
+        expect(service_json_cluster).not_to be_empty
+      end
+      health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
+      health_cluster = health_cluster.stdout.chomp.split("\n")
+      service_and_health = service_json_cluster.zip(health_cluster)
+      service_and_health.each do |service, health|
+        it 'Should be registered and enabled' do
+          registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
+          expect(registered).to be true
         end
       end
     end

From 8d771141fa3515a2d20c5baa5307ac550edd107e Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 11 Jul 2024 13:02:16 +0100
Subject: [PATCH 09/15] lint

---
 spec/services/consul_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/consul_spec.rb b/spec/services/consul_spec.rb
index c40de91..838e9ef 100644
--- a/spec/services/consul_spec.rb
+++ b/spec/services/consul_spec.rb
@@ -41,7 +41,7 @@
     end
 
     # Use this block to test other services that need to be registered in consul
-    describe "#{service} Registered in consul" do 
+    describe "#{service} Registered in consul" do
       service_json_cluster = command("curl -s #{api_endpoint}/catalog/service/#{service} | jq -c 'group_by(.ID)[]'")
       service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
       it "API response for #{service} should not be empty" do

From 4b93040d4e39430551662f28efb3aa86f5bdf9b5 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 1 Aug 2024 14:51:23 +0100
Subject: [PATCH 10/15] adding check in consul, port checks. Removed ruby path
 check

---
 spec/services/ale_spec.rb | 43 +++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index 4958de0..d609391 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -2,10 +2,14 @@
 
 require 'spec_helper'
 require 'set'
+require 'json'
 set :os, family: 'redhat', release: '9', arch: 'x86_64'
 
-service = 'redborder-ale'
+service = serv_consul = 'redborder-ale'
 package = 'redborder-ale'
+port = 7779
+
+API_ENDPOINT = 'http://localhost:8500/v1'
 
 describe "Checking packages for #{service}..." do
   describe package(package) do
@@ -25,17 +29,28 @@
     if service_status == 'enabled'
       it { should be_enabled }
       it { should be_running }
-    end
-  end
-end
+      describe port(port) do
+        it { should be_listening }
+      end
 
-describe 'Redborder-ale is using correct ruby setup' do
-  if service_status == 'enabled'
-    describe command('sudo -u redborder-ale which ruby') do
-      its(:stdout) { should match %r{/usr/lib/rvm/rubies/ruby-2.7.5/bin/ruby} }
-    end
-  elsif service_status == 'disabled'
-    describe "Checking #{service_status} service for #{service}..." do
+      describe 'Registered in consul' do
+        service_json_cluster = command("curl -s #{API_ENDPOINT}/catalog/service/#{serv_consul} | jq -c 'group_by(.ID)[]'")
+        service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
+        health_cluster = command("curl -s #{API_ENDPOINT}/health/service/#{serv_consul} | jq -r '.[].Checks[0].Status'")
+        health_cluster = health_cluster.stdout.chomp.split("\n")
+        it 'Should be at least in one node' do
+          # expect(service_json_cluster.size).to be > 0 # redundant check
+          expect(health_cluster.size).to be > 0
+        end
+        service_and_health = service_json_cluster.zip(health_cluster)
+        service_and_health.each do |service, health|
+          registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
+          it 'Should be registered and enabled' do
+            expect(registered).to be true
+          end
+        end
+      end
+    elsif service_status == 'disabled'
       describe service(service) do
         it { should_not be_enabled }
         it { should_not be_running }
@@ -47,3 +62,9 @@
     end
   end
 end
+
+# describe 'Redborder-ale is using correct ruby setup' do
+    # describe command('sudo -u redborder-ale which ruby') do
+    #   its(:stdout) { should match %r{/usr/lib/rvm/rubies/ruby-2.7.5/bin/ruby} }
+    # end
+# end

From 79c5f0f59b0b958d4996803e5eb8b6cc434b5566 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 1 Aug 2024 15:58:33 +0100
Subject: [PATCH 11/15] fix tabs and ends

---
 spec/services/ale_spec.rb | 59 +++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index a901b34..b3bd34a 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -5,7 +5,7 @@
 require 'json'
 set :os, family: 'redhat', release: '9', arch: 'x86_64'
 
-service = serv_consul = pkg 'redborder-ale'
+service = serv_consul = pkg = 'redborder-ale'
 port = 7779
 API_ENDPOINT = 'http://localhost:8500/v1'
 
@@ -27,44 +27,43 @@
     describe service(service) do
       it { should be_enabled }
       it { should be_running }
+    end
       
-      describe port(port) do
-        it { should be_listening }
-      end
-
-      describe 'Registered in consul' do
-        service_json_cluster = command("curl -s #{API_ENDPOINT}/catalog/service/#{serv_consul} | jq -c 'group_by(.ID)[]'")
-        service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
-        health_cluster = command("curl -s #{API_ENDPOINT}/health/service/#{serv_consul} | jq -r '.[].Checks[0].Status'")
-        health_cluster = health_cluster.stdout.chomp.split("\n")
-        it 'Should be at least in one node' do
-          # expect(service_json_cluster.size).to be > 0 # redundant check
-          expect(health_cluster.size).to be > 0
-        end
-        service_and_health = service_json_cluster.zip(health_cluster)
-        service_and_health.each do |service, health|
-          registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
-          it 'Should be registered and enabled' do
-            expect(registered).to be true
-          end
-        end
-      end
-    elsif service_status == 'disabled'
-      describe service(service) do
-        it { should_not be_enabled }
-        it { should_not be_running }
-
-      end
-      health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
+    describe 'Registered in consul' do
+      service_json_cluster = command("curl -s #{API_ENDPOINT}/catalog/service/#{serv_consul} | jq -c 'group_by(.ID)[]'")
+      service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
+      health_cluster = command("curl -s #{API_ENDPOINT}/health/service/#{serv_consul} | jq -r '.[].Checks[0].Status'")
       health_cluster = health_cluster.stdout.chomp.split("\n")
+      it 'Should be at least in one node' do
+        # expect(service_json_cluster.size).to be > 0 # redundant check
+        expect(health_cluster.size).to be > 0
+      end
       service_and_health = service_json_cluster.zip(health_cluster)
       service_and_health.each do |service, health|
+        registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
         it 'Should be registered and enabled' do
-          registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
           expect(registered).to be true
         end
       end
     end
+    
+    describe port(port) do
+      it { should be_listening }
+    end
+  elsif service_status == 'disabled'
+    describe service(service) do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+    health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
+    health_cluster = health_cluster.stdout.chomp.split("\n")
+    service_and_health = service_json_cluster.zip(health_cluster)
+    service_and_health.each do |service, health|
+      it 'Should be registered and enabled' do
+        registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
+        expect(registered).to be true
+      end
+    end
   end
 end
 

From 093472e23b87ae4bb50080db7b23bb3c4d91f4d7 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 1 Aug 2024 17:14:37 +0100
Subject: [PATCH 12/15] comment port until we know if this is check is
 necessary

---
 spec/services/ale_spec.rb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index b3bd34a..d9903cc 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -6,7 +6,7 @@
 set :os, family: 'redhat', release: '9', arch: 'x86_64'
 
 service = serv_consul = pkg = 'redborder-ale'
-port = 7779
+# port = 7779
 API_ENDPOINT = 'http://localhost:8500/v1'
 
 describe "Checking packages for #{service}..." do
@@ -29,6 +29,10 @@
       it { should be_running }
     end
       
+    # describe port(port) do
+    #   it { should be_listening }
+    # end
+
     describe 'Registered in consul' do
       service_json_cluster = command("curl -s #{API_ENDPOINT}/catalog/service/#{serv_consul} | jq -c 'group_by(.ID)[]'")
       service_json_cluster = service_json_cluster.stdout.chomp.split("\n")
@@ -46,23 +50,20 @@
         end
       end
     end
-    
-    describe port(port) do
-      it { should be_listening }
-    end
+
   elsif service_status == 'disabled'
     describe service(service) do
       it { should_not be_enabled }
       it { should_not be_running }
     end
-    health_cluster = command("curl -s #{api_endpoint}/health/service/#{service} | jq -r '.[].Checks[0].Status'")
-    health_cluster = health_cluster.stdout.chomp.split("\n")
-    service_and_health = service_json_cluster.zip(health_cluster)
-    service_and_health.each do |service, health|
-      it 'Should be registered and enabled' do
-        registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
-        expect(registered).to be true
-      end
+    
+    # describe port(port) do
+    #   it { should_not be_listening }
+    # end
+
+    it 'Should be registered and enabled' do
+      registered = JSON.parse(service)[0].key?('Address') && health == 'passing' # ? true : false
+      expect(registered).to be true
     end
   end
 end

From f1531479fc54f1b71e89dee603e6b79a9d846c99 Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Thu, 1 Aug 2024 17:18:24 +0100
Subject: [PATCH 13/15] LINT

---
 spec/services/ale_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index d9903cc..ddd3c8d 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -69,7 +69,7 @@
 end
 
 # describe 'Redborder-ale is using correct ruby setup' do
-    # describe command('sudo -u redborder-ale which ruby') do
-    #   its(:stdout) { should match %r{/usr/lib/rvm/rubies/ruby-2.7.5/bin/ruby} }
-    # end
+  # describe command('sudo -u redborder-ale which ruby') do
+  #   its(:stdout) { should match %r{/usr/lib/rvm/rubies/ruby-2.7.5/bin/ruby} }
+  # end
 # end

From d682500b4e16ed3a96112ecc0728731c58b1eecc Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Wed, 28 Aug 2024 10:40:32 +0100
Subject: [PATCH 14/15] if ale is running, expected at least one sensor in
 config

---
 spec/configuration/ale_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/configuration/ale_spec.rb b/spec/configuration/ale_spec.rb
index c434f9d..b638374 100644
--- a/spec/configuration/ale_spec.rb
+++ b/spec/configuration/ale_spec.rb
@@ -15,6 +15,7 @@
     describe file('/etc/redborder-ale/config.yml') do
       it { should exist }
       it { should be_file }
+      it { should_not be_empty }
     end
 
     describe file('/etc/redborder-ale/rb_ale_aps.conf') do

From 857d6bceaf357a1acc328ea2fd1afc3e2bb5dbff Mon Sep 17 00:00:00 2001
From: Luis Blanco <ljblanco@redborder.com>
Date: Wed, 28 Aug 2024 11:53:24 +0100
Subject: [PATCH 15/15] lint

---
 spec/services/ale_spec.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spec/services/ale_spec.rb b/spec/services/ale_spec.rb
index ddd3c8d..652a16c 100644
--- a/spec/services/ale_spec.rb
+++ b/spec/services/ale_spec.rb
@@ -28,7 +28,7 @@
       it { should be_enabled }
       it { should be_running }
     end
-      
+
     # describe port(port) do
     #   it { should be_listening }
     # end
@@ -56,7 +56,7 @@
       it { should_not be_enabled }
       it { should_not be_running }
     end
-    
+
     # describe port(port) do
     #   it { should_not be_listening }
     # end
@@ -67,9 +67,3 @@
     end
   end
 end
-
-# describe 'Redborder-ale is using correct ruby setup' do
-  # describe command('sudo -u redborder-ale which ruby') do
-  #   its(:stdout) { should match %r{/usr/lib/rvm/rubies/ruby-2.7.5/bin/ruby} }
-  # end
-# end