chore: run ssf across all ssf-formula files to bring up-to-date

myii · Apr 5, 2021 · 91de65d · 91de65d
1 parent acc0b05
commit 91de65d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,6 +91,9 @@ celerybeat-schedule
 venv/
 ENV/
 
+# visual studio
+.vs/
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -120,3 +123,11 @@ docs/*.md
 Dockerfile.*_*
 ignore/
 tmp/
+
+# `salt-formula` -- Vagrant Specific files
+.vagrant
+top.sls
+
+# `suricata-formula` -- Platform binaries
+*.rpm
+*.deb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,11 +25,9 @@
 stages:
   - *stage_lint
   - *stage_release
-variables:
-  DOCKER_DRIVER: 'overlay2'
 
 ###############################################################################
-# `lint` stage: `commitlint` & `pre-commit`
+# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
 ###############################################################################
 commitlint:
   stage: *stage_lint

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,14 +25,13 @@ repos:
         args: [--debug]
         always_run: true
         pass_filenames: false
-  - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 2.1.3
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.7.1.1
     hooks:
       - id: shellcheck
         name: Check shell scripts with shellcheck
         files: ^.*\.(sh|bash|ksh)$
         types: []
-        args: []
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.23.0
     hooks:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -12,6 +12,9 @@ Metrics/BlockLength:
     - describe
   # Increase from default of `25`
   Max: 30
+Security/YAMLLoad:
+  Exclude:
+    - test/integration/**/_mapdata.rb
 
 # General settings across all cops in this formula
 AllCops:

diff --git a/.yamllint b/.yamllint
@@ -29,7 +29,9 @@ ignore: |
   ssf/files/default/.yamllint
   ssf/files/default/inspec/inspec.yml
   ssf/files/default/kitchen.yml
+  ssf/files/default/kitchen.windows.yml
   ssf/files/default/.github/workflows/kitchen.yml
+  ssf/files/default/.github/workflows/kitchen.windows.yml
   ssf/files/tofs_arvados-formula/.travis.yml
   ssf/files/tofs_ssf-formula/.yamllint
 

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -4444,7 +4444,9 @@ ssf:
               - ssf/files/default/.yamllint
               - ssf/files/default/inspec/inspec.yml
               - ssf/files/default/kitchen.yml
+              - ssf/files/default/kitchen.windows.yml
               - ssf/files/default/.github/workflows/kitchen.yml
+              - ssf/files/default/.github/workflows/kitchen.windows.yml
               - ssf/files/tofs_arvados-formula/.travis.yml
               - ssf/files/tofs_ssf-formula/.yamllint
           rules: