Merge branch 'main' into fix-packages-install-go-1-18

sous-chefs · May 3, 2024 · 734b730 · 734b730
2 parents a3bd692 + 7082707
commit 734b730
Show file tree

Hide file tree

Showing 15 changed files with 222 additions and 66 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ name: ci
 
 jobs:
   lint-unit:
-    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3
+    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.1.1
 
   integration:
     needs: lint-unit
@@ -40,11 +40,11 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4 # v4
       - name: Install Chef
-        uses: actionshub/chef-install@main
+        uses: actionshub/chef-install@3.0.0
       - name: Dokken
-        uses: actionshub/test-kitchen@main
+        uses: actionshub/test-kitchen@3.0.0
         env:
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
@@ -54,6 +54,6 @@ jobs:
       - name: Print debug output on failure
         if: failure()
         run: |
-            set -x
-            sudo journalctl -l --since today
-            KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
+          set -x
+          sudo journalctl -l --since today
+          KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml
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@v3
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           close-issue-message: >

diff --git a/.markdownlint-cli2.yaml b/.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
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
@@ -6,6 +6,56 @@ This file is used to list changes made in each version of golang.
 
 - Use go install rather than go get to install packages through node attributes
 
+## 5.4.18 - *2024-05-03*
+
+## 5.4.17 - *2024-05-03*
+
+## 5.4.16 - *2023-12-21*
+
+## 5.4.15 - *2023-09-28*
+
+## 5.4.14 - *2023-09-04*
+
+## 5.4.13 - *2023-05-17*
+
+## 5.4.12 - *2023-04-17*
+
+## 5.4.11 - *2023-04-07*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.10 - *2023-04-01*
+
+## 5.4.9 - *2023-04-01*
+
+## 5.4.8 - *2023-04-01*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.7 - *2023-03-20*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.6 - *2023-03-15*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.5 - *2023-03-02*
+
+## 5.4.4 - *2023-02-23*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.3 - *2023-02-15*
+
+## 5.4.2 - *2023-02-15*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.1 - *2022-12-15*
+
+Standardise files with files in sous-chefs/repo-management
+
 ## 5.4.0 - *2022-08-08*
 
 - Use `node['golang']['install_dir']` attribute in default recipe.

diff --git a/documentation/resources/golang.md b/documentation/resources/golang.md
@@ -18,9 +18,9 @@
 | directory_mode | mode for user directories               | String                   | Default 0755                       |
 | version        | Version of go to install                | String                   | Default 1.14.4                     |
 | source_version | Version of go to compile from source    | String                   | Default 1.14.4                     |
-| url            | Location of the golang binary package for the target version  | String              | Default https://golang.org/dl and computed from the OS and version |
+| url            | Location of the golang binary package for the target version  | String              | Default <https://golang.org/dl> and computed from the OS and version |
 | from_source    | Install and compile golang from source  | True, False              | Default false                       |
-| source_url     | Location of the golang source url for the source version      | String              | Default https://golang.org/dl and computed from the version |
+| source_url     | Location of the golang source url for the source version      | String              | Default <https://golang.org/dl> and computed from the version |
 | source_method  | Compile script in the golang source package | String              | Default all.bash                    |
 | scm            | Install SCM packages, git and mercurial | True, False             | Default True                        |
 | scm_packages   | Source control packages to install      | String, Array            | Default [git mercurial]            |

diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
@@ -1,57 +1,113 @@
----
 driver:
   name: dokken
   privileged: true
-
-transport:
-  name: dokken
-
-provisioner:
-  name: dokken
   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
-
-  - name: debian-10
+  - name: almalinux-9
     driver:
-      image: dokken/debian-10
+      image: dokken/almalinux-9
+      pid_one_command: /usr/lib/systemd/systemd
 
-  - name: debian-11
+  - name: amazonlinux-2023
     driver:
-      image: dokken/debian-11
+      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
+      pid_one_command: /bin/systemd
+
+  - name: debian-11
+    driver:
+      image: dokken/debian-11
+      pid_one_command: /bin/systemd
+
+  - name: debian-12
+    driver:
+      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: opensuse-leap-15
+    driver:
+      image: dokken/opensuse-leap-15
+      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: 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
     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
+  - name: ubuntu-22.04
     driver:
-      image: dokken/rockylinux-8
+      image: dokken/ubuntu-22.04
+      pid_one_command: /bin/systemd
 
-  - name: opensuse-leap-15
+  - name: ubuntu-23.04
     driver:
-      image: dokken/opensuse-leap-15
+      image: dokken/ubuntu-23.04
+      pid_one_command: /bin/systemd
diff --git a/kitchen.exec.yml b/kitchen.exec.yml
@@ -0,0 +1,7 @@
+---
+driver: { name: exec }
+transport: { name: exec }
+
+platforms:
+  - name: macos-latest
+  - name: windows-latest
diff --git a/kitchen.global.yml b/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
diff --git a/metadata.rb b/metadata.rb
@@ -6,7 +6,7 @@
 source_url       'https://github.com/sous-chefs/golang'
 issues_url       'https://github.com/sous-chefs/golang/issues'
 chef_version     '>= 15.3'
-version          '5.4.0'
+version          '5.4.18'
 
 supports 'debian'
 supports 'ubuntu'