Fix Linting

- Remove rubocop config - Update stale workflow to v8 - Update vscode extensions - Update renovate config - Update yamllint config - Add dokken config and add standard kitchen config
sous-chefs · Mar 23, 2023 · 98898a8 · 98898a8
1 parent 8cf81ed
commit 98898a8
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 114 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           close-issue-message: >

diff --git a/.overcommit.yml b/.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
diff --git a/.vscode/extensions.json b/.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"
   ]
 }
diff --git a/.yamllint b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ This file is used to list changes made in each version of the openvpn cookbook.
 
 ## Unreleased
 
+- Remove rubocop config
+- Update stale workflow to v8
+- Update vscode extensions
+- Update renovate config
+- Update yamllint config
+- Add dokken config and add standard kitchen config
+
 ## 7.0.6 - *2023-03-01*
 
 - Switch from mdl to markdownlint-cli2

diff --git a/Dangerfile b/Dangerfile
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
@@ -0,0 +1,77 @@
+driver:
+  name: dokken
+  privileged: true  # because Docker and SystemD/Upstart
+  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
+  chef_license: accept-no-persist
+
+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
+    driver:
+      image: dokken/amazonlinux-2
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: debian-10
+    driver:
+      image: dokken/debian-10
+      pid_one_command: /bin/systemd
+
+  - name: debian-11
+    driver:
+      image: dokken/debian-11
+      pid_one_command: /bin/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: oraclelinux-7
+    driver:
+      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: fedora-latest
+    driver:
+      image: dokken/fedora-latest
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: ubuntu-18.04
+    driver:
+      image: dokken/ubuntu-18.04
+      pid_one_command: /bin/systemd
+
+  - name: ubuntu-20.04
+    driver:
+      image: dokken/ubuntu-20.04
+      pid_one_command: /bin/systemd
+
+  - name: opensuse-leap-15
+    driver:
+      image: dokken/opensuse-leap-15
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: rockylinux-8
+    driver:
+      image: dokken/rockylinux-8
+      pid_one_command: /usr/lib/systemd/systemd
diff --git a/kitchen.yml b/kitchen.yml
@@ -1,76 +1,27 @@
----
 driver:
-  name: dokken
-  privileged: true  # because Docker and SystemD/Upstart
-  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
-
-transport:
-  name: dokken
-  require_chef_omnibus: <%= ENV['CHEF_VERSION'] || 'latest' %>
+  name: vagrant
 
 provisioner:
-  name: dokken
+  name: chef_infra
   enforce_idempotency: true
   multiple_converge: 2
   deprecations_as_errors: true
-  chef_log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>
   chef_license: accept-no-persist
 
 verifier:
   name: inspec
-  deprecations_as_errors: true
 
-# currently only support 2 last major revs of distros (at the most)
 platforms:
-  - name: almalinux-8
-    driver:
-      image: dokken/almalinux-8
-      pid_one_command: /usr/lib/systemd/systemd
-
   - name: amazonlinux-2
-    driver:
-      image: dokken/amazonlinux-2
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: debian-10
-    driver:
-      image: dokken/debian-10
-      pid_one_command: /bin/systemd
-
-  - name: debian-11
-    driver:
-      image: dokken/debian-11
-      pid_one_command: /bin/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: debian-10
+  - name: debian-10
+  - name: freebsd-12
   - name: fedora-latest
-    driver:
-      image: dokken/fedora-latest
-      pid_one_command: /usr/lib/systemd/systemd
-
+  - name: opensuse-leap-15
   - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      pid_one_command: /bin/systemd
-
   - name: ubuntu-20.04
-    driver:
-      image: dokken/ubuntu-20.04
-      pid_one_command: /bin/systemd
-
-  - name: rockylinux-8
-    driver:
-      image: dokken/rockylinux-8
-      pid_one_command: /usr/lib/systemd/systemd
 
 suites:
   - name: server
@@ -81,22 +32,23 @@ suites:
         config:
           verb: 1
           mute: 10
-          route:
-            - '192.168.4.0 255.255.255.0'
+          route: ["192.168.4.0 255.255.255.0"]
         push_routes:
           - 192.168.10.0 255.255.255.0
           - 10.12.10.0 255.255.255.0
         push_options:
           dhcp-option:
-            - 'DOMAIN local'
-            - 'DOMAIN-SEARCH local'
+            - "DOMAIN local"
+            - "DOMAIN-SEARCH local"
+
   - name: server_verification
     run_list:
       - recipe[openvpn::server]
       - recipe[openvpn::users]
     attributes:
       openvpn:
         server_verification: "remote-cert-tls server"
+
   - name: server_verify_no_databag
     run_list:
       - recipe[openvpn::server]

diff --git a/metadata.rb b/metadata.rb
@@ -1,11 +1,11 @@
 name              'openvpn'
-version           '7.0.6'
 maintainer        'Sous Chefs'
 maintainer_email  '[email protected]'
 license           'Apache-2.0'
 description       'Installs and configures openvpn and includes rake tasks for managing certs.'
 source_url        'https://github.com/sous-chefs/openvpn'
 issues_url        'https://github.com/sous-chefs/openvpn/issues'
+version           '7.0.6'
 chef_version      '>= 15.3'
 
 supports 'arch'