Fixes

Signed-off-by: Dan Webb <[email protected]>

Author: damacus

.rubocop.yml

@@ -0,0 +1,2 @@
+require:
+  - cookstyle

Dangerfile

@@ -232,7 +232,7 @@ a matching `elasticsearch_config` resource in the collection.
 elasticsearch_service 'elasticsearch'
 ```
 
-**Restart Configuration**
+#### Restart Configuration
 
 You can configure systemd restart behavior using the `restart_policy` and `restart_sec` properties:
 

README.md

@@ -0,0 +1,5 @@
+# .mise.toml
+
+[env]
+PATH = "/opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:{{env.PATH}}"
+KITCHEN_LOCAL_YAML = "kitchen.dokken.yml"

mise.toml

@@ -40,6 +40,38 @@
 
   default_conf_dir = platform_family?('rhel', 'amazon') ? '/etc/sysconfig' : '/etc/default'
 
+  service_config = {
+    Type: 'notify',
+    RuntimeDirectory: 'elasticsearch',
+    PrivateTmp: 'true',
+    Environment: [
+      "ES_HOME=#{es_conf.path_home}",
+      'ES_PATH_CONF=/etc/elasticsearch',
+      "PID_DIR=#{es_conf.path_pid}",
+      'ES_SD_NOTIFY=true',
+    ],
+    EnvironmentFile: "-#{default_conf_dir}/#{new_resource.service_name}",
+    WorkingDirectory: es_conf.path_home.to_s,
+    User: es_user.username,
+    Group: es_user.groupname,
+    ExecStart: "#{es_conf.path_home}/bin/systemd-entrypoint -p ${PID_DIR}/elasticsearch.pid --quiet",
+    StandardOutput: 'journal',
+    StandardError: 'inherit',
+    LimitNOFILE: '65535',
+    LimitNPROC: '4096',
+    LimitAS: 'infinity',
+    LimitFSIZE: 'infinity',
+    TimeoutStopSec: '0',
+    KillSignal: 'SIGTERM',
+    KillMode: 'process',
+    SendSIGKILL: 'no',
+    SuccessExitStatus: '143',
+    TimeoutStartSec: '900',
+  }
+
+  service_config[:Restart] = new_resource.restart_policy if new_resource.restart_policy && !new_resource.restart_policy.empty?
+  service_config[:RestartSec] = new_resource.restart_sec if new_resource.restart_sec
+
   systemd_unit new_resource.service_name do
     content(
       Unit: {
@@ -48,36 +80,7 @@
         Wants: 'network-online.target',
         After: 'network-online.target',
       },
-      Service: {
-        Type: 'notify',
-        RuntimeDirectory: 'elasticsearch',
-        PrivateTmp: 'true',
-        Environment: [
-          "ES_HOME=#{es_conf.path_home}",
-          'ES_PATH_CONF=/etc/elasticsearch',
-          "PID_DIR=#{es_conf.path_pid}",
-          'ES_SD_NOTIFY=true',
-        ],
-        EnvironmentFile: "-#{default_conf_dir}/#{new_resource.service_name}",
-        WorkingDirectory: "#{es_conf.path_home}",
-        User: es_user.username,
-        Group: es_user.groupname,
-        ExecStart: "#{es_conf.path_home}/bin/systemd-entrypoint -p ${PID_DIR}/elasticsearch.pid --quiet",
-        StandardOutput: 'journal',
-        StandardError: 'inherit',
-        LimitNOFILE: '65535',
-        LimitNPROC: '4096',
-        LimitAS: 'infinity',
-        LimitFSIZE: 'infinity',
-        TimeoutStopSec: '0',
-        KillSignal: 'SIGTERM',
-        KillMode: 'process',
-        SendSIGKILL: 'no',
-        SuccessExitStatus: '143',
-        TimeoutStartSec: '900',
-        Restart: new_resource.restart_policy if new_resource.restart_policy,
-        RestartSec: new_resource.restart_sec if new_resource.restart_sec
-      },
+      Service: service_config,
       Install: {
         WantedBy: 'multi-user.target',
       }

resources/service.rb

@@ -33,6 +33,7 @@
   end
 
   # Test default behavior (no restart)
+  # rubocop:disable Style/MultilineBlockChain
   context 'with default configuration' do
     let(:chef_run) do
       ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '20.04', step_into: ['elasticsearch_service']) do |node, server|
@@ -54,4 +55,5 @@
       expect(systemd_unit.content[:Service]).not_to have_key(:RestartSec)
     end
   end
+  # rubocop:enable Style/MultilineBlockChain
 end