Merge branch 'main' into automated/cookstyle

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

.github/workflows/ci.yml

@@ -8,10 +8,16 @@ name: ci
 
 jobs:
   lint-unit:
-    uses: sous-chefs/.github/.github/workflows/[email protected]
+    uses: sous-chefs/.github/.github/workflows/[email protected]
+    permissions:
+      actions: write
+      checks: write
+      pull-requests: write
+      statuses: write
+      issues: write
 
   integration:
-    needs: lint-unit
+    needs: "lint-unit"
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -32,11 +38,11 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Chef
-        uses: actionshub/chef-install@main
+        uses: actionshub/chef-install@2.0.4
       - name: Dokken
-        uses: actionshub/test-kitchen@main
+        uses: actionshub/test-kitchen@2.1.0
         env:
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml

.github/workflows/md-links.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: markdown-link-check
         uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v8
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           close-issue-message: >

.markdownlint-cli2.yaml

@@ -0,0 +1,5 @@
+config:
+  ul-indent: false # MD007
+  line-length: false # MD013
+  no-duplicate-heading: false # MD024
+  reference-links-images: false # MD052

.overcommit.yml

@@ -4,13 +4,21 @@ PreCommit:
     enabled: true
   YamlLint:
     enabled: true
-  Rspec:
+    required_executable: "yamllint"
+  ChefSpec:
     enabled: true
-    required_executable: 'rspec'
+    required_executable: "chef"
+    command: ["chef", "exec", "rspec"]
   Cookstyle:
     enabled: true
-    required_executable: 'cookstyle'
+    required_executable: "cookstyle"
     command: ["cookstyle"]
+  MarkdownLint:
+    enabled: false
+    required_executable: "npx"
+    command: ["npx", "markdownlint-cli2", "'**/*.md'"]
+    include: ["**/*.md"]
+
 CommitMsg:
   HardTabs:
     enabled: true

.vscode/extensions.json

@@ -1,7 +1,8 @@
 {
   "recommendations": [
-      "chef-software.chef",
-      "rebornix.ruby",
-      "editorconfig.editorconfig"
+    "chef-software.chef",
+    "rebornix.ruby",
+    "editorconfig.editorconfig",
+    "DavidAnson.vscode-markdownlint"
   ]
 }

.yamllint

@@ -11,3 +11,5 @@ rules:
     max-spaces-inside: 1
     min-spaces-inside-empty: -1
     max-spaces-inside-empty: -1
+  comments:
+    min-spaces-from-content: 1

CHANGELOG.md

@@ -16,6 +16,18 @@ This file is used to list changes made in each version of the snort cookbook.
 - Update tested platforms
 - Enable unified_mode
 
+## 5.0.8 - *2023-10-03*
+
+## 5.0.7 - *2023-09-29*
+
+## 5.0.6 - *2023-06-08*
+
+## 5.0.5 - *2023-06-08*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.0.4 - *2023-02-14*
+
 ## 5.0.3 - *2022-02-08*
 
 - Remove delivery folder
@@ -64,7 +76,7 @@ This file is used to list changes made in each version of the snort cookbook.
 
 ## v2.0.0
 
-- Added new snort_service custom resource and a _service.rb recipe. The recipe is called by the default.rb recipe. The custom resource can be used to write wrapper cookbooks and supports the standard service actions (enable, start, restart, reload). The custom resource used the new Chef 12.5 customer resource format and the compat_resource cookbook for compatibility with 12.0+
+- Added new snort_service custom resource and a `_service.rb` recipe. The recipe is called by the default.rb recipe. The custom resource can be used to write wrapper cookbooks and supports the standard service actions (enable, start, restart, reload). The custom resource used the new Chef 12.5 customer resource format and the compat_resource cookbook for compatibility with 12.0+
 
 ## v1.1.0
 

chefignore

@@ -61,7 +61,7 @@ Dangerfile
 examples/*
 features/*
 Guardfile
-kitchen.yml*
+kitchen*.yml
 mlc_config.json
 Procfile
 Rakefile

kitchen.dokken.yml

@@ -1,25 +1,47 @@
----
 driver:
   name: dokken
   privileged: true
+  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
 
-transport:
-  name: dokken
-
-provisioner:
-  name: dokken
+transport: { name: dokken }
+provisioner: { name: dokken }
 
 platforms:
   - name: almalinux-8
     driver:
       image: dokken/almalinux-8
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: amazonlinux-2
+  - name: almalinux-9
+    driver:
+      image: dokken/almalinux-9
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: amazonlinux-2023
     driver:
-      image: dokken/amazonlinux-2
+      image: dokken/amazonlinux-2023
       pid_one_command: /usr/lib/systemd/systemd
 
+  - name: centos-7
+    driver:
+      image: dokken/centos-7
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: centos-stream-8
+    driver:
+      image: dokken/centos-stream-8
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: centos-stream-9
+    driver:
+      image: dokken/centos-stream-9
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: debian-9
+    driver:
+      image: dokken/debian-9
+      pid_one_command: /bin/systemd
+
   - name: debian-10
     driver:
       image: dokken/debian-10
@@ -30,19 +52,44 @@ platforms:
       image: dokken/debian-11
       pid_one_command: /bin/systemd
 
-  - name: centos-7
+  - name: debian-12
     driver:
-      image: dokken/centos-7
+      image: dokken/debian-12
+      pid_one_command: /bin/systemd
+
+  - name: fedora-latest
+    driver:
+      image: dokken/fedora-latest
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: centos-stream-8
+  - name: opensuse-leap-15
     driver:
-      image: dokken/centos-stream-8
+      image: dokken/opensuse-leap-15
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: fedora-latest
+  - name: oraclelinux-7
     driver:
-      image: dokken/fedora-latest
+      image: dokken/oraclelinux-7
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: oraclelinux-8
+    driver:
+      image: dokken/oraclelinux-8
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: oraclelinux-9
+    driver:
+      image: dokken/oraclelinux-9
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: rockylinux-8
+    driver:
+      image: dokken/rockylinux-8
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: rockylinux-9
+    driver:
+      image: dokken/rockylinux-9
       pid_one_command: /usr/lib/systemd/systemd
 
   - name: ubuntu-18.04
@@ -55,12 +102,12 @@ platforms:
       image: dokken/ubuntu-20.04
       pid_one_command: /bin/systemd
 
-  - name: opensuse-leap-15
+  - name: ubuntu-22.04
     driver:
-      image: dokken/opensuse-leap-15
-      pid_one_command: /usr/lib/systemd/systemd
+      image: dokken/ubuntu-22.04
+      pid_one_command: /bin/systemd
 
-  - name: rockylinux-8
+  - name: ubuntu-23.04
     driver:
-      image: dokken/rockylinux-8
-      pid_one_command: /usr/lib/systemd/systemd
+      image: dokken/ubuntu-23.04
+      pid_one_command: /bin/systemd

kitchen.exec.yml

@@ -0,0 +1,7 @@
+---
+driver: { name: exec }
+transport: { name: exec }
+
+platforms:
+  - name: macos-latest
+  - name: windows-latest

kitchen.global.yml

@@ -0,0 +1,38 @@
+---
+provisioner:
+  name: chef_infra
+  product_name: chef
+  product_version: <%= ENV['CHEF_VERSION'] || 'latest' %>
+  channel: stable
+  install_strategy: once
+  chef_license: accept
+  enforce_idempotency: <%= ENV['ENFORCE_IDEMPOTENCY'] || true %>
+  multiple_converge: <%= ENV['MULTIPLE_CONVERGE'] || 2 %>
+  deprecations_as_errors: true
+  log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>
+
+verifier:
+  name: inspec
+
+platforms:
+  - name: almalinux-8
+  - name: almalinux-9
+  - name: amazonlinux-2023
+  - name: centos-7
+  - name: centos-stream-8
+  - name: centos-stream-9
+  - name: debian-9
+  - name: debian-10
+  - name: debian-11
+  - name: debian-12
+  - name: fedora-latest
+  - name: opensuse-leap-15
+  - name: oraclelinux-7
+  - name: oraclelinux-8
+  - name: oraclelinux-9
+  - name: rockylinux-8
+  - name: rockylinux-9
+  - name: ubuntu-18.04
+  - name: ubuntu-20.04
+  - name: ubuntu-22.04
+  - name: ubuntu-23.04

metadata.rb

@@ -3,8 +3,8 @@
 maintainer_email '[email protected]'
 license          'Apache-2.0'
 description      'Installs Snort IDS packages'
-version          '5.0.3'
-chef_version     '>= 15.5'
+version          '5.0.8'
+chef_version     '>= 15.0'
 source_url       'https://github.com/sous-chefs/snort'
 issues_url       'https://github.com/sous-chefs/snort/issues'
 

renovate.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "packageRules": [{
+      "groupName": "Actions",
+      "matchUpdateTypes": ["patch", "pin", "digest"],
+      "automerge": true,
+      "addLabels": ["Release: Patch", "Skip: Announcements"]
+    },
+    {
+      "groupName": "Actions",
+      "matchUpdateTypes": ["major"],
+      "automerge": false,
+      "addLabels": ["Release: Patch", "Skip: Announcements"]
+    }
+  ]
+}