Merge pull request #81 from jeff350/master

chore: update pre-commit

Author: jeff350

.kitchen.yml

@@ -17,7 +17,9 @@ platforms:
   - name: ubuntu-16.04
     driver_config:
       provision_command:
+        # yamllint disable rule:line-length
         - apt-get update && apt-get install -y netcat-openbsd locales && locale-gen en_US.UTF-8
+        # yamllint enable
       run_command: /sbin/init
       privileged: true
       pid_one_command: /usr/lib/systemd/systemd
@@ -51,8 +53,10 @@ suites:
         sun-java.sls:
           java:
             version_name: jdk1.8.0_131
+            # yamllint disable rule:line-length
             source_url: http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz
             source_hash: 62b215bdfb48bace523723cdbb2157c665e6a25429c73828a32f00e587301236
+            # yamllint enable
         zookeeper.sls:
           zookeeper:
             version: 3.4.10

.pre-commit-config.yaml

@@ -30,30 +30,30 @@ repos:
         additional_dependencies: ['@commitlint/config-conventional@8.3.4']
         always_run: true
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.30.1
+    rev: v1.56.4
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
         args: [--debug]
         always_run: true
         pass_filenames: false
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.9.0.6
     hooks:
       - id: shellcheck
         name: Check shell scripts with shellcheck
         files: ^.*\.(sh|bash|ksh)$
         types: []
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.32.0
     hooks:
       - id: yamllint
         name: Check YAML syntax with yamllint
         args: [--strict, '.']
         always_run: true
         pass_filenames: false
   - repo: https://github.com/warpnet/salt-lint
-    rev: v0.8.0
+    rev: v0.9.2
     hooks:
       - id: salt-lint
         name: Check Salt files using salt-lint

.rubocop.yml

@@ -7,10 +7,17 @@ Layout/LineLength:
   # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
   Max: 88
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
     - control
     - describe
   # Increase from default of `25`
   Max: 30
+Security/YAMLLoad:
+  Exclude:
+    - test/integration/**/_mapdata.rb
+
+# General settings across all cops in this formula
+AllCops:
+  NewCops: enable
 
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`

.salt-lint

@@ -2,7 +2,9 @@
 # vim: ft=yaml
 ---
 exclude_paths: []
-rules: {}
+rules:
+  204:
+    ignore: 'zookeeper/files/default/systemd.tmpl.jinja'
 skip_list:
   # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
   - 205  # Use ".sls" as a Salt State file extension

bin/kitchen

@@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
     load(bundle_binstub)
   else
     abort(
-      'Your `bin/bundle` was not generated by Bundler, '\
-      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      'Your `bin/bundle` was not generated by Bundler, ' \
+      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
       '`bundle binstubs bundler --force`, then run this command again.'
     )
   end

docs/README.rst

@@ -1,7 +1,7 @@
 .. _readme:
 
 zookeeper-formula
-================
+=================
 
 Installs and Configures Apache Zookeeper from from a tar file.
 
@@ -75,7 +75,7 @@ Available states
    :local:
 
 ``zookeeper``
-^^^^^^^^^^^^
+^^^^^^^^^^^^^
 
 *Meta-state (This is a state that includes other states)*.
 
@@ -84,24 +84,24 @@ manages the zookeeper configuration file and then
 starts the associated zookeeper service.
 
 ``zookeeper.package``
-^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^
 
 This state will install the zookeeper package only.
 
 ``zookeeper.config``
-^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^
 
 This state will configure the zookeeper service and has a dependency on ``zookeeper.install``
 via include list.
 
 ``zookeeper.service``
-^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^
 
 This state will start the zookeeper service and has a dependency on ``zookeeper.config``
 via include list.
 
 ``zookeeper.clean``
-^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^
 
 *Meta-state (This is a state that includes other states)*.
 
@@ -111,18 +111,18 @@ removes the configuration file and
 then uninstalls the package.
 
 ``zookeeper.service.clean``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This state will stop the zookeeper service and disable it at boot time.
 
 ``zookeeper.config.clean``
-^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This state will remove the configuration of the zookeeper service and has a
 dependency on ``zookeeper.service.clean`` via include list.
 
 ``zookeeper.package.clean``
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This state will remove the zookeeper package and has a depency on
 ``zookeeper.config.clean`` via include list.

pillar.example

@@ -30,5 +30,4 @@ zookeeper:
     clientPort: 2181
     initLimit: 5
     syncLimit: 2
-
-    customservers: ''
+    customservers: ''

test/integration/default/controls/config_spec.rb

@@ -24,8 +24,8 @@
       # rubocop:disable Lint/RedundantCopDisableDirective
       # rubocop:disable Layout/LineLength
       should include(
-        '"tofs": {"files_switch": ["any/path/can/be/used/here", "id", '\
-        '"roles", "osfinger", "os", "os_family"], "source_files": '\
+        '"tofs": {"files_switch": ["any/path/can/be/used/here", "id", ' \
+        '"roles", "osfinger", "os", "os_family"], "source_files": ' \
         '{"zookeeper-config-file-file-managed": ["example.tmpl.jinja"]}'
       )
       # rubocop:enable Layout/LineLength

zookeeper/defaults.yaml

@@ -30,6 +30,4 @@ zookeeper:
     clientPort: 2181
     initLimit: 5
     syncLimit: 2
-
     customservers: ''
-