From 49f94f3ace79bb2c8182d06dfdf600fae2312e84 Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 14:39:29 +0200 Subject: [PATCH 1/9] Remove version from third party licenses file Signed-off-by: Enrico Usai --- cookbooks/third-party/THIRD-PARTY-LICENSES.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cookbooks/third-party/THIRD-PARTY-LICENSES.txt b/cookbooks/third-party/THIRD-PARTY-LICENSES.txt index d00987cae..d8b25fff1 100644 --- a/cookbooks/third-party/THIRD-PARTY-LICENSES.txt +++ b/cookbooks/third-party/THIRD-PARTY-LICENSES.txt @@ -1,12 +1,12 @@ -** apt Cookbook; version 7.4.2 -- https://github.com/sous-chefs/apt -** iptables cookbook; version 8.0.0 -- https://github.com/sous-chefs/iptables -** line cookbook; version 4.5.2 -- https://github.com/sous-chefs/line -** NFS cookbook; version 5.0.0 -- https://github.com/atomic-penguin/cookbook-nfs -** openssh cookbook; version 2.10.3 -- https://github.com/sous-chefs/openssh -** pyenv cookbook; version 3.5.1 -- https://github.com/sous-chefs/pyenv -** SELinux cookbook; version 6.0.4 -- https://github.com/sous-chefs/selinux -** yum cookbook; version 7.4.0 -- https://github.com/sous-chefs/yum -** yum-epel cookbook; version 4.5.0 -- https://github.com/sous-chefs/yum-epel +** apt Cookbook -- https://github.com/sous-chefs/apt +** iptables cookbook -- https://github.com/sous-chefs/iptables +** line cookbook -- https://github.com/sous-chefs/line +** NFS cookbook -- https://github.com/atomic-penguin/cookbook-nfs +** openssh cookbook -- https://github.com/sous-chefs/openssh +** pyenv cookbook -- https://github.com/sous-chefs/pyenv +** SELinux cookbook -- https://github.com/sous-chefs/selinux +** yum cookbook -- https://github.com/sous-chefs/yum +** yum-epel cookbook -- https://github.com/sous-chefs/yum-epel Apache License From c2479304d92cf4b26d25a9b301cdcc0e86d3347e Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 10:48:49 +0200 Subject: [PATCH 2/9] Upgrade apt cookbook to version 7.5.14 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 2 + .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../apt-7.4.2/.circleci/config.yml | 10 -- cookbooks/third-party/apt-7.4.2/.editorconfig | 19 --- cookbooks/third-party/apt-7.4.2/.envrc | 1 - .../third-party/apt-7.4.2/.gitattributes | 1 - .../third-party/apt-7.4.2/.github/CODEOWNERS | 1 - .../apt-7.4.2/.github/workflows/ci.yml | 51 -------- .../apt-7.4.2/.github/workflows/md-links.yml | 19 --- .../apt-7.4.2/.github/workflows/stale.yml | 25 ---- cookbooks/third-party/apt-7.4.2/.gitignore | 49 -------- cookbooks/third-party/apt-7.4.2/.mdlrc | 1 - .../third-party/apt-7.4.2/.overcommit.yml | 16 --- cookbooks/third-party/apt-7.4.2/.yamllint | 13 -- cookbooks/third-party/apt-7.4.2/Gemfile | 9 -- .../third-party/apt-7.4.2/kitchen.dokken.yml | 38 ------ .../{apt-7.4.2 => apt-7.5.14}/Berksfile | 0 .../{apt-7.4.2 => apt-7.5.14}/CHANGELOG.md | 78 ++++++++++-- .../CODE_OF_CONDUCT.md | 0 .../{apt-7.4.2 => apt-7.5.14}/CONTRIBUTING.md | 0 .../{apt-7.4.2 => apt-7.5.14}/Dangerfile | 0 .../{apt-7.4.2 => apt-7.5.14}/LICENSE | 0 .../{apt-7.4.2 => apt-7.5.14}/README.md | 0 .../{apt-7.4.2 => apt-7.5.14}/TESTING.md | 0 .../attributes/default.rb | 0 .../{apt-7.4.2 => apt-7.5.14}/chefignore | 2 +- .../documentation/.gitkeep | 0 .../files/15update-stamp | 0 .../files/apt-proxy-v2.conf | 0 .../third-party/apt-7.5.14/kitchen.dokken.yml | 113 ++++++++++++++++++ .../third-party/apt-7.5.14/kitchen.exec.yml | 7 ++ .../third-party/apt-7.5.14/kitchen.global.yml | 38 ++++++ .../{apt-7.4.2 => apt-7.5.14}/kitchen.yml | 1 + .../libraries/helpers.rb | 0 .../{apt-7.4.2 => apt-7.5.14}/metadata.rb | 2 +- .../recipes/cacher-client.rb | 0 .../recipes/cacher-ng.rb | 0 .../recipes/default.rb | 0 .../recipes/unattended-upgrades.rb | 0 .../third-party/apt-7.5.14/renovate.json | 17 +++ .../spec/spec_helper.rb | 0 .../spec/unit/recipes/cacher-client_spec.rb | 0 .../spec/unit/recipes/cacher-ng_spec.rb | 0 .../spec/unit/recipes/default_spec.rb | 0 .../unit/recipes/unattended-upgrades_spec.rb | 0 .../templates/01proxy.erb | 0 .../templates/10dpkg-options.erb | 0 .../templates/10recommends.erb | 0 .../templates/20auto-upgrades.erb | 0 .../templates/50unattended-upgrades.erb | 70 +++++++---- .../templates/acng.conf.erb | 0 .../templates/unattended-upgrades.seed.erb | 0 .../test/fixtures/cookbooks/test/metadata.rb | 0 .../fixtures/cookbooks/test/recipes/base.rb | 0 .../fixtures/cookbooks/test/recipes/cacher.rb | 0 .../test/recipes/unattended-upgrades.rb | 0 .../cacher/cacher-ng-client_spec.rb | 0 .../integration/compile-time/default_spec.rb | 0 .../test/integration/default/default_spec.rb | 0 .../integration/resources/resources_spec.rb | 0 .../resources/unattended_upgrades_spec.rb | 0 metadata.rb | 2 +- 67 files changed, 304 insertions(+), 293 deletions(-) delete mode 100644 cookbooks/third-party/apt-7.4.2/.circleci/config.yml delete mode 100755 cookbooks/third-party/apt-7.4.2/.editorconfig delete mode 100644 cookbooks/third-party/apt-7.4.2/.envrc delete mode 100644 cookbooks/third-party/apt-7.4.2/.gitattributes delete mode 100644 cookbooks/third-party/apt-7.4.2/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/apt-7.4.2/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/apt-7.4.2/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/apt-7.4.2/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/apt-7.4.2/.gitignore delete mode 100644 cookbooks/third-party/apt-7.4.2/.mdlrc delete mode 100644 cookbooks/third-party/apt-7.4.2/.overcommit.yml delete mode 100644 cookbooks/third-party/apt-7.4.2/.yamllint delete mode 100644 cookbooks/third-party/apt-7.4.2/Gemfile delete mode 100644 cookbooks/third-party/apt-7.4.2/kitchen.dokken.yml rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/Berksfile (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/CHANGELOG.md (87%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/Dangerfile (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/LICENSE (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/README.md (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/TESTING.md (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/attributes/default.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/chefignore (98%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/documentation/.gitkeep (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/files/15update-stamp (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/files/apt-proxy-v2.conf (100%) create mode 100644 cookbooks/third-party/apt-7.5.14/kitchen.dokken.yml create mode 100644 cookbooks/third-party/apt-7.5.14/kitchen.exec.yml create mode 100644 cookbooks/third-party/apt-7.5.14/kitchen.global.yml rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/kitchen.yml (97%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/libraries/helpers.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/metadata.rb (92%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/recipes/cacher-client.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/recipes/cacher-ng.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/recipes/default.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/recipes/unattended-upgrades.rb (100%) create mode 100644 cookbooks/third-party/apt-7.5.14/renovate.json rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/spec/spec_helper.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/spec/unit/recipes/cacher-client_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/spec/unit/recipes/cacher-ng_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/spec/unit/recipes/default_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/spec/unit/recipes/unattended-upgrades_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/01proxy.erb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/10dpkg-options.erb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/10recommends.erb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/20auto-upgrades.erb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/50unattended-upgrades.erb (62%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/acng.conf.erb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/templates/unattended-upgrades.seed.erb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/fixtures/cookbooks/test/metadata.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/fixtures/cookbooks/test/recipes/base.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/fixtures/cookbooks/test/recipes/cacher.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/fixtures/cookbooks/test/recipes/unattended-upgrades.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/integration/cacher/cacher-ng-client_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/integration/compile-time/default_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/integration/default/default_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/integration/resources/resources_spec.rb (100%) rename cookbooks/third-party/{apt-7.4.2 => apt-7.5.14}/test/integration/resources/unattended_upgrades_spec.rb (100%) diff --git a/Berksfile b/Berksfile index 09eae7221..3bfdeb887 100644 --- a/Berksfile +++ b/Berksfile @@ -7,7 +7,7 @@ source chef_repo: "." metadata -cookbook "apt", path: "./cookbooks/third-party/apt-7.4.2" +cookbook "apt", path: "./cookbooks/third-party/apt-7.5.14" cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0" cookbook "line", path: "./cookbooks/third-party/line-4.5.2" cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index f9fb97bff..d41ce84cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,8 @@ This file is used to list changes made in each version of the AWS ParallelCluste - Open MPI: `openmpi40-aws-4.1.5-3` - Upgrade Slurm to version 23.02.4. - Upgrade ARM PL to version 23.04.1 for Ubuntu 22.04 only. +- Upgrade third-party cookbook dependencies: + - apt-7.5.14 (from apt-7.4.0) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index fcdcf0c3e..bcc221d9a 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -12,7 +12,7 @@ cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-compu cookbook "aws-parallelcluster-tests", path: "../aws-parallelcluster-tests" cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm" -cookbook "apt", path: "../third-party/apt-7.4.2" +cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.2" cookbook "nfs", path: "../third-party/nfs-5.0.0" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index d78a70960..05a0f14f0 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -13,7 +13,7 @@ supports 'centos', '>= 7.0' supports 'ubuntu', '>= 20.04' -depends 'apt', '~> 7.4.2' +depends 'apt', '~> 7.5.14' depends 'iptables', '~> 8.0.0' depends 'nfs', '~> 5.0.0' depends 'line', '~> 4.5.2' diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index febf60cc3..dcec36c5b 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -9,7 +9,7 @@ cookbook "aws-parallelcluster-platform", path: "../aws-parallelcluster-platform" cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm" -cookbook "apt", path: "../third-party/apt-7.4.2" +cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.2" cookbook "nfs", path: "../third-party/nfs-5.0.0" diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index b77baf19f..1df447e97 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -6,7 +6,7 @@ cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-compu cookbook "aws-parallelcluster-environment", path: "../aws-parallelcluster-environment" cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" -cookbook "apt", path: "../third-party/apt-7.4.2" +cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.2" cookbook "nfs", path: "../third-party/nfs-5.0.0" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index 5d79788c0..a26b7d1ca 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -13,7 +13,7 @@ supports 'centos', '>= 7.0' supports 'ubuntu', '>= 20.04' -depends 'apt', '~> 7.4.2' +depends 'apt', '~> 7.5.14' depends 'iptables', '~> 8.0.0' depends 'line', '~> 4.5.2' depends 'nfs', '~> 5.0.0' diff --git a/cookbooks/third-party/apt-7.4.2/.circleci/config.yml b/cookbooks/third-party/apt-7.4.2/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/apt-7.4.2/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/apt-7.4.2/.editorconfig b/cookbooks/third-party/apt-7.4.2/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/apt-7.4.2/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/apt-7.4.2/.envrc b/cookbooks/third-party/apt-7.4.2/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/apt-7.4.2/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/apt-7.4.2/.gitattributes b/cookbooks/third-party/apt-7.4.2/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/apt-7.4.2/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/apt-7.4.2/.github/CODEOWNERS b/cookbooks/third-party/apt-7.4.2/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/apt-7.4.2/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/apt-7.4.2/.github/workflows/ci.yml b/cookbooks/third-party/apt-7.4.2/.github/workflows/ci.yml deleted file mode 100644 index a3fad86c6..000000000 --- a/cookbooks/third-party/apt-7.4.2/.github/workflows/ci.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 - - integration: - needs: 'lint-unit' - runs-on: ubuntu-latest - strategy: - matrix: - os: - - 'centos-stream-8' - - 'debian-10' - - 'debian-11' - - 'ubuntu-1804' - - 'ubuntu-2004' - suite: - - 'default' - - 'cacher' - - 'compile-time' - - 'unattended-upgrades' - exclude: - - os: centos-stream-8 - suite: cacher - - os: centos-stream-8 - suite: compile-time - - os: centos-stream-8 - suite: unattended-upgrades - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/apt-7.4.2/.github/workflows/md-links.yml b/cookbooks/third-party/apt-7.4.2/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/apt-7.4.2/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/apt-7.4.2/.github/workflows/stale.yml b/cookbooks/third-party/apt-7.4.2/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/apt-7.4.2/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/apt-7.4.2/.gitignore b/cookbooks/third-party/apt-7.4.2/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/apt-7.4.2/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/apt-7.4.2/.mdlrc b/cookbooks/third-party/apt-7.4.2/.mdlrc deleted file mode 100644 index 9cc2c6322..000000000 --- a/cookbooks/third-party/apt-7.4.2/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013", "~MD024", "~MD025" diff --git a/cookbooks/third-party/apt-7.4.2/.overcommit.yml b/cookbooks/third-party/apt-7.4.2/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/apt-7.4.2/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/apt-7.4.2/.yamllint b/cookbooks/third-party/apt-7.4.2/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/apt-7.4.2/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/apt-7.4.2/Gemfile b/cookbooks/third-party/apt-7.4.2/Gemfile deleted file mode 100644 index 7938c74fc..000000000 --- a/cookbooks/third-party/apt-7.4.2/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This gemfile provides additional gems for testing and releasing this cookbook -# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority -# of the necessary gems for testing this cookbook -# -# Run 'chef exec bundle install' to install these dependencies - -source 'https://rubygems.org' - -gem 'community_cookbook_releaser' diff --git a/cookbooks/third-party/apt-7.4.2/kitchen.dokken.yml b/cookbooks/third-party/apt-7.4.2/kitchen.dokken.yml deleted file mode 100644 index f489853ae..000000000 --- a/cookbooks/third-party/apt-7.4.2/kitchen.dokken.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -driver: - name: dokken - privileged: true # because Docker and SystemD - chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> - env: [CHEF_LICENSE=accept] - -transport: - name: dokken - -provisioner: - name: dokken - -platforms: - - 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-stream-8 - driver: - image: dokken/centos-stream-8 - 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 diff --git a/cookbooks/third-party/apt-7.4.2/Berksfile b/cookbooks/third-party/apt-7.5.14/Berksfile similarity index 100% rename from cookbooks/third-party/apt-7.4.2/Berksfile rename to cookbooks/third-party/apt-7.5.14/Berksfile diff --git a/cookbooks/third-party/apt-7.4.2/CHANGELOG.md b/cookbooks/third-party/apt-7.5.14/CHANGELOG.md similarity index 87% rename from cookbooks/third-party/apt-7.4.2/CHANGELOG.md rename to cookbooks/third-party/apt-7.5.14/CHANGELOG.md index 0928013ec..637bcd7a3 100644 --- a/cookbooks/third-party/apt-7.4.2/CHANGELOG.md +++ b/cookbooks/third-party/apt-7.5.14/CHANGELOG.md @@ -2,6 +2,64 @@ This file is used to list changes made in each version of the apt cookbook. +## 7.5.14 - *2023-07-10* + +## 7.5.13 - *2023-05-17* + +## 7.5.12 - *2023-05-03* + +## 7.5.11 - *2023-04-07* + +Standardise files with files in sous-chefs/repo-management + +## 7.5.10 - *2023-04-01* + +## 7.5.9 - *2023-04-01* + +## 7.5.8 - *2023-04-01* + +Standardise files with files in sous-chefs/repo-management + +## 7.5.7 - *2023-03-18* + +- Standardise files with files in sous-chefs/repo-management +- Various markdown fixes + +## 7.5.6 - *2023-03-15* + +- Standardise files with files in sous-chefs/repo-management + +## 7.5.5 - *2023-03-02* + +- Fix yaml + +## 7.5.4 - *2023-03-01* + +- Update workflows to 2.0.1 +- Remove mdl and replace with markdownlint-cli2 + +## 7.5.3 - *2023-02-20* + +- Standardise files with files in sous-chefs/repo-management + +## 7.5.2 - *2023-02-14* + +- Standardise files with files in sous-chefs/repo-management + +## 7.5.1 - *2023-02-14* + +- Remove CircleCI + +## 7.5.0 - *2022-12-29* + +- Update `50unattended-upgrades` to package defaults +- Add testing for Ubuntu 22.04 +- CI updates + +## 7.4.3 - *2022-12-05* + +- Standardise files with files in sous-chefs/repo-management + ## 7.4.2 - *2022-02-02* - Standardise files with files in sous-chefs/repo-management @@ -65,7 +123,7 @@ This file is used to list changes made in each version of the apt cookbook. ## 6.1.2 (2017-06-20) -- restore backwards compatability by respecting node['apt']['periodic_update_min_delay'] +- restore backwards compatability by respecting `node['apt']['periodic_update_min_delay']` ## 6.1.1 (2017-06-20) @@ -149,7 +207,7 @@ This cookbook now requires Chef 12\. If you require Chef 11 compatibility you wi ## v2.9.2 -- # 168 Adding guard to package resource +- #168 Adding guard to package resource ## v2.9.1 @@ -195,7 +253,7 @@ This cookbook now requires Chef 12\. If you require Chef 11 compatibility you wi ## v2.5.3 (2014-08-14) -- # 87 - Improve default settings, account for non-linux platforms +- #87 - Improve default settings, account for non-linux platforms ## v2.5.2 (2014-08-14) @@ -225,7 +283,7 @@ This cookbook now requires Chef 12\. If you require Chef 11 compatibility you wi ### Bug -- **[COOK-4287](https://tickets.opscode.com/browse/COOK-4287)** - Cleanup the Kitchen +- [COOK-4287] - Cleanup the Kitchen ## v2.3.6 @@ -251,35 +309,35 @@ No change. Version bump for toolchain sanity ### Bug -- **[COOK-3812](https://tickets.opscode.com/browse/COOK-3812)** - Add a way to bypass the apt existence check +- [COOK-3812] - Add a way to bypass the apt existence check ### Improvement -- **[COOK-3567](https://tickets.opscode.com/browse/COOK-3567)** - Allow users to bypass apt-cache via attributes +- [COOK-3567] - Allow users to bypass apt-cache via attributes ## v2.2.1 ### Improvement -- **[COOK-664](https://tickets.opscode.com/browse/COOK-664)** - Check platform before running apt-specific commands +- [COOK-664] - Check platform before running apt-specific commands ## v2.2.0 ### Bug -- **[COOK-3707](https://tickets.opscode.com/browse/COOK-3707)** - multiple nics confuse apt::cacher-client +- [COOK-3707] - multiple nics confuse apt::cacher-client ## v2.1.2 ### Improvement -- **[COOK-3551](https://tickets.opscode.com/browse/COOK-3551)** - Allow user to set up a trusted APT repository +- [COOK-3551] - Allow user to set up a trusted APT repository ## v2.1.1 ### Bug -- **[COOK-1856](https://tickets.opscode.com/browse/COOK-1856)** - Match GPG keys without case sensitivity +- [COOK-1856] - Match GPG keys without case sensitivity ## v2.1.0 diff --git a/cookbooks/third-party/apt-7.4.2/CODE_OF_CONDUCT.md b/cookbooks/third-party/apt-7.5.14/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/apt-7.4.2/CODE_OF_CONDUCT.md rename to cookbooks/third-party/apt-7.5.14/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/apt-7.4.2/CONTRIBUTING.md b/cookbooks/third-party/apt-7.5.14/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/apt-7.4.2/CONTRIBUTING.md rename to cookbooks/third-party/apt-7.5.14/CONTRIBUTING.md diff --git a/cookbooks/third-party/apt-7.4.2/Dangerfile b/cookbooks/third-party/apt-7.5.14/Dangerfile similarity index 100% rename from cookbooks/third-party/apt-7.4.2/Dangerfile rename to cookbooks/third-party/apt-7.5.14/Dangerfile diff --git a/cookbooks/third-party/apt-7.4.2/LICENSE b/cookbooks/third-party/apt-7.5.14/LICENSE similarity index 100% rename from cookbooks/third-party/apt-7.4.2/LICENSE rename to cookbooks/third-party/apt-7.5.14/LICENSE diff --git a/cookbooks/third-party/apt-7.4.2/README.md b/cookbooks/third-party/apt-7.5.14/README.md similarity index 100% rename from cookbooks/third-party/apt-7.4.2/README.md rename to cookbooks/third-party/apt-7.5.14/README.md diff --git a/cookbooks/third-party/apt-7.4.2/TESTING.md b/cookbooks/third-party/apt-7.5.14/TESTING.md similarity index 100% rename from cookbooks/third-party/apt-7.4.2/TESTING.md rename to cookbooks/third-party/apt-7.5.14/TESTING.md diff --git a/cookbooks/third-party/apt-7.4.2/attributes/default.rb b/cookbooks/third-party/apt-7.5.14/attributes/default.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/attributes/default.rb rename to cookbooks/third-party/apt-7.5.14/attributes/default.rb diff --git a/cookbooks/third-party/apt-7.4.2/chefignore b/cookbooks/third-party/apt-7.5.14/chefignore similarity index 98% rename from cookbooks/third-party/apt-7.4.2/chefignore rename to cookbooks/third-party/apt-7.5.14/chefignore index cc170ea79..a27b0b258 100644 --- a/cookbooks/third-party/apt-7.4.2/chefignore +++ b/cookbooks/third-party/apt-7.5.14/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile diff --git a/cookbooks/third-party/apt-7.4.2/documentation/.gitkeep b/cookbooks/third-party/apt-7.5.14/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/apt-7.4.2/documentation/.gitkeep rename to cookbooks/third-party/apt-7.5.14/documentation/.gitkeep diff --git a/cookbooks/third-party/apt-7.4.2/files/15update-stamp b/cookbooks/third-party/apt-7.5.14/files/15update-stamp similarity index 100% rename from cookbooks/third-party/apt-7.4.2/files/15update-stamp rename to cookbooks/third-party/apt-7.5.14/files/15update-stamp diff --git a/cookbooks/third-party/apt-7.4.2/files/apt-proxy-v2.conf b/cookbooks/third-party/apt-7.5.14/files/apt-proxy-v2.conf similarity index 100% rename from cookbooks/third-party/apt-7.4.2/files/apt-proxy-v2.conf rename to cookbooks/third-party/apt-7.5.14/files/apt-proxy-v2.conf diff --git a/cookbooks/third-party/apt-7.5.14/kitchen.dokken.yml b/cookbooks/third-party/apt-7.5.14/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/apt-7.5.14/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + 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: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/apt-7.5.14/kitchen.exec.yml b/cookbooks/third-party/apt-7.5.14/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/apt-7.5.14/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/apt-7.5.14/kitchen.global.yml b/cookbooks/third-party/apt-7.5.14/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/apt-7.5.14/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/cookbooks/third-party/apt-7.4.2/kitchen.yml b/cookbooks/third-party/apt-7.5.14/kitchen.yml similarity index 97% rename from cookbooks/third-party/apt-7.4.2/kitchen.yml rename to cookbooks/third-party/apt-7.5.14/kitchen.yml index 424b95ba6..6132a9d3f 100644 --- a/cookbooks/third-party/apt-7.4.2/kitchen.yml +++ b/cookbooks/third-party/apt-7.5.14/kitchen.yml @@ -17,6 +17,7 @@ platforms: - name: debian-11 - name: ubuntu-18.04 - name: ubuntu-20.04 + - name: ubuntu-22.04 - name: ubuntu-16.04-chef-13.3 driver_config: box: bento/ubuntu-16.04 diff --git a/cookbooks/third-party/apt-7.4.2/libraries/helpers.rb b/cookbooks/third-party/apt-7.5.14/libraries/helpers.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/libraries/helpers.rb rename to cookbooks/third-party/apt-7.5.14/libraries/helpers.rb diff --git a/cookbooks/third-party/apt-7.4.2/metadata.rb b/cookbooks/third-party/apt-7.5.14/metadata.rb similarity index 92% rename from cookbooks/third-party/apt-7.4.2/metadata.rb rename to cookbooks/third-party/apt-7.5.14/metadata.rb index 5af5b0bc9..242db7889 100644 --- a/cookbooks/third-party/apt-7.4.2/metadata.rb +++ b/cookbooks/third-party/apt-7.5.14/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Configures apt and apt caching.' -version '7.4.2' +version '7.5.14' source_url 'https://github.com/sous-chefs/apt' issues_url 'https://github.com/sous-chefs/apt/issues' chef_version '>= 13.3' diff --git a/cookbooks/third-party/apt-7.4.2/recipes/cacher-client.rb b/cookbooks/third-party/apt-7.5.14/recipes/cacher-client.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/recipes/cacher-client.rb rename to cookbooks/third-party/apt-7.5.14/recipes/cacher-client.rb diff --git a/cookbooks/third-party/apt-7.4.2/recipes/cacher-ng.rb b/cookbooks/third-party/apt-7.5.14/recipes/cacher-ng.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/recipes/cacher-ng.rb rename to cookbooks/third-party/apt-7.5.14/recipes/cacher-ng.rb diff --git a/cookbooks/third-party/apt-7.4.2/recipes/default.rb b/cookbooks/third-party/apt-7.5.14/recipes/default.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/recipes/default.rb rename to cookbooks/third-party/apt-7.5.14/recipes/default.rb diff --git a/cookbooks/third-party/apt-7.4.2/recipes/unattended-upgrades.rb b/cookbooks/third-party/apt-7.5.14/recipes/unattended-upgrades.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/recipes/unattended-upgrades.rb rename to cookbooks/third-party/apt-7.5.14/recipes/unattended-upgrades.rb diff --git a/cookbooks/third-party/apt-7.5.14/renovate.json b/cookbooks/third-party/apt-7.5.14/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/apt-7.5.14/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"] + } + ] +} diff --git a/cookbooks/third-party/apt-7.4.2/spec/spec_helper.rb b/cookbooks/third-party/apt-7.5.14/spec/spec_helper.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/spec/spec_helper.rb rename to cookbooks/third-party/apt-7.5.14/spec/spec_helper.rb diff --git a/cookbooks/third-party/apt-7.4.2/spec/unit/recipes/cacher-client_spec.rb b/cookbooks/third-party/apt-7.5.14/spec/unit/recipes/cacher-client_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/spec/unit/recipes/cacher-client_spec.rb rename to cookbooks/third-party/apt-7.5.14/spec/unit/recipes/cacher-client_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/spec/unit/recipes/cacher-ng_spec.rb b/cookbooks/third-party/apt-7.5.14/spec/unit/recipes/cacher-ng_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/spec/unit/recipes/cacher-ng_spec.rb rename to cookbooks/third-party/apt-7.5.14/spec/unit/recipes/cacher-ng_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/spec/unit/recipes/default_spec.rb b/cookbooks/third-party/apt-7.5.14/spec/unit/recipes/default_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/spec/unit/recipes/default_spec.rb rename to cookbooks/third-party/apt-7.5.14/spec/unit/recipes/default_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/spec/unit/recipes/unattended-upgrades_spec.rb b/cookbooks/third-party/apt-7.5.14/spec/unit/recipes/unattended-upgrades_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/spec/unit/recipes/unattended-upgrades_spec.rb rename to cookbooks/third-party/apt-7.5.14/spec/unit/recipes/unattended-upgrades_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/templates/01proxy.erb b/cookbooks/third-party/apt-7.5.14/templates/01proxy.erb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/templates/01proxy.erb rename to cookbooks/third-party/apt-7.5.14/templates/01proxy.erb diff --git a/cookbooks/third-party/apt-7.4.2/templates/10dpkg-options.erb b/cookbooks/third-party/apt-7.5.14/templates/10dpkg-options.erb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/templates/10dpkg-options.erb rename to cookbooks/third-party/apt-7.5.14/templates/10dpkg-options.erb diff --git a/cookbooks/third-party/apt-7.4.2/templates/10recommends.erb b/cookbooks/third-party/apt-7.5.14/templates/10recommends.erb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/templates/10recommends.erb rename to cookbooks/third-party/apt-7.5.14/templates/10recommends.erb diff --git a/cookbooks/third-party/apt-7.4.2/templates/20auto-upgrades.erb b/cookbooks/third-party/apt-7.5.14/templates/20auto-upgrades.erb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/templates/20auto-upgrades.erb rename to cookbooks/third-party/apt-7.5.14/templates/20auto-upgrades.erb diff --git a/cookbooks/third-party/apt-7.4.2/templates/50unattended-upgrades.erb b/cookbooks/third-party/apt-7.5.14/templates/50unattended-upgrades.erb similarity index 62% rename from cookbooks/third-party/apt-7.4.2/templates/50unattended-upgrades.erb rename to cookbooks/third-party/apt-7.5.14/templates/50unattended-upgrades.erb index de9cd825a..a183e63c1 100644 --- a/cookbooks/third-party/apt-7.4.2/templates/50unattended-upgrades.erb +++ b/cookbooks/third-party/apt-7.5.14/templates/50unattended-upgrades.erb @@ -15,7 +15,7 @@ Unattended-Upgrade::Origins-Pattern { }; <% end -%> -// List of packages to not update +// Python regular expressions, matching packages to exclude from upgrading Unattended-Upgrade::Package-Blacklist { <% unless node['apt']['unattended_upgrades']['package_blacklist'].empty? -%> <% node['apt']['unattended_upgrades']['package_blacklist'].each do |package| -%> @@ -31,21 +31,27 @@ Unattended-Upgrade::Package-Blacklist { Unattended-Upgrade::AutoFixInterruptedDpkg "<%= node['apt']['unattended_upgrades']['auto_fix_interrupted_dpkg'] ? 'true' : 'false' %>"; // Split the upgrade into the smallest possible chunks so that -// they can be interrupted with SIGUSR1. This makes the upgrade +// they can be interrupted with SIGTERM. This makes the upgrade // a bit slower but it has the benefit that shutdown while a upgrade // is running is possible (with a small delay) Unattended-Upgrade::MinimalSteps "<%= node['apt']['unattended_upgrades']['minimal_steps'] ? 'true' : 'false' %>"; -// Install all unattended-upgrades when the machine is shuting down -// instead of doing it in the background while the machine is running -// This will (obviously) make shutdown slower +// Install all updates when the machine is shutting down +// instead of doing it in the background while the machine is running. +// This will (obviously) make shutdown slower. +// Unattended-upgrades increases logind's InhibitDelayMaxSec to 30s. +// This allows more time for unattended-upgrades to shut down gracefully +// or even install a few packages in InstallOnShutdown mode, but is still a +// big step back from the 30 minutes allowed for InstallOnShutdown previously. +// Users enabling InstallOnShutdown mode are advised to increase +// InhibitDelayMaxSec even further, possibly to 30 minutes. Unattended-Upgrade::InstallOnShutdown "<%= node['apt']['unattended_upgrades']['install_on_shutdown'] ? 'true' : 'false' %>"; <% if node['apt']['unattended_upgrades']['mail'] -%> // Send email to this address for problems or packages upgrades // If empty or unset then no email is sent, make sure that you // have a working mail setup on your system. A package that provides -// 'mailx' must be installed. +// 'mailx' must be installed. E.g. "user@example.com" Unattended-Upgrade::Mail "<%= node['apt']['unattended_upgrades']['mail'] %>"; <% end -%> @@ -55,21 +61,36 @@ Unattended-Upgrade::Mail "<%= node['apt']['unattended_upgrades']['mail'] %>"; Unattended-Upgrade::Sender "<%= node['apt']['unattended_upgrades']['sender'] %>"; <% end -%> -// Set this value to "true" to get emails only on errors. Default -// is to always send a mail if Unattended-Upgrade::Mail is set +// Set this value to one of: +// "always", "only-on-error" or "on-change" +// If this is not set, then any legacy MailOnlyOnError (boolean) value +// is used to chose between "only-on-error" and "on-change" +//Unattended-Upgrade::MailReport "on-change"; Unattended-Upgrade::MailOnlyOnError "<%= node['apt']['unattended_upgrades']['mail_only_on_error'] ? 'true' : 'false' %>"; -// Do automatic removal of new unused dependencies after the upgrade +// Remove unused automatically installed kernel-related packages +// (kernel images, kernel headers and kernel version locked tools). +//Unattended-Upgrade::Remove-Unused-Kernel-Packages "true"; + +// Do automatic removal of newly unused dependencies after the upgrade +//Unattended-Upgrade::Remove-New-Unused-Dependencies "true"; + +// Do automatic removal of unused packages after the upgrade // (equivalent to apt-get autoremove) Unattended-Upgrade::Remove-Unused-Dependencies "<%= node['apt']['unattended_upgrades']['remove_unused_dependencies'] ? 'true' : 'false' %>"; -// Automatically reboot *WITHOUT CONFIRMATION* if a -// the file /var/run/reboot-required is found after the upgrade +// Automatically reboot *WITHOUT CONFIRMATION* if +// the file /var/run/reboot-required is found after the upgrade Unattended-Upgrade::Automatic-Reboot "<%= node['apt']['unattended_upgrades']['automatic_reboot'] ? 'true' : 'false' %>"; <% if node['apt']['unattended_upgrades']['automatic_reboot'] -%> +// Automatically reboot even if there are users currently logged in +// when Unattended-Upgrade::Automatic-Reboot is set to true +//Unattended-Upgrade::Automatic-Reboot-WithUsers "true"; + // If automatic reboot is enabled and needed, reboot at the specific -// time instead of immediately. Default is "now" +// time instead of immediately +// Default: "now" Unattended-Upgrade::Automatic-Reboot-Time "<%= node['apt']['unattended_upgrades']['automatic_reboot_time'] %>"; <% end %> @@ -86,15 +107,7 @@ Unattended-Upgrade::SyslogEnable "<%= node['apt']['unattended_upgrades']['syslog // Specify syslog facility. Default is daemon Unattended-Upgrade::SyslogFacility "<%= node['apt']['unattended_upgrades']['syslog_facility'] %>"; -// specify any dpkg options you want to run -// for example if you wanted to upgrade and use -// the installed version of config files when -// resolving conflicts during an upgrade you -// typically need: -// Dpkg::Options { -// "--force-confdef"; -// "--force-confold"; -//}; + <% unless node['apt']['unattended_upgrades']['dpkg_options'].empty? -%> Dpkg::Options { <% node['apt']['unattended_upgrades']['dpkg_options'].each do |option|%> @@ -102,3 +115,18 @@ Dpkg::Options { <% end -%> }; <% end -%> + +// Download and install upgrades only on AC power +// (i.e. skip or gracefully stop updates on battery) +// Unattended-Upgrade::OnlyOnACPower "true"; + +// Download and install upgrades only on non-metered connection +// (i.e. skip or gracefully stop updates on a metered connection) +// Unattended-Upgrade::Skip-Updates-On-Metered-Connections "true"; + +// Verbose logging +// Unattended-Upgrade::Verbose "false"; + +// Print debugging information both in unattended-upgrades and +// in unattended-upgrade-shutdown +// Unattended-Upgrade::Debug "false"; diff --git a/cookbooks/third-party/apt-7.4.2/templates/acng.conf.erb b/cookbooks/third-party/apt-7.5.14/templates/acng.conf.erb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/templates/acng.conf.erb rename to cookbooks/third-party/apt-7.5.14/templates/acng.conf.erb diff --git a/cookbooks/third-party/apt-7.4.2/templates/unattended-upgrades.seed.erb b/cookbooks/third-party/apt-7.5.14/templates/unattended-upgrades.seed.erb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/templates/unattended-upgrades.seed.erb rename to cookbooks/third-party/apt-7.5.14/templates/unattended-upgrades.seed.erb diff --git a/cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/metadata.rb b/cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/metadata.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/metadata.rb rename to cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/metadata.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/recipes/base.rb b/cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/recipes/base.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/recipes/base.rb rename to cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/recipes/base.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/recipes/cacher.rb b/cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/recipes/cacher.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/recipes/cacher.rb rename to cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/recipes/cacher.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/recipes/unattended-upgrades.rb b/cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/recipes/unattended-upgrades.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/fixtures/cookbooks/test/recipes/unattended-upgrades.rb rename to cookbooks/third-party/apt-7.5.14/test/fixtures/cookbooks/test/recipes/unattended-upgrades.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/integration/cacher/cacher-ng-client_spec.rb b/cookbooks/third-party/apt-7.5.14/test/integration/cacher/cacher-ng-client_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/integration/cacher/cacher-ng-client_spec.rb rename to cookbooks/third-party/apt-7.5.14/test/integration/cacher/cacher-ng-client_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/integration/compile-time/default_spec.rb b/cookbooks/third-party/apt-7.5.14/test/integration/compile-time/default_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/integration/compile-time/default_spec.rb rename to cookbooks/third-party/apt-7.5.14/test/integration/compile-time/default_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/integration/default/default_spec.rb b/cookbooks/third-party/apt-7.5.14/test/integration/default/default_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/integration/default/default_spec.rb rename to cookbooks/third-party/apt-7.5.14/test/integration/default/default_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/integration/resources/resources_spec.rb b/cookbooks/third-party/apt-7.5.14/test/integration/resources/resources_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/integration/resources/resources_spec.rb rename to cookbooks/third-party/apt-7.5.14/test/integration/resources/resources_spec.rb diff --git a/cookbooks/third-party/apt-7.4.2/test/integration/resources/unattended_upgrades_spec.rb b/cookbooks/third-party/apt-7.5.14/test/integration/resources/unattended_upgrades_spec.rb similarity index 100% rename from cookbooks/third-party/apt-7.4.2/test/integration/resources/unattended_upgrades_spec.rb rename to cookbooks/third-party/apt-7.5.14/test/integration/resources/unattended_upgrades_spec.rb diff --git a/metadata.rb b/metadata.rb index 5907d899b..6293bf417 100644 --- a/metadata.rb +++ b/metadata.rb @@ -13,7 +13,7 @@ supports 'centos', '>= 7.0' supports 'ubuntu', '>= 20.04' -depends 'apt', '~> 7.4.2' +depends 'apt', '~> 7.5.14' depends 'iptables', '~> 8.0.0' depends 'line', '~> 4.5.2' depends 'nfs', '~> 5.0.0' From 98c6c6a4f89ac90386905d6adaa32a74fe61f811 Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 13:20:30 +0200 Subject: [PATCH 3/9] Upgrade line cookbook to version 4.5.13 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 3 +- .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- .../aws-parallelcluster-environment/Berksfile | 2 +- .../metadata.rb | 2 +- .../aws-parallelcluster-platform/Berksfile | 2 +- .../aws-parallelcluster-platform/metadata.rb | 2 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../{line-4.5.2 => line-4.5.13}/Berksfile | 0 .../{line-4.5.2 => line-4.5.13}/CHANGELOG.md | 38 +++++- .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../{line-4.5.2 => line-4.5.13}/Dangerfile | 0 .../FilterDevelopment.md | 2 +- .../{line-4.5.2 => line-4.5.13}/LICENSE | 0 .../{line-4.5.2 => line-4.5.13}/README.md | 0 .../{line-4.5.2 => line-4.5.13}/TESTING.md | 0 .../{line-4.5.2 => line-4.5.13}/chefignore | 0 .../documentation/.gitkeep | 0 .../documentation/resources/add_to_list.md | 0 .../resources/append_if_no_line.md | 0 .../resources/delete_from_list.md | 0 .../documentation/resources/delete_lines.md | 0 .../documentation/resources/filter_lines.md | 0 .../documentation/resources/filters/after.md | 0 .../documentation/resources/filters/before.md | 0 .../resources/filters/between.md | 0 .../resources/filters/comment.md | 0 .../resources/filters/delete_between.md | 0 .../resources/filters/missing.md | 0 .../resources/filters/replace.md | 0 .../resources/filters/replace_between.md | 0 .../documentation/resources/filters/stanza.md | 0 .../resources/filters/substitute.md | 0 .../documentation/resources/replace_or_add.md | 0 .../line-4.5.13/kitchen.dokken.yml | 113 ++++++++++++++++++ .../third-party/line-4.5.13/kitchen.exec.yml | 7 ++ .../line-4.5.13/kitchen.global.yml | 38 ++++++ .../{line-4.5.2 => line-4.5.13}/kitchen.yml | 0 .../libraries/after_filter.rb | 0 .../libraries/before_filter.rb | 0 .../libraries/between.rb | 0 .../libraries/comment_filter.rb | 0 .../libraries/delete_between.rb | 0 .../libraries/filter_helper.rb | 0 .../libraries/helper.rb | 0 .../libraries/list_helper.rb | 0 .../libraries/missing_filter.rb | 0 .../libraries/replace_between.rb | 0 .../libraries/replace_filter.rb | 0 .../libraries/stanza_filter.rb | 0 .../libraries/substitute_filter.rb | 0 .../{line-4.5.2 => line-4.5.13}/metadata.rb | 2 +- .../recipes/default.rb | 0 .../third-party/line-4.5.13/renovate.json | 17 +++ .../resources/add_to_list.rb | 0 .../resources/append_if_no_line.rb | 0 .../resources/delete_from_list.rb | 0 .../resources/delete_lines.rb | 0 .../resources/filter_lines.rb | 0 .../resources/replace_or_add.rb | 0 .../spec/chefspec_helper.rb | 0 .../spec/cookbook/documentation_spec.rb | 0 .../fixtures/cookbooks/spectest/README.md | 2 +- .../fixtures/cookbooks/spectest/metadata.rb | 0 .../recipes/add_to_list_missing_file.rb | 0 .../recipes/append_if_no_line_missing_file.rb | 0 .../recipes/delete_from_list_missing_file.rb | 0 .../recipes/delete_lines_missing_file.rb | 0 .../recipes/replace_or_add_missing_file.rb | 0 .../spec/rspec_helper.rb | 0 .../spec/unit/library/filter/after_spec.rb | 0 .../spec/unit/library/filter/before_spec.rb | 0 .../spec/unit/library/filter/between_spec.rb | 0 .../spec/unit/library/filter/comment_spec.rb | 0 .../library/filter/delete_between_spec.rb | 0 .../spec/unit/library/filter/missing_spec.rb | 0 .../library/filter/replace_between_spec.rb | 0 .../spec/unit/library/filter/replace_spec.rb | 0 .../spec/unit/library/filter/stanza_spec.rb | 0 .../unit/library/filter/substitute_spec.rb | 0 .../unit/library/filter_helper/chomp_spec.rb | 0 .../unit/library/filter_helper/expand_spec.rb | 0 .../filter_helper/match_insert_lines_spec.rb | 0 .../filter_helper/match_limits_spec.rb | 0 .../missing_line_between_spec.rb | 0 .../filter_helper/next_match_after_spec.rb | 0 .../library/filter_helper/options_spec.rb | 0 .../filter_helper/string_to_lines_spec.rb | 0 .../filter_helper/verify_all_of_spec.rb | 0 .../library/filter_helper/verify_kind_spec.rb | 0 .../filter_helper/verify_one_of_spec.rb | 0 .../spec/unit/library/helper_spec.rb | 0 .../spec/unit/library/list_helper_spec.rb | 0 .../recipes/add_to_list_missing_file_spec.rb | 0 .../append_if_no_line_missing_file_spec.rb | 0 .../delete_from_list_missing_file_spec.rb | 0 .../recipes/delete_lines_missing_file_spec.rb | 0 .../replace_or_add_missing_file_spec.rb | 0 .../test/libraries/resource_handler.rb | 0 .../test/fixtures/cookbooks/test/metadata.rb | 0 .../cookbooks/test/recipes/add_to_list_1d.rb | 0 .../test/recipes/add_to_list_1d_terminal.rb | 0 .../cookbooks/test/recipes/add_to_list_2d.rb | 0 .../test/recipes/add_to_list_2d_terminal.rb | 0 .../cookbooks/test/recipes/add_to_list_3d.rb | 0 .../test/recipes/add_to_list_3d_terminal.rb | 0 .../test/recipes/add_to_list_empty.rb | 0 .../test/recipes/append_if_no_line_empty.rb | 0 .../recipes/append_if_no_line_single_line.rb | 0 .../recipes/append_if_no_line_template.rb | 0 .../test/recipes/delete_from_list_1d.rb | 0 .../test/recipes/delete_from_list_2d.rb | 0 .../test/recipes/delete_from_list_3d.rb | 0 .../test/recipes/delete_from_list_empty.rb | 0 .../test/recipes/delete_lines_empty.rb | 0 .../test/recipes/delete_lines_regexp.rb | 0 .../test/recipes/delete_lines_string.rb | 0 .../test/recipes/filter_lines_after.rb | 0 .../test/recipes/filter_lines_before.rb | 0 .../test/recipes/filter_lines_between.rb | 0 .../test/recipes/filter_lines_comment.rb | 0 .../recipes/filter_lines_delete_between.rb | 0 .../test/recipes/filter_lines_inline.rb | 0 .../test/recipes/filter_lines_misc.rb | 0 .../test/recipes/filter_lines_multi.rb | 0 .../test/recipes/filter_lines_replace.rb | 0 .../recipes/filter_lines_replace_between.rb | 0 .../test/recipes/filter_lines_stanza.rb | 0 .../test/recipes/filter_lines_substitute.rb | 0 ...lace_or_add_add_a_line_matching_pattern.rb | 0 .../recipes/replace_or_add_change_line_eof.rb | 0 .../test/recipes/replace_or_add_duplicate.rb | 0 .../recipes/replace_or_add_missing_file.rb | 0 .../recipes/replace_or_add_replace_only.rb | 0 .../cookbooks/test/templates/samplefile.erb | 0 .../cookbooks/test/templates/samplefile1.erb | 0 .../cookbooks/test/templates/samplefile2.erb | 0 .../cookbooks/test/templates/samplefile3.erb | 0 .../cookbooks/test/templates/stanza.erb | 0 .../cookbooks/test/templates/text_file.erb | 0 .../inspec/controls/add_to_list_1d.rb | 0 .../controls/add_to_list_1d_terminal.rb | 0 .../inspec/controls/add_to_list_2d.rb | 0 .../controls/add_to_list_2d_terminal.rb | 0 .../inspec/controls/add_to_list_3d.rb | 0 .../controls/add_to_list_3d_terminal.rb | 0 .../inspec/controls/add_to_list_empty.rb | 0 .../integration/add_to_list/inspec/inspec.yml | 0 .../controls/append_if_no_line_empty.rb | 0 .../controls/append_if_no_line_single_line.rb | 0 .../controls/append_if_no_line_template.rb | 0 .../append_if_no_line/inspec/inspec.yml | 0 .../inspec/controls/delete_from_list_1d.rb | 0 .../inspec/controls/delete_from_list_2d.rb | 0 .../inspec/controls/delete_from_list_3d.rb | 0 .../inspec/controls/delete_from_list_empty.rb | 0 .../delete_from_list/inspec/inspec.yml | 0 .../inspec/controls/delete_lines_empty.rb | 0 .../inspec/controls/delete_lines_regexp.rb | 0 .../inspec/controls/delete_lines_string.rb | 0 .../delete_lines/inspec/inspec.yml | 0 .../controls/filter_lines_after.rb | 0 .../controls/filter_lines_before.rb | 0 .../controls/filter_lines_between.rb | 0 .../controls/filter_lines_comment.rb | 0 .../controls/filter_lines_delete_between.rb | 0 .../controls/filter_lines_inline.rb | 0 .../controls/filter_lines_misc.rb | 0 .../controls/filter_lines_multi.rb | 0 .../controls/filter_lines_replace.rb | 0 .../controls/filter_lines_replace_between.rb | 0 .../controls/filter_lines_stanza.rb | 0 .../controls/filter_lines_substitue.rb | 0 .../test/integration/filter_lines/inspec.yml | 0 .../test/integration/line_resources/README.md | 0 .../integration/line_resources/controls/dummy | 0 .../integration/line_resources/inspec.yml | 0 .../line_resources/libraries/file_ext.rb | 0 .../line_resources/libraries/matches.rb | 0 ...lace_or_add_add_a_line_matching_pattern.rb | 0 .../replace_or_add_change_line_eof.rb | 0 .../controls/replace_or_add_duplicate.rb | 0 .../controls/replace_or_add_missing_file.rb | 0 .../controls/replace_or_add_replace_only.rb | 0 .../integration/replace_or_add/inspec.yml | 0 .../line-4.5.2/.circleci/config.yml | 10 -- .../third-party/line-4.5.2/.editorconfig | 19 --- cookbooks/third-party/line-4.5.2/.envrc | 1 - .../third-party/line-4.5.2/.gitattributes | 1 - .../third-party/line-4.5.2/.github/CODEOWNERS | 1 - .../third-party/line-4.5.2/.github/lock.yml | 8 -- .../line-4.5.2/.github/workflows/ci.yml | 66 ---------- .../line-4.5.2/.github/workflows/md-links.yml | 19 --- .../line-4.5.2/.github/workflows/stale.yml | 25 ---- cookbooks/third-party/line-4.5.2/.gitignore | 49 -------- cookbooks/third-party/line-4.5.2/.mdlrc | 1 - .../third-party/line-4.5.2/.overcommit.yml | 16 --- cookbooks/third-party/line-4.5.2/.yamllint | 13 -- cookbooks/third-party/line-4.5.2/Gemfile | 3 - .../third-party/line-4.5.2/kitchen.dokken.yml | 65 ---------- .../pyenv-3.5.1/documentation/.gitkeep | 0 metadata.rb | 2 +- 206 files changed, 227 insertions(+), 314 deletions(-) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/Berksfile (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/CHANGELOG.md (92%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/Dangerfile (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/FilterDevelopment.md (96%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/LICENSE (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/README.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/TESTING.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/chefignore (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/.gitkeep (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/add_to_list.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/append_if_no_line.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/delete_from_list.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/delete_lines.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filter_lines.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/after.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/before.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/between.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/comment.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/delete_between.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/missing.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/replace.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/replace_between.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/stanza.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/filters/substitute.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/documentation/resources/replace_or_add.md (100%) create mode 100644 cookbooks/third-party/line-4.5.13/kitchen.dokken.yml create mode 100644 cookbooks/third-party/line-4.5.13/kitchen.exec.yml create mode 100644 cookbooks/third-party/line-4.5.13/kitchen.global.yml rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/kitchen.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/after_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/before_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/comment_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/delete_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/filter_helper.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/helper.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/list_helper.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/missing_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/replace_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/replace_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/stanza_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/libraries/substitute_filter.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/metadata.rb (94%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/recipes/default.rb (100%) create mode 100644 cookbooks/third-party/line-4.5.13/renovate.json rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/resources/add_to_list.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/resources/append_if_no_line.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/resources/delete_from_list.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/resources/delete_lines.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/resources/filter_lines.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/resources/replace_or_add.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/chefspec_helper.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/cookbook/documentation_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/README.md (65%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/metadata.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/rspec_helper.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/after_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/before_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/between_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/comment_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/delete_between_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/missing_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/replace_between_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/replace_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/stanza_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter/substitute_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/chomp_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/expand_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/match_insert_lines_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/match_limits_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/missing_line_between_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/next_match_after_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/options_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/string_to_lines_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/verify_all_of_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/verify_kind_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/filter_helper/verify_one_of_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/helper_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/library/list_helper_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/recipes/add_to_list_missing_file_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/recipes/append_if_no_line_missing_file_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/recipes/delete_from_list_missing_file_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/recipes/delete_lines_missing_file_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/spec/unit/recipes/replace_or_add_missing_file_spec.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/libraries/resource_handler.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/metadata.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/templates/samplefile.erb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/templates/samplefile1.erb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/templates/samplefile2.erb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/templates/samplefile3.erb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/templates/stanza.erb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/fixtures/cookbooks/test/templates/text_file.erb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/add_to_list/inspec/inspec.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/append_if_no_line/inspec/inspec.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_from_list/inspec/inspec.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_lines/inspec/controls/delete_lines_string.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/delete_lines/inspec/inspec.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_after.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_before.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_comment.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_delete_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_inline.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_misc.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_multi.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_replace.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_replace_between.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_stanza.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/controls/filter_lines_substitue.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/filter_lines/inspec.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/line_resources/README.md (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/line_resources/controls/dummy (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/line_resources/inspec.yml (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/line_resources/libraries/file_ext.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/line_resources/libraries/matches.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb (100%) rename cookbooks/third-party/{line-4.5.2 => line-4.5.13}/test/integration/replace_or_add/inspec.yml (100%) delete mode 100644 cookbooks/third-party/line-4.5.2/.circleci/config.yml delete mode 100755 cookbooks/third-party/line-4.5.2/.editorconfig delete mode 100644 cookbooks/third-party/line-4.5.2/.envrc delete mode 100644 cookbooks/third-party/line-4.5.2/.gitattributes delete mode 100644 cookbooks/third-party/line-4.5.2/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/line-4.5.2/.github/lock.yml delete mode 100644 cookbooks/third-party/line-4.5.2/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/line-4.5.2/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/line-4.5.2/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/line-4.5.2/.gitignore delete mode 100644 cookbooks/third-party/line-4.5.2/.mdlrc delete mode 100644 cookbooks/third-party/line-4.5.2/.overcommit.yml delete mode 100644 cookbooks/third-party/line-4.5.2/.yamllint delete mode 100644 cookbooks/third-party/line-4.5.2/Gemfile delete mode 100644 cookbooks/third-party/line-4.5.2/kitchen.dokken.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/documentation/.gitkeep diff --git a/Berksfile b/Berksfile index 3bfdeb887..bc92e1ecc 100644 --- a/Berksfile +++ b/Berksfile @@ -9,7 +9,7 @@ metadata cookbook "apt", path: "./cookbooks/third-party/apt-7.5.14" cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0" -cookbook "line", path: "./cookbooks/third-party/line-4.5.2" +cookbook "line", path: "./cookbooks/third-party/line-4.5.13" cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0" cookbook "openssh", path: "./cookbooks/third-party/openssh-2.10.3" cookbook "pyenv", path: "./cookbooks/third-party/pyenv-3.5.1" diff --git a/CHANGELOG.md b/CHANGELOG.md index d41ce84cb..8b19e2da5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - Upgrade ARM PL to version 23.04.1 for Ubuntu 22.04 only. - Upgrade third-party cookbook dependencies: - apt-7.5.14 (from apt-7.4.0) + - line-4.5.13 (from line-4.5.2) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. @@ -251,7 +252,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - Move `SelectTypeParameters` and `ConstrainRAMSpace` to the `parallelcluster_slurm*.conf` include files. - Upgrade third-party cookbook dependencies: - apt-7.4.2 (from apt-7.4.0) - - line-4.5.2 (from line-4.0.1) + - line-4.5.13 (from line-4.0.1) - openssh-2.10.3 (from openssh-2.9.1) - pyenv-3.5.1 (from pyenv-3.4.2) - selinux-6.0.4 (from selinux-3.1.1) diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index bcc221d9a..bd510562a 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -14,7 +14,7 @@ cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm" cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" -cookbook "line", path: "../third-party/line-4.5.2" +cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.10.3" cookbook "pyenv", path: "../third-party/pyenv-3.5.1" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index 05a0f14f0..a5bb7a882 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -16,7 +16,7 @@ depends 'apt', '~> 7.5.14' depends 'iptables', '~> 8.0.0' depends 'nfs', '~> 5.0.0' -depends 'line', '~> 4.5.2' +depends 'line', '~> 4.5.13' depends 'openssh', '~> 2.10.3' depends 'pyenv', '~> 3.5.1' depends 'selinux', '~> 6.0.5' diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index dcec36c5b..0936ee80f 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -11,7 +11,7 @@ cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm" cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" -cookbook "line", path: "../third-party/line-4.5.2" +cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.10.3" cookbook "pyenv", path: "../third-party/pyenv-3.5.1" diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile index c5fdce9fa..23ac5169e 100644 --- a/cookbooks/aws-parallelcluster-environment/Berksfile +++ b/cookbooks/aws-parallelcluster-environment/Berksfile @@ -7,7 +7,7 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" cookbook "nfs", path: "../third-party/nfs-5.0.0" # dependency od nfs -cookbook "line", path: "../third-party/line-4.5.2" +cookbook "line", path: "../third-party/line-4.5.13" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-3.5.1" diff --git a/cookbooks/aws-parallelcluster-environment/metadata.rb b/cookbooks/aws-parallelcluster-environment/metadata.rb index 102fc1516..5b17a14be 100644 --- a/cookbooks/aws-parallelcluster-environment/metadata.rb +++ b/cookbooks/aws-parallelcluster-environment/metadata.rb @@ -14,7 +14,7 @@ supports 'ubuntu', '>= 20.04' supports 'redhat', '= 8.7' -depends 'line', '~> 4.5.2' +depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile index bb2f907d2..14c0af6b1 100644 --- a/cookbooks/aws-parallelcluster-platform/Berksfile +++ b/cookbooks/aws-parallelcluster-platform/Berksfile @@ -4,7 +4,7 @@ metadata cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" -cookbook "line", path: "../third-party/line-4.5.2" +cookbook "line", path: "../third-party/line-4.5.13" cookbook "selinux", path: "../third-party/selinux-6.0.5" # for shared cookbook diff --git a/cookbooks/aws-parallelcluster-platform/metadata.rb b/cookbooks/aws-parallelcluster-platform/metadata.rb index 9d2d18104..a82c4c8c8 100644 --- a/cookbooks/aws-parallelcluster-platform/metadata.rb +++ b/cookbooks/aws-parallelcluster-platform/metadata.rb @@ -14,7 +14,7 @@ supports 'ubuntu', '>= 20.04' supports 'redhat', '= 8.7' -depends 'line', '~> 4.5.2' +depends 'line', '~> 4.5.13' depends 'selinux', '~> 6.0.5' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index 1df447e97..68e9dacc9 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -8,7 +8,7 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" -cookbook "line", path: "../third-party/line-4.5.2" +cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.10.3" cookbook "pyenv", path: "../third-party/pyenv-3.5.1" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index a26b7d1ca..0d11c6c8c 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -15,7 +15,7 @@ depends 'apt', '~> 7.5.14' depends 'iptables', '~> 8.0.0' -depends 'line', '~> 4.5.2' +depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' depends 'openssh', '~> 2.10.3' depends 'pyenv', '~> 3.5.1' diff --git a/cookbooks/third-party/line-4.5.2/Berksfile b/cookbooks/third-party/line-4.5.13/Berksfile similarity index 100% rename from cookbooks/third-party/line-4.5.2/Berksfile rename to cookbooks/third-party/line-4.5.13/Berksfile diff --git a/cookbooks/third-party/line-4.5.2/CHANGELOG.md b/cookbooks/third-party/line-4.5.13/CHANGELOG.md similarity index 92% rename from cookbooks/third-party/line-4.5.2/CHANGELOG.md rename to cookbooks/third-party/line-4.5.13/CHANGELOG.md index 734a2bb11..1bc07fae8 100644 --- a/cookbooks/third-party/line-4.5.2/CHANGELOG.md +++ b/cookbooks/third-party/line-4.5.13/CHANGELOG.md @@ -4,6 +4,40 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 4.5.13 - *2023-07-10* + +## 4.5.12 - *2023-05-16* + +## 4.5.11 - *2023-04-26* + +Update CI test matrix + +## 4.5.10 - *2023-04-17* + +## 4.5.9 - *2023-04-11* + +Standardise files with files in sous-chefs/repo-management + +## 4.5.8 - *2023-04-01* + +## 4.5.7 - *2023-02-23* + +Standardise files with files in sous-chefs/repo-management + +## 4.5.6 - *2023-02-16* + +Standardise files with files in sous-chefs/repo-management + +## 4.5.5 - *2023-02-15* + +## 4.5.4 - *2023-02-15* + +Standardise files with files in sous-chefs/repo-management + +## 4.5.3 - *2022-12-09* + +Standardise files with files in sous-chefs/repo-management + ## 4.5.2 - *2022-06-08* - StanzaSlash add some stanza filter unit tests to fill in the checks @@ -211,8 +245,8 @@ Standardise files with files in sous-chefs/repo-management ## [2.0.0] - 2018-05-19 -- _Breaking change_ - Files are processed in memory instead of line by line. It's possible that large files that were previously updated by the line cookbook will not be able to be processed. -- _Breaking change_ - Drop Chef 12 support +- **Breaking change** - Files are processed in memory instead of line by line. It's possible that large files that were previously updated by the line cookbook will not be able to be processed. +- **Breaking change** - Drop Chef 12 support - Use template files instead of `cookbook_file` so that we get platform sensitive line endings written for testing. - Add windows support to `add_to_list`, `append_if_no_line`, `delete_from_list`, `delete_lines`, `replace_or_add`. - Make the processing of missing target files consistent. Add the `ignore_missing` property to the resources to allow a missing file to raise an error. diff --git a/cookbooks/third-party/line-4.5.2/CODE_OF_CONDUCT.md b/cookbooks/third-party/line-4.5.13/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/CODE_OF_CONDUCT.md rename to cookbooks/third-party/line-4.5.13/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/line-4.5.2/CONTRIBUTING.md b/cookbooks/third-party/line-4.5.13/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/CONTRIBUTING.md rename to cookbooks/third-party/line-4.5.13/CONTRIBUTING.md diff --git a/cookbooks/third-party/line-4.5.2/Dangerfile b/cookbooks/third-party/line-4.5.13/Dangerfile similarity index 100% rename from cookbooks/third-party/line-4.5.2/Dangerfile rename to cookbooks/third-party/line-4.5.13/Dangerfile diff --git a/cookbooks/third-party/line-4.5.2/FilterDevelopment.md b/cookbooks/third-party/line-4.5.13/FilterDevelopment.md similarity index 96% rename from cookbooks/third-party/line-4.5.2/FilterDevelopment.md rename to cookbooks/third-party/line-4.5.13/FilterDevelopment.md index 4c843f941..9ebc8ed23 100644 --- a/cookbooks/third-party/line-4.5.2/FilterDevelopment.md +++ b/cookbooks/third-party/line-4.5.13/FilterDevelopment.md @@ -1,4 +1,4 @@ -Checklist for adding a new filter +# Checklist for adding a new filter README.md Note new filter diff --git a/cookbooks/third-party/line-4.5.2/LICENSE b/cookbooks/third-party/line-4.5.13/LICENSE similarity index 100% rename from cookbooks/third-party/line-4.5.2/LICENSE rename to cookbooks/third-party/line-4.5.13/LICENSE diff --git a/cookbooks/third-party/line-4.5.2/README.md b/cookbooks/third-party/line-4.5.13/README.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/README.md rename to cookbooks/third-party/line-4.5.13/README.md diff --git a/cookbooks/third-party/line-4.5.2/TESTING.md b/cookbooks/third-party/line-4.5.13/TESTING.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/TESTING.md rename to cookbooks/third-party/line-4.5.13/TESTING.md diff --git a/cookbooks/third-party/line-4.5.2/chefignore b/cookbooks/third-party/line-4.5.13/chefignore similarity index 100% rename from cookbooks/third-party/line-4.5.2/chefignore rename to cookbooks/third-party/line-4.5.13/chefignore diff --git a/cookbooks/third-party/line-4.5.2/documentation/.gitkeep b/cookbooks/third-party/line-4.5.13/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/.gitkeep rename to cookbooks/third-party/line-4.5.13/documentation/.gitkeep diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/add_to_list.md b/cookbooks/third-party/line-4.5.13/documentation/resources/add_to_list.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/add_to_list.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/add_to_list.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/append_if_no_line.md b/cookbooks/third-party/line-4.5.13/documentation/resources/append_if_no_line.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/append_if_no_line.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/append_if_no_line.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/delete_from_list.md b/cookbooks/third-party/line-4.5.13/documentation/resources/delete_from_list.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/delete_from_list.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/delete_from_list.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/delete_lines.md b/cookbooks/third-party/line-4.5.13/documentation/resources/delete_lines.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/delete_lines.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/delete_lines.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filter_lines.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filter_lines.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filter_lines.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filter_lines.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/after.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/after.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/after.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/after.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/before.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/before.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/before.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/before.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/between.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/between.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/between.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/between.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/comment.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/comment.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/comment.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/comment.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/delete_between.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/delete_between.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/delete_between.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/delete_between.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/missing.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/missing.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/missing.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/missing.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/replace.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/replace.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/replace.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/replace.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/replace_between.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/replace_between.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/replace_between.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/replace_between.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/stanza.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/stanza.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/stanza.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/stanza.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/filters/substitute.md b/cookbooks/third-party/line-4.5.13/documentation/resources/filters/substitute.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/filters/substitute.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/filters/substitute.md diff --git a/cookbooks/third-party/line-4.5.2/documentation/resources/replace_or_add.md b/cookbooks/third-party/line-4.5.13/documentation/resources/replace_or_add.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/documentation/resources/replace_or_add.md rename to cookbooks/third-party/line-4.5.13/documentation/resources/replace_or_add.md diff --git a/cookbooks/third-party/line-4.5.13/kitchen.dokken.yml b/cookbooks/third-party/line-4.5.13/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/line-4.5.13/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + 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: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/line-4.5.13/kitchen.exec.yml b/cookbooks/third-party/line-4.5.13/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/line-4.5.13/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/line-4.5.13/kitchen.global.yml b/cookbooks/third-party/line-4.5.13/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/line-4.5.13/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/cookbooks/third-party/line-4.5.2/kitchen.yml b/cookbooks/third-party/line-4.5.13/kitchen.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/kitchen.yml rename to cookbooks/third-party/line-4.5.13/kitchen.yml diff --git a/cookbooks/third-party/line-4.5.2/libraries/after_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/after_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/after_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/after_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/before_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/before_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/before_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/before_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/between.rb b/cookbooks/third-party/line-4.5.13/libraries/between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/between.rb rename to cookbooks/third-party/line-4.5.13/libraries/between.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/comment_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/comment_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/comment_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/comment_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/delete_between.rb b/cookbooks/third-party/line-4.5.13/libraries/delete_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/delete_between.rb rename to cookbooks/third-party/line-4.5.13/libraries/delete_between.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/filter_helper.rb b/cookbooks/third-party/line-4.5.13/libraries/filter_helper.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/filter_helper.rb rename to cookbooks/third-party/line-4.5.13/libraries/filter_helper.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/helper.rb b/cookbooks/third-party/line-4.5.13/libraries/helper.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/helper.rb rename to cookbooks/third-party/line-4.5.13/libraries/helper.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/list_helper.rb b/cookbooks/third-party/line-4.5.13/libraries/list_helper.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/list_helper.rb rename to cookbooks/third-party/line-4.5.13/libraries/list_helper.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/missing_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/missing_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/missing_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/missing_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/replace_between.rb b/cookbooks/third-party/line-4.5.13/libraries/replace_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/replace_between.rb rename to cookbooks/third-party/line-4.5.13/libraries/replace_between.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/replace_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/replace_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/replace_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/replace_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/stanza_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/stanza_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/stanza_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/stanza_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/libraries/substitute_filter.rb b/cookbooks/third-party/line-4.5.13/libraries/substitute_filter.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/libraries/substitute_filter.rb rename to cookbooks/third-party/line-4.5.13/libraries/substitute_filter.rb diff --git a/cookbooks/third-party/line-4.5.2/metadata.rb b/cookbooks/third-party/line-4.5.13/metadata.rb similarity index 94% rename from cookbooks/third-party/line-4.5.2/metadata.rb rename to cookbooks/third-party/line-4.5.13/metadata.rb index 20f40f3dd..578dafe5c 100644 --- a/cookbooks/third-party/line-4.5.2/metadata.rb +++ b/cookbooks/third-party/line-4.5.13/metadata.rb @@ -4,7 +4,7 @@ license 'Apache-2.0' description 'Provides line editing resources for use by recipes' -version '4.5.2' +version '4.5.13' source_url 'https://github.com/sous-chefs/line' issues_url 'https://github.com/sous-chefs/line/issues' diff --git a/cookbooks/third-party/line-4.5.2/recipes/default.rb b/cookbooks/third-party/line-4.5.13/recipes/default.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/recipes/default.rb rename to cookbooks/third-party/line-4.5.13/recipes/default.rb diff --git a/cookbooks/third-party/line-4.5.13/renovate.json b/cookbooks/third-party/line-4.5.13/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/line-4.5.13/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"] + } + ] +} diff --git a/cookbooks/third-party/line-4.5.2/resources/add_to_list.rb b/cookbooks/third-party/line-4.5.13/resources/add_to_list.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/resources/add_to_list.rb rename to cookbooks/third-party/line-4.5.13/resources/add_to_list.rb diff --git a/cookbooks/third-party/line-4.5.2/resources/append_if_no_line.rb b/cookbooks/third-party/line-4.5.13/resources/append_if_no_line.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/resources/append_if_no_line.rb rename to cookbooks/third-party/line-4.5.13/resources/append_if_no_line.rb diff --git a/cookbooks/third-party/line-4.5.2/resources/delete_from_list.rb b/cookbooks/third-party/line-4.5.13/resources/delete_from_list.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/resources/delete_from_list.rb rename to cookbooks/third-party/line-4.5.13/resources/delete_from_list.rb diff --git a/cookbooks/third-party/line-4.5.2/resources/delete_lines.rb b/cookbooks/third-party/line-4.5.13/resources/delete_lines.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/resources/delete_lines.rb rename to cookbooks/third-party/line-4.5.13/resources/delete_lines.rb diff --git a/cookbooks/third-party/line-4.5.2/resources/filter_lines.rb b/cookbooks/third-party/line-4.5.13/resources/filter_lines.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/resources/filter_lines.rb rename to cookbooks/third-party/line-4.5.13/resources/filter_lines.rb diff --git a/cookbooks/third-party/line-4.5.2/resources/replace_or_add.rb b/cookbooks/third-party/line-4.5.13/resources/replace_or_add.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/resources/replace_or_add.rb rename to cookbooks/third-party/line-4.5.13/resources/replace_or_add.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/chefspec_helper.rb b/cookbooks/third-party/line-4.5.13/spec/chefspec_helper.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/chefspec_helper.rb rename to cookbooks/third-party/line-4.5.13/spec/chefspec_helper.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/cookbook/documentation_spec.rb b/cookbooks/third-party/line-4.5.13/spec/cookbook/documentation_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/cookbook/documentation_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/cookbook/documentation_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/README.md b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/README.md similarity index 65% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/README.md rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/README.md index 2ab4b5ebb..0e6a05a3b 100644 --- a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/README.md +++ b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/README.md @@ -1,3 +1,3 @@ -Place holder for recipes tested using rspec. +# Place holder for recipes tested using rspec The tests to this point are used for verifying the resource's ignore_missing property. diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/metadata.rb b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/metadata.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/metadata.rb rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/metadata.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb b/cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb rename to cookbooks/third-party/line-4.5.13/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/rspec_helper.rb b/cookbooks/third-party/line-4.5.13/spec/rspec_helper.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/rspec_helper.rb rename to cookbooks/third-party/line-4.5.13/spec/rspec_helper.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/after_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/after_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/after_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/after_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/before_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/before_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/before_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/before_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/between_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/between_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/between_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/between_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/comment_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/comment_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/comment_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/comment_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/delete_between_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/delete_between_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/delete_between_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/delete_between_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/missing_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/missing_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/missing_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/missing_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/replace_between_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/replace_between_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/replace_between_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/replace_between_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/replace_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/replace_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/replace_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/replace_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/stanza_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/stanza_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/stanza_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/stanza_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter/substitute_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter/substitute_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter/substitute_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter/substitute_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/chomp_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/chomp_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/chomp_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/chomp_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/expand_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/expand_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/expand_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/expand_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/match_insert_lines_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/match_insert_lines_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/match_insert_lines_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/match_insert_lines_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/match_limits_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/match_limits_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/match_limits_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/match_limits_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/missing_line_between_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/missing_line_between_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/missing_line_between_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/missing_line_between_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/next_match_after_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/next_match_after_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/next_match_after_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/next_match_after_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/options_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/options_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/options_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/options_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/string_to_lines_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/string_to_lines_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/string_to_lines_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/string_to_lines_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/verify_all_of_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/verify_all_of_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/verify_all_of_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/verify_all_of_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/verify_kind_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/verify_kind_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/verify_kind_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/verify_kind_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/verify_one_of_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/verify_one_of_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/filter_helper/verify_one_of_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/filter_helper/verify_one_of_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/helper_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/helper_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/helper_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/helper_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/library/list_helper_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/library/list_helper_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/library/list_helper_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/library/list_helper_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/recipes/add_to_list_missing_file_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/recipes/add_to_list_missing_file_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/recipes/add_to_list_missing_file_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/recipes/add_to_list_missing_file_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/recipes/append_if_no_line_missing_file_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/recipes/append_if_no_line_missing_file_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/recipes/append_if_no_line_missing_file_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/recipes/append_if_no_line_missing_file_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/recipes/delete_from_list_missing_file_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/recipes/delete_from_list_missing_file_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/recipes/delete_from_list_missing_file_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/recipes/delete_from_list_missing_file_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/recipes/delete_lines_missing_file_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/recipes/delete_lines_missing_file_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/recipes/delete_lines_missing_file_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/recipes/delete_lines_missing_file_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/spec/unit/recipes/replace_or_add_missing_file_spec.rb b/cookbooks/third-party/line-4.5.13/spec/unit/recipes/replace_or_add_missing_file_spec.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/spec/unit/recipes/replace_or_add_missing_file_spec.rb rename to cookbooks/third-party/line-4.5.13/spec/unit/recipes/replace_or_add_missing_file_spec.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/libraries/resource_handler.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/libraries/resource_handler.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/libraries/resource_handler.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/libraries/resource_handler.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/metadata.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/metadata.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/metadata.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/metadata.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile.erb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile.erb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile.erb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile.erb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile1.erb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile1.erb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile1.erb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile1.erb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile2.erb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile2.erb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile2.erb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile2.erb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile3.erb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile3.erb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/samplefile3.erb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/samplefile3.erb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/stanza.erb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/stanza.erb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/stanza.erb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/stanza.erb diff --git a/cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/text_file.erb b/cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/text_file.erb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/fixtures/cookbooks/test/templates/text_file.erb rename to cookbooks/third-party/line-4.5.13/test/fixtures/cookbooks/test/templates/text_file.erb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/add_to_list/inspec/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/add_to_list/inspec/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb b/cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb rename to cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb b/cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb rename to cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb b/cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb rename to cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/append_if_no_line/inspec/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/append_if_no_line/inspec/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_from_list/inspec/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/delete_from_list/inspec/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/controls/delete_lines_string.rb b/cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/controls/delete_lines_string.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/controls/delete_lines_string.rb rename to cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/controls/delete_lines_string.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/delete_lines/inspec/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/delete_lines/inspec/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_after.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_after.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_after.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_after.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_before.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_before.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_before.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_before.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_between.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_between.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_between.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_comment.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_comment.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_comment.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_comment.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_delete_between.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_delete_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_delete_between.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_delete_between.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_inline.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_inline.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_inline.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_inline.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_misc.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_misc.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_misc.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_misc.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_multi.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_multi.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_multi.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_multi.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_replace.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_replace.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_replace.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_replace.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_replace_between.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_replace_between.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_replace_between.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_replace_between.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_stanza.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_stanza.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_stanza.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_stanza.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_substitue.rb b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_substitue.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/controls/filter_lines_substitue.rb rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/controls/filter_lines_substitue.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/filter_lines/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/filter_lines/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/filter_lines/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/filter_lines/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/test/integration/line_resources/README.md b/cookbooks/third-party/line-4.5.13/test/integration/line_resources/README.md similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/line_resources/README.md rename to cookbooks/third-party/line-4.5.13/test/integration/line_resources/README.md diff --git a/cookbooks/third-party/line-4.5.2/test/integration/line_resources/controls/dummy b/cookbooks/third-party/line-4.5.13/test/integration/line_resources/controls/dummy similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/line_resources/controls/dummy rename to cookbooks/third-party/line-4.5.13/test/integration/line_resources/controls/dummy diff --git a/cookbooks/third-party/line-4.5.2/test/integration/line_resources/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/line_resources/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/line_resources/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/line_resources/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/test/integration/line_resources/libraries/file_ext.rb b/cookbooks/third-party/line-4.5.13/test/integration/line_resources/libraries/file_ext.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/line_resources/libraries/file_ext.rb rename to cookbooks/third-party/line-4.5.13/test/integration/line_resources/libraries/file_ext.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/line_resources/libraries/matches.rb b/cookbooks/third-party/line-4.5.13/test/integration/line_resources/libraries/matches.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/line_resources/libraries/matches.rb rename to cookbooks/third-party/line-4.5.13/test/integration/line_resources/libraries/matches.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb b/cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb rename to cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb b/cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb rename to cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb b/cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb rename to cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb b/cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb rename to cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb b/cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb rename to cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb diff --git a/cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/inspec.yml b/cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/inspec.yml similarity index 100% rename from cookbooks/third-party/line-4.5.2/test/integration/replace_or_add/inspec.yml rename to cookbooks/third-party/line-4.5.13/test/integration/replace_or_add/inspec.yml diff --git a/cookbooks/third-party/line-4.5.2/.circleci/config.yml b/cookbooks/third-party/line-4.5.2/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/line-4.5.2/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/line-4.5.2/.editorconfig b/cookbooks/third-party/line-4.5.2/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/line-4.5.2/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/line-4.5.2/.envrc b/cookbooks/third-party/line-4.5.2/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/line-4.5.2/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/line-4.5.2/.gitattributes b/cookbooks/third-party/line-4.5.2/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/line-4.5.2/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/line-4.5.2/.github/CODEOWNERS b/cookbooks/third-party/line-4.5.2/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/line-4.5.2/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/line-4.5.2/.github/lock.yml b/cookbooks/third-party/line-4.5.2/.github/lock.yml deleted file mode 100644 index 8344a7b3e..000000000 --- a/cookbooks/third-party/line-4.5.2/.github/lock.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -daysUntilLock: 365 -exemptLabels: [] -lockLabel: false -lockComment: > - This thread has been automatically locked since there has not been - any recent activity after it was closed. Please open a new issue for - related bugs. diff --git a/cookbooks/third-party/line-4.5.2/.github/workflows/ci.yml b/cookbooks/third-party/line-4.5.2/.github/workflows/ci.yml deleted file mode 100644 index a78098c98..000000000 --- a/cookbooks/third-party/line-4.5.2/.github/workflows/ci.yml +++ /dev/null @@ -1,66 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 - - yamllint: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run yaml Lint - uses: actionshub/yamllint@main - - mdl: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Markdown Lint - uses: actionshub/markdownlint@main - - integration: - needs: [mdl, yamllint, lint-unit] - runs-on: ubuntu-latest - strategy: - matrix: - os: - - debian-9 - - debian-10 - - centos-7 - - centos-8 - - centos-stream-8 - - fedora-latest - - ubuntu-2004 - - ubuntu-2104 - - amazonlinux-2 - suite: - - add-to-list - - append-if-no-line - - delete-from-list - - delete-lines - - filter-lines - - replace-or-add - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/line-4.5.2/.github/workflows/md-links.yml b/cookbooks/third-party/line-4.5.2/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/line-4.5.2/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/line-4.5.2/.github/workflows/stale.yml b/cookbooks/third-party/line-4.5.2/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/line-4.5.2/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/line-4.5.2/.gitignore b/cookbooks/third-party/line-4.5.2/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/line-4.5.2/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/line-4.5.2/.mdlrc b/cookbooks/third-party/line-4.5.2/.mdlrc deleted file mode 100644 index b7e08259a..000000000 --- a/cookbooks/third-party/line-4.5.2/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013" diff --git a/cookbooks/third-party/line-4.5.2/.overcommit.yml b/cookbooks/third-party/line-4.5.2/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/line-4.5.2/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/line-4.5.2/.yamllint b/cookbooks/third-party/line-4.5.2/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/line-4.5.2/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/line-4.5.2/Gemfile b/cookbooks/third-party/line-4.5.2/Gemfile deleted file mode 100644 index c9c92bd23..000000000 --- a/cookbooks/third-party/line-4.5.2/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source 'https://rubygems.org' - -gem 'danger' diff --git a/cookbooks/third-party/line-4.5.2/kitchen.dokken.yml b/cookbooks/third-party/line-4.5.2/kitchen.dokken.yml deleted file mode 100644 index 822ef9c09..000000000 --- a/cookbooks/third-party/line-4.5.2/kitchen.dokken.yml +++ /dev/null @@ -1,65 +0,0 @@ ---- -driver: - name: dokken - privileged: true - chef_version: current - env: [CHEF_LICENSE=accept] - -transport: { name: dokken } -provisioner: { name: dokken } -verifier: { name: inspec } - -platforms: - - name: debian-9 - driver: - image: dokken/debian-9 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - - name: debian-10 - driver: - image: dokken/debian-10 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - - name: centos-7 - driver: - image: dokken/centos-7 - platform: rhel - pid_one_command: /usr/lib/systemd/systemd - - - name: centos-8 - driver: - image: dokken/centos-8 - 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: fedora-latest - driver: - image: dokken/fedora-latest - pid_one_command: /usr/lib/systemd/systemd - - - name: ubuntu-20.04 - driver: - image: dokken/ubuntu-20.04 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - - name: ubuntu-21.04 - driver: - image: dokken/ubuntu-21.04 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - - name: amazonlinux-2 - driver: - image: dokken/amazonlinux-2 - pid_one_command: /usr/lib/systemd/systemd diff --git a/cookbooks/third-party/pyenv-3.5.1/documentation/.gitkeep b/cookbooks/third-party/pyenv-3.5.1/documentation/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/metadata.rb b/metadata.rb index 6293bf417..9693998b4 100644 --- a/metadata.rb +++ b/metadata.rb @@ -15,7 +15,7 @@ depends 'apt', '~> 7.5.14' depends 'iptables', '~> 8.0.0' -depends 'line', '~> 4.5.2' +depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' depends 'openssh', '~> 2.10.3' depends 'pyenv', '~> 3.5.1' From 0a159c5d43b64426936a973e31fec58dbf190e63 Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 13:31:49 +0200 Subject: [PATCH 4/9] Upgrade openssh cookbook to version 2.11.3 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 13 ++ .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../openssh-2.10.3/.circleci/config.yml | 10 -- .../third-party/openssh-2.10.3/.editorconfig | 19 --- cookbooks/third-party/openssh-2.10.3/.envrc | 1 - .../third-party/openssh-2.10.3/.gitattributes | 1 - .../openssh-2.10.3/.github/CODEOWNERS | 1 - .../openssh-2.10.3/.github/workflows/ci.yml | 112 --------------- .../.github/workflows/md-links.yml | 19 --- .../.github/workflows/stale.yml | 25 ---- .../third-party/openssh-2.10.3/.gitignore | 49 ------- cookbooks/third-party/openssh-2.10.3/.mdlrc | 1 - .../openssh-2.10.3/.overcommit.yml | 16 --- .../third-party/openssh-2.10.3/.yamllint | 13 -- cookbooks/third-party/openssh-2.10.3/Gemfile | 9 -- .../openssh-2.10.3/kitchen.exec.yml | 13 -- .../Berksfile | 0 .../CHANGELOG.md | 67 +++++++++ .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../Dangerfile | 0 .../LICENSE | 0 .../README.md | 1 + .../TESTING.md | 0 .../attributes/default.rb | 16 ++- .../chefignore | 2 +- .../documentation/.gitkeep | 0 .../kitchen.dokken.yml | 83 +++++++---- .../openssh-2.11.3/kitchen.exec.yml | 7 + .../openssh-2.11.3/kitchen.global.yml | 38 +++++ .../kitchen.yml | 25 +++- .../libraries/helpers.rb | 20 ++- .../metadata.rb | 3 +- .../openssh-2.11.3/mlc_config.json | 10 ++ .../recipes/default.rb | 28 ++-- .../recipes/iptables.rb | 3 + .../third-party/openssh-2.11.3/renovate.json | 17 +++ .../spec/spec_helper.rb | 4 + .../spec/unit/recipes/default_spec.rb | 0 .../spec/unit/recipes/default_windows_spec.rb | 136 ++++++++++++++++++ .../spec/unit/recipes/iptables_spec.rb | 0 .../templates/ca_keys.erb | 0 .../templates/port_ssh.erb | 0 .../templates/revoked_keys.erb | 0 .../templates/ssh_config.erb | 0 .../templates/sshd_config.erb | 0 .../test/integration/default/default_spec.rb | 0 .../test/integration/iptables/default_spec.rb | 0 .../windows-default/default_spec.rb | 37 +++++ metadata.rb | 2 +- 55 files changed, 467 insertions(+), 346 deletions(-) delete mode 100644 cookbooks/third-party/openssh-2.10.3/.circleci/config.yml delete mode 100755 cookbooks/third-party/openssh-2.10.3/.editorconfig delete mode 100644 cookbooks/third-party/openssh-2.10.3/.envrc delete mode 100644 cookbooks/third-party/openssh-2.10.3/.gitattributes delete mode 100644 cookbooks/third-party/openssh-2.10.3/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/openssh-2.10.3/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/openssh-2.10.3/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/openssh-2.10.3/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/openssh-2.10.3/.gitignore delete mode 100644 cookbooks/third-party/openssh-2.10.3/.mdlrc delete mode 100644 cookbooks/third-party/openssh-2.10.3/.overcommit.yml delete mode 100644 cookbooks/third-party/openssh-2.10.3/.yamllint delete mode 100644 cookbooks/third-party/openssh-2.10.3/Gemfile delete mode 100644 cookbooks/third-party/openssh-2.10.3/kitchen.exec.yml rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/Berksfile (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/CHANGELOG.md (87%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/Dangerfile (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/LICENSE (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/README.md (99%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/TESTING.md (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/attributes/default.rb (90%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/chefignore (98%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/documentation/.gitkeep (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/kitchen.dokken.yml (59%) create mode 100644 cookbooks/third-party/openssh-2.11.3/kitchen.exec.yml create mode 100644 cookbooks/third-party/openssh-2.11.3/kitchen.global.yml rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/kitchen.yml (61%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/libraries/helpers.rb (73%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/metadata.rb (93%) create mode 100644 cookbooks/third-party/openssh-2.11.3/mlc_config.json rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/recipes/default.rb (77%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/recipes/iptables.rb (94%) create mode 100644 cookbooks/third-party/openssh-2.11.3/renovate.json rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/spec/spec_helper.rb (80%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/spec/unit/recipes/default_spec.rb (100%) create mode 100644 cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/default_windows_spec.rb rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/spec/unit/recipes/iptables_spec.rb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/templates/ca_keys.erb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/templates/port_ssh.erb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/templates/revoked_keys.erb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/templates/ssh_config.erb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/templates/sshd_config.erb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/test/integration/default/default_spec.rb (100%) rename cookbooks/third-party/{openssh-2.10.3 => openssh-2.11.3}/test/integration/iptables/default_spec.rb (100%) create mode 100644 cookbooks/third-party/openssh-2.11.3/test/integration/windows-default/default_spec.rb diff --git a/Berksfile b/Berksfile index bc92e1ecc..b316d3c3b 100644 --- a/Berksfile +++ b/Berksfile @@ -11,7 +11,7 @@ cookbook "apt", path: "./cookbooks/third-party/apt-7.5.14" cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0" cookbook "line", path: "./cookbooks/third-party/line-4.5.13" cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0" -cookbook "openssh", path: "./cookbooks/third-party/openssh-2.10.3" +cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3" cookbook "pyenv", path: "./cookbooks/third-party/pyenv-3.5.1" cookbook "selinux", path: "./cookbooks/third-party/selinux-6.0.5" cookbook "yum", path: "./cookbooks/third-party/yum-7.4.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b19e2da5..ed94b7ea8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ aws-parallelcluster-cookbook CHANGELOG This file is used to list changes made in each version of the AWS ParallelCluster cookbook. +3.8.0 +------ + +**ENHANCEMENTS** + +**CHANGES** +- Upgrade third-party cookbook dependencies: + - apt-7.5.14 (from apt-7.4.0) + - line-4.5.13 (from line-4.5.2) + +**BUG FIXES** + 3.7.0 ------ @@ -33,6 +45,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - Upgrade third-party cookbook dependencies: - apt-7.5.14 (from apt-7.4.0) - line-4.5.13 (from line-4.5.2) + - openssh-2.11.3 (from openssh-2.10.3) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index bd510562a..4fb364587 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -16,7 +16,7 @@ cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" -cookbook "openssh", path: "../third-party/openssh-2.10.3" +cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-3.5.1" cookbook "selinux", path: "../third-party/selinux-6.0.5" cookbook "yum", path: "../third-party/yum-7.4.0" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index a5bb7a882..302e5a305 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -17,7 +17,7 @@ depends 'iptables', '~> 8.0.0' depends 'nfs', '~> 5.0.0' depends 'line', '~> 4.5.13' -depends 'openssh', '~> 2.10.3' +depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 3.5.1' depends 'selinux', '~> 6.0.5' depends 'yum', '~> 7.4.0' diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index 0936ee80f..97b600cff 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -13,7 +13,7 @@ cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" -cookbook "openssh", path: "../third-party/openssh-2.10.3" +cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-3.5.1" cookbook "selinux", path: "../third-party/selinux-6.0.5" cookbook "yum", path: "../third-party/yum-7.4.0" diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index 68e9dacc9..78f898300 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -10,7 +10,7 @@ cookbook "apt", path: "../third-party/apt-7.5.14" cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" -cookbook "openssh", path: "../third-party/openssh-2.10.3" +cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-3.5.1" cookbook "selinux", path: "../third-party/selinux-6.0.5" cookbook "yum", path: "../third-party/yum-7.4.0" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index 0d11c6c8c..fd45fdc61 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -17,7 +17,7 @@ depends 'iptables', '~> 8.0.0' depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' -depends 'openssh', '~> 2.10.3' +depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 3.5.1' depends 'selinux', '~> 6.0.5' depends 'yum', '~> 7.4.0' diff --git a/cookbooks/third-party/openssh-2.10.3/.circleci/config.yml b/cookbooks/third-party/openssh-2.10.3/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/openssh-2.10.3/.editorconfig b/cookbooks/third-party/openssh-2.10.3/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/openssh-2.10.3/.envrc b/cookbooks/third-party/openssh-2.10.3/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/openssh-2.10.3/.gitattributes b/cookbooks/third-party/openssh-2.10.3/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/openssh-2.10.3/.github/CODEOWNERS b/cookbooks/third-party/openssh-2.10.3/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/openssh-2.10.3/.github/workflows/ci.yml b/cookbooks/third-party/openssh-2.10.3/.github/workflows/ci.yml deleted file mode 100644 index e4b8f4f34..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.github/workflows/ci.yml +++ /dev/null @@ -1,112 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - delivery: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Chef Delivery - uses: actionshub/chef-delivery@main - env: - CHEF_LICENSE: accept-no-persist - - yamllint: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run yaml Lint - uses: actionshub/yamllint@main - - mdl: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Markdown Lint - uses: actionshub/markdownlint@main - - integration: - needs: [delivery] - runs-on: ubuntu-latest - strategy: - matrix: - os: - - 'almalinux-8' - - 'amazonlinux-2' - - 'centos-7' - - 'centos-stream-8' - - 'debian-10' - - 'debian-11' - - 'fedora-latest' - - 'opensuse-leap-15' - - 'ubuntu-1804' - - 'ubuntu-2004' - - 'rockylinux-8' - suite: - - 'default' - - 'iptables' - exclude: - - os: 'almalinux-8' - suite: 'iptables' - - os: 'centos-7' - suite: 'iptables' - - os: 'centos-stream-8' - suite: 'iptables' - - os: 'opensuse-leap-15' - suite: 'iptables' - - os: 'rockylinux-8' - suite: 'iptables' - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} - - # unable to get SSH service to start - # integration-macos: - # needs: [mdl, yamllint, delivery] - # runs-on: macos-latest - # strategy: - # matrix: - # os: - # - 'macos-latest' - # suite: - # - 'default' - # fail-fast: false - # - # steps: - # - name: Check out code - # uses: actions/checkout@v2 - # - name: Install Chef - # uses: actionshub/chef-install@main - # - name: test-kitchen - # uses: actionshub/test-kitchen@main - # env: - # CHEF_LICENSE: accept-no-persist - # KITCHEN_LOCAL_YAML: kitchen.exec.yml - # with: - # suite: ${{ matrix.suite }} - # os: ${{ matrix.os }} - # - name: Print debug output on failure - # if: failure() - # run: | - # sudo syslog diff --git a/cookbooks/third-party/openssh-2.10.3/.github/workflows/md-links.yml b/cookbooks/third-party/openssh-2.10.3/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/openssh-2.10.3/.github/workflows/stale.yml b/cookbooks/third-party/openssh-2.10.3/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/openssh-2.10.3/.gitignore b/cookbooks/third-party/openssh-2.10.3/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/openssh-2.10.3/.mdlrc b/cookbooks/third-party/openssh-2.10.3/.mdlrc deleted file mode 100644 index 9cc2c6322..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013", "~MD024", "~MD025" diff --git a/cookbooks/third-party/openssh-2.10.3/.overcommit.yml b/cookbooks/third-party/openssh-2.10.3/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/openssh-2.10.3/.yamllint b/cookbooks/third-party/openssh-2.10.3/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/openssh-2.10.3/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/openssh-2.10.3/Gemfile b/cookbooks/third-party/openssh-2.10.3/Gemfile deleted file mode 100644 index 7938c74fc..000000000 --- a/cookbooks/third-party/openssh-2.10.3/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This gemfile provides additional gems for testing and releasing this cookbook -# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority -# of the necessary gems for testing this cookbook -# -# Run 'chef exec bundle install' to install these dependencies - -source 'https://rubygems.org' - -gem 'community_cookbook_releaser' diff --git a/cookbooks/third-party/openssh-2.10.3/kitchen.exec.yml b/cookbooks/third-party/openssh-2.10.3/kitchen.exec.yml deleted file mode 100644 index 603cbf2ca..000000000 --- a/cookbooks/third-party/openssh-2.10.3/kitchen.exec.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -driver: - name: exec - -transport: - name: exec - -provisioner: - name: chef_zero - deprecations_as_errors: true - -platforms: - - name: macos-latest diff --git a/cookbooks/third-party/openssh-2.10.3/Berksfile b/cookbooks/third-party/openssh-2.11.3/Berksfile similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/Berksfile rename to cookbooks/third-party/openssh-2.11.3/Berksfile diff --git a/cookbooks/third-party/openssh-2.10.3/CHANGELOG.md b/cookbooks/third-party/openssh-2.11.3/CHANGELOG.md similarity index 87% rename from cookbooks/third-party/openssh-2.10.3/CHANGELOG.md rename to cookbooks/third-party/openssh-2.11.3/CHANGELOG.md index d83862caa..21e046104 100644 --- a/cookbooks/third-party/openssh-2.10.3/CHANGELOG.md +++ b/cookbooks/third-party/openssh-2.11.3/CHANGELOG.md @@ -2,6 +2,73 @@ This file is used to list changes made in each version of the openssh cookbook. +## 2.11.3 - *2023-08-05* + +- resolved cookstyle error: attributes/default.rb:120:58 refactor: `Chef/RedundantCode/MultiplePlatformChecks` +## 2.11.2 - *2023-08-04* + +Standardise files with files in sous-chefs/repo-management + +## 2.11.1 - *2023-08-04* + +- Disable PAM option on Windows + +## 2.11.0 - *2023-08-01* + +- Add Windows Support + +## 2.10.18 - *2023-07-10* + +## 2.10.17 - *2023-05-16* + +## 2.10.16 - *2023-04-17* + +## 2.10.15 - *2023-04-07* + +Standardise files with files in sous-chefs/repo-management + +## 2.10.14 - *2023-04-01* + +## 2.10.13 - *2023-04-01* + +## 2.10.12 - *2023-04-01* + +Standardise files with files in sous-chefs/repo-management + +## 2.10.11 - *2023-03-20* + +Standardise files with files in sous-chefs/repo-management + +## 2.10.10 - *2023-03-15* + +Standardise files with files in sous-chefs/repo-management + +Standardise files with files in sous-chefs/repo-management + +## 2.10.9 - *2023-02-23* + +Standardise files with files in sous-chefs/repo-management + +## 2.10.8 - *2023-02-23* + +Remove delivery + +## 2.10.7 - *2023-02-16* + +Standardise files with files in sous-chefs/repo-management + +## 2.10.6 - *2023-02-14* + +## 2.10.5 - *2023-02-14* + +Standardise files with files in sous-chefs/repo-management + +## 2.10.4 - *2022-12-08* + +Standardise files with files in sous-chefs/repo-management + +Standardise files with files in sous-chefs/repo-management + ## 2.10.3 - *2022-02-10* - Standardise files with files in sous-chefs/repo-management diff --git a/cookbooks/third-party/openssh-2.10.3/CODE_OF_CONDUCT.md b/cookbooks/third-party/openssh-2.11.3/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/CODE_OF_CONDUCT.md rename to cookbooks/third-party/openssh-2.11.3/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/openssh-2.10.3/CONTRIBUTING.md b/cookbooks/third-party/openssh-2.11.3/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/CONTRIBUTING.md rename to cookbooks/third-party/openssh-2.11.3/CONTRIBUTING.md diff --git a/cookbooks/third-party/openssh-2.10.3/Dangerfile b/cookbooks/third-party/openssh-2.11.3/Dangerfile similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/Dangerfile rename to cookbooks/third-party/openssh-2.11.3/Dangerfile diff --git a/cookbooks/third-party/openssh-2.10.3/LICENSE b/cookbooks/third-party/openssh-2.11.3/LICENSE similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/LICENSE rename to cookbooks/third-party/openssh-2.11.3/LICENSE diff --git a/cookbooks/third-party/openssh-2.10.3/README.md b/cookbooks/third-party/openssh-2.11.3/README.md similarity index 99% rename from cookbooks/third-party/openssh-2.10.3/README.md rename to cookbooks/third-party/openssh-2.11.3/README.md index 8d9be00cb..d2f5e9c44 100644 --- a/cookbooks/third-party/openssh-2.10.3/README.md +++ b/cookbooks/third-party/openssh-2.11.3/README.md @@ -23,6 +23,7 @@ This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of - Suse Enterprise Linux - openSUSE / openSUSE leap - AIX 7.1 +- Windows ### Chef diff --git a/cookbooks/third-party/openssh-2.10.3/TESTING.md b/cookbooks/third-party/openssh-2.11.3/TESTING.md similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/TESTING.md rename to cookbooks/third-party/openssh-2.11.3/TESTING.md diff --git a/cookbooks/third-party/openssh-2.10.3/attributes/default.rb b/cookbooks/third-party/openssh-2.11.3/attributes/default.rb similarity index 90% rename from cookbooks/third-party/openssh-2.10.3/attributes/default.rb rename to cookbooks/third-party/openssh-2.11.3/attributes/default.rb index 1cc737c74..2243ba853 100644 --- a/cookbooks/third-party/openssh-2.10.3/attributes/default.rb +++ b/cookbooks/third-party/openssh-2.11.3/attributes/default.rb @@ -26,7 +26,7 @@ %w(openssh-clients openssh-server) when 'arch', 'suse', 'gentoo' %w(openssh) - when 'freebsd', 'smartos', 'mac_os_x', 'aix' + when 'freebsd', 'smartos', 'mac_os_x', 'aix', 'windows' %w() else %w(openssh-client openssh-server) @@ -117,7 +117,7 @@ # default['openssh']['server']['kerberos_get_afs_token'] = 'no' # default['openssh']['server']['gssapi_authentication'] = 'no' # default['openssh']['server']['gssapi_clean_up_credentials'] = 'yes' -default['openssh']['server']['use_p_a_m'] = 'yes' unless platform_family?('smartos') +default['openssh']['server']['use_p_a_m'] = 'yes' unless platform_family?('smartos', 'windows') # default['openssh']['server']['allow_agent_forwarding'] = 'yes' # default['openssh']['server']['allow_tcp_forwarding'] = 'yes' # default['openssh']['server']['gateway_ports'] = 'no' @@ -140,8 +140,16 @@ # default['openssh']['server']['chroot_directory'] = 'none' # default['openssh']['server']['banner'] = 'none' # default['openssh']['server']['subsystem'] = 'sftp /usr/libexec/sftp-server' -default['openssh']['server']['trusted_user_c_a_keys'] = '/etc/ssh/ca_keys' -default['openssh']['server']['revoked_keys'] = '/etc/ssh/revoked_keys' +default['openssh']['server']['trusted_user_c_a_keys'] = if platform_family?('windows') + join_path(base_ssh_config_dir, 'ca_userkeys.pub') + else + '/etc/ssh/ca_keys' + end +default['openssh']['server']['revoked_keys'] = if platform_family?('windows') + join_path(base_ssh_config_dir, 'revoked_keys') + else + '/etc/ssh/revoked_keys' + end default['openssh']['server']['subsystem'] = 'sftp /usr/libexec/openssh/sftp-server' if platform_family?('rhel', 'amazon', 'fedora') default['openssh']['server']['subsystem'] = 'sftp /usr/lib/openssh/sftp-server' if platform_family?('debian') default['openssh']['server']['subsystem'] = 'sftp /usr/lib/ssh/sftp-server' if platform_family?('suse') diff --git a/cookbooks/third-party/openssh-2.10.3/chefignore b/cookbooks/third-party/openssh-2.11.3/chefignore similarity index 98% rename from cookbooks/third-party/openssh-2.10.3/chefignore rename to cookbooks/third-party/openssh-2.11.3/chefignore index cc170ea79..a27b0b258 100644 --- a/cookbooks/third-party/openssh-2.10.3/chefignore +++ b/cookbooks/third-party/openssh-2.11.3/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile diff --git a/cookbooks/third-party/openssh-2.10.3/documentation/.gitkeep b/cookbooks/third-party/openssh-2.11.3/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/documentation/.gitkeep rename to cookbooks/third-party/openssh-2.11.3/documentation/.gitkeep diff --git a/cookbooks/third-party/openssh-2.10.3/kitchen.dokken.yml b/cookbooks/third-party/openssh-2.11.3/kitchen.dokken.yml similarity index 59% rename from cookbooks/third-party/openssh-2.10.3/kitchen.dokken.yml rename to cookbooks/third-party/openssh-2.11.3/kitchen.dokken.yml index 0e18adb97..47eff95d8 100644 --- a/cookbooks/third-party/openssh-2.10.3/kitchen.dokken.yml +++ b/cookbooks/third-party/openssh-2.11.3/kitchen.dokken.yml @@ -1,31 +1,47 @@ driver: name: dokken - privileged: true # because Docker and SystemD/Upstart + privileged: true chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> - chef_license: accept-no-persist -transport: - name: dokken - -provisioner: - name: dokken - deprecations_as_errors: true - -verifier: - name: inspec +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 @@ -36,14 +52,19 @@ 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: oraclelinux-7 @@ -56,9 +77,19 @@ platforms: image: dokken/oraclelinux-8 pid_one_command: /usr/lib/systemd/systemd - - name: fedora-latest + - name: oraclelinux-9 driver: - image: dokken/fedora-latest + 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 @@ -71,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 diff --git a/cookbooks/third-party/openssh-2.11.3/kitchen.exec.yml b/cookbooks/third-party/openssh-2.11.3/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/openssh-2.11.3/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/openssh-2.11.3/kitchen.global.yml b/cookbooks/third-party/openssh-2.11.3/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/openssh-2.11.3/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/cookbooks/third-party/openssh-2.10.3/kitchen.yml b/cookbooks/third-party/openssh-2.11.3/kitchen.yml similarity index 61% rename from cookbooks/third-party/openssh-2.10.3/kitchen.yml rename to cookbooks/third-party/openssh-2.11.3/kitchen.yml index 7e1b47219..e05331dbc 100644 --- a/cookbooks/third-party/openssh-2.10.3/kitchen.yml +++ b/cookbooks/third-party/openssh-2.11.3/kitchen.yml @@ -1,10 +1,10 @@ +--- driver: name: vagrant provisioner: - name: chef_infra - enforce_idempotency: true - multiple_converge: 2 + name: chef_zero + product_name: chef deprecations_as_errors: true chef_license: accept-no-persist @@ -26,10 +26,20 @@ platforms: driver_config: box: tas50/macos_10.15 provider: vmware_desktop + - name: windows-2016 + driver_config: + box: tas50/windows_2016 + - name: windows-2019 + driver_config: + box: tas50/windows_2019 suites: - name: default run_list: openssh::default + excludes: + - windows-2016 + - windows-2019 + - windows-latest - name: iptables run_list: - openssh::default @@ -41,3 +51,12 @@ suites: - macosx-10.15 - opensuse-leap-15 - rockylinux-8 + - windows-2016 + - windows-2019 + - windows-latest + - name: windows-default + run_list: openssh::default + includes: + - windows-2016 + - windows-2019 + - windows-latest diff --git a/cookbooks/third-party/openssh-2.10.3/libraries/helpers.rb b/cookbooks/third-party/openssh-2.11.3/libraries/helpers.rb similarity index 73% rename from cookbooks/third-party/openssh-2.10.3/libraries/helpers.rb rename to cookbooks/third-party/openssh-2.11.3/libraries/helpers.rb index 19f985e58..a1f557b56 100644 --- a/cookbooks/third-party/openssh-2.10.3/libraries/helpers.rb +++ b/cookbooks/third-party/openssh-2.11.3/libraries/helpers.rb @@ -44,17 +44,29 @@ def sshd_host_keys_missing? end def openssh_service_name - if platform_family?('rhel', 'fedora', 'suse', 'freebsd', 'gentoo', 'arch', 'mac_os_x', 'amazon', 'aix') + if platform_family?('rhel', 'fedora', 'suse', 'freebsd', 'gentoo', 'arch', 'mac_os_x', 'amazon', 'aix', 'windows') 'sshd' else 'ssh' end end + def base_ssh_config_dir + platform_family?('windows') ? 'C:\\ProgramData\\ssh' : '/etc/ssh' + end + + def base_ssh_bin_dir + platform_family?('windows') ? 'C:\\Program Files\\OpenSSH' : '/usr/sbin/' + end + + def join_path(*path) + Chef::Util::PathHelper.cleanpath(::File.join(path)) + end + def supported_ssh_host_keys - keys = ['/etc/ssh/ssh_host_rsa_key', '/etc/ssh/ssh_host_ecdsa_key'] - keys << '/etc/ssh/ssh_host_dsa_key' if platform_family?('smartos, suse') - keys << '/etc/ssh/ssh_host_ed25519_key' if rhel_7_plus? || platform?('amazon', 'fedora') || platform_family?('debian') || opensuse_15_plus? + keys = [join_path(base_ssh_config_dir, 'ssh_host_rsa_key'), join_path(base_ssh_config_dir, 'ssh_host_ecdsa_key')] + keys << join_path(base_ssh_config_dir, 'ssh_host_dsa_key') if platform_family?('smartos', 'suse', 'windows') + keys << join_path(base_ssh_config_dir, 'ssh_host_ed25519_key') if rhel_7_plus? || platform?('amazon', 'fedora') || platform_family?('debian', 'windows') || opensuse_15_plus? keys end diff --git a/cookbooks/third-party/openssh-2.10.3/metadata.rb b/cookbooks/third-party/openssh-2.11.3/metadata.rb similarity index 93% rename from cookbooks/third-party/openssh-2.10.3/metadata.rb rename to cookbooks/third-party/openssh-2.11.3/metadata.rb index 1b2ab9a9c..a5d202f16 100644 --- a/cookbooks/third-party/openssh-2.10.3/metadata.rb +++ b/cookbooks/third-party/openssh-2.11.3/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Installs and configures OpenSSH client and daemon' -version '2.10.3' +version '2.11.3' source_url 'https://github.com/sous-chefs/openssh' issues_url 'https://github.com/sous-chefs/openssh/issues' chef_version '>= 12.15' @@ -21,6 +21,7 @@ supports 'smartos' supports 'suse' supports 'ubuntu' +supports 'windows' supports 'zlinux' depends 'iptables', '>= 7.0' diff --git a/cookbooks/third-party/openssh-2.11.3/mlc_config.json b/cookbooks/third-party/openssh-2.11.3/mlc_config.json new file mode 100644 index 000000000..9ffd3ef0d --- /dev/null +++ b/cookbooks/third-party/openssh-2.11.3/mlc_config.json @@ -0,0 +1,10 @@ +{ + "ignorePatterns": [ + { + "pattern": "^https://tickets.chef.io/browse/COOK" + }, + { + "pattern": "^https://opencollective.com/sous-chefs/contributors.svg" + } + ] +} \ No newline at end of file diff --git a/cookbooks/third-party/openssh-2.10.3/recipes/default.rb b/cookbooks/third-party/openssh-2.11.3/recipes/default.rb similarity index 77% rename from cookbooks/third-party/openssh-2.10.3/recipes/default.rb rename to cookbooks/third-party/openssh-2.11.3/recipes/default.rb index 5dca56b30..13e78be89 100644 --- a/cookbooks/third-party/openssh-2.10.3/recipes/default.rb +++ b/cookbooks/third-party/openssh-2.11.3/recipes/default.rb @@ -24,10 +24,10 @@ def listen_addr_for(interface, type) package node['openssh']['package_name'] unless node['openssh']['package_name'].empty? -template '/etc/ssh/ssh_config' do +template join_path(base_ssh_config_dir, 'ssh_config') do source 'ssh_config.erb' - mode '0644' - owner 'root' + mode '0644' unless platform_family?('windows') + owner 'root' unless platform_family?('windows') group node['root_group'] end @@ -44,16 +44,16 @@ def listen_addr_for(interface, type) template 'sshd_ca_keys_file' do source 'ca_keys.erb' path node['openssh']['server']['trusted_user_c_a_keys'] - mode node['openssh']['config_mode'] - owner 'root' + mode node['openssh']['config_mode'] unless platform_family?('windows') + owner 'root' unless platform_family?('windows') group node['root_group'] end template 'sshd_revoked_keys_file' do source 'revoked_keys.erb' path node['openssh']['server']['revoked_keys'] - mode node['openssh']['config_mode'] - owner 'root' + mode node['openssh']['config_mode'] unless platform_family?('windows') + owner 'root' unless platform_family?('windows') group node['root_group'] end @@ -78,13 +78,19 @@ def listen_addr_for(interface, type) directory dir end -template '/etc/ssh/sshd_config' do +default_sshd_path = if platform_family?('windows') + "\"#{join_path(base_ssh_bin_dir, 'sshd.exe')}\"" + else + join_path(base_ssh_bin_dir, 'sshd') + end + +template join_path(base_ssh_config_dir, 'sshd_config') do source 'sshd_config.erb' - mode node['openssh']['config_mode'] - owner 'root' + mode node['openssh']['config_mode'] unless platform_family?('windows') + owner 'root' unless platform_family?('windows') group node['root_group'] variables(options: openssh_server_options) - verify '/usr/sbin/sshd -t -f %{path}' + verify "#{default_sshd_path} -t -f %{path}" notifies :restart, 'service[ssh]' end diff --git a/cookbooks/third-party/openssh-2.10.3/recipes/iptables.rb b/cookbooks/third-party/openssh-2.11.3/recipes/iptables.rb similarity index 94% rename from cookbooks/third-party/openssh-2.10.3/recipes/iptables.rb rename to cookbooks/third-party/openssh-2.11.3/recipes/iptables.rb index 107329535..eecd05a46 100644 --- a/cookbooks/third-party/openssh-2.10.3/recipes/iptables.rb +++ b/cookbooks/third-party/openssh-2.11.3/recipes/iptables.rb @@ -17,6 +17,9 @@ # limitations under the License. # +# The iptables cookbook doesn't support Windows +return if platform_family?('windows') + iptables_packages 'install iptables' iptables_service 'start iptables' diff --git a/cookbooks/third-party/openssh-2.11.3/renovate.json b/cookbooks/third-party/openssh-2.11.3/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/openssh-2.11.3/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"] + } + ] +} diff --git a/cookbooks/third-party/openssh-2.10.3/spec/spec_helper.rb b/cookbooks/third-party/openssh-2.11.3/spec/spec_helper.rb similarity index 80% rename from cookbooks/third-party/openssh-2.10.3/spec/spec_helper.rb rename to cookbooks/third-party/openssh-2.11.3/spec/spec_helper.rb index dbfc1d091..5ce676375 100644 --- a/cookbooks/third-party/openssh-2.10.3/spec/spec_helper.rb +++ b/cookbooks/third-party/openssh-2.11.3/spec/spec_helper.rb @@ -8,3 +8,7 @@ config.platform = 'ubuntu' config.version = '18.04' end + +def join_path(*path) + Chef::Util::PathHelper.cleanpath(::File.join(path)) +end diff --git a/cookbooks/third-party/openssh-2.10.3/spec/unit/recipes/default_spec.rb b/cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/default_spec.rb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/spec/unit/recipes/default_spec.rb rename to cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/default_spec.rb diff --git a/cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/default_windows_spec.rb b/cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/default_windows_spec.rb new file mode 100644 index 000000000..d61d37d8d --- /dev/null +++ b/cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/default_windows_spec.rb @@ -0,0 +1,136 @@ +require 'spec_helper' + +describe 'openssh::default' do + context 'Windows' do + platform 'windows', '2016' + + let(:ssh_config_path) { join_path('C:\\ProgramData\\ssh', 'ssh_config') } + let(:sshd_config_path) { join_path('C:\\ProgramData\\ssh', 'sshd_config') } + let(:ca_keys_path) { join_path('C:\\ProgramData\\ssh', 'ca_userkeys.pub') } + let(:revoked_keys_path) { join_path('C:\\ProgramData\\ssh', 'revoked_keys') } + + describe 'ssh_config' do + it 'writes the ssh_config' do + template = chef_run.template(ssh_config_path) + expect(template).to be + end + end + + describe 'sshd_config' do + it 'writes the sshd_config' do + template = chef_run.template(sshd_config_path) + expect(template).to be + end + + it 'does not use PAM option on Windows' do + expect(chef_run).to_not render_file(sshd_config_path).with_content(/UsePAM/) + end + + it 'allow legacy default AuthorizedKeysFile behavior' do + expect(chef_run).to_not render_file(sshd_config_path).with_content(/AuthorizedKeysFile.*/) + end + + it 'writes a match group block' do + chef_run.node.override['openssh']['server']['match'] = { 'Group admins' => { 'permit_tunnel' => 'yes' } } + chef_run.converge('openssh::default') + expect(chef_run).to render_file(sshd_config_path).with_content(/Match Group admins\n\s\sPermitTunnel yes/) + end + + it 'skips match group block' do + chef_run.node.override['openssh']['server']['match'] = {} + chef_run.converge('openssh::default') + expect(chef_run).to_not render_file(sshd_config_path).with_content(/Match Group admins\n\s\sPermitTunnel yes/) + end + + it 'write multiple SSH subsystems from Hash' do + chef_run.node.override['openssh']['server']['subsystem'] = { + sftp: '/usr/lib/openssh/sftp-server', + test: '/my/subsystem/bin', + } + chef_run.converge('openssh::default') + expect(chef_run).to render_file(sshd_config_path).with_content(%r{Subsystem sftp \/usr\/lib\/openssh\/sftp-server\nSubsystem test.*}) + end + + it 'skips subsystems block' do + chef_run.node.override['openssh']['server']['subsystem'] = {} + chef_run.converge('openssh::default') + expect(chef_run).to_not render_file(sshd_config_path).with_content(/^Subsystem?/) + end + + it 'supports legacy subsystem format' do + chef_run.node.override['openssh']['server']['subsystem'] = 'sftp /usr/lib/openssh/sftp-server' + chef_run.converge('openssh::default') + expect(chef_run).to render_file(sshd_config_path).with_content(%r{Subsystem sftp \/usr\/lib\/openssh\/sftp-server\n}) + end + + it 'allows subsystem from Array attribute' do + chef_run.node.override['openssh']['server']['subsystem'] = [ + 'sftp /usr/lib/openssh/sftp-server', + 'test /my/subsystem/bin', + ] + chef_run.converge('openssh::default') + expect(chef_run).to render_file(sshd_config_path).with_content(%r{Subsystem sftp \/usr\/lib\/openssh\/sftp-server\nSubsystem test.*}) + end + + context 'port set without listen address set' do + cached(:chef_run) do + ChefSpec::SoloRunner.new(platform: 'windows', version: '2016') do |node| + node.normal['openssh']['server']['port'] = 1234 + end.converge('openssh::default') + end + + it 'writes out port at the top of the config' do + expect(chef_run).to render_file(sshd_config_path) + .with_content(/# Do NOT modify this file by hand!\n\nPort 1234/) + end + end + + context 'supports multiple ports' do + cached(:chef_run) do + ChefSpec::SoloRunner.new(platform: 'windows', version: '2016') do |node| + node.normal['openssh']['server']['port'] = [1234, 1235] + end.converge('openssh::default') + end + + it 'writes both ports to sshd_config' do + expect(chef_run).to render_file(sshd_config_path) + .with_content(/Port 1234/) + .with_content(/Port 1235/) + end + end + + context 'supports ca keys and revoked keys' do + cached(:chef_run) do + ChefSpec::SoloRunner.new(platform: 'windows', version: '2016') do |node| + node.normal['openssh']['ca_keys'] = ['ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJt7VN0YkI2jVnWUod8I/Qy9Am4lq0VOmFUTbzrMVTM8iut8E7heWu8G5QsDFLi3BNcU5wnwWO8rTWZZh1CJq6+zVn010rUYZhDxjlvFD4ZOUrN4RqsxSPBAaW2tgNXwoNeBgx/ZIrDSqj1xKP2Dixri2AxAuTQvxLn249dAv6MRwBGWJDtqOo0606VdQ933lq7eoYy57wvLtHBQHqZnjboIUtBxQTLyHrGTc0UdUrWRTtU8geynX2ABRWYKrHsXixgqPcYiiJOyrMufQEWzXr4u6PQs5LiSVsM9b6n8Aq184LDJiybDhQXEYnO8VeCV8v8GaDOGV4HB9W/15Fpxd/ ca'] + node.normal['openssh']['revoked_keys'] = ['ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCeNFbS05i75Na662aH5uzXvdWqWxLELs1kEy3L60EYJpZ9GzJ4ByR7Gk2EQE5Knvpm/ck3en6ef1nyJzniELrPwO1OwVqVfNGjiz+4cl9EjReuk+wKWhoHpM2clEpp52Kl0TSBKt+oDCsv0REc0uSyi7rWkQSuRqnZvoxx3M7UIWJhMpFYKM2Few8c90ckHG4SY1Qcj2E/zI5ueVDz/jRfogF10dgSC8J4H6OO9+4N42EASQDbWFx1CO5jqB+1dmf3/7KbvdZUsO9zF1D5Kphk+bLm4SnIQsOJE5cfnqSNIvP6UcW2gNxHD4inxGQvz5Gljk3yYZ7n6HwDHo7hukpP user'] + end.converge('openssh::default') + end + + it 'writes the ca_keys' do + template = chef_run.template(ca_keys_path) + expect(template).to be + end + + it 'writes the revoked_keys' do + template = chef_run.template(revoked_keys_path) + expect(template).to be + end + + it 'writes ca public key to ca_keys file' do + expect(chef_run).to render_file(ca_keys_path) + .with_content { |content| + expect(content).to include('ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJt7VN0YkI2jVnWUod8I/Qy9Am4lq0VOmFUTbzrMVTM8iut8E7heWu8G5QsDFLi3BNcU5wnwWO8rTWZZh1CJq6+zVn010rUYZhDxjlvFD4ZOUrN4RqsxSPBAaW2tgNXwoNeBgx/ZIrDSqj1xKP2Dixri2AxAuTQvxLn249dAv6MRwBGWJDtqOo0606VdQ933lq7eoYy57wvLtHBQHqZnjboIUtBxQTLyHrGTc0UdUrWRTtU8geynX2ABRWYKrHsXixgqPcYiiJOyrMufQEWzXr4u6PQs5LiSVsM9b6n8Aq184LDJiybDhQXEYnO8VeCV8v8GaDOGV4HB9W/15Fpxd/ ca') + } + end + + it 'writes user public key to revoked_keys file' do + expect(chef_run).to render_file(revoked_keys_path) + .with_content { |content| + expect(content).to include('ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCeNFbS05i75Na662aH5uzXvdWqWxLELs1kEy3L60EYJpZ9GzJ4ByR7Gk2EQE5Knvpm/ck3en6ef1nyJzniELrPwO1OwVqVfNGjiz+4cl9EjReuk+wKWhoHpM2clEpp52Kl0TSBKt+oDCsv0REc0uSyi7rWkQSuRqnZvoxx3M7UIWJhMpFYKM2Few8c90ckHG4SY1Qcj2E/zI5ueVDz/jRfogF10dgSC8J4H6OO9+4N42EASQDbWFx1CO5jqB+1dmf3/7KbvdZUsO9zF1D5Kphk+bLm4SnIQsOJE5cfnqSNIvP6UcW2gNxHD4inxGQvz5Gljk3yYZ7n6HwDHo7hukpP user') + } + end + end + end + end +end diff --git a/cookbooks/third-party/openssh-2.10.3/spec/unit/recipes/iptables_spec.rb b/cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/iptables_spec.rb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/spec/unit/recipes/iptables_spec.rb rename to cookbooks/third-party/openssh-2.11.3/spec/unit/recipes/iptables_spec.rb diff --git a/cookbooks/third-party/openssh-2.10.3/templates/ca_keys.erb b/cookbooks/third-party/openssh-2.11.3/templates/ca_keys.erb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/templates/ca_keys.erb rename to cookbooks/third-party/openssh-2.11.3/templates/ca_keys.erb diff --git a/cookbooks/third-party/openssh-2.10.3/templates/port_ssh.erb b/cookbooks/third-party/openssh-2.11.3/templates/port_ssh.erb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/templates/port_ssh.erb rename to cookbooks/third-party/openssh-2.11.3/templates/port_ssh.erb diff --git a/cookbooks/third-party/openssh-2.10.3/templates/revoked_keys.erb b/cookbooks/third-party/openssh-2.11.3/templates/revoked_keys.erb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/templates/revoked_keys.erb rename to cookbooks/third-party/openssh-2.11.3/templates/revoked_keys.erb diff --git a/cookbooks/third-party/openssh-2.10.3/templates/ssh_config.erb b/cookbooks/third-party/openssh-2.11.3/templates/ssh_config.erb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/templates/ssh_config.erb rename to cookbooks/third-party/openssh-2.11.3/templates/ssh_config.erb diff --git a/cookbooks/third-party/openssh-2.10.3/templates/sshd_config.erb b/cookbooks/third-party/openssh-2.11.3/templates/sshd_config.erb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/templates/sshd_config.erb rename to cookbooks/third-party/openssh-2.11.3/templates/sshd_config.erb diff --git a/cookbooks/third-party/openssh-2.10.3/test/integration/default/default_spec.rb b/cookbooks/third-party/openssh-2.11.3/test/integration/default/default_spec.rb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/test/integration/default/default_spec.rb rename to cookbooks/third-party/openssh-2.11.3/test/integration/default/default_spec.rb diff --git a/cookbooks/third-party/openssh-2.10.3/test/integration/iptables/default_spec.rb b/cookbooks/third-party/openssh-2.11.3/test/integration/iptables/default_spec.rb similarity index 100% rename from cookbooks/third-party/openssh-2.10.3/test/integration/iptables/default_spec.rb rename to cookbooks/third-party/openssh-2.11.3/test/integration/iptables/default_spec.rb diff --git a/cookbooks/third-party/openssh-2.11.3/test/integration/windows-default/default_spec.rb b/cookbooks/third-party/openssh-2.11.3/test/integration/windows-default/default_spec.rb new file mode 100644 index 000000000..cc55af07a --- /dev/null +++ b/cookbooks/third-party/openssh-2.11.3/test/integration/windows-default/default_spec.rb @@ -0,0 +1,37 @@ +service_name = 'sshd' + +describe service(service_name) do + it { should be_enabled } + it { should be_running } +end + +describe port(22) do + it { should be_listening } +end + +describe ssh_config do + its('UseRoaming') { should eq 'no' } +end + +# Attempt to ssh to localhost +script_stderr = <<-EOF + Start-Process ssh "-oStrictHostKeyChecking=no -oPasswordAuthentication=no -v localhost" -NoNewWindow -Wait -RedirectStandardOutput stdOut.log -RedirectStandardError stdErr.log; gc stdErr.log; rm *.log +EOF + +describe powershell(script_stderr) do + # No way of actually sshing in without a keypair or password + # but being prompted for an authentication method should be sufficient to + # test that SSH is working as expected, for the most part + its('stdout') { should match /Next authentication method/ } +end + +script_stdout = <<-EOF + Start-Process ssh "-oStrictHostKeyChecking=no -oPasswordAuthentication=no -v localhost" -NoNewWindow -Wait -RedirectStandardOutput stdOut.log -RedirectStandardError stdErr.log; gc stdOut.log; rm *.log +EOF + +describe powershell(script_stdout) do + # No way of actually sshing in without a keypair or password + # but being prompted for an authentication method should be sufficient to + # test that SSH is working as expected, for the most part + its('stdout') { should eq '' } +end diff --git a/metadata.rb b/metadata.rb index 9693998b4..34e15f875 100644 --- a/metadata.rb +++ b/metadata.rb @@ -17,7 +17,7 @@ depends 'iptables', '~> 8.0.0' depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' -depends 'openssh', '~> 2.10.3' +depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 3.5.1' depends 'selinux', '~> 6.0.5' depends 'yum', '~> 7.4.0' From d111b1d231d140911535fb4ce33bcaab0b1c0802 Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 13:35:43 +0200 Subject: [PATCH 5/9] Upgrade pyenv cookbook to version 4.2.3 Use pyenv_install in place of pyenv_system|user_install to align with 4.+ version As part of 4.0.0 Pyenv cookbook removed the pyenv_system_install and pyenv_user_install resources for a singular pyenv_install. https://github.com/sous-chefs/pyenv/blob/main/CHANGELOG.md#400 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 2 + .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../Berksfile | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- .../aws-parallelcluster-environment/Berksfile | 2 +- .../aws-parallelcluster-platform/Berksfile | 2 +- .../aws-parallelcluster-shared/Berksfile | 2 +- .../aws-parallelcluster-shared/metadata.rb | 2 +- .../resources/install_pyenv.rb | 8 +- .../spec/unit/resources/install_pyenv_spec.rb | 10 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../pyenv-3.5.1/.circleci/config.yml | 10 - .../pyenv-3.5.1/.delivery/project.toml | 9 - .../third-party/pyenv-3.5.1/.editorconfig | 19 -- cookbooks/third-party/pyenv-3.5.1/.envrc | 1 - .../third-party/pyenv-3.5.1/.gitattributes | 1 - .../pyenv-3.5.1/.github/CODEOWNERS | 1 - .../third-party/pyenv-3.5.1/.github/lock.yml | 8 - .../pyenv-3.5.1/.github/workflows/ci.yml | 68 ------- .../.github/workflows/md-links.yml | 19 -- .../pyenv-3.5.1/.github/workflows/stale.yml | 25 --- cookbooks/third-party/pyenv-3.5.1/.gitignore | 49 ----- cookbooks/third-party/pyenv-3.5.1/.mdlrc | 1 - .../third-party/pyenv-3.5.1/.overcommit.yml | 20 -- cookbooks/third-party/pyenv-3.5.1/.yamllint | 13 -- cookbooks/third-party/pyenv-3.5.1/Gemfile | 14 -- cookbooks/third-party/pyenv-3.5.1/README.md | 192 ------------------ .../pyenv-3.5.1/attributes/default.rb | 18 -- .../pyenv-3.5.1/kitchen.dokken.yml | 83 -------- .../pyenv-3.5.1/resources/global.rb | 63 ------ .../pyenv-3.5.1/resources/plugin.rb | 45 ---- .../pyenv-3.5.1/resources/python.rb | 69 ------- .../pyenv-3.5.1/resources/rehash.rb | 37 ---- .../pyenv-3.5.1/resources/script.rb | 57 ------ .../pyenv-3.5.1/resources/system_install.rb | 83 -------- .../pyenv-3.5.1/resources/user_install.rb | 89 -------- .../cookbooks/test/recipes/system_install.rb | 48 ----- .../integration/system_install/inspec.yml | 10 - .../{pyenv-3.5.1 => pyenv-4.2.3}/Berksfile | 0 .../{pyenv-3.5.1 => pyenv-4.2.3}/CHANGELOG.md | 40 ++++ .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../{pyenv-3.5.1 => pyenv-4.2.3}/Dangerfile | 0 .../{pyenv-3.5.1 => pyenv-4.2.3}/LICENSE | 0 cookbooks/third-party/pyenv-4.2.3/README.md | 73 +++++++ .../{pyenv-3.5.1 => pyenv-4.2.3}/TESTING.md | 0 .../{pyenv-3.5.1 => pyenv-4.2.3}/chefignore | 2 +- .../pyenv-4.2.3/documentation/.gitkeep | 0 .../pyenv-4.2.3/documentation/pyenv_global.md | 15 ++ .../documentation/pyenv_install.md | 29 +++ .../pyenv-4.2.3/documentation/pyenv_pip.md | 32 +++ .../pyenv-4.2.3/documentation/pyenv_plugin.md | 16 ++ .../pyenv-4.2.3/documentation/pyenv_python.md | 25 +++ .../pyenv-4.2.3/documentation/pyenv_rehash.md | 19 ++ .../pyenv-4.2.3/documentation/pyenv_script.md | 27 +++ .../pyenv-4.2.3/kitchen.dokken.yml | 113 +++++++++++ .../third-party/pyenv-4.2.3/kitchen.exec.yml | 7 + .../pyenv-4.2.3/kitchen.global.yml | 38 ++++ .../{pyenv-3.5.1 => pyenv-4.2.3}/kitchen.yml | 5 +- .../libraries/helpers.rb} | 38 ++-- .../{pyenv-3.5.1 => pyenv-4.2.3}/metadata.rb | 4 +- .../third-party/pyenv-4.2.3/renovate.json | 17 ++ .../pyenv-4.2.3/resources/global.rb | 36 ++++ .../pyenv-4.2.3/resources/install.rb | 108 ++++++++++ .../pyenv-4.2.3/resources/local.rb | 35 ++++ .../resources/pip.rb | 74 ++++--- .../pyenv-4.2.3/resources/plugin.rb | 34 ++++ .../pyenv-4.2.3/resources/python.rb | 62 ++++++ .../pyenv-4.2.3/resources/rehash.rb | 16 ++ .../pyenv-4.2.3/resources/script.rb | 58 ++++++ .../spec/spec_helper.rb | 0 .../templates/pyenv.sh | 10 +- .../cookbooks/test/files/requirements.txt | 0 .../test/fixtures/cookbooks/test/metadata.rb | 0 .../fixtures/cookbooks/test/recipes/dokken.rb | 0 .../cookbooks/test/recipes/system_install.rb | 28 +++ .../cookbooks/test/recipes/user_install.rb | 10 +- .../integration/common/controls/common.rb | 19 ++ .../system_install/controls/system_install.rb | 40 +--- .../integration/system_install/inspec.yml | 11 + .../user_install/controls/user_install.rb | 62 +++--- .../test/integration/user_install/inspec.yml | 7 +- .../virtualenv/controls/virtualenv.rb | 45 ++++ .../test/integration/virtualenv/inspec.yml | 8 + metadata.rb | 2 +- 88 files changed, 1047 insertions(+), 1212 deletions(-) delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.circleci/config.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.delivery/project.toml delete mode 100755 cookbooks/third-party/pyenv-3.5.1/.editorconfig delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.envrc delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.gitattributes delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.github/lock.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.gitignore delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.mdlrc delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.overcommit.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/.yamllint delete mode 100644 cookbooks/third-party/pyenv-3.5.1/Gemfile delete mode 100644 cookbooks/third-party/pyenv-3.5.1/README.md delete mode 100644 cookbooks/third-party/pyenv-3.5.1/attributes/default.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/kitchen.dokken.yml delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/global.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/plugin.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/python.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/rehash.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/script.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/system_install.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/resources/user_install.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/system_install.rb delete mode 100644 cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/inspec.yml rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/Berksfile (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/CHANGELOG.md (64%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/Dangerfile (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/LICENSE (100%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/README.md rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/TESTING.md (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/chefignore (98%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/.gitkeep create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_global.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_install.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_pip.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_plugin.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_python.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_rehash.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_script.md create mode 100644 cookbooks/third-party/pyenv-4.2.3/kitchen.dokken.yml create mode 100644 cookbooks/third-party/pyenv-4.2.3/kitchen.exec.yml create mode 100644 cookbooks/third-party/pyenv-4.2.3/kitchen.global.yml rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/kitchen.yml (87%) rename cookbooks/third-party/{pyenv-3.5.1/libraries/chef_pyenv_script_helpers.rb => pyenv-4.2.3/libraries/helpers.rb} (55%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/metadata.rb (89%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/renovate.json create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/global.rb create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/install.rb create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/local.rb rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/resources/pip.rb (70%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/plugin.rb create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/python.rb create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/rehash.rb create mode 100644 cookbooks/third-party/pyenv-4.2.3/resources/script.rb rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/spec/spec_helper.rb (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/templates/pyenv.sh (67%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/fixtures/cookbooks/test/files/requirements.txt (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/fixtures/cookbooks/test/metadata.rb (100%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/fixtures/cookbooks/test/recipes/dokken.rb (100%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/system_install.rb rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/fixtures/cookbooks/test/recipes/user_install.rb (85%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/test/integration/common/controls/common.rb rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/integration/system_install/controls/system_install.rb (55%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/inspec.yml rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/integration/user_install/controls/user_install.rb (97%) rename cookbooks/third-party/{pyenv-3.5.1 => pyenv-4.2.3}/test/integration/user_install/inspec.yml (61%) create mode 100644 cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/controls/virtualenv.rb create mode 100644 cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/inspec.yml diff --git a/Berksfile b/Berksfile index b316d3c3b..05e2b5b0f 100644 --- a/Berksfile +++ b/Berksfile @@ -12,7 +12,7 @@ cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0" cookbook "line", path: "./cookbooks/third-party/line-4.5.13" cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0" cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3" -cookbook "pyenv", path: "./cookbooks/third-party/pyenv-3.5.1" +cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3" cookbook "selinux", path: "./cookbooks/third-party/selinux-6.0.5" cookbook "yum", path: "./cookbooks/third-party/yum-7.4.0" cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-4.5.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index ed94b7ea8..80cfadbde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - Upgrade third-party cookbook dependencies: - apt-7.5.14 (from apt-7.4.0) - line-4.5.13 (from line-4.5.2) + - openssh-2.11.3 (from openssh-2.10.3) **BUG FIXES** @@ -46,6 +47,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - apt-7.5.14 (from apt-7.4.0) - line-4.5.13 (from line-4.5.2) - openssh-2.11.3 (from openssh-2.10.3) + - pyenv-4.2.3 (from pyenv-3.5.1) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index 4fb364587..13c46270b 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -17,7 +17,7 @@ cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.0.5" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index 302e5a305..423aa925b 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -18,7 +18,7 @@ depends 'nfs', '~> 5.0.0' depends 'line', '~> 4.5.13' depends 'openssh', '~> 2.11.3' -depends 'pyenv', '~> 3.5.1' +depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.0.5' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' diff --git a/cookbooks/aws-parallelcluster-computefleet/Berksfile b/cookbooks/aws-parallelcluster-computefleet/Berksfile index 657cea9da..3084f2bae 100644 --- a/cookbooks/aws-parallelcluster-computefleet/Berksfile +++ b/cookbooks/aws-parallelcluster-computefleet/Berksfile @@ -5,6 +5,6 @@ metadata cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" # for shared cookbook -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index 97b600cff..2e69808bd 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -14,7 +14,7 @@ cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.0.5" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile index 23ac5169e..e1cc91a97 100644 --- a/cookbooks/aws-parallelcluster-environment/Berksfile +++ b/cookbooks/aws-parallelcluster-environment/Berksfile @@ -10,6 +10,6 @@ cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "line", path: "../third-party/line-4.5.13" # for shared cookbook -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile index 14c0af6b1..92434df16 100644 --- a/cookbooks/aws-parallelcluster-platform/Berksfile +++ b/cookbooks/aws-parallelcluster-platform/Berksfile @@ -8,6 +8,6 @@ cookbook "line", path: "../third-party/line-4.5.13" cookbook "selinux", path: "../third-party/selinux-6.0.5" # for shared cookbook -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-shared/Berksfile b/cookbooks/aws-parallelcluster-shared/Berksfile index f76c55d1f..5789425d6 100644 --- a/cookbooks/aws-parallelcluster-shared/Berksfile +++ b/cookbooks/aws-parallelcluster-shared/Berksfile @@ -4,6 +4,6 @@ source chef_repo: "." metadata -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-shared/metadata.rb b/cookbooks/aws-parallelcluster-shared/metadata.rb index 2952870b2..69572572b 100644 --- a/cookbooks/aws-parallelcluster-shared/metadata.rb +++ b/cookbooks/aws-parallelcluster-shared/metadata.rb @@ -14,6 +14,6 @@ supports 'ubuntu', '>= 20.04' supports 'redhat', '= 8.7' -depends 'pyenv', '~> 3.5.1' +depends 'pyenv', '~> 4.2.3' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' diff --git a/cookbooks/aws-parallelcluster-shared/resources/install_pyenv.rb b/cookbooks/aws-parallelcluster-shared/resources/install_pyenv.rb index e577cad61..1d9f86bde 100644 --- a/cookbooks/aws-parallelcluster-shared/resources/install_pyenv.rb +++ b/cookbooks/aws-parallelcluster-shared/resources/install_pyenv.rb @@ -18,9 +18,9 @@ if new_resource.user_only raise "user property is required for resource install_pyenv when user_only is set to true" unless new_resource.user - pyenv_user_install python_version do + pyenv_install 'user' do user new_resource.user - user_prefix new_resource.prefix if new_resource.prefix + prefix new_resource.prefix if new_resource.prefix end else prefix = new_resource.prefix || node['cluster']['system_pyenv_root'] @@ -29,8 +29,8 @@ recursive true end - pyenv_system_install python_version do - global_prefix prefix + pyenv_install 'system' do + prefix prefix end # Remove the profile.d script that the pyenv cookbook writes. diff --git a/cookbooks/aws-parallelcluster-shared/spec/unit/resources/install_pyenv_spec.rb b/cookbooks/aws-parallelcluster-shared/spec/unit/resources/install_pyenv_spec.rb index 30ebe9988..339145cba 100644 --- a/cookbooks/aws-parallelcluster-shared/spec/unit/resources/install_pyenv_spec.rb +++ b/cookbooks/aws-parallelcluster-shared/spec/unit/resources/install_pyenv_spec.rb @@ -38,8 +38,7 @@ def self.run(chef_run, python_version: nil, pyenv_root: nil, user_only: nil, use end it 'installs pyenv system' do - is_expected.to install_pyenv_system_install(python_version) - .with_global_prefix(system_pyenv_root) + is_expected.to install_pyenv_install('system').with_prefix(system_pyenv_root) end it 'deletes /etc/profile.d/pyenv.sh to avoid exposing the ParallelCluster pyenv installation to customers' do || @@ -68,8 +67,7 @@ def self.run(chef_run, python_version: nil, pyenv_root: nil, user_only: nil, use end it 'installs pyenv system' do - is_expected.to install_pyenv_system_install(python_version) - .with_global_prefix(system_pyenv_root) + is_expected.to install_pyenv_install('system').with_prefix(system_pyenv_root) end it 'installs default python version' do @@ -98,9 +96,9 @@ def self.run(chef_run, python_version: nil, pyenv_root: nil, user_only: nil, use end it 'installs pyenv for user' do - is_expected.to install_pyenv_user_install(python_version).with( + is_expected.to install_pyenv_install('user').with( user: user, - user_prefix: pyenv_root + prefix: pyenv_root ) end diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index 78f898300..52ba12dac 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -11,7 +11,7 @@ cookbook "iptables", path: "../third-party/iptables-8.0.0" cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" -cookbook "pyenv", path: "../third-party/pyenv-3.5.1" +cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.0.5" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index fd45fdc61..a67ce4a68 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -18,7 +18,7 @@ depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' depends 'openssh', '~> 2.11.3' -depends 'pyenv', '~> 3.5.1' +depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.0.5' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' diff --git a/cookbooks/third-party/pyenv-3.5.1/.circleci/config.yml b/cookbooks/third-party/pyenv-3.5.1/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/pyenv-3.5.1/.delivery/project.toml b/cookbooks/third-party/pyenv-3.5.1/.delivery/project.toml deleted file mode 100644 index 0d6f0ae9a..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.delivery/project.toml +++ /dev/null @@ -1,9 +0,0 @@ -[local_phases] -unit = "rspec spec/" -lint = 'cookstyle --display-cop-names --extra-details' -syntax = "echo skipping" -provision = "echo skipping" -deploy = "echo skipping" -smoke = "echo skipping" -functional = "echo skipping" -cleanup = "echo skipping" diff --git a/cookbooks/third-party/pyenv-3.5.1/.editorconfig b/cookbooks/third-party/pyenv-3.5.1/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/pyenv-3.5.1/.envrc b/cookbooks/third-party/pyenv-3.5.1/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/pyenv-3.5.1/.gitattributes b/cookbooks/third-party/pyenv-3.5.1/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/pyenv-3.5.1/.github/CODEOWNERS b/cookbooks/third-party/pyenv-3.5.1/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/pyenv-3.5.1/.github/lock.yml b/cookbooks/third-party/pyenv-3.5.1/.github/lock.yml deleted file mode 100644 index 8344a7b3e..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.github/lock.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -daysUntilLock: 365 -exemptLabels: [] -lockLabel: false -lockComment: > - This thread has been automatically locked since there has not been - any recent activity after it was closed. Please open a new issue for - related bugs. diff --git a/cookbooks/third-party/pyenv-3.5.1/.github/workflows/ci.yml b/cookbooks/third-party/pyenv-3.5.1/.github/workflows/ci.yml deleted file mode 100644 index 378e8229c..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.github/workflows/ci.yml +++ /dev/null @@ -1,68 +0,0 @@ ---- -name: ci - -'on': - pull_request: - push: - branches: - - main - -jobs: - delivery: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Chef Delivery - uses: actionshub/chef-delivery@main - env: - CHEF_LICENSE: accept-no-persist - - yamllint: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run yaml Lint - uses: actionshub/yamllint@main - - mdl: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Markdown Lint - uses: actionshub/markdownlint@main - - integration: - needs: [mdl, yamllint, delivery] - runs-on: ubuntu-latest - strategy: - matrix: - os: - - 'debian-9' - - 'debian-10' - - 'centos-7' - - 'centos-8' - - 'oracle-linux' - - 'amazon-linux' - - 'ubuntu-1804' - - 'ubuntu-2004' - suite: - - 'system-install' - - 'user-install' - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/pyenv-3.5.1/.github/workflows/md-links.yml b/cookbooks/third-party/pyenv-3.5.1/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/pyenv-3.5.1/.github/workflows/stale.yml b/cookbooks/third-party/pyenv-3.5.1/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/pyenv-3.5.1/.gitignore b/cookbooks/third-party/pyenv-3.5.1/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/pyenv-3.5.1/.mdlrc b/cookbooks/third-party/pyenv-3.5.1/.mdlrc deleted file mode 100644 index adc10ad78..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules '~MD013' \ No newline at end of file diff --git a/cookbooks/third-party/pyenv-3.5.1/.overcommit.yml b/cookbooks/third-party/pyenv-3.5.1/.overcommit.yml deleted file mode 100644 index 1d27ed8d3..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.overcommit.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] - Delivery: - enabled: true - required_executable: 'delivery' - flags: ['local', 'all'] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/pyenv-3.5.1/.yamllint b/cookbooks/third-party/pyenv-3.5.1/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/pyenv-3.5.1/Gemfile b/cookbooks/third-party/pyenv-3.5.1/Gemfile deleted file mode 100644 index 4dd0d9905..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/Gemfile +++ /dev/null @@ -1,14 +0,0 @@ -source 'https://rubygems.org' - -gem 'berkshelf' -gem 'chef', '~> 15.0' - -group :development, :test do - gem 'cookstyle' - gem 'inspec' - gem 'kitchen-dokken' - gem 'kitchen-inspec' - gem 'kitchen-vagrant' - gem 'mdl' - gem 'test-kitchen' -end diff --git a/cookbooks/third-party/pyenv-3.5.1/README.md b/cookbooks/third-party/pyenv-3.5.1/README.md deleted file mode 100644 index 7f27a5067..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/README.md +++ /dev/null @@ -1,192 +0,0 @@ -# pyenv Chef Cookbook - -[![Cookbook Version](https://img.shields.io/cookbook/v/pyenv.svg)](https://supermarket.chef.io/cookbooks/pyenv) -[![Build Status](https://img.shields.io/circleci/project/github/sous-chefs/pyenv/master.svg)](https://circleci.com/gh/sous-chefs/pyenv) -[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers) -[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors) -[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0) -[![Maintainability](https://api.codeclimate.com/v1/badges/693934e931aa1c52bfa0/maintainability)](https://codeclimate.com/github/sous-chefs/pyenv/maintainability) - -## Description - -Manages [pyenv][pyenv] and its installed Pythons. - -Several custom resources are defined to facilitate this. - -**WARNING** As of `v1.0.0`, this cookbook no longer provide any recipes. Custom resources are provided instead. - -**NOTE** The following distros have [known issues][openssl-issues] regarding building python `3.7` which are all related to the OpenSSL library versions. - -* RHEL6 -* Debian 8 - -[openssl-issue]: https://github.com/pyenv/pyenv/wiki/Common-build-problems#error-the-python-ssl-extension-was-not-compiled-missing-the-openssl-lib - -## Requirements - -### Chef - -This cookbook requires Chef 14.0+. - -### Platform family - -* Debian derivatives (debian, ubuntu) -* Fedora -* RHEL derivatives (RHEL, CentOS, Amazon Linux, Oracle, Scientific Linux) -* openSUSE and openSUSE leap - -## Usage - -Examples installations are provided in `test/fixtures/cookbooks/test/recipes` - -A `pyenv_system_install` or `pyenv_user_install` is required to be set so that pyenv knows which version you want to use, and is installed on the system. - -## Pip - -Used to install a Python package into the selected pyenv environment. - -```ruby -pyenv_pip 'requests' do - virtualenv # Optional: if passed, pip inside provided virtualenv would be used (by default system's pip) - version # Optional: if passed, the version the python package to install - user # Optional: if passed, the user to install the python module for - umask # Optional: if passed, the umask to set before installing the python module - options # Optional: if passed, pip would install/uninstall packages with given options - requirement # Optional: if true passed, install/uninstall requirements file passed with name property - editable # Optional: if true passed, install package in editable mode -end -``` - -The pyenv_pip resource has the following actions: - -* `:install` - Default. Install a python package. If a version is specified, install the specified version of the python package. -* `:upgrade` - Install/upgrade a python package. Call `install` command with `--upgrade` flag. If version is not specified, latest version will be installed. -* `:uninstall` - Uninstall a python package. - -## Global - -```ruby -pyenv_global '3.6.1' do - user # Optional: if passed sets the users global version. Do not set, to set the systems global version -end -``` - -If a user is passed in to this resource it sets the global version for the user, under the users root_path (usually `~/.pyenv/version`), otherwise it sets the system global version. - -## Plugin - -Installs a pyenv plugin. - -```ruby -pyenv_plugin 'virtualenv' do - git_url # Git URL of the plugin - git_ref # Git reference of the plugin - environment # Optional: pass environment variables to git resource - user # Optional: if passed installs to the users pyenv. Do not set, to set installs to the system pyenv. -end -``` - -## Rehash - -```ruby -pyenv_rehash 'rehash' do - user # Optional: if passed rehashes the user pyenv otherwise rehashes the system pyenv -end -``` - -## Python - -```ruby -pyenv_python '3.6.1' do - user # Optional: if passed, the user pyenv to install to - environment # Optional: pass environment variable to git resource - pyenv_action # Optional: the action to perform, install, remove etc - verbose # Optional: print verbose output during python installation -end -``` - -Shorter example `pyenv_python '3.6.1'.` - -## Script - -Runs a pyenv aware script. - -```ruby -pyenv_script 'foo' do - code # Script code to run - pyenv_version # pyenv version to run the script against - environment # Optional: Environment to setup to run the script - user # Optional: User to run as - umask # Optional: the umask to set before running the script - group # Optional: Group to run as - path # Optional: Path to search for commands - returns # Optional: Expected return code -end -``` - -## System install - -Installs pyenv to the system location, by default `/usr/local/pyenv` - -```ruby -pyenv_system_install 'foo' do - git_url # URL of the plugin repo you want to checkout - git_ref # Optional: Git reference to checkout - environment # Optional: pass environment variable during pyenv installation - update_pyenv # Optional: Keeps the git repo up to date -end -``` - -## User install - -Installs pyenv to the user path, making pyenv available to that user only. - -```ruby -pyenv_user_install 'vagrant' do - git_url # Optional: Git URL to checkout pyenv from. - git_ref # Optional: Git reference to checkout e.g. 'master' - environment # Optional: pass environment variable during pyenv installation - user # Which user to install pyenv to (also specified in the resources name above) -end -``` - -## System-Wide Mac Installation Note - -This cookbook takes advantage of managing profile fragments in an -`/etc/profile.d` directory, common on most Unix-flavored platforms. -Unfortunately, Mac OS X does not support this idiom out of the box, -so you may need to [modify][mac_profile_d] your user profile. - -## Development - -* Source hosted at [GitHub](https://github.com/sous-chefs/pyenv) -* Report issues/Questions/Feature requests on [GitHub Issues](https://github.com/sous-chefs/pyenv) - -Pull requests are very welcome! Make sure your patches are well tested. - -## Contributors - -This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false) - -### Backers - -Thank you to all our backers! - -![https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40) - -### Sponsors - -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. - -![https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100) -![https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100) - -[pyenv]: https://github.com/pyenv/pyenv diff --git a/cookbooks/third-party/pyenv-3.5.1/attributes/default.rb b/cookbooks/third-party/pyenv-3.5.1/attributes/default.rb deleted file mode 100644 index 2a8d3fb62..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/attributes/default.rb +++ /dev/null @@ -1,18 +0,0 @@ -# git repository containing pyenv -default['pyenv']['git_url'] = 'https://github.com/pyenv/pyenv.git' -default['pyenv']['git_ref'] = 'master' - -default['pyenv']['prerequisites'] = case node['platform_family'] - when 'debian' - if node['platform_version'].to_i >= 22 - %w(make libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev git) - else - %w(make libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl git) - end - when 'rhel', 'fedora', 'amazon' # oracle, centos, amazon, fedora - %w(git zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel xz xz-devel libffi-devel findutils) - when 'suse' - %w(git git-core zlib-devel bzip2 libbz2-devel libopenssl-devel readline-devel sqlite3 sqlite3-devel xz xz-devel) - when 'mac_os_x' - %w(git readline xz) # not tested - end diff --git a/cookbooks/third-party/pyenv-3.5.1/kitchen.dokken.yml b/cookbooks/third-party/pyenv-3.5.1/kitchen.dokken.yml deleted file mode 100644 index f42c001ac..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/kitchen.dokken.yml +++ /dev/null @@ -1,83 +0,0 @@ ---- -driver: - name: dokken - chef_version: <%= ENV['CHEF_VERSION'] || "current" %> - -transport: - name: dokken - -provisioner: - name: dokken - deprecations_as_errors: true - -verifier: - name: inspec - -platforms: - - name: debian-9 - driver: - image: dokken/debian-9 - intermediate_instructions: - - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get install sudo -y - - - name: debian-10 - driver: - image: dokken/debian-10 - intermediate_instructions: - - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get install sudo -y - - - name: centos-7 - driver: - image: dokken/centos-7 - intermediate_instructions: - - RUN yum -y install sudo - - - name: centos-8 - driver: - image: dokken/centos-8 - intermediate_instructions: - - RUN yum -y install sudo - - - name: amazon-linux - driver: - image: dokken/amazonlinux - intermediate_instructions: - - RUN yum -y install sudo - - - name: oracle-linux - driver: - image: oraclelinux:7 - intermediate_instructions: - - RUN yum -y install sudo - - - name: fedora - driver: - image: dokken/fedora-latest - intermediate_instructions: - - RUN dnf -y install sudo - - - name: ubuntu-18.04 - driver: - image: dokken/ubuntu-16.04 - intermediate_instructions: - - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get install sudo -y - - - name: ubuntu-20.04 - driver: - image: dokken/ubuntu-18.04 - intermediate_instructions: - - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get install sudo -y - -suites: - - name: system_install - run_list: - - recipe[test::system_install] - - - name: user_install - run_list: - - recipe[test::dokken] - - recipe[test::user_install] diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/global.rb b/cookbooks/third-party/pyenv-3.5.1/resources/global.rb deleted file mode 100644 index 6f0eaa58e..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/global.rb +++ /dev/null @@ -1,63 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: global -# -# Author:: Shane da Silva -# Author:: Darwin D. Wu -# -# Copyright:: 2014-2017, Shane da Silva -# Copyright:: 2017-2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Check for the user or system global verison -# If we pass in a user check that users global - -provides :pyenv_global - -property :pyenv_version, String, name_property: true -property :user, String -property :root_path, String, default: lazy { - if user - node.run_state['sous-chefs']['pyenv']['root_path'][user] - else - node.run_state['sous-chefs']['pyenv']['root_path']['system'] - end -} - -# This sets the Global pyenv version -# e.g. "pyenv global" should return the version we set - -action :create do - pyenv_script "globals #{which_pyenv}" do - code "pyenv global #{new_resource.pyenv_version}" - user new_resource.user if new_resource.user - action :run - not_if { current_global_version_correct? } - end -end - -action_class do - include Chef::Pyenv::ScriptHelpers - - def current_global_version_correct? - current_global_version == new_resource.pyenv_version - end - - def current_global_version - version_file = ::File.join(new_resource.root_path, 'version') - - ::File.exist?(version_file) && ::IO.read(version_file).chomp - end -end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/plugin.rb b/cookbooks/third-party/pyenv-3.5.1/resources/plugin.rb deleted file mode 100644 index 1b8980f8e..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/plugin.rb +++ /dev/null @@ -1,45 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: plugin -# -# Author:: Darwin D. Wu -# -# Copyright:: 2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -provides :pyenv_plugin - -property :git_url, String, required: true -property :git_ref, String, default: 'master' -property :environment, Hash -property :user, String - -# https://github.com/pyenv/pyenv/wiki/Plugins -action :install do - # If we pass in a username, we then install the plugin to the user's home_dir - # See chef_pyenv_script_helpers.rb for root_path - git "Install #{new_resource.name} plugin" do - checkout_branch 'deploy' - destination ::File.join(root_path, 'plugins', new_resource.name) - repository new_resource.git_url - reference new_resource.git_ref - user new_resource.user if new_resource.user - action :sync - environment(new_resource.environment) - end -end - -action_class do - include Chef::Pyenv::ScriptHelpers -end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/python.rb b/cookbooks/third-party/pyenv-3.5.1/resources/python.rb deleted file mode 100644 index 3bfb1f81e..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/python.rb +++ /dev/null @@ -1,69 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: python -# -# Author:: Shane da Silva -# Author:: Darwin D. Wu -# -# Copyright:: 2014-2017, Shane da Silva -# Copyright:: 2017-2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -provides :pyenv_python - -property :version, String, name_property: true -property :version_file, String -property :user, String -property :environment, Hash -property :pyenv_action, String, default: 'install' -property :verbose, [true, false], default: false - -action :install do - Chef::Log.fatal('Rubinius not supported by this cookbook') if new_resource.version =~ /rbx/ - - install_start = Time.now - - Chef::Log.info("Building Python #{new_resource.version}, this could take a while...") - - command = %(pyenv #{new_resource.pyenv_action} #{new_resource.version} #{verbose}) - - pyenv_script "#{command} #{which_pyenv}" do - code command - user new_resource.user if new_resource.user - environment new_resource.environment if new_resource.environment - live_stream true if new_resource.verbose - action :run - end unless python_installed? - - Chef::Log.info("#{new_resource} build time was #{(Time.now - install_start) / 60.0} minutes") -end - -action :reinstall do -end - -action_class do - include Chef::Pyenv::ScriptHelpers - - def python_installed? - if Array(new_resource.action).include?(:reinstall) - false - elsif ::File.directory?(::File.join(root_path, 'versions', new_resource.version)) - true - end - end - - def verbose - return '-v' if new_resource.verbose - end -end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/rehash.rb b/cookbooks/third-party/pyenv-3.5.1/resources/rehash.rb deleted file mode 100644 index 83b189ec2..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/rehash.rb +++ /dev/null @@ -1,37 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: rehash -# -# Author:: Shane da Silva -# Author:: Darwin D. Wu -# -# Copyright:: 2014-2017, Shane da Silva -# Copyright:: 2017-2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -provides :pyenv_rehash - -property :user, String - -action :run do - pyenv_script "pyenv rehash #{which_pyenv}" do - code %(pyenv rehash) - user new_resource.user if new_resource.user - action :run - end -end - -action_class do - include Chef::Pyenv::ScriptHelpers -end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/script.rb b/cookbooks/third-party/pyenv-3.5.1/resources/script.rb deleted file mode 100644 index 392ec2867..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/script.rb +++ /dev/null @@ -1,57 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: script -# -# Author:: Shane da Silva -# Author:: Darwin D. Wu -# -# Copyright:: 2014-2017, Shane da Silva -# Copyright:: 2017-2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -provides :pyenv_script - -property :pyenv_version, String -property :code, String -property :creates, String -property :cwd, String -property :environment, Hash -property :group, String -property :path, Array -property :returns, Array, default: [0] -property :timeout, Integer -property :user, String -property :umask, [String, Integer] -property :live_stream, [true, false], default: false - -action :run do - bash new_resource.name do - code script_code - creates new_resource.creates if new_resource.creates - cwd new_resource.cwd if new_resource.cwd - user new_resource.user if new_resource.user - group new_resource.group if new_resource.group - returns new_resource.returns if new_resource.returns - timeout new_resource.timeout if new_resource.timeout - umask new_resource.umask if new_resource.umask - flags '-e' - environment(script_environment) - live_stream new_resource.live_stream - end -end - -action_class do - include Chef::Pyenv::ScriptHelpers -end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/system_install.rb b/cookbooks/third-party/pyenv-3.5.1/resources/system_install.rb deleted file mode 100644 index 5daa248ef..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/system_install.rb +++ /dev/null @@ -1,83 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: system_install -# -# Author:: Darwin D. Wu -# -# Copyright:: 2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -provides :pyenv_system_install - -property :git_url, String, default: node['pyenv']['git_url'] -property :git_ref, String, default: node['pyenv']['git_ref'] -property :global_prefix, String, default: '/usr/local/pyenv' -property :environment, Hash -property :update_pyenv, [true, false], default: true - -action :install do - node.run_state['sous-chefs'] ||= {} - node.run_state['sous-chefs']['pyenv'] ||= {} - node.run_state['sous-chefs']['pyenv']['root_path'] ||= {} - - node.run_state['sous-chefs']['pyenv']['root_path']['system'] = new_resource.global_prefix - - apt_update 'update' - build_essential 'build packages' - package node['pyenv']['prerequisites'] - - directory '/etc/profile.d' do - owner 'root' - mode '0755' - end - - template '/etc/profile.d/pyenv.sh' do - cookbook 'pyenv' - source 'pyenv.sh' - owner 'root' - mode '0755' - variables(global_prefix: new_resource.global_prefix) - end - - git new_resource.global_prefix do - checkout_branch 'deploy' - repository new_resource.git_url - reference new_resource.git_ref - action :checkout if new_resource.update_pyenv == false - environment(new_resource.environment) - - notifies :run, 'ruby_block[Add pyenv to PATH]', :immediately - notifies :run, 'bash[Initialize system pyenv]', :immediately - end - - directory "#{new_resource.global_prefix}/plugins" do - owner 'root' - mode '0755' - end - - # Initialize pyenv - ruby_block 'Add pyenv to PATH' do - block do - ENV['PATH'] = "#{new_resource.global_prefix}/shims:#{new_resource.global_prefix}/bin:#{ENV['PATH']}" - end - action :nothing - end - - bash 'Initialize system pyenv' do - code %(PATH="#{new_resource.global_prefix}/bin:$PATH" pyenv init -) - environment('PYENV_ROOT' => new_resource.global_prefix) - action :nothing - end -end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/user_install.rb b/cookbooks/third-party/pyenv-3.5.1/resources/user_install.rb deleted file mode 100644 index c3a69efbe..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/resources/user_install.rb +++ /dev/null @@ -1,89 +0,0 @@ -# -# Cookbook:: pyenv -# Resource:: user_install -# -# Author:: Darwin D. Wu -# -# Copyright:: 2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -provides :pyenv_user_install - -property :user, String, name_property: true -property :git_url, String, default: node['pyenv']['git_url'] -property :git_ref, String, default: node['pyenv']['git_ref'] -property :group, String, default: lazy { user } -property :home_dir, String, default: lazy { ::File.expand_path("~#{user}") } -property :user_prefix, String, default: lazy { ::File.join(home_dir, '.pyenv') } -property :environment, Hash -property :update_pyenv, [true, false], default: true - -action :install do - node.run_state['sous-chefs'] ||= {} - node.run_state['sous-chefs']['pyenv'] ||= {} - node.run_state['sous-chefs']['pyenv']['root_path'] ||= {} - - node.run_state['sous-chefs']['pyenv']['root_path'][new_resource.user] ||= new_resource.user_prefix - - apt_update 'update' - build_essential 'build packages' - package node['pyenv']['prerequisites'] - - system_prefix = node.run_state['sous-chefs']['pyenv']['root_path']['system'] - - template '/etc/profile.d/pyenv.sh' do - cookbook 'pyenv' - source 'pyenv.sh' - owner 'root' - mode '0755' - variables(global_prefix: system_prefix) if system_prefix - end - - git new_resource.user_prefix do - checkout_branch 'deploy' - repository new_resource.git_url - reference new_resource.git_ref - user new_resource.user - group new_resource.group - action :checkout if new_resource.update_pyenv == false - environment(new_resource.environment) - - notifies :run, 'ruby_block[Add pyenv to PATH]', :immediately - end - - %w(plugins shims versions).each do |d| - directory "#{new_resource.user_prefix}/#{d}" do - owner new_resource.user - group new_resource.group - mode '0755' - end - end - - # Initialize pyenv - ruby_block 'Add pyenv to PATH' do - block do - ENV['PATH'] = "#{new_resource.user_prefix}/shims:#{new_resource.user_prefix}/bin:#{ENV['PATH']}" - end - action :nothing - end - - bash "Initialize user #{new_resource.user} pyenv" do - code %(PATH="#{new_resource.user_prefix}/bin:$PATH" pyenv init -) - environment('PYENV_ROOT' => new_resource.user_prefix) - action :nothing - subscribes :run, "git[#{new_resource.user_prefix}]", :immediately - # Subscribe because it's easier to find the resource ;) - end -end diff --git a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/system_install.rb b/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/system_install.rb deleted file mode 100644 index 254a2965d..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/system_install.rb +++ /dev/null @@ -1,48 +0,0 @@ -# frozen_string_literal: true - -version = '3.7.7' -venv_root = '/opt/venv_test' - -cookbook_file '/tmp/requirements.txt' do - source 'requirements.txt' - mode '0644' -end - -# Install pyenv globally -pyenv_system_install 'system' - -pyenv_python version - -pyenv_global version - -pyenv_plugin 'virtualenv' do - git_url 'https://github.com/pyenv/pyenv-virtualenv' -end - -pyenv_pip 'requests' do - version '2.18.3' -end - -pyenv_pip 'virtualenv' do - version '16.2.0' -end - -pyenv_script 'create virtualenv' do - code "virtualenv #{venv_root}" -end - -pyenv_pip '/tmp/requirements.txt' do - virtualenv venv_root - requirement true -end - -pyenv_pip 'urllib3' do - virtualenv venv_root - action :upgrade - version '1.25.11' -end - -pyenv_pip 'requests' do - virtualenv venv_root - action :uninstall -end diff --git a/cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/inspec.yml b/cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/inspec.yml deleted file mode 100644 index 35099d66f..000000000 --- a/cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/inspec.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: pyenv -title: pyenv profile -maintainer: Darwin D. Wu -copyright: Darwin D. Wu -license: Apache-2.0 -summary: Verifies pyenv installed correctly -version: 1.0.0 -supports: - - os-family: linux diff --git a/cookbooks/third-party/pyenv-3.5.1/Berksfile b/cookbooks/third-party/pyenv-4.2.3/Berksfile similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/Berksfile rename to cookbooks/third-party/pyenv-4.2.3/Berksfile diff --git a/cookbooks/third-party/pyenv-3.5.1/CHANGELOG.md b/cookbooks/third-party/pyenv-4.2.3/CHANGELOG.md similarity index 64% rename from cookbooks/third-party/pyenv-3.5.1/CHANGELOG.md rename to cookbooks/third-party/pyenv-4.2.3/CHANGELOG.md index 860574645..d3e612cd3 100644 --- a/cookbooks/third-party/pyenv-3.5.1/CHANGELOG.md +++ b/cookbooks/third-party/pyenv-4.2.3/CHANGELOG.md @@ -1,5 +1,45 @@ # pyenv Changelog +## 4.2.3 - *2023-06-08* + +## 4.2.2 - *2023-06-08* + +Standardise files with files in sous-chefs/repo-management + +## 4.2.1 - *2023-02-02* + +- Update `templates/pyenv.sh` script to properly evaluate when to add a user install to `$PATH` + +## 4.2.0 - *2022-09-26* + +- Add support for ubuntu >= 22.04 and debian >= 11 + +## 4.1.0 - *2022-07-20* + +- Remove duplicate pyenv init from profile script, fixes "pyenv: cannot rehash: <...>/shims isn't writable" for system install + +## 4.0.1 - *2022-02-08* + +- Remove delivery folder + +## 4.0.0 - *2021-12-20* + +- Set unified_mode for Chef 17 support +- Require Chef 15.3 for unified_mode +- Fix pyenv not being on the path properly +- resolved cookstyle error: resources/global.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/pip.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/plugin.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/python.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/rehash.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/script.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/system_install.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- resolved cookstyle error: resources/user_install.rb:1:1 refactor: `Chef/Deprecations/ResourceWithoutUnifiedTrue` +- Removed the pyenv_system_install and pyenv_user_install resources for a singular pyenv_install. + + - This resource acts like all other resources where it can install both as a user and system wide. + Please see the documentation for further information. + ## 3.5.1 - *2021-08-30* - Standardise files with files in sous-chefs/repo-management diff --git a/cookbooks/third-party/pyenv-3.5.1/CODE_OF_CONDUCT.md b/cookbooks/third-party/pyenv-4.2.3/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/CODE_OF_CONDUCT.md rename to cookbooks/third-party/pyenv-4.2.3/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/pyenv-3.5.1/CONTRIBUTING.md b/cookbooks/third-party/pyenv-4.2.3/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/CONTRIBUTING.md rename to cookbooks/third-party/pyenv-4.2.3/CONTRIBUTING.md diff --git a/cookbooks/third-party/pyenv-3.5.1/Dangerfile b/cookbooks/third-party/pyenv-4.2.3/Dangerfile similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/Dangerfile rename to cookbooks/third-party/pyenv-4.2.3/Dangerfile diff --git a/cookbooks/third-party/pyenv-3.5.1/LICENSE b/cookbooks/third-party/pyenv-4.2.3/LICENSE similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/LICENSE rename to cookbooks/third-party/pyenv-4.2.3/LICENSE diff --git a/cookbooks/third-party/pyenv-4.2.3/README.md b/cookbooks/third-party/pyenv-4.2.3/README.md new file mode 100644 index 000000000..25986439c --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/README.md @@ -0,0 +1,73 @@ +# pyenv Chef Cookbook + +[![Cookbook Version](https://img.shields.io/cookbook/v/pyenv.svg)](https://supermarket.chef.io/cookbooks/pyenv) +[![Build Status](https://img.shields.io/circleci/project/github/sous-chefs/pyenv/master.svg)](https://circleci.com/gh/sous-chefs/pyenv) +[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers) +[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors) +[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0) +[![Maintainability](https://api.codeclimate.com/v1/badges/693934e931aa1c52bfa0/maintainability)](https://codeclimate.com/github/sous-chefs/pyenv/maintainability) + +## Description + +Manages [pyenv][pyenv] and its installed Pythons. + +## Chef + +This cookbook requires Chef 15.3+. + +## Platform family + +- Debian derivatives (debian, ubuntu) +- Fedora +- RHEL derivatives (RHEL, CentOS, Amazon Linux, Oracle, Scientific Linux) +- openSUSE and openSUSE leap + +## Usage + +Examples installations are provided in `test/fixtures/cookbooks/test/recipes` + +A `pyenv_install` is required to be set so that pyenv knows which version you want to use, and is installed on the system. + +## Resources + +- [pyenv_global](documentation/pyenv_global.md) +- [pyenv_install](documentation/pyenv_install.md) +- [pyenv_pip](documentation/pyenv_pip.md) +- [pyenv_plugin](documentation/pyenv_plugin.md) +- [pyenv_python](documentation/pyenv_python.md) +- [pyenv_rehash](documentation/pyenv_rehash.md) +- [pyenv_script](documentation/pyenv_script.md) + +## System-Wide Mac Installation Note + +This cookbook takes advantage of managing profile fragments in an +`/etc/profile.d` directory, common on most Unix-flavored platforms. +Unfortunately, Mac OS X does not support this idiom out of the box, +so you may need to [modify][mac_profile_d] your user profile. + +## Contributors + +This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false) + +### Backers + +Thank you to all our backers! + +![https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40) + +### Sponsors + +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. + +![https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100) +![https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100) + +[pyenv]: https://github.com/pyenv/pyenv diff --git a/cookbooks/third-party/pyenv-3.5.1/TESTING.md b/cookbooks/third-party/pyenv-4.2.3/TESTING.md similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/TESTING.md rename to cookbooks/third-party/pyenv-4.2.3/TESTING.md diff --git a/cookbooks/third-party/pyenv-3.5.1/chefignore b/cookbooks/third-party/pyenv-4.2.3/chefignore similarity index 98% rename from cookbooks/third-party/pyenv-3.5.1/chefignore rename to cookbooks/third-party/pyenv-4.2.3/chefignore index cc170ea79..a27b0b258 100644 --- a/cookbooks/third-party/pyenv-3.5.1/chefignore +++ b/cookbooks/third-party/pyenv-4.2.3/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/.gitkeep b/cookbooks/third-party/pyenv-4.2.3/documentation/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_global.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_global.md new file mode 100644 index 000000000..33d270402 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_global.md @@ -0,0 +1,15 @@ +# `pyenv_global` + +If a user is passed in to this resource it sets the global version for the user, under the users root_path (usually `~/.pyenv/version`), otherwise it sets the system global version. + +| Name | Type | Default | Description | +| ------------- | ------ | --------- | ----------- | +| pyenv_version | String | | | +| user | String | | | +| prefix | String | root_path | | + +## Examples + +```ruby +pyenv_global '3.6.1' +``` diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_install.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_install.md new file mode 100644 index 000000000..8f0283afb --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_install.md @@ -0,0 +1,29 @@ +# `pyenv_install` + +Installs pyenv to either a user or system location. + +Install PyEnv under the vagrant home directory + +```ruby +pyenv_install 'user' do + user 'vagrant' +end +``` + +Install PyEnv globally + +```ruby +pyenv_install 'system' +``` + +| Name | Type | Allowed Options | Default | Description | +| ------------ | --------------- | ------------------------------------------ | ------------------------------------ | ------------------------------------------------------ | +| prefix_type | String | user system | | Whether to install pyenv to a user or system directory | +| user | String | | `root` | User directory to install pyenv to | +| group | String, | | `user` | Group for the pyenv directories and files | +| git_url | String | | `https://github.com/pyenv/pyenv.git` | | +| git_ref | String, | | | `master` | +| home_dir | String | | user home | | +| prefix | String | `/usr/local/pyenv` or users home directory | Path to install pyenv to | | +| environment | Hash | | | | +| update_pyenv | `true`, `false` | | false | | diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_pip.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_pip.md new file mode 100644 index 000000000..54913501b --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_pip.md @@ -0,0 +1,32 @@ +# `pyenv_pip` + +Used to install a Python package into the selected pyenv environment. + +```ruby +pyenv_pip 'requests' do + virtualenv + version + user + umask + options + requirement + editable +end +``` + +## Actions + +- `:install` - Default. Install a python package. If a version is specified, install the specified version of the python package. +- `:upgrade` - Install/upgrade a python package. Call `install` command with `--upgrade` flag. If version is not specified, latest version will be installed. +- `:uninstall` - Uninstall a python package. + +| Name | Type | Default | Description | +| ------------ | ----------------- | -------------- | ----------- | +| package_name | String | true | | +| virtualenv | String | | | +| version | String | | | +| user | String | | | +| umask | [String, Integer] | | | +| options | String | | | +| requirement | [true, false] | false | | +| editable | [true, false] | default: false | | diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_plugin.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_plugin.md new file mode 100644 index 000000000..4e08d7e9e --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_plugin.md @@ -0,0 +1,16 @@ +# `pyenv_plugin` + +Installs a pyenv plugin. + +```ruby +pyenv_plugin 'virtualenv' do + git_url 'https://github.com/pyenv/pyenv-virtualenv' +end +``` + +| Name | Type | Default | Description | +| ----------- | ------ | -------- | ---------------------------------------------------- | +| git_url | String | | Git URL of the plugin | +| git_ref | String | `master` | Git reference of the plugin | +| environment | Hash | | Optional: pass environment variables to git resource | +| user | String | | # Optional: if passed installs to the users pyenv. | diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_python.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_python.md new file mode 100644 index 000000000..200fce78e --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_python.md @@ -0,0 +1,25 @@ +# `pyenv_python` + +Installs Python. + +| Name | Type | Default | Description | +| ------------ | --------------- | ------- | ----------------------------- | +| version | `String` | | Version of Python to install | +| version_file | `String` | | | +| user | `String` | | User to install the Python to | +| environment | `Hash` | | | +| verbose | `[true, false]` | `false` | | + +## Examples + +```ruby +pyenv_python '3.6.1' +``` + +Install a Python for a user install + +```ruby +pyenv_python version do + user 'vagrant' +end +``` diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_rehash.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_rehash.md new file mode 100644 index 000000000..224b7902a --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_rehash.md @@ -0,0 +1,19 @@ +# `pyenv_rehash` + +Rehashes the system or user pyenv. + +| Name | Type | Default | Description | +| ---- | -------- | ------- | -------------- | +| user | `String` | | User to rehash | + +## Examples + +```ruby +pyenv_rehash 'rehash' do + user 'vagrant' +end +``` + +```ruby +pyenv 'rehash' +``` diff --git a/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_script.md b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_script.md new file mode 100644 index 000000000..d4201d8b4 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/documentation/pyenv_script.md @@ -0,0 +1,27 @@ +# pyenv_script + +Runs a pyenv aware script. + +| Name | Type | Default | Description | +| ------------- | ------------------- | ------- | ----------- | +| pyenv_version | `String` | | | +| code | `String` | | | +| creates | `String` | | | +| cwd | `String` | | | +| environment | `Hash` | | | +| group | `String` | | | +| path | `Array` | | | +| returns | `Array` | `[0]` | | +| timeout | Integer | | | +| user | String | | | +| umask | `[String, Integer]` | | | +| live_stream | `[true, false]` | `false` | | + +## Examples + +```ruby +pyenv_script 'create virtualenv' do + code "virtualenv #{venv_root}" + user 'vagrant' +end +``` diff --git a/cookbooks/third-party/pyenv-4.2.3/kitchen.dokken.yml b/cookbooks/third-party/pyenv-4.2.3/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + 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: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/pyenv-4.2.3/kitchen.exec.yml b/cookbooks/third-party/pyenv-4.2.3/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/pyenv-4.2.3/kitchen.global.yml b/cookbooks/third-party/pyenv-4.2.3/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/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/cookbooks/third-party/pyenv-3.5.1/kitchen.yml b/cookbooks/third-party/pyenv-4.2.3/kitchen.yml similarity index 87% rename from cookbooks/third-party/pyenv-3.5.1/kitchen.yml rename to cookbooks/third-party/pyenv-4.2.3/kitchen.yml index 6d1ef4377..7561a7704 100644 --- a/cookbooks/third-party/pyenv-3.5.1/kitchen.yml +++ b/cookbooks/third-party/pyenv-4.2.3/kitchen.yml @@ -1,7 +1,6 @@ --- driver: name: vagrant - provider: virtualbox provisioner: product_name: chef @@ -17,13 +16,15 @@ platforms: driver_config: box: mvbcoding/awslinux - name: debian-10 + - name: debian-11 - name: centos-7 - name: centos-8 - name: oracle-7 - name: fedora-29 - name: ubuntu-18.04 - name: ubuntu-20.04 - - name: opensuse-leap-15 # error downloading chef 14 + - name: ubuntu-22.04 + - name: opensuse-leap-15 suites: - name: system_install diff --git a/cookbooks/third-party/pyenv-3.5.1/libraries/chef_pyenv_script_helpers.rb b/cookbooks/third-party/pyenv-4.2.3/libraries/helpers.rb similarity index 55% rename from cookbooks/third-party/pyenv-3.5.1/libraries/chef_pyenv_script_helpers.rb rename to cookbooks/third-party/pyenv-4.2.3/libraries/helpers.rb index ffaeaa930..7f4e94131 100644 --- a/cookbooks/third-party/pyenv-3.5.1/libraries/chef_pyenv_script_helpers.rb +++ b/cookbooks/third-party/pyenv-4.2.3/libraries/helpers.rb @@ -1,29 +1,17 @@ -require 'chef/mixin/shell_out' - -class Chef - module Pyenv +class PyEnv + module Cookbook module ScriptHelpers + require 'chef/mixin/shell_out' + include Chef::Mixin::ShellOut def root_path - node.run_state['sous-chefs'] ||= {} - node.run_state['sous-chefs']['pyenv'] ||= {} - node.run_state['sous-chefs']['pyenv']['root_path'] ||= {} - - if new_resource.user - node.run_state['sous-chefs']['pyenv']['root_path'][new_resource.user] - else - node.run_state['sous-chefs']['pyenv']['root_path']['system'] - end - end - - def which_pyenv - "(#{new_resource.user || 'system'})" + node.run_state['sous-chefs']['pyenv']['root_path']['prefix'] end def script_code script = [] script << %(export PYENV_ROOT="#{root_path}") - script << %(export PATH="${PYENV_ROOT}/bin:$PATH") + script << %(export PATH="${PYENV_ROOT}/bin:${PYENV_ROOT}/shims:$PATH") script << %{eval "$(pyenv init -)"} if new_resource.pyenv_version script << %(export PYENV_VERSION="#{new_resource.pyenv_version}") @@ -61,6 +49,20 @@ def pip_command(command) }, user: new_resource.user) end + + def pyenv_prerequisites + value_for_platform_family( + 'debian' => %w(make libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev git) \ + << value_for_platform( + 'debian' => { '>= 11' => 'python3-openssl', 'default' => 'python-openssl' }, + 'ubuntu' => { '>= 22.04' => 'python3-openssl', 'default' => 'python-openssl' }, + 'default' => 'python-openssl' + ), + %w(rhel fedora amazon) => %w(git zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel xz xz-devel libffi-devel findutils), + 'suse' => %w(git git-core zlib-devel bzip2 libbz2-devel libopenssl-devel readline-devel sqlite3 sqlite3-devel xz xz-devel), + 'mac_os_x' => %w(git readline xz) + ) + end end end end diff --git a/cookbooks/third-party/pyenv-3.5.1/metadata.rb b/cookbooks/third-party/pyenv-4.2.3/metadata.rb similarity index 89% rename from cookbooks/third-party/pyenv-3.5.1/metadata.rb rename to cookbooks/third-party/pyenv-4.2.3/metadata.rb index 3fedde46e..0ca61390b 100644 --- a/cookbooks/third-party/pyenv-3.5.1/metadata.rb +++ b/cookbooks/third-party/pyenv-4.2.3/metadata.rb @@ -5,8 +5,8 @@ description 'Manages pyenv and its installed Python versions.' issues_url 'https://github.com/sous-chefs/pyenv/issues' source_url 'https://github.com/sous-chefs/pyenv' -version '3.5.1' -chef_version '>= 14.0' +version '4.2.3' +chef_version '>= 15.3' %w( ubuntu diff --git a/cookbooks/third-party/pyenv-4.2.3/renovate.json b/cookbooks/third-party/pyenv-4.2.3/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/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"] + } + ] +} diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/global.rb b/cookbooks/third-party/pyenv-4.2.3/resources/global.rb new file mode 100644 index 000000000..1490713fa --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/global.rb @@ -0,0 +1,36 @@ +unified_mode true +include PyEnv::Cookbook::ScriptHelpers + +property :pyenv_version, + String, + name_property: true + +property :user, + String + +property :prefix, + String, + default: lazy { root_path } + +action :create do + pyenv_script 'globals' do + code "pyenv global #{new_resource.pyenv_version}" + user new_resource.user + action :run + not_if { current_global_version_correct? } + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers + + def current_global_version_correct? + current_global_version == new_resource.pyenv_version + end + + def current_global_version + version_file = ::File.join(new_resource.root_path, 'version') + + ::File.exist?(version_file) && ::IO.read(version_file).chomp + end +end diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/install.rb b/cookbooks/third-party/pyenv-4.2.3/resources/install.rb new file mode 100644 index 000000000..08c095461 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/install.rb @@ -0,0 +1,108 @@ +unified_mode true + +property :prefix_type, + String, + equal_to: %w( user system ), + name_property: true, + description: 'Whether to install pyenv to a user or system directory.' + +property :user, + String, + default: 'root', + description: 'User directory to install pyenv to.' + +property :group, + String, + default: lazy { user }, + description: 'Group for the pyenv directories and files.' + +property :git_url, + String, + default: 'https://github.com/pyenv/pyenv.git' + +property :git_ref, + String, + default: 'master' + +property :home_dir, + String, + default: lazy { ::File.expand_path("~#{user}") } + +property :prefix, + String, + default: lazy { + if prefix_type == 'user' + ::File.join(home_dir, '.pyenv') + else + '/usr/local/pyenv' + end + }, + description: 'Path to install pyenv to' + +property :environment, + Hash + +property :update_pyenv, + [true, false], + default: false + +action :install do + node.run_state['sous-chefs'] ||= {} + node.run_state['sous-chefs']['pyenv'] ||= {} + node.run_state['sous-chefs']['pyenv']['root_path'] ||= {} + node.run_state['sous-chefs']['pyenv']['root_path']['prefix'] ||= new_resource.prefix + + build_essential 'build packages' + package pyenv_prerequisites + + directory '/etc/profile.d' do + owner 'root' + mode '0755' + end + + template '/etc/profile.d/pyenv.sh' do + cookbook 'pyenv' + source 'pyenv.sh' + owner 'root' + mode '0755' + variables(prefix: new_resource.prefix) + end + + git new_resource.prefix do + repository new_resource.git_url + revision new_resource.git_ref + user new_resource.user + group new_resource.group + depth 1 + action new_resource.update_pyenv ? :sync : :checkout + environment(new_resource.environment) + notifies :run, 'ruby_block[Add pyenv to PATH]', :immediately + notifies :run, 'execute[Initialize pyenv]', :immediately + end + + %w(plugins shims versions).each do |dir| + directory "#{new_resource.prefix}/#{dir}" do + owner new_resource.user + group new_resource.group + mode '0755' + end + end + + # Initialize pyenv + ruby_block 'Add pyenv to PATH' do + block do + ENV['PATH'] = "#{new_resource.prefix}/shims:#{new_resource.prefix}/bin:#{ENV['PATH']}" + end + action :nothing + end + + execute 'Initialize pyenv' do + command %(PATH="#{new_resource.prefix}/bin:$PATH" pyenv init -) + environment('PYENV_ROOT' => new_resource.prefix) + action :nothing + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers +end diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/local.rb b/cookbooks/third-party/pyenv-4.2.3/resources/local.rb new file mode 100644 index 000000000..78081f260 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/local.rb @@ -0,0 +1,35 @@ +unified_mode true + +property :python_version, + String, + name_property: true +property :path, + String, + required: true + +property :user, + String + +action :create do + pyenv_script 'local' do + code "pyenv local #{new_resource.python_version}" + cwd new_resource.path + user new_resource.user if new_resource.user + action :run + not_if { current_local_version_correct? } + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers + + def current_local_version_correct? + current_local_version == new_resource.python_version + end + + def current_local_version + version_file = ::File.join(new_resource.path, '.python-version') + + ::File.exist?(version_file) && ::IO.read(version_file).chomp + end +end diff --git a/cookbooks/third-party/pyenv-3.5.1/resources/pip.rb b/cookbooks/third-party/pyenv-4.2.3/resources/pip.rb similarity index 70% rename from cookbooks/third-party/pyenv-3.5.1/resources/pip.rb rename to cookbooks/third-party/pyenv-4.2.3/resources/pip.rb index 7a8470610..b34dda3e4 100644 --- a/cookbooks/third-party/pyenv-3.5.1/resources/pip.rb +++ b/cookbooks/third-party/pyenv-4.2.3/resources/pip.rb @@ -1,33 +1,31 @@ -# -# Cookbook:: pyenv -# Resource:: pip -# -# Author:: Darwin D. Wu -# -# Copyright:: 2018, Darwin D. Wu -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -provides :pyenv_pip - -property :package_name, String, name_property: true -property :virtualenv, String -property :version, String -property :user, String -property :umask, [String, Integer] -property :options, String -property :requirement, [true, false], default: false -property :editable, [true, false], default: false +unified_mode true + +property :package_name, + String, + name_property: true + +property :virtualenv, + String + +property :version, + String + +property :user, + String + +property :umask, + [String, Integer] + +property :options, + String + +property :requirement, + [true, false], + default: false + +property :editable, + [true, false], + default: false action :install do install_mode = if new_resource.requirement @@ -41,7 +39,7 @@ install_target = if new_resource.version "#{new_resource.package_name}==#{new_resource.version}" else - new_resource.package_name.to_s + new_resource.package_name end pip_args = "install #{new_resource.options} #{install_mode} #{install_target}" @@ -55,8 +53,8 @@ pyenv_script new_resource.package_name do code command - user new_resource.user if new_resource.user - umask new_resource.umask if new_resource.umask + user new_resource.user + umask new_resource.umask only_if { require_install? } end end @@ -79,8 +77,8 @@ pyenv_script new_resource.package_name do code command - user new_resource.user if new_resource.user - umask new_resource.umask if new_resource.umask + user new_resource.user + umask new_resource.umask only_if { require_upgrade? } end end @@ -104,13 +102,13 @@ pyenv_script new_resource.package_name do code command - user new_resource.user if new_resource.user - umask new_resource.umask if new_resource.umask + user new_resource.user + umask new_resource.umask end end action_class do - include Chef::Pyenv::ScriptHelpers + include PyEnv::Cookbook::ScriptHelpers def require_install? current_version = get_current_version diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/plugin.rb b/cookbooks/third-party/pyenv-4.2.3/resources/plugin.rb new file mode 100644 index 000000000..a48471ac2 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/plugin.rb @@ -0,0 +1,34 @@ +unified_mode true + +property :git_url, + String, + required: true + +property :git_ref, + String, + default: 'master' + +property :environment, + Hash + +property :user, + String + +# https://github.com/pyenv/pyenv/wiki/Plugins +action :install do + # If we pass in a username, we then install the plugin to the user's home_dir + # See chef_pyenv_script_helpers.rb for root_path + git "Install #{new_resource.name} plugin" do + checkout_branch 'deploy' + destination ::File.join(root_path, 'plugins', new_resource.name) + repository new_resource.git_url + reference new_resource.git_ref + user new_resource.user + action :sync + environment(new_resource.environment) + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers +end diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/python.rb b/cookbooks/third-party/pyenv-4.2.3/resources/python.rb new file mode 100644 index 000000000..f9c7853f4 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/python.rb @@ -0,0 +1,62 @@ +unified_mode true + +property :version, + String, + name_property: true + +property :version_file, + String + +property :user, + String + +property :environment, + Hash + +property :verbose, + [true, false], + default: false + +action :install do + install_start = Time.now + + Chef::Log.info("Building Python #{new_resource.version}, this could take a while...") + + command = %(pyenv install #{verbose} #{new_resource.version}) + + pyenv_script "#{command}" do + code command + user new_resource.user + environment new_resource.environment + live_stream new_resource.verbose + action :run + not_if { python_installed? } + end + + Chef::Log.info("#{new_resource} build time was #{(Time.now - install_start) / 60.0} minutes") +end + +action :uninstall do + command = %(pyenv uninstall -f #{new_resource.version}) + + pyenv_script "#{command}" do + code command + user new_resource.user + environment new_resource.environment + live_stream new_resource.verbose + action :run + not_if { python_installed? } + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers + + def python_installed? + ::File.directory?(::File.join(root_path, 'versions', new_resource.version)) + end + + def verbose + return '-v' if new_resource.verbose + end +end diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/rehash.rb b/cookbooks/third-party/pyenv-4.2.3/resources/rehash.rb new file mode 100644 index 000000000..1c481e8da --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/rehash.rb @@ -0,0 +1,16 @@ +unified_mode true + +property :user, + String + +action :run do + pyenv_script 'pyenv rehash' do + code %(pyenv rehash) + user new_resource.user + action :run + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers +end diff --git a/cookbooks/third-party/pyenv-4.2.3/resources/script.rb b/cookbooks/third-party/pyenv-4.2.3/resources/script.rb new file mode 100644 index 000000000..2cd6e7b83 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/resources/script.rb @@ -0,0 +1,58 @@ +unified_mode true + +property :pyenv_version, + String + +property :code, + String + +property :creates, + String + +property :cwd, + String + +property :environment, + Hash + +property :group, + String + +property :path, + Array + +property :returns, + Array, + default: [0] + +property :timeout, + Integer + +property :user, + String + +property :umask, + [String, Integer] + +property :live_stream, + [true, false], + default: false + +action :run do + execute new_resource.name do + command script_code + creates new_resource.creates + cwd new_resource.cwd + user new_resource.user + group new_resource.group + returns new_resource.returns + timeout new_resource.timeout + umask new_resource.umask + live_stream new_resource.live_stream + environment(script_environment) + end +end + +action_class do + include PyEnv::Cookbook::ScriptHelpers +end diff --git a/cookbooks/third-party/pyenv-3.5.1/spec/spec_helper.rb b/cookbooks/third-party/pyenv-4.2.3/spec/spec_helper.rb similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/spec/spec_helper.rb rename to cookbooks/third-party/pyenv-4.2.3/spec/spec_helper.rb diff --git a/cookbooks/third-party/pyenv-3.5.1/templates/pyenv.sh b/cookbooks/third-party/pyenv-4.2.3/templates/pyenv.sh similarity index 67% rename from cookbooks/third-party/pyenv-3.5.1/templates/pyenv.sh rename to cookbooks/third-party/pyenv-4.2.3/templates/pyenv.sh index fd0abb3f4..4af35fa79 100644 --- a/cookbooks/third-party/pyenv-3.5.1/templates/pyenv.sh +++ b/cookbooks/third-party/pyenv-4.2.3/templates/pyenv.sh @@ -1,15 +1,17 @@ +#!/bin/sh + # Prefer a user pyenv over a system-wide install if [ -s "${HOME}/.pyenv/bin" ]; then pyenv_root="${HOME}/.pyenv" pyenv_init="pyenv init -" -elif [ -s "<%= @global_prefix %>" ]; then - pyenv_root="<%= @global_prefix %>" - export PYENV_ROOT=${pyenv_root} +else + pyenv_root="<%= @prefix %>" + export PYENV_ROOT="${pyenv_root}" # Rehashing will fail in a system install pyenv_init="pyenv init - --no-rehash" fi -if [ -n "$pyenv_root" ]; then +if [ -d "$pyenv_root" ]; then export PATH="${pyenv_root}/bin:$PATH" eval "$($pyenv_init)" fi diff --git a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/files/requirements.txt b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/files/requirements.txt similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/files/requirements.txt rename to cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/files/requirements.txt diff --git a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/metadata.rb b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/metadata.rb similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/metadata.rb rename to cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/metadata.rb diff --git a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/dokken.rb b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/dokken.rb similarity index 100% rename from cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/dokken.rb rename to cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/dokken.rb diff --git a/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/system_install.rb b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/system_install.rb new file mode 100644 index 000000000..b0e453d3d --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/system_install.rb @@ -0,0 +1,28 @@ +# Install Python system wide +# and make it the global default + +version = '3.7.7' +local_folder = '/opt/pyenv_test' + +directory local_folder + +pyenv_install 'system' + +# pyenv_rehash 'for-new-python' + +pyenv_python version + +pyenv_local version do + path local_folder + user 'root' +end + +pyenv_global version + +pyenv_plugin 'virtualenv' do + git_url 'https://github.com/pyenv/pyenv-virtualenv' +end + +pyenv_pip 'requests' do + version '2.18.3' +end diff --git a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/user_install.rb b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/user_install.rb similarity index 85% rename from cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/user_install.rb rename to cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/user_install.rb index 45bf7a6de..5000c690a 100644 --- a/cookbooks/third-party/pyenv-3.5.1/test/fixtures/cookbooks/test/recipes/user_install.rb +++ b/cookbooks/third-party/pyenv-4.2.3/test/fixtures/cookbooks/test/recipes/user_install.rb @@ -1,5 +1,7 @@ -# Install pyenv and makes it avilable to the selected user -version = '3.6.1' +# Install pyenv +# and make it avilable to the selected user + +version = '3.7.7' user = 'vagrant' venv_root = "/home/#{user}/venv_test" @@ -10,7 +12,9 @@ mode '0644' end -pyenv_user_install user +pyenv_install 'user' do + user user +end pyenv_python version do user user diff --git a/cookbooks/third-party/pyenv-4.2.3/test/integration/common/controls/common.rb b/cookbooks/third-party/pyenv-4.2.3/test/integration/common/controls/common.rb new file mode 100644 index 000000000..d33a655d5 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/common/controls/common.rb @@ -0,0 +1,19 @@ +control 'Path' do + impact 1 + title 'pyenv should be on the path' + desc 'pyenv bin and shims should be on the path' + + describe bash('source /etc/profile.d/pyenv.sh && echo $PATH') do + its('stdout') { should match /shims/ } + end +end + +control 'Shims' do + impact 1 + title 'Pyenv shims should contain the correct Python' + desc 'When pyen shims is run we should have the correct version of Python shimmed' + describe bash('source /etc/profile.d/pyenv.sh && pyenv shims') do + its('stdout') { should match /shims/ } + its('stdout') { should match /python3.7/ } + end +end diff --git a/cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/controls/system_install.rb b/cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/controls/system_install.rb similarity index 55% rename from cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/controls/system_install.rb rename to cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/controls/system_install.rb index 975b6eac2..5e13b94bc 100644 --- a/cookbooks/third-party/pyenv-3.5.1/test/integration/system_install/controls/system_install.rb +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/controls/system_install.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true global_python = '3.7.7' -venv_root = '/opt/venv_test' control 'pyenv should be installed' do title 'pyenv should be installed globally' @@ -29,29 +28,6 @@ its('exit_status') { should eq(0) } its('stdout') { should match('Version: 2.18.3') } end - - desc 'Pip should install package virtualenv' - describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && pip show virtualenv'") do - its('exit_status') { should eq(0) } - its('stdout') { should match('Version: 16.2.0') } - end - - desc 'Pip should upgrade package urllib3 inside virtualenv' - describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show urllib3'") do - its('exit_status') { should eq(0) } - its('stdout') { should match('Version: 1.25.11') } - end - - desc 'Pip should install package fire inside virtualenv according to requirements.txt' - describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show fire'") do - its('exit_status') { should eq(0) } - its('stdout') { should match('Version: 0.1.2') } - end - - desc 'Pip should uninstall package requests inside virtualenv' - describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show requests'") do - its('exit_status') { should eq(1) } - end end control 'pyenv should be installed to the system path' do @@ -62,7 +38,7 @@ it { should be_executable } its('owner') { should eq('root') } its('content') { should match(/^\s+pyenv_init="pyenv init -"/) } - its('content') { should match(/Rehashing will fail in a system install\n\s+pyenv_init="pyenv init - --no-rehash"/m) } + its('content') { should match(/--no-rehash"/) } its('content') { should match(/^\s+eval "\$\(\$pyenv_init\)"/) } end @@ -84,16 +60,4 @@ end end -control 'virtualenv should be created' do - title "virtualenv should be created in #{venv_root}" - - describe directory(venv_root) do - it { should exist } - its('owner') { should eq('root') } - end - - describe file("#{venv_root}/bin/activate") do - it { should be_file } - its('owner') { should eq('root') } - end -end +include_controls 'common' diff --git a/cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/inspec.yml b/cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/inspec.yml new file mode 100644 index 000000000..bc6d9b154 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/system_install/inspec.yml @@ -0,0 +1,11 @@ +--- +name: pyenv +title: pyenv user install +maintainer: Sous-Chefs +summary: Verifies pyenv is installed correctly at a system level +version: 1.0.0 +supports: + - os-family: linux +depends: + - name: common + path: test/integration/common diff --git a/cookbooks/third-party/pyenv-3.5.1/test/integration/user_install/controls/user_install.rb b/cookbooks/third-party/pyenv-4.2.3/test/integration/user_install/controls/user_install.rb similarity index 97% rename from cookbooks/third-party/pyenv-3.5.1/test/integration/user_install/controls/user_install.rb rename to cookbooks/third-party/pyenv-4.2.3/test/integration/user_install/controls/user_install.rb index c3bb71294..1f227642c 100644 --- a/cookbooks/third-party/pyenv-3.5.1/test/integration/user_install/controls/user_install.rb +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/user_install/controls/user_install.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -global_python = '3.6.1' +global_python = '3.7.7' user = 'vagrant' venv_root = "/home/#{user}/venv_test" @@ -19,34 +19,6 @@ its('exit_status') { should eq(0) } its('stdout') { should match(global_python) } end - - desc 'Plugin should be installed' - describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && pyenv virtualenv'") do - its('stderr') { should match('pyenv-virtualenv') } - end - - desc 'Pip should install package requests' - describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && pip show requests'") do - its('exit_status') { should eq(0) } - its('stdout') { should match('Version: 2.18.3') } - end - - desc 'Pip should install package virtualenv' - describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && pip show virtualenv'") do - its('exit_status') { should eq(0) } - its('stdout') { should match('Version: 16.2.0') } - end - - desc 'Pip should install package fire inside virtualenv according to requirements.txt' - describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show fire'") do - its('exit_status') { should eq(0) } - its('stdout') { should match('Version: 0.1.2') } - end - - desc 'Pip should uninstall package requests inside virtualenv' - describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show requests'") do - its('exit_status') { should eq(1) } - end end control 'pyenv should be installed to the user path' do @@ -79,6 +51,36 @@ end end +control 'virtualenv' do + desc 'Plugin should be installed' + describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && pyenv virtualenv'") do + its('stderr') { should match('pyenv-virtualenv') } + end + + desc 'Pip should install package requests' + describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && pip show requests'") do + its('exit_status') { should eq(0) } + its('stdout') { should match('Version: 2.18.3') } + end + + desc 'Pip should install package virtualenv' + describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && pip show virtualenv'") do + its('exit_status') { should eq(0) } + its('stdout') { should match('Version: 16.2.0') } + end + + desc 'Pip should install package fire inside virtualenv according to requirements.txt' + describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show fire'") do + its('exit_status') { should eq(0) } + its('stdout') { should match('Version: 0.1.2') } + end + + desc 'Pip should uninstall package requests inside virtualenv' + describe bash("sudo -H -u #{user} bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show requests'") do + its('exit_status') { should eq(1) } + end +end + control 'virtualenv should be created' do title "virtualenv should be created in #{venv_root}" @@ -92,3 +94,5 @@ its('owner') { should eq(user) } end end + +include_controls 'common' diff --git a/cookbooks/third-party/pyenv-3.5.1/test/integration/user_install/inspec.yml b/cookbooks/third-party/pyenv-4.2.3/test/integration/user_install/inspec.yml similarity index 61% rename from cookbooks/third-party/pyenv-3.5.1/test/integration/user_install/inspec.yml rename to cookbooks/third-party/pyenv-4.2.3/test/integration/user_install/inspec.yml index e06cabb18..0bfbeb898 100644 --- a/cookbooks/third-party/pyenv-3.5.1/test/integration/user_install/inspec.yml +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/user_install/inspec.yml @@ -1,10 +1,11 @@ --- name: pyenv title: pyenv profile -maintainer: Darwin D. Wu -copyright: Darwin D. Wu -license: Apache-2.0 +maintainer: Sous-Chefs summary: Verifies pyenv is installed correctly version: 1.0.0 supports: - os-family: linux +depends: + - name: common + path: test/integration/common diff --git a/cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/controls/virtualenv.rb b/cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/controls/virtualenv.rb new file mode 100644 index 000000000..b5d72517f --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/controls/virtualenv.rb @@ -0,0 +1,45 @@ + +venv_root = "/home/#{user}/venv_test" + +control 'VirtualEnv' do + impact 0.7 + title 'A human-readable title' + desc 'An optional description ...' + + desc 'Pip should install package virtualenv' + describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && pip show virtualenv'") do + its('exit_status') { should eq(0) } + its('stdout') { should match('Version: 16.2.0') } + end + + desc 'Pip should upgrade package urllib3 inside virtualenv' + describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show urllib3'") do + its('exit_status') { should eq(0) } + its('stdout') { should match('Version: 1.25.11') } + end + + desc 'Pip should install package fire inside virtualenv according to requirements.txt' + describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show fire'") do + its('exit_status') { should eq(0) } + its('stdout') { should match('Version: 0.1.2') } + end + + desc 'Pip should uninstall package requests inside virtualenv' + describe bash("sudo -H bash -c 'source /etc/profile.d/pyenv.sh && #{venv_root}/bin/pip show requests'") do + its('exit_status') { should eq(1) } + end +end + +control 'virtualenv should be created' do + title "virtualenv should be created in #{venv_root}" + + describe directory(venv_root) do + it { should exist } + its('owner') { should eq('root') } + end + + describe file("#{venv_root}/bin/activate") do + it { should be_file } + its('owner') { should eq('root') } + end +end diff --git a/cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/inspec.yml b/cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/inspec.yml new file mode 100644 index 000000000..e6c919021 --- /dev/null +++ b/cookbooks/third-party/pyenv-4.2.3/test/integration/virtualenv/inspec.yml @@ -0,0 +1,8 @@ +--- +name: virtualenv +title: virtualenv +maintainer: Sous-Chefs +summary: Verifies pyenv configures virtualenv properly +version: 1.0.0 +supports: + - os-family: linux diff --git a/metadata.rb b/metadata.rb index 34e15f875..7d0c9f1d7 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,7 +18,7 @@ depends 'line', '~> 4.5.13' depends 'nfs', '~> 5.0.0' depends 'openssh', '~> 2.11.3' -depends 'pyenv', '~> 3.5.1' +depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.0.5' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' From fbb8e706345d089367ff006863646f4581fb07bd Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 14:38:45 +0200 Subject: [PATCH 6/9] Upgrade selinux cookbook to version 6.1.12 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 2 + .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- .../aws-parallelcluster-platform/Berksfile | 2 +- .../aws-parallelcluster-platform/metadata.rb | 2 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../selinux-6.0.5/.circleci/config.yml | 10 -- .../third-party/selinux-6.0.5/.editorconfig | 19 --- cookbooks/third-party/selinux-6.0.5/.envrc | 1 - .../third-party/selinux-6.0.5/.gitattributes | 1 - .../selinux-6.0.5/.github/CODEOWNERS | 1 - .../selinux-6.0.5/.github/workflows/ci.yml | 51 -------- .../.github/workflows/md-links.yml | 19 --- .../selinux-6.0.5/.github/workflows/stale.yml | 25 ---- .../third-party/selinux-6.0.5/.gitignore | 49 ------- cookbooks/third-party/selinux-6.0.5/.mdlrc | 1 - .../third-party/selinux-6.0.5/.overcommit.yml | 16 --- .../third-party/selinux-6.0.5/.rubocop.yml | 6 - cookbooks/third-party/selinux-6.0.5/.yamllint | 13 -- .../selinux-6.0.5/libraries/install.rb | 22 ---- .../common/controls/install_control.rb | 17 --- .../Berksfile | 0 .../CHANGELOG.md | 66 +++++++++- .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../Dangerfile | 0 .../{selinux-6.0.5 => selinux-6.1.12}/LICENSE | 0 .../README.md | 2 + .../TESTING.md | 0 .../chefignore | 0 .../documentation/.gitkeep | 0 .../documentation/selinux_boolean.md | 0 .../documentation/selinux_fcontext.md | 0 .../documentation/selinux_install.md | 0 .../documentation/selinux_login.md | 37 ++++++ .../documentation/selinux_module.md | 0 .../documentation/selinux_permissive.md | 0 .../documentation/selinux_port.md | 4 +- .../documentation/selinux_state.md | 0 .../documentation/selinux_user.md | 39 ++++++ .../selinux-6.1.12/kitchen.dokken.yml | 113 ++++++++++++++++ .../selinux-6.1.12/kitchen.exec.yml | 7 + .../selinux-6.1.12/kitchen.global.yml | 38 ++++++ .../kitchen.yml | 16 ++- .../libraries/boolean.rb | 0 .../selinux-6.1.12/libraries/install.rb | 33 +++++ .../libraries/state.rb | 21 ++- .../metadata.rb | 2 +- .../recipes/disabled.rb | 0 .../recipes/enforcing.rb | 0 .../recipes/permissive.rb | 0 .../third-party/selinux-6.1.12/renovate.json | 17 +++ .../resources/boolean.rb | 4 +- .../resources/fcontext.rb | 2 +- .../resources/install.rb | 6 +- .../selinux-6.1.12/resources/login.rb | 88 +++++++++++++ .../resources/module.rb | 2 +- .../resources/permissive.rb | 0 .../resources/port.rb | 2 +- .../resources/state.rb | 10 +- .../selinux-6.1.12/resources/user.rb | 95 ++++++++++++++ .../spec/spec_helper.rb | 0 .../spec/unit/resources/boolean_spec.rb | 0 .../spec/unit/resources/fcontext_spec.rb | 0 .../spec/unit/resources/install_spec.rb | 4 +- .../spec/unit/resources/login_spec.rb | 107 +++++++++++++++ .../spec/unit/resources/module_spec.rb | 0 .../spec/unit/resources/permissive_spec.rb | 0 .../spec/unit/resources/port_spec.rb | 0 .../spec/unit/resources/state_spec.rb | 0 .../spec/unit/resources/user_spec.rb | 123 ++++++++++++++++++ .../templates/debian/selinux.erb | 0 .../templates/default/selinux.erb | 0 .../test/cookbooks/selinux_test/README.md | 0 .../files/default/dirtest_module/dirtest.fc | 0 .../files/default/dirtest_module/dirtest.if | 0 .../files/default/dirtest_module/dirtest.te | 0 .../files/default/kitchenConverge.te | 0 .../files/default/kitchenVerify.te | 0 .../selinux_test/files/default/moduleLoad.te | 0 .../selinux_test/files/default/test.te | 0 .../files/ubuntu-18.04/kitchenConverge.te | 43 ++++++ .../test/cookbooks/selinux_test/metadata.rb | 0 .../cookbooks/selinux_test/recipes/boolean.rb | 0 .../recipes/debian_enforcing_prepare.rb | 0 .../selinux_test/recipes/enforcing.rb | 2 +- .../selinux_test/recipes/fcontext.rb | 0 .../cookbooks/selinux_test/recipes/install.rb | 0 .../cookbooks/selinux_test/recipes/login.rb | 11 ++ .../selinux_test/recipes/module_create.rb | 0 .../selinux_test/recipes/module_remove.rb | 0 .../recipes/permissive_resource.rb | 0 .../cookbooks/selinux_test/recipes/port.rb | 0 .../cookbooks/selinux_test/recipes/user.rb | 9 ++ .../common/controls/install_control.rb | 26 ++++ .../test/integration/common/inspec.yml | 0 .../disabled/controls/disabled_control.rb | 0 .../test/integration/disabled/inspec.yml | 0 .../enforcing/controls/boolean_control.rb | 0 .../enforcing/controls/enforcing_control.rb | 0 .../enforcing/controls/module_control.rb | 0 .../test/integration/enforcing/inspec.yml | 0 .../fcontext/controls/fcontext_control.rb | 0 .../test/integration/fcontext/inspec.yml | 0 .../permissive/controls/boolean_control.rb | 0 .../permissive/controls/module_control.rb | 0 .../permissive/controls/permissive_control.rb | 0 .../test/integration/permissive/inspec.yml | 0 .../controls/permissive_control.rb | 0 .../permissive_resource/inspec.yml | 0 .../integration/port/controls/port_control.rb | 0 .../test/integration/port/inspec.yml | 0 .../controls/user_login_mapping_control.rb | 19 +++ .../integration/user_login_mapping/inspec.yml | 7 + metadata.rb | 2 +- 118 files changed, 938 insertions(+), 288 deletions(-) delete mode 100644 cookbooks/third-party/selinux-6.0.5/.circleci/config.yml delete mode 100755 cookbooks/third-party/selinux-6.0.5/.editorconfig delete mode 100644 cookbooks/third-party/selinux-6.0.5/.envrc delete mode 100644 cookbooks/third-party/selinux-6.0.5/.gitattributes delete mode 100644 cookbooks/third-party/selinux-6.0.5/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/selinux-6.0.5/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/selinux-6.0.5/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/selinux-6.0.5/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/selinux-6.0.5/.gitignore delete mode 100644 cookbooks/third-party/selinux-6.0.5/.mdlrc delete mode 100644 cookbooks/third-party/selinux-6.0.5/.overcommit.yml delete mode 100644 cookbooks/third-party/selinux-6.0.5/.rubocop.yml delete mode 100644 cookbooks/third-party/selinux-6.0.5/.yamllint delete mode 100644 cookbooks/third-party/selinux-6.0.5/libraries/install.rb delete mode 100644 cookbooks/third-party/selinux-6.0.5/test/integration/common/controls/install_control.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/Berksfile (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/CHANGELOG.md (78%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/Dangerfile (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/LICENSE (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/README.md (97%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/TESTING.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/chefignore (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/.gitkeep (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_boolean.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_fcontext.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_install.md (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/documentation/selinux_login.md rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_module.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_permissive.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_port.md (96%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/documentation/selinux_state.md (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/documentation/selinux_user.md create mode 100644 cookbooks/third-party/selinux-6.1.12/kitchen.dokken.yml create mode 100644 cookbooks/third-party/selinux-6.1.12/kitchen.exec.yml create mode 100644 cookbooks/third-party/selinux-6.1.12/kitchen.global.yml rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/kitchen.yml (88%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/libraries/boolean.rb (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/libraries/install.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/libraries/state.rb (54%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/metadata.rb (94%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/recipes/disabled.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/recipes/enforcing.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/recipes/permissive.rb (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/renovate.json rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/boolean.rb (92%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/fcontext.rb (98%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/install.rb (91%) create mode 100644 cookbooks/third-party/selinux-6.1.12/resources/login.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/module.rb (98%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/permissive.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/port.rb (98%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/resources/state.rb (94%) create mode 100644 cookbooks/third-party/selinux-6.1.12/resources/user.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/spec_helper.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/boolean_spec.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/fcontext_spec.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/install_spec.rb (78%) create mode 100644 cookbooks/third-party/selinux-6.1.12/spec/unit/resources/login_spec.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/module_spec.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/permissive_spec.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/port_spec.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/spec/unit/resources/state_spec.rb (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/spec/unit/resources/user_spec.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/templates/debian/selinux.erb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/templates/default/selinux.erb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/README.md (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.fc (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.if (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.te (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/kitchenConverge.te (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/kitchenVerify.te (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/moduleLoad.te (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/files/default/test.te (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/ubuntu-18.04/kitchenConverge.te rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/metadata.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/boolean.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/debian_enforcing_prepare.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/enforcing.rb (85%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/fcontext.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/install.rb (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/login.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/module_create.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/module_remove.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/permissive_resource.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/cookbooks/selinux_test/recipes/port.rb (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/user.rb create mode 100644 cookbooks/third-party/selinux-6.1.12/test/integration/common/controls/install_control.rb rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/common/inspec.yml (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/disabled/controls/disabled_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/disabled/inspec.yml (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/enforcing/controls/boolean_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/enforcing/controls/enforcing_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/enforcing/controls/module_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/enforcing/inspec.yml (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/fcontext/controls/fcontext_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/fcontext/inspec.yml (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/permissive/controls/boolean_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/permissive/controls/module_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/permissive/controls/permissive_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/permissive/inspec.yml (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/permissive_resource/controls/permissive_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/permissive_resource/inspec.yml (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/port/controls/port_control.rb (100%) rename cookbooks/third-party/{selinux-6.0.5 => selinux-6.1.12}/test/integration/port/inspec.yml (100%) create mode 100644 cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/controls/user_login_mapping_control.rb create mode 100644 cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/inspec.yml diff --git a/Berksfile b/Berksfile index 05e2b5b0f..6523254c7 100644 --- a/Berksfile +++ b/Berksfile @@ -13,7 +13,7 @@ cookbook "line", path: "./cookbooks/third-party/line-4.5.13" cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0" cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3" cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3" -cookbook "selinux", path: "./cookbooks/third-party/selinux-6.0.5" +cookbook "selinux", path: "./cookbooks/third-party/selinux-6.1.12" cookbook "yum", path: "./cookbooks/third-party/yum-7.4.0" cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-4.5.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index 80cfadbde..68fa3a810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - apt-7.5.14 (from apt-7.4.0) - line-4.5.13 (from line-4.5.2) - openssh-2.11.3 (from openssh-2.10.3) + - pyenv-4.2.3 (from pyenv-3.5.1) **BUG FIXES** @@ -48,6 +49,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - line-4.5.13 (from line-4.5.2) - openssh-2.11.3 (from openssh-2.10.3) - pyenv-4.2.3 (from pyenv-3.5.1) + - selinux-6.1.12 (from selinux-6.0.5) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index 13c46270b..feada45d6 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -18,6 +18,6 @@ cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "selinux", path: "../third-party/selinux-6.0.5" +cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index 423aa925b..ddce6920d 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -19,7 +19,7 @@ depends 'line', '~> 4.5.13' depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 4.2.3' -depends 'selinux', '~> 6.0.5' +depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index 2e69808bd..4d8da4038 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -15,7 +15,7 @@ cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "selinux", path: "../third-party/selinux-6.0.5" +cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile index 92434df16..7ed3e3069 100644 --- a/cookbooks/aws-parallelcluster-platform/Berksfile +++ b/cookbooks/aws-parallelcluster-platform/Berksfile @@ -5,7 +5,7 @@ metadata cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" cookbook "line", path: "../third-party/line-4.5.13" -cookbook "selinux", path: "../third-party/selinux-6.0.5" +cookbook "selinux", path: "../third-party/selinux-6.1.12" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" diff --git a/cookbooks/aws-parallelcluster-platform/metadata.rb b/cookbooks/aws-parallelcluster-platform/metadata.rb index a82c4c8c8..1cc71a310 100644 --- a/cookbooks/aws-parallelcluster-platform/metadata.rb +++ b/cookbooks/aws-parallelcluster-platform/metadata.rb @@ -15,6 +15,6 @@ supports 'redhat', '= 8.7' depends 'line', '~> 4.5.13' -depends 'selinux', '~> 6.0.5' +depends 'selinux', '~> 6.1.12' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index 52ba12dac..8a343b5ca 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -12,6 +12,6 @@ cookbook "line", path: "../third-party/line-4.5.13" cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "selinux", path: "../third-party/selinux-6.0.5" +cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.0" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index a67ce4a68..3780c9aa1 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -19,7 +19,7 @@ depends 'nfs', '~> 5.0.0' depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 4.2.3' -depends 'selinux', '~> 6.0.5' +depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' depends 'aws-parallelcluster-computefleet', '~> 3.7.0' diff --git a/cookbooks/third-party/selinux-6.0.5/.circleci/config.yml b/cookbooks/third-party/selinux-6.0.5/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/selinux-6.0.5/.editorconfig b/cookbooks/third-party/selinux-6.0.5/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/selinux-6.0.5/.envrc b/cookbooks/third-party/selinux-6.0.5/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/selinux-6.0.5/.gitattributes b/cookbooks/third-party/selinux-6.0.5/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/selinux-6.0.5/.github/CODEOWNERS b/cookbooks/third-party/selinux-6.0.5/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/selinux-6.0.5/.github/workflows/ci.yml b/cookbooks/third-party/selinux-6.0.5/.github/workflows/ci.yml deleted file mode 100644 index cad212361..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.github/workflows/ci.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 - - integration: - needs: lint-unit - runs-on: macos-10.15 - strategy: - matrix: - os: - - almalinux-8 - - centos-7 - - centos-stream-8 - # - fedora-latest # TODO: reenable once https://github.com/chef/bento/issues/1333 is fixed - - debian-10 - - debian-11 - - ubuntu-1804 - - ubuntu-2004 - - oracle-7 - - oracle-8 - - rockylinux-8 - suite: - - enforcing - - permissive - - disabled - exclude: - - os: ubuntu-1804 - suite: enforcing - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: test-kitchen - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/selinux-6.0.5/.github/workflows/md-links.yml b/cookbooks/third-party/selinux-6.0.5/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/selinux-6.0.5/.github/workflows/stale.yml b/cookbooks/third-party/selinux-6.0.5/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/selinux-6.0.5/.gitignore b/cookbooks/third-party/selinux-6.0.5/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/selinux-6.0.5/.mdlrc b/cookbooks/third-party/selinux-6.0.5/.mdlrc deleted file mode 100644 index 4e491d968..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013", "~MD024", "~MD026", "~MD029", "~MD033" diff --git a/cookbooks/third-party/selinux-6.0.5/.overcommit.yml b/cookbooks/third-party/selinux-6.0.5/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/selinux-6.0.5/.rubocop.yml b/cookbooks/third-party/selinux-6.0.5/.rubocop.yml deleted file mode 100644 index 65165307e..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.rubocop.yml +++ /dev/null @@ -1,6 +0,0 @@ -AllCops: - TargetChefVersion: 17.latest -Chef/Modernize/FoodcriticComments: - Enabled: true -Chef/Style/CopyrightCommentFormat: - Enabled: true diff --git a/cookbooks/third-party/selinux-6.0.5/.yamllint b/cookbooks/third-party/selinux-6.0.5/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/selinux-6.0.5/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/selinux-6.0.5/libraries/install.rb b/cookbooks/third-party/selinux-6.0.5/libraries/install.rb deleted file mode 100644 index b99c64f43..000000000 --- a/cookbooks/third-party/selinux-6.0.5/libraries/install.rb +++ /dev/null @@ -1,22 +0,0 @@ -module SELinux - module Cookbook - module InstallHelpers - def default_install_packages - case node['platform_family'] - when 'rhel', 'fedora', 'amazon' - %w(make policycoreutils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) - when 'debian' - if node['platform'] == 'ubuntu' - if node['platform_version'].to_f == 18.04 - %w(make policycoreutils selinux selinux-basics selinux-policy-default selinux-policy-dev auditd setools) - else - %w(make policycoreutils selinux-basics selinux-policy-default selinux-policy-dev auditd setools) - end - else - %w(make policycoreutils selinux-basics selinux-policy-default selinux-policy-dev auditd setools) - end - end - end - end - end -end diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/common/controls/install_control.rb b/cookbooks/third-party/selinux-6.0.5/test/integration/common/controls/install_control.rb deleted file mode 100644 index 588107674..000000000 --- a/cookbooks/third-party/selinux-6.0.5/test/integration/common/controls/install_control.rb +++ /dev/null @@ -1,17 +0,0 @@ -control 'install' do - title 'Verify SELinux packages are installed' - - pkgs = if os.debian? - %w(make policycoreutils selinux-basics selinux-policy-default selinux-policy-dev auditd setools) - elsif os.redhat? && os.release.to_i == 6 - %w(make policycoreutils selinux-policy selinux-policy-targeted libselinux-utils setools-console) - else - %w(make policycoreutils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) - end - - pkgs.each do |pkg| - describe package(pkg) do - it { should be_installed } - end - end -end diff --git a/cookbooks/third-party/selinux-6.0.5/Berksfile b/cookbooks/third-party/selinux-6.1.12/Berksfile similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/Berksfile rename to cookbooks/third-party/selinux-6.1.12/Berksfile diff --git a/cookbooks/third-party/selinux-6.0.5/CHANGELOG.md b/cookbooks/third-party/selinux-6.1.12/CHANGELOG.md similarity index 78% rename from cookbooks/third-party/selinux-6.0.5/CHANGELOG.md rename to cookbooks/third-party/selinux-6.1.12/CHANGELOG.md index 46c91ff34..26ae15e16 100644 --- a/cookbooks/third-party/selinux-6.0.5/CHANGELOG.md +++ b/cookbooks/third-party/selinux-6.1.12/CHANGELOG.md @@ -2,6 +2,65 @@ This file is used to list changes made in each version of the selinux cookbook. +## 6.1.12 - *2023-05-17* + +## 6.1.11 - *2023-04-17* + +## 6.1.10 - *2023-04-07* + +Standardise files with files in sous-chefs/repo-management + +## 6.1.9 - *2023-04-01* + +## 6.1.8 - *2023-04-01* + +## 6.1.7 - *2023-04-01* + +Standardise files with files in sous-chefs/repo-management + +## 6.1.6 - *2023-03-20* + +Standardise files with files in sous-chefs/repo-management + +## 6.1.5 - *2023-03-15* + +Standardise files with files in sous-chefs/repo-management + +## 6.1.4 - *2023-02-23* + +Standardise files with files in sous-chefs/repo-management + +## 6.1.3 - *2023-02-15* + +## 6.1.2 - *2023-02-14* + +Standardise files with files in sous-chefs/repo-management + +## 6.1.1 - *2023-02-03* + +- Updated selinux_port documentation + +## 6.1.0 - *2023-01-18* + +- resolved cookstyle error: resources/install.rb:5:1 refactor: `Chef/Style/CopyrightCommentFormat` +- resolved cookstyle error: resources/module.rb:5:1 refactor: `Chef/Style/CopyrightCommentFormat` +- resolved cookstyle error: resources/state.rb:5:1 refactor: `Chef/Style/CopyrightCommentFormat` +- Standardise files with files in sous-chefs/repo-management +- Add `selinux_login` resource +- Add `selinux_user` resource + +## 6.0.7 - *2022-11-01* + +- Fix CentOS 6 package requirements +- Fix Chef 18 compatibility + +## 6.0.6 - *2022-09-28* + +- Add missing `policycoreutils-python` package +- Include additional platforms and suites for testing +- Run `apt_update` in `selinux_install` on Debian-based systems +- Fix SELinux enablement on Ubuntu 18.04 + ## 6.0.5 - *2022-09-18* - Standardise files with files in sous-chefs/repo-management @@ -30,7 +89,7 @@ This file is used to list changes made in each version of the selinux cookbook. ## 6.0.0 - *2021-09-02* - Import `selinux_policy` resources into this cookbook (`_fcontext`, `_permissive`, and `_port`) - - `selinux_policy_module` not imported since it is a duplicate of `selinux_module` +- `selinux_policy_module` not imported since it is a duplicate of `selinux_module` ### Deprecations @@ -54,7 +113,7 @@ This file is used to list changes made in each version of the selinux cookbook. - All resources now use unified_mode - Added selinux_boolean resource - Remove attributes and default recipe - - Replaced with a set of bare recipes for the three selinux states +- Replaced with a set of bare recipes for the three selinux states - Add automatic restart function to `selinux_state` resource ## 4.0.0 - *2021-07-21* @@ -152,8 +211,7 @@ This file is used to list changes made in each version of the selinux cookbook. - Rewrite LWRP to 12.5 resources - Resolved cookstyle errors - Update package information for debian based on - - - selinux-activate looks like it's required to ACTUALLY activate selinux on non-RHEL systems. This seems like it could be destructive if unexpected. +- selinux-activate looks like it's required to ACTUALLY activate selinux on non-RHEL systems. This seems like it could be destructive if unexpected. - Add property temporary to allow for switching between permissive and enabled diff --git a/cookbooks/third-party/selinux-6.0.5/CODE_OF_CONDUCT.md b/cookbooks/third-party/selinux-6.1.12/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/CODE_OF_CONDUCT.md rename to cookbooks/third-party/selinux-6.1.12/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/selinux-6.0.5/CONTRIBUTING.md b/cookbooks/third-party/selinux-6.1.12/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/CONTRIBUTING.md rename to cookbooks/third-party/selinux-6.1.12/CONTRIBUTING.md diff --git a/cookbooks/third-party/selinux-6.0.5/Dangerfile b/cookbooks/third-party/selinux-6.1.12/Dangerfile similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/Dangerfile rename to cookbooks/third-party/selinux-6.1.12/Dangerfile diff --git a/cookbooks/third-party/selinux-6.0.5/LICENSE b/cookbooks/third-party/selinux-6.1.12/LICENSE similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/LICENSE rename to cookbooks/third-party/selinux-6.1.12/LICENSE diff --git a/cookbooks/third-party/selinux-6.0.5/README.md b/cookbooks/third-party/selinux-6.1.12/README.md similarity index 97% rename from cookbooks/third-party/selinux-6.0.5/README.md rename to cookbooks/third-party/selinux-6.1.12/README.md index 9a452bf02..e4d6b635c 100644 --- a/cookbooks/third-party/selinux-6.0.5/README.md +++ b/cookbooks/third-party/selinux-6.1.12/README.md @@ -46,10 +46,12 @@ The following resources are provided: - [selinux_boolean](documentation/selinux_boolean.md) - [selinux_fcontext](documentation/selinux_fcontext.md) - [selinux_install](documentation/selinux_install.md) +- [selinux_login](documentation/selinux_login.md) - [selinux_module](documentation/selinux_module.md) - [selinux_permissive](documentation/selinux_permissive.md) - [selinux_port](documentation/selinux_port.md) - [selinux_state](documentation/selinux_state.md) +- [selinux_user](documentation/selinux_user.md) ## Maintainers diff --git a/cookbooks/third-party/selinux-6.0.5/TESTING.md b/cookbooks/third-party/selinux-6.1.12/TESTING.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/TESTING.md rename to cookbooks/third-party/selinux-6.1.12/TESTING.md diff --git a/cookbooks/third-party/selinux-6.0.5/chefignore b/cookbooks/third-party/selinux-6.1.12/chefignore similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/chefignore rename to cookbooks/third-party/selinux-6.1.12/chefignore diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/.gitkeep b/cookbooks/third-party/selinux-6.1.12/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/.gitkeep rename to cookbooks/third-party/selinux-6.1.12/documentation/.gitkeep diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_boolean.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_boolean.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_boolean.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_boolean.md diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_fcontext.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_fcontext.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_fcontext.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_fcontext.md diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_install.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_install.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_install.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_install.md diff --git a/cookbooks/third-party/selinux-6.1.12/documentation/selinux_login.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_login.md new file mode 100644 index 000000000..a3547f488 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_login.md @@ -0,0 +1,37 @@ +[Back to resource list](../README.md#resources) + +# selinux_login + +The `selinux_login` resource is used to manage Linux user to SELinux user mappings on the system. + +## Actions + +| Action | Description | +| --------- | ------------------------------------------------------------------------------------------------ | +| `:manage` | *(Default)* Sets the SELinux login mapping to the desired settings regardless of previous state. | +| `:add` | Creates the SELinux login mapping if not created.(`-a`) | +| `:modify` | Updates the SELinux login mapping if previously created.(`-m`) | +| `:delete` | Removes the SELinux login mapping if previously created. (`-d`) | + +## Properties + +| Name | Type | Default | Description | +| ------- | ------ | ------------- | ------------------------------------ | +| `login` | String | Resource name | The OS user login. | +| `user` | String | | The SELinux user. | +| `range` | String | | MLS/MCS security range for the user. | + +## Examples + +```ruby +# Manage myuser OS user mapping with a range of s0 and associated SELinux user myuser_u +selinux_login 'myuser' do + user 'myuser_u' + range 's0' +end + +# Manage myuser OS user mapping using the default system range and associated SELinux user myuser_u +selinux_login 'myuser' do + user 'myuser_u' +end +``` diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_module.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_module.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_module.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_module.md diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_permissive.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_permissive.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_permissive.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_permissive.md diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_port.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_port.md similarity index 96% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_port.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_port.md index 0621ddba3..2e173e1a3 100644 --- a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_port.md +++ b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_port.md @@ -1,6 +1,6 @@ [Back to resource list](../README.md#resources) -# selinux_policy_port +# selinux_port Allows assigning a network port to a certain SELinux context, e.g. for running a webserver on a non-standard port. @@ -25,7 +25,7 @@ Allows assigning a network port to a certain SELinux context, e.g. for running a ```ruby # Allow nginx/apache to bind to port 5678 by giving it the http_port_t context -selinux_policy_port '5678' do +selinux_port '5678' do protocol 'tcp' secontext 'http_port_t' end diff --git a/cookbooks/third-party/selinux-6.0.5/documentation/selinux_state.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_state.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/documentation/selinux_state.md rename to cookbooks/third-party/selinux-6.1.12/documentation/selinux_state.md diff --git a/cookbooks/third-party/selinux-6.1.12/documentation/selinux_user.md b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_user.md new file mode 100644 index 000000000..0310f628e --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/documentation/selinux_user.md @@ -0,0 +1,39 @@ +[Back to resource list](../README.md#resources) + +# selinux_user + +The `selinux_user` resource is used to manage SELinux users on the system. + +## Actions + +| Action | Description | +| --------- | --------------------------------------------------------------------------------------- | +| `:manage` | *(Default)* Sets the SELinux user to the desired settings regardless of previous state. | +| `:add` | Creates the SELinux user if not created.(`-a`) | +| `:modify` | Updates the SELinux user if previously created.(`-m`) | +| `:delete` | Removes the SELinux user if previously created. (`-d`) | + +## Properties + +| Name | Type | Default | Description | +| ------- | ------ | ------------- | --------------------------------------------------- | +| `user` | String | Resource name | The SELinux user. | +| `level` | String | | MLS/MCS security level for the user. | +| `range` | String | | MLS/MCS security range for the user. | +| `roles` | Array | | SELinux roles for the user (required for creation). | + +## Examples + +```ruby +# Manage myuser_u SELinux user with a level and range of s0 and roles sysadm_r and staff_r +selinux_user 'myuser_u' do + level 's0' + range 's0' + roles %w(sysadm_r staff_r) +end + +# Manage myuser_u SELinux user using the default system level and range and roles sysadm_r and staff_r +selinux_user 'myuser_u' do + roles %w(sysadm_r staff_r) +end +``` diff --git a/cookbooks/third-party/selinux-6.1.12/kitchen.dokken.yml b/cookbooks/third-party/selinux-6.1.12/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + 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: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/selinux-6.1.12/kitchen.exec.yml b/cookbooks/third-party/selinux-6.1.12/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/selinux-6.1.12/kitchen.global.yml b/cookbooks/third-party/selinux-6.1.12/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/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/cookbooks/third-party/selinux-6.0.5/kitchen.yml b/cookbooks/third-party/selinux-6.1.12/kitchen.yml similarity index 88% rename from cookbooks/third-party/selinux-6.0.5/kitchen.yml rename to cookbooks/third-party/selinux-6.1.12/kitchen.yml index 90cfeb363..691a1b2a1 100644 --- a/cookbooks/third-party/selinux-6.0.5/kitchen.yml +++ b/cookbooks/third-party/selinux-6.1.12/kitchen.yml @@ -13,7 +13,7 @@ provisioner: log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %> # Allow reboots max_retries: 60 - wait_for_retry: 300 + wait_for_retry: 180 root_path: /var/tmp/kitchen verifier: @@ -21,16 +21,18 @@ verifier: platforms: - name: almalinux-8 + - name: amazonlinux-2 - name: centos-7 - name: centos-stream-8 - - name: fedora-latest - name: debian-10 - name: debian-11 - - name: ubuntu-18.04 - - name: ubuntu-20.04 + - name: fedora-latest - name: oracle-7 - name: oracle-8 - name: rockylinux-8 + - name: ubuntu-18.04 + - name: ubuntu-20.04 + - name: ubuntu-22.04 suites: - name: enforcing @@ -70,3 +72,9 @@ suites: - recipe[selinux_test::install] - recipe[selinux::permissive] - recipe[selinux_test::permissive_resource] + - name: user_login_mapping + run_list: + - recipe[selinux_test::install] + - recipe[selinux::permissive] + - recipe[selinux_test::user] + - recipe[selinux_test::login] diff --git a/cookbooks/third-party/selinux-6.0.5/libraries/boolean.rb b/cookbooks/third-party/selinux-6.1.12/libraries/boolean.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/libraries/boolean.rb rename to cookbooks/third-party/selinux-6.1.12/libraries/boolean.rb diff --git a/cookbooks/third-party/selinux-6.1.12/libraries/install.rb b/cookbooks/third-party/selinux-6.1.12/libraries/install.rb new file mode 100644 index 000000000..0de178963 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/libraries/install.rb @@ -0,0 +1,33 @@ +module SELinux + module Cookbook + module InstallHelpers + def default_install_packages + case node['platform_family'] + when 'rhel' + case node['platform_version'].to_i + when 6 + %w(make policycoreutils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + when 7 + %w(make policycoreutils policycoreutils-python selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + else + %w(make policycoreutils policycoreutils-python-utils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + end + when 'amazon' + %w(make policycoreutils policycoreutils-python selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + when 'fedora' + %w(make policycoreutils policycoreutils-python-utils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + when 'debian' + if node['platform'] == 'ubuntu' + if node['platform_version'].to_f == 18.04 + %w(make policycoreutils selinux selinux-basics selinux-policy-default selinux-policy-dev auditd setools) + else + %w(make policycoreutils selinux-basics selinux-policy-default selinux-policy-dev auditd setools) + end + else + %w(make policycoreutils selinux-basics selinux-policy-default selinux-policy-dev auditd setools) + end + end + end + end + end +end diff --git a/cookbooks/third-party/selinux-6.0.5/libraries/state.rb b/cookbooks/third-party/selinux-6.1.12/libraries/state.rb similarity index 54% rename from cookbooks/third-party/selinux-6.0.5/libraries/state.rb rename to cookbooks/third-party/selinux-6.1.12/libraries/state.rb index 56ce2fbea..81421df72 100644 --- a/cookbooks/third-party/selinux-6.0.5/libraries/state.rb +++ b/cookbooks/third-party/selinux-6.1.12/libraries/state.rb @@ -14,7 +14,9 @@ def selinux_permissive? end def state_change_reboot_required? - (selinux_disabled? && %i(enforcing permissive).include?(action)) || ((selinux_enforcing? || selinux_permissive?) && action == :disabled) + (selinux_disabled? && %i(enforcing permissive).include?(action)) || + ((selinux_enforcing? || selinux_permissive?) && action == :disabled) || + (selinux_activate_required? && %i(enforcing permissive).include?(action)) end def selinux_state @@ -26,8 +28,23 @@ def selinux_state def selinux_activate_required? return false unless platform_family?('debian') + sestatus = shell_out!('sestatus -v').stdout.strip - !File.read('/etc/default/grub').match?('security=selinux') + # Ensure we're booted up to a system which has selinux activated and filesystem is properly labeled + if File.read('/proc/cmdline').match?('security=selinux') && sestatus.match?(%r{/usr/sbin/sshd.*sshd_exec_t}) + false + else + true + end + end + + def selinux_activate_cmd + # selinux-activate is semi-broken on Ubuntu 18.04 however this method does work + if platform?('ubuntu') && node['platform_version'] == '18.04' + 'touch /.autorelabel' + else + '/usr/sbin/selinux-activate' + end end def default_policy_platform diff --git a/cookbooks/third-party/selinux-6.0.5/metadata.rb b/cookbooks/third-party/selinux-6.1.12/metadata.rb similarity index 94% rename from cookbooks/third-party/selinux-6.0.5/metadata.rb rename to cookbooks/third-party/selinux-6.1.12/metadata.rb index 3c685e795..85c8109c4 100644 --- a/cookbooks/third-party/selinux-6.0.5/metadata.rb +++ b/cookbooks/third-party/selinux-6.1.12/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Manages SELinux policy state and rules.' -version '6.0.5' +version '6.1.12' source_url 'https://github.com/sous-chefs/selinux' issues_url 'https://github.com/sous-chefs/selinux/issues' chef_version '>= 15.3' diff --git a/cookbooks/third-party/selinux-6.0.5/recipes/disabled.rb b/cookbooks/third-party/selinux-6.1.12/recipes/disabled.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/recipes/disabled.rb rename to cookbooks/third-party/selinux-6.1.12/recipes/disabled.rb diff --git a/cookbooks/third-party/selinux-6.0.5/recipes/enforcing.rb b/cookbooks/third-party/selinux-6.1.12/recipes/enforcing.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/recipes/enforcing.rb rename to cookbooks/third-party/selinux-6.1.12/recipes/enforcing.rb diff --git a/cookbooks/third-party/selinux-6.0.5/recipes/permissive.rb b/cookbooks/third-party/selinux-6.1.12/recipes/permissive.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/recipes/permissive.rb rename to cookbooks/third-party/selinux-6.1.12/recipes/permissive.rb diff --git a/cookbooks/third-party/selinux-6.1.12/renovate.json b/cookbooks/third-party/selinux-6.1.12/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/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"] + } + ] +} diff --git a/cookbooks/third-party/selinux-6.0.5/resources/boolean.rb b/cookbooks/third-party/selinux-6.1.12/resources/boolean.rb similarity index 92% rename from cookbooks/third-party/selinux-6.0.5/resources/boolean.rb rename to cookbooks/third-party/selinux-6.1.12/resources/boolean.rb index 0ed7444ae..b55cff146 100644 --- a/cookbooks/third-party/selinux-6.0.5/resources/boolean.rb +++ b/cookbooks/third-party/selinux-6.1.12/resources/boolean.rb @@ -24,7 +24,7 @@ property :value, [Integer, String, true, false], required: true, equal_to: %w(on off), - coerce: proc { |p| SELinux::Cookbook::BooleanHelpers.selinux_bool(p) }, + coerce: proc { |p| ::SELinux::Cookbook::BooleanHelpers.selinux_bool(p) }, description: 'SELinux boolean value' property :persistent, [true, false], @@ -37,7 +37,7 @@ end action_class do - include SELinux::Cookbook::StateHelpers + include ::SELinux::Cookbook::StateHelpers end action :set do diff --git a/cookbooks/third-party/selinux-6.0.5/resources/fcontext.rb b/cookbooks/third-party/selinux-6.1.12/resources/fcontext.rb similarity index 98% rename from cookbooks/third-party/selinux-6.0.5/resources/fcontext.rb rename to cookbooks/third-party/selinux-6.1.12/resources/fcontext.rb index ac2b4d60b..9efbbbb87 100644 --- a/cookbooks/third-party/selinux-6.0.5/resources/fcontext.rb +++ b/cookbooks/third-party/selinux-6.1.12/resources/fcontext.rb @@ -31,7 +31,7 @@ description: 'The type of the file being labeled' action_class do - include SELinux::Cookbook::StateHelpers + include ::SELinux::Cookbook::StateHelpers def current_file_context file_hash = { diff --git a/cookbooks/third-party/selinux-6.0.5/resources/install.rb b/cookbooks/third-party/selinux-6.1.12/resources/install.rb similarity index 91% rename from cookbooks/third-party/selinux-6.0.5/resources/install.rb rename to cookbooks/third-party/selinux-6.1.12/resources/install.rb index 9948b5cdb..9bb195ce8 100644 --- a/cookbooks/third-party/selinux-6.0.5/resources/install.rb +++ b/cookbooks/third-party/selinux-6.1.12/resources/install.rb @@ -2,7 +2,7 @@ # Cookbook:: selinux # Resource:: install # -# Copyright:: 2016-2022, Chef Software, Inc. +# Copyright:: 2016-2023, Chef Software, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ unified_mode true -include SELinux::Cookbook::InstallHelpers +include ::SELinux::Cookbook::InstallHelpers property :packages, [String, Array], default: lazy { default_install_packages }, @@ -29,6 +29,8 @@ def do_package_action(action) # friendly message for unsupported platforms raise "The platform #{node['platform']} is not currently supported by the `selinux_install` resource. Please file an issue at https://github.com/sous-chefs/selinux/issues/new with details on the platform this cookbook is running on." if new_resource.packages.nil? + apt_update 'selinux' if platform_family?('debian') + package 'selinux' do package_name new_resource.packages action action diff --git a/cookbooks/third-party/selinux-6.1.12/resources/login.rb b/cookbooks/third-party/selinux-6.1.12/resources/login.rb new file mode 100644 index 000000000..52b160be3 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/resources/login.rb @@ -0,0 +1,88 @@ +# +# Cookbook:: selinux +# Resource:: login +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +unified_mode true + +property :login, String, + name_property: true, + description: 'OS user login' + +property :user, String, + description: 'SELinux user' + +property :range, String, + description: 'MLS/MCS security range for the login' + +load_current_value do |new_resource| + logins = shell_out!('semanage login -l').stdout.split("\n") + + current_login = logins.grep(/^#{Regexp.escape(new_resource.login)}\s+/) do |l| + l.match(/^(?[^\s]+)\s+(?[^\s]+)\s+(?[^\s]+)/) + # match returns [] or [], shift converts that to or nil + end.shift + + current_value_does_not_exist! unless current_login + + # Existing resources should maintain their current configuration unless otherwise specified + new_resource.user ||= current_login[:user] + new_resource.range ||= current_login[:range] + + user current_login[:user] + range current_login[:range] +end + +action_class do + def semanage_login_args + args = '' + + args += " -s #{new_resource.user}" if new_resource.user + args += " -r #{new_resource.range}" if new_resource.range + + args + end +end + +action :manage do + run_action(:add) + run_action(:modify) +end + +action :add do + raise 'The user property must be populated to create a new SELinux login' unless new_resource.user + + unless current_resource + converge_if_changed do + shell_out!("semanage login -a#{semanage_login_args} #{new_resource.login}") + end + end +end + +action :modify do + if current_resource + converge_if_changed do + shell_out!("semanage login -m#{semanage_login_args} #{new_resource.login}") + end + end +end + +action :delete do + if current_resource + converge_by "deleting SELinux login #{new_resource.login}" do + shell_out!("semanage login -d #{new_resource.login}") + end + end +end diff --git a/cookbooks/third-party/selinux-6.0.5/resources/module.rb b/cookbooks/third-party/selinux-6.1.12/resources/module.rb similarity index 98% rename from cookbooks/third-party/selinux-6.0.5/resources/module.rb rename to cookbooks/third-party/selinux-6.1.12/resources/module.rb index e9b78266d..3ac55ef43 100644 --- a/cookbooks/third-party/selinux-6.0.5/resources/module.rb +++ b/cookbooks/third-party/selinux-6.1.12/resources/module.rb @@ -2,7 +2,7 @@ # Cookbook:: selinux # Resource:: module # -# Copyright:: 2016-2022, Chef Software, Inc. +# Copyright:: 2016-2023, Chef Software, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cookbooks/third-party/selinux-6.0.5/resources/permissive.rb b/cookbooks/third-party/selinux-6.1.12/resources/permissive.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/resources/permissive.rb rename to cookbooks/third-party/selinux-6.1.12/resources/permissive.rb diff --git a/cookbooks/third-party/selinux-6.0.5/resources/port.rb b/cookbooks/third-party/selinux-6.1.12/resources/port.rb similarity index 98% rename from cookbooks/third-party/selinux-6.0.5/resources/port.rb rename to cookbooks/third-party/selinux-6.1.12/resources/port.rb index b8393ca03..987c08149 100644 --- a/cookbooks/third-party/selinux-6.0.5/resources/port.rb +++ b/cookbooks/third-party/selinux-6.1.12/resources/port.rb @@ -32,7 +32,7 @@ description: 'SELinux context to assign to the port' action_class do - include SELinux::Cookbook::StateHelpers + include ::SELinux::Cookbook::StateHelpers def current_port_context # use awk to see if the given port is within a reported port range diff --git a/cookbooks/third-party/selinux-6.0.5/resources/state.rb b/cookbooks/third-party/selinux-6.1.12/resources/state.rb similarity index 94% rename from cookbooks/third-party/selinux-6.0.5/resources/state.rb rename to cookbooks/third-party/selinux-6.1.12/resources/state.rb index e3ea9fe27..36dee12d8 100644 --- a/cookbooks/third-party/selinux-6.0.5/resources/state.rb +++ b/cookbooks/third-party/selinux-6.1.12/resources/state.rb @@ -2,7 +2,7 @@ # Cookbook:: selinux # Resource:: state # -# Copyright:: 2016-2022, Chef Software, Inc. +# Copyright:: 2016-2023, Chef Software, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ unified_mode true -include SELinux::Cookbook::StateHelpers +include ::SELinux::Cookbook::StateHelpers default_action :nothing @@ -41,7 +41,7 @@ deprecated_property_alias 'temporary', 'persistent', 'The temporary property was renamed persistent in the 4.0 release of this cookbook. Please update your cookbooks to use the new property name.' action_class do - include SELinux::Cookbook::StateHelpers + include ::SELinux::Cookbook::StateHelpers def render_selinux_template(action) Chef::Log.warn( @@ -86,7 +86,7 @@ def node_selinux_restart end unless selinux_disabled? || selinux_enforcing? execute 'debian-selinux-activate' do - command '/usr/sbin/selinux-activate' + command selinux_activate_cmd end if selinux_activate_required? render_selinux_template(action) if new_resource.persistent @@ -99,7 +99,7 @@ def node_selinux_restart end unless selinux_disabled? || selinux_permissive? execute 'debian-selinux-activate' do - command '/usr/sbin/selinux-activate' + command selinux_activate_cmd end if selinux_activate_required? render_selinux_template(action) if new_resource.persistent diff --git a/cookbooks/third-party/selinux-6.1.12/resources/user.rb b/cookbooks/third-party/selinux-6.1.12/resources/user.rb new file mode 100644 index 000000000..03e5ee032 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/resources/user.rb @@ -0,0 +1,95 @@ +# +# Cookbook:: selinux +# Resource:: user +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +unified_mode true + +property :user, String, + name_property: true, + description: 'SELinux user' + +property :level, String, + description: 'MLS/MCS security level for the user' + +property :range, String, + description: 'MLS/MCS security range for the user' + +property :roles, Array, + description: 'SELinux roles for the user' + +load_current_value do |new_resource| + users = shell_out!('semanage user -l').stdout.split("\n") + + current_user = users.grep(/^#{Regexp.escape(new_resource.user)}\s+/) do |u| + u.match(/^(?[^\s]+)\s+(?[^\s]+)\s+(?[^\s]+)\s+(?[^\s]+)\s+(?.*)$/) + # match returns [] or [], shift converts that to or nil + end.shift + + current_value_does_not_exist! unless current_user + + # Existing resources should maintain their current configuration unless otherwise specified + new_resource.level ||= current_user[:level] + new_resource.range ||= current_user[:range] + new_resource.roles ||= current_user[:roles].to_s.split + new_resource.roles = new_resource.roles.sort + + level current_user[:level] + range current_user[:range] + roles current_user[:roles].to_s.split.sort +end + +action_class do + def semanage_user_args + args = '' + + args += " -L #{new_resource.level}" if new_resource.level + args += " -r #{new_resource.range}" if new_resource.range + args += " -R '#{new_resource.roles.join(' ')}'" unless new_resource.roles.to_a.empty? + + args + end +end + +action :manage do + run_action(:add) + run_action(:modify) +end + +action :add do + raise 'The roles property must be populated to create a new SELinux user' if new_resource.roles.to_a.empty? + + unless current_resource + converge_if_changed do + shell_out!("semanage user -a#{semanage_user_args} #{new_resource.user}") + end + end +end + +action :modify do + if current_resource + converge_if_changed do + shell_out!("semanage user -m#{semanage_user_args} #{new_resource.user}") + end + end +end + +action :delete do + if current_resource + converge_by "deleting SELinux user #{new_resource.user}" do + shell_out!("semanage user -d #{new_resource.user}") + end + end +end diff --git a/cookbooks/third-party/selinux-6.0.5/spec/spec_helper.rb b/cookbooks/third-party/selinux-6.1.12/spec/spec_helper.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/spec_helper.rb rename to cookbooks/third-party/selinux-6.1.12/spec/spec_helper.rb diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/boolean_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/boolean_spec.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/boolean_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/boolean_spec.rb diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/fcontext_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/fcontext_spec.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/fcontext_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/fcontext_spec.rb diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/install_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/install_spec.rb similarity index 78% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/install_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/install_spec.rb index c3bb60af5..160b042a5 100644 --- a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/install_spec.rb +++ b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/install_spec.rb @@ -13,7 +13,7 @@ it do is_expected.to install_package('selinux').with( - package_name: %w(make policycoreutils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + package_name: %w(make policycoreutils policycoreutils-python-utils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) ) end end @@ -23,7 +23,7 @@ it do is_expected.to install_package('selinux').with( - package_name: %w(make policycoreutils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + package_name: %w(make policycoreutils policycoreutils-python-utils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) ) end end diff --git a/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/login_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/login_spec.rb new file mode 100644 index 000000000..f2b017e7f --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/login_spec.rb @@ -0,0 +1,107 @@ +require 'spec_helper' + +describe 'login' do + step_into :selinux_login + platform 'centos' + + recipe do + selinux_login 'oslogin' do + user 'seuser' + range 's0' + action %i(manage add modify delete) + end + end + + context 'when not set' do + stubs_for_resource('selinux_login[oslogin]') do |resource| + allow(resource).to receive_shell_out('semanage login -l', stdout: '') + end + + # this is what actually checks that the login was set correctly + # incorrect commands would not be stubbed and would throw error + stubs_for_provider('selinux_login[oslogin]') do |provider| + # when not set, only add calls (-a) should happen + allow(provider).to receive_shell_out('semanage login -a -s seuser -r s0 oslogin') + end + + # needed to have the test run + it { is_expected.to manage_selinux_login('oslogin') } + it { is_expected.to add_selinux_login('oslogin') } + it { is_expected.to modify_selinux_login('oslogin') } + it { is_expected.to delete_selinux_login('oslogin') } + end + + context 'when set to incorrect value' do + stubs_for_resource('selinux_login[oslogin]') do |resource| + allow(resource).to receive_shell_out( + 'semanage login -l', + stdout: <<~STDOUT + Login Name SELinux User MLS/MCS Range Service + + __default__ unconfined_u s0-s0:c0.c1023 * + root unconfined_u s0-s0:c0.c1023 * + oslogin unconfined_u s0-s0:c0.c1023 * + STDOUT + ) + end + + # this is what actually checks that the login was set correctly + # incorrect commands would not be stubbed and would throw error + stubs_for_provider('selinux_login[oslogin]') do |provider| + # when set incorrectly, only modify calls (-m) and delete calls (-d) should happen + allow(provider).to receive_shell_out('semanage login -m -s seuser -r s0 oslogin') + allow(provider).to receive_shell_out('semanage login -d oslogin') + end + + # needed to have the test run + it { is_expected.to manage_selinux_login('oslogin') } + it { is_expected.to add_selinux_login('oslogin') } + it { is_expected.to modify_selinux_login('oslogin') } + it { is_expected.to delete_selinux_login('oslogin') } + end + + context 'when set to correct value' do + stubs_for_resource('selinux_login[oslogin]') do |resource| + allow(resource).to receive_shell_out( + 'semanage login -l', + stdout: <<~STDOUT + Login Name SELinux User MLS/MCS Range Service + + __default__ unconfined_u s0-s0:c0.c1023 * + root unconfined_u s0-s0:c0.c1023 * + oslogin seuser s0 * + STDOUT + ) + end + + # this is what actually checks that the login was set correctly + # incorrect commands would not be stubbed and would throw error + stubs_for_provider('selinux_login[oslogin]') do |provider| + # when set correctly, only delete calls (-d) should happen + allow(provider).to receive_shell_out('semanage login -d oslogin') + end + + # needed to have the test run + it { is_expected.to manage_selinux_login('oslogin') } + it { is_expected.to add_selinux_login('oslogin') } + it { is_expected.to modify_selinux_login('oslogin') } + it { is_expected.to delete_selinux_login('oslogin') } + end + + context 'when user property is unset' do + recipe do + selinux_login 'oslogin' do + range 's0' + action %i(manage add) + end + end + + stubs_for_resource('selinux_login[oslogin]') do |resource| + allow(resource).to receive_shell_out('semanage login -l', stdout: '') + end + + it 'raises an exception' do + expect { chef_run }.to raise_error(/user property must be populated/) + end + end +end diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/module_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/module_spec.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/module_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/module_spec.rb diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/permissive_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/permissive_spec.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/permissive_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/permissive_spec.rb diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/port_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/port_spec.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/port_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/port_spec.rb diff --git a/cookbooks/third-party/selinux-6.0.5/spec/unit/resources/state_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/state_spec.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/spec/unit/resources/state_spec.rb rename to cookbooks/third-party/selinux-6.1.12/spec/unit/resources/state_spec.rb diff --git a/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/user_spec.rb b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/user_spec.rb new file mode 100644 index 000000000..9dbca2564 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/spec/unit/resources/user_spec.rb @@ -0,0 +1,123 @@ +require 'spec_helper' + +describe 'user' do + step_into :selinux_user + platform 'centos' + + recipe do + selinux_user 'seuser' do + level 's0' + range 's0' + roles %w(staff_r sysadm_r) + action %i(manage add modify delete) + end + end + + context 'when not set' do + stubs_for_resource('selinux_user[seuser]') do |resource| + allow(resource).to receive_shell_out('semanage user -l', stdout: '') + end + + # this is what actually checks that the user was set correctly + # incorrect commands would not be stubbed and would throw error + stubs_for_provider('selinux_user[seuser]') do |provider| + # when not set, only add calls (-a) should happen + allow(provider).to receive_shell_out("semanage user -a -L s0 -r s0 -R 'staff_r sysadm_r' seuser") + end + + # needed to have the test run + it { is_expected.to manage_selinux_user('seuser') } + it { is_expected.to add_selinux_user('seuser') } + it { is_expected.to modify_selinux_user('seuser') } + it { is_expected.to delete_selinux_user('seuser') } + end + + context 'when set to incorrect value' do + stubs_for_resource('selinux_user[seuser]') do |resource| + allow(resource).to receive_shell_out( + 'semanage user -l', + stdout: <<~STDOUT + Labeling MLS/ MLS/ + SELinux User Prefix MCS Level MCS Range SELinux Roles + + guest_u user s0 s0 guest_r + root user s0 s0-s0:c0.c1023 staff_r sysadm_r system_r unconfined_r + staff_u user s0 s0-s0:c0.c1023 staff_r sysadm_r system_r unconfined_r + seuser user s0 s0-s0:c0.c1023 staff_r sysadm_r system_r unconfined_r + sysadm_u user s0 s0-s0:c0.c1023 sysadm_r + system_u user s0 s0-s0:c0.c1023 system_r unconfined_r + unconfined_u user s0 s0-s0:c0.c1023 system_r unconfined_r + user_u user s0 s0 user_r + xguest_u user s0 s0 xguest_r + STDOUT + ) + end + + # this is what actually checks that the user was set correctly + # incorrect commands would not be stubbed and would throw error + stubs_for_provider('selinux_user[seuser]') do |provider| + # when set incorrectly, only modify calls (-m) and delete calls (-d) should happen + allow(provider).to receive_shell_out("semanage user -m -L s0 -r s0 -R 'staff_r sysadm_r' seuser") + allow(provider).to receive_shell_out('semanage user -d seuser') + end + + # needed to have the test run + it { is_expected.to manage_selinux_user('seuser') } + it { is_expected.to add_selinux_user('seuser') } + it { is_expected.to modify_selinux_user('seuser') } + it { is_expected.to delete_selinux_user('seuser') } + end + + context 'when set to correct value' do + stubs_for_resource('selinux_user[seuser]') do |resource| + allow(resource).to receive_shell_out( + 'semanage user -l', + stdout: <<~STDOUT + Labeling MLS/ MLS/ + SELinux User Prefix MCS Level MCS Range SELinux Roles + + guest_u user s0 s0 guest_r + root user s0 s0-s0:c0.c1023 staff_r sysadm_r system_r unconfined_r + staff_u user s0 s0-s0:c0.c1023 staff_r sysadm_r system_r unconfined_r + seuser user s0 s0 staff_r sysadm_r + sysadm_u user s0 s0-s0:c0.c1023 sysadm_r + system_u user s0 s0-s0:c0.c1023 system_r unconfined_r + unconfined_u user s0 s0-s0:c0.c1023 system_r unconfined_r + user_u user s0 s0 user_r + xguest_u user s0 s0 xguest_r + STDOUT + ) + end + + # this is what actually checks that the user was set correctly + # incorrect commands would not be stubbed and would throw error + stubs_for_provider('selinux_user[seuser]') do |provider| + # when set correctly, only delete calls (-d) should happen + allow(provider).to receive_shell_out('semanage user -d seuser') + end + + # needed to have the test run + it { is_expected.to manage_selinux_user('seuser') } + it { is_expected.to add_selinux_user('seuser') } + it { is_expected.to modify_selinux_user('seuser') } + it { is_expected.to delete_selinux_user('seuser') } + end + + context 'when roles property is unset' do + recipe do + selinux_user 'seuser' do + level 's0' + range 's0' + action %i(manage add) + end + end + + stubs_for_resource('selinux_user[seuser]') do |resource| + allow(resource).to receive_shell_out('semanage user -l', stdout: '') + end + + it 'raises an exception' do + expect { chef_run }.to raise_error(/roles property must be populated/) + end + end +end diff --git a/cookbooks/third-party/selinux-6.0.5/templates/debian/selinux.erb b/cookbooks/third-party/selinux-6.1.12/templates/debian/selinux.erb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/templates/debian/selinux.erb rename to cookbooks/third-party/selinux-6.1.12/templates/debian/selinux.erb diff --git a/cookbooks/third-party/selinux-6.0.5/templates/default/selinux.erb b/cookbooks/third-party/selinux-6.1.12/templates/default/selinux.erb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/templates/default/selinux.erb rename to cookbooks/third-party/selinux-6.1.12/templates/default/selinux.erb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/README.md b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/README.md similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/README.md rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/README.md diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.fc b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.fc similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.fc rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.fc diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.if b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.if similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.if rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.if diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.te b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.te similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.te rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/dirtest_module/dirtest.te diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/kitchenConverge.te b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/kitchenConverge.te similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/kitchenConverge.te rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/kitchenConverge.te diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/kitchenVerify.te b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/kitchenVerify.te similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/kitchenVerify.te rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/kitchenVerify.te diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/moduleLoad.te b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/moduleLoad.te similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/moduleLoad.te rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/moduleLoad.te diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/test.te b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/test.te similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/files/default/test.te rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/default/test.te diff --git a/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/ubuntu-18.04/kitchenConverge.te b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/ubuntu-18.04/kitchenConverge.te new file mode 100644 index 000000000..e6a9ce10e --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/files/ubuntu-18.04/kitchenConverge.te @@ -0,0 +1,43 @@ + +module kitchenConverge 1.0; + +require { + type systemd_logind_t; + type init_t; + type system_dbusd_t; + type var_run_t; + type sshd_t; + type unconfined_t; + type shadow_t; + type selinux_config_t; + type load_policy_t; + type init_var_run_t; + type semanage_t; + class dir { read search }; + class unix_stream_socket connectto; + class file { getattr map open read rename unlink }; + class sock_file write; + class fifo_file write; +} + +#============= load_policy_t ============== +allow load_policy_t unconfined_t:fifo_file write; + +#============= semanage_t ============== +allow semanage_t init_t:unix_stream_socket connectto; +allow semanage_t init_var_run_t:dir read; +allow semanage_t init_var_run_t:sock_file write; +allow semanage_t selinux_config_t:file map; + +#============= sshd_t ============== +allow sshd_t init_t:unix_stream_socket connectto; +allow sshd_t init_var_run_t:dir read; +allow sshd_t var_run_t:file { getattr open read rename unlink }; + +#============= system_dbusd_t ============== +allow system_dbusd_t init_t:unix_stream_socket connectto; +allow system_dbusd_t init_var_run_t:sock_file write; + +#============= systemd_logind_t ============== +allow systemd_logind_t init_t:unix_stream_socket connectto; +allow systemd_logind_t shadow_t:file { getattr open read }; diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/metadata.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/metadata.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/metadata.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/metadata.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/boolean.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/boolean.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/boolean.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/boolean.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/debian_enforcing_prepare.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/debian_enforcing_prepare.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/debian_enforcing_prepare.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/debian_enforcing_prepare.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/enforcing.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/enforcing.rb similarity index 85% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/enforcing.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/enforcing.rb index f7902f18d..b24fd2cc8 100644 --- a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/enforcing.rb +++ b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/enforcing.rb @@ -1,4 +1,4 @@ -if platform?('ubuntu') +if platform_family?('debian') # Ubuntu breaks kitchen SSH connections by default so need to load a module or two first include_recipe 'selinux::permissive' else diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/fcontext.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/fcontext.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/fcontext.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/fcontext.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/install.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/install.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/install.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/install.rb diff --git a/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/login.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/login.rb new file mode 100644 index 000000000..d49a677ea --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/login.rb @@ -0,0 +1,11 @@ +user 'test1' +user 'test2' + +selinux_login 'test1' do + user 'test1_u' + range 's0' +end + +selinux_login 'test2' do + user 'test2_u' +end diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/module_create.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/module_create.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/module_create.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/module_create.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/module_remove.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/module_remove.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/module_remove.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/module_remove.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/permissive_resource.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/permissive_resource.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/permissive_resource.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/permissive_resource.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/port.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/port.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/cookbooks/selinux_test/recipes/port.rb rename to cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/port.rb diff --git a/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/user.rb b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/user.rb new file mode 100644 index 000000000..7be3719f3 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/test/cookbooks/selinux_test/recipes/user.rb @@ -0,0 +1,9 @@ +selinux_user 'test1_u' do + level 's0' + range 's0-s0:c0.c1023' + roles %w(unconfined_r staff_r sysadm_r) +end + +selinux_user 'test2_u' do + roles %w(staff_r) +end diff --git a/cookbooks/third-party/selinux-6.1.12/test/integration/common/controls/install_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/common/controls/install_control.rb new file mode 100644 index 000000000..e9f61b46b --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/test/integration/common/controls/install_control.rb @@ -0,0 +1,26 @@ +control 'install' do + title 'Verify SELinux packages are installed' + + pkgs = if os.debian? + %w(make policycoreutils selinux-basics selinux-policy-default selinux-policy-dev auditd setools) + elsif os.name == 'amazon' + %w(make policycoreutils policycoreutils-python selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + elsif os.redhat? + case os.release.to_i + when 6 + %w(make policycoreutils selinux-policy selinux-policy-targeted libselinux-utils setools-console) + when 7 + %w(make policycoreutils policycoreutils-python selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + else + %w(make policycoreutils policycoreutils-python-utils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + end + else + %w(make policycoreutils policycoreutils-python-utils selinux-policy selinux-policy-targeted selinux-policy-devel libselinux-utils setools-console) + end + + pkgs.each do |pkg| + describe package(pkg) do + it { should be_installed } + end + end +end diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/common/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/common/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/common/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/common/inspec.yml diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/disabled/controls/disabled_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/disabled/controls/disabled_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/disabled/controls/disabled_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/disabled/controls/disabled_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/disabled/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/disabled/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/disabled/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/disabled/inspec.yml diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/controls/boolean_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/controls/boolean_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/controls/boolean_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/controls/boolean_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/controls/enforcing_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/controls/enforcing_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/controls/enforcing_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/controls/enforcing_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/controls/module_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/controls/module_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/controls/module_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/controls/module_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/enforcing/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/enforcing/inspec.yml diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/fcontext/controls/fcontext_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/fcontext/controls/fcontext_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/fcontext/controls/fcontext_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/fcontext/controls/fcontext_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/fcontext/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/fcontext/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/fcontext/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/fcontext/inspec.yml diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/permissive/controls/boolean_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/permissive/controls/boolean_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/permissive/controls/boolean_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/permissive/controls/boolean_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/permissive/controls/module_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/permissive/controls/module_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/permissive/controls/module_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/permissive/controls/module_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/permissive/controls/permissive_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/permissive/controls/permissive_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/permissive/controls/permissive_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/permissive/controls/permissive_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/permissive/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/permissive/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/permissive/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/permissive/inspec.yml diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/permissive_resource/controls/permissive_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/permissive_resource/controls/permissive_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/permissive_resource/controls/permissive_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/permissive_resource/controls/permissive_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/permissive_resource/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/permissive_resource/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/permissive_resource/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/permissive_resource/inspec.yml diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/port/controls/port_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/port/controls/port_control.rb similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/port/controls/port_control.rb rename to cookbooks/third-party/selinux-6.1.12/test/integration/port/controls/port_control.rb diff --git a/cookbooks/third-party/selinux-6.0.5/test/integration/port/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/port/inspec.yml similarity index 100% rename from cookbooks/third-party/selinux-6.0.5/test/integration/port/inspec.yml rename to cookbooks/third-party/selinux-6.1.12/test/integration/port/inspec.yml diff --git a/cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/controls/user_login_mapping_control.rb b/cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/controls/user_login_mapping_control.rb new file mode 100644 index 000000000..ee69ea911 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/controls/user_login_mapping_control.rb @@ -0,0 +1,19 @@ +include_controls 'common' + +control 'user' do + title 'Verify that SELinux user are set correctly' + + describe command('semanage user -l') do + its('stdout') { should match /^test1_u\s+user\s+s0\s+s0-s0:c0\.c1023\s+staff_r sysadm_r unconfined_r/ } + its('stdout') { should match /^test2_u\s+user\s+s0\s+s0\s+staff_r\s*$/ } + end +end + +control 'login' do + title 'Verify that SELinux login mappings are set correctly' + + describe command('semanage login -l') do + its('stdout') { should match /^test1\s+test1_u\s+s0\s*\*?\s*$/ } + its('stdout') { should match /^test2\s+test2_u\s+s0\s*\*?\s*$/ } + end +end diff --git a/cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/inspec.yml b/cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/inspec.yml new file mode 100644 index 000000000..952bae715 --- /dev/null +++ b/cookbooks/third-party/selinux-6.1.12/test/integration/user_login_mapping/inspec.yml @@ -0,0 +1,7 @@ +--- +name: user_login_mapping +title: User and login mapping suite tests for the SELinux cookbook + +depends: + - name: common + path: test/integration/common diff --git a/metadata.rb b/metadata.rb index 7d0c9f1d7..dd8ee9954 100644 --- a/metadata.rb +++ b/metadata.rb @@ -19,7 +19,7 @@ depends 'nfs', '~> 5.0.0' depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 4.2.3' -depends 'selinux', '~> 6.0.5' +depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.0' depends 'yum-epel', '~> 4.5.0' depends 'aws-parallelcluster-slurm', '~> 3.7.0' From 2c1cdf594082be8cf02c7b42df331ef7a260c8d6 Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 14:43:25 +0200 Subject: [PATCH 7/9] Remove unused yum 7.4.0 cookbook Signed-off-by: Enrico Usai --- .../yum-7.4.0/.circleci/config.yml | 10 ---- cookbooks/third-party/yum-7.4.0/.editorconfig | 19 ------- cookbooks/third-party/yum-7.4.0/.envrc | 1 - .../third-party/yum-7.4.0/.gitattributes | 1 - .../third-party/yum-7.4.0/.github/CODEOWNERS | 1 - .../yum-7.4.0/.github/workflows/ci.yml | 52 ------------------ .../yum-7.4.0/.github/workflows/md-links.yml | 19 ------- .../yum-7.4.0/.github/workflows/stale.yml | 25 --------- cookbooks/third-party/yum-7.4.0/.gitignore | 49 ----------------- cookbooks/third-party/yum-7.4.0/.mdlrc | 1 - .../third-party/yum-7.4.0/.overcommit.yml | 16 ------ cookbooks/third-party/yum-7.4.0/.yamllint | 13 ----- cookbooks/third-party/yum-7.4.0/Gemfile | 9 ---- .../third-party/yum-7.4.0/kitchen.dokken.yml | 53 ------------------- 14 files changed, 269 deletions(-) delete mode 100644 cookbooks/third-party/yum-7.4.0/.circleci/config.yml delete mode 100755 cookbooks/third-party/yum-7.4.0/.editorconfig delete mode 100644 cookbooks/third-party/yum-7.4.0/.envrc delete mode 100644 cookbooks/third-party/yum-7.4.0/.gitattributes delete mode 100644 cookbooks/third-party/yum-7.4.0/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/yum-7.4.0/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/yum-7.4.0/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/yum-7.4.0/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/yum-7.4.0/.gitignore delete mode 100644 cookbooks/third-party/yum-7.4.0/.mdlrc delete mode 100644 cookbooks/third-party/yum-7.4.0/.overcommit.yml delete mode 100644 cookbooks/third-party/yum-7.4.0/.yamllint delete mode 100644 cookbooks/third-party/yum-7.4.0/Gemfile delete mode 100644 cookbooks/third-party/yum-7.4.0/kitchen.dokken.yml diff --git a/cookbooks/third-party/yum-7.4.0/.circleci/config.yml b/cookbooks/third-party/yum-7.4.0/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/yum-7.4.0/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/yum-7.4.0/.editorconfig b/cookbooks/third-party/yum-7.4.0/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/yum-7.4.0/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/yum-7.4.0/.envrc b/cookbooks/third-party/yum-7.4.0/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/yum-7.4.0/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/yum-7.4.0/.gitattributes b/cookbooks/third-party/yum-7.4.0/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/yum-7.4.0/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/yum-7.4.0/.github/CODEOWNERS b/cookbooks/third-party/yum-7.4.0/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/yum-7.4.0/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/yum-7.4.0/.github/workflows/ci.yml b/cookbooks/third-party/yum-7.4.0/.github/workflows/ci.yml deleted file mode 100644 index 88ea56bb7..000000000 --- a/cookbooks/third-party/yum-7.4.0/.github/workflows/ci.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 - - integration: - needs: 'lint-unit' - runs-on: ubuntu-latest - strategy: - matrix: - os: - - almalinux-8 - - amazonlinux-2 - - centos-7 - - centos-stream-8 - - fedora-latest - - oraclelinux-7 - - oraclelinux-8 - - rockylinux-8 - suite: - - default - - dnf-module - exclude: - - os: amazonlinux-2 - suite: dnf-module - - os: centos-7 - suite: dnf-module - - os: oraclelinux-7 - suite: dnf-module - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/yum-7.4.0/.github/workflows/md-links.yml b/cookbooks/third-party/yum-7.4.0/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/yum-7.4.0/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/yum-7.4.0/.github/workflows/stale.yml b/cookbooks/third-party/yum-7.4.0/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/yum-7.4.0/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/yum-7.4.0/.gitignore b/cookbooks/third-party/yum-7.4.0/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/yum-7.4.0/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/yum-7.4.0/.mdlrc b/cookbooks/third-party/yum-7.4.0/.mdlrc deleted file mode 100644 index 9cc2c6322..000000000 --- a/cookbooks/third-party/yum-7.4.0/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013", "~MD024", "~MD025" diff --git a/cookbooks/third-party/yum-7.4.0/.overcommit.yml b/cookbooks/third-party/yum-7.4.0/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/yum-7.4.0/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/yum-7.4.0/.yamllint b/cookbooks/third-party/yum-7.4.0/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/yum-7.4.0/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/yum-7.4.0/Gemfile b/cookbooks/third-party/yum-7.4.0/Gemfile deleted file mode 100644 index 7938c74fc..000000000 --- a/cookbooks/third-party/yum-7.4.0/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This gemfile provides additional gems for testing and releasing this cookbook -# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority -# of the necessary gems for testing this cookbook -# -# Run 'chef exec bundle install' to install these dependencies - -source 'https://rubygems.org' - -gem 'community_cookbook_releaser' diff --git a/cookbooks/third-party/yum-7.4.0/kitchen.dokken.yml b/cookbooks/third-party/yum-7.4.0/kitchen.dokken.yml deleted file mode 100644 index fbbb719d5..000000000 --- a/cookbooks/third-party/yum-7.4.0/kitchen.dokken.yml +++ /dev/null @@ -1,53 +0,0 @@ ---- -driver: - name: dokken - privileged: true # because Docker and SystemD/Upstart - -transport: - name: dokken - -provisioner: - name: dokken - chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> - chef_license: accept-no-persist - -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: 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: rockylinux-8 - driver: - image: dokken/rockylinux-8 - pid_one_command: /usr/lib/systemd/systemd From 9ac805e371c8539d12224da0e0298ed16fd90a00 Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 14:45:10 +0200 Subject: [PATCH 8/9] Upgrade yum cookbook to version 7.4.13 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 2 + .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../Berksfile | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- .../aws-parallelcluster-environment/Berksfile | 2 +- .../aws-parallelcluster-platform/Berksfile | 2 +- .../aws-parallelcluster-shared/Berksfile | 2 +- .../aws-parallelcluster-shared/metadata.rb | 2 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../{yum-7.4.0 => yum-7.4.13}/Berksfile | 0 .../{yum-7.4.0 => yum-7.4.13}/CHANGELOG.md | 49 ++++++++ .../CODE_OF_CONDUCT.md | 0 .../{yum-7.4.0 => yum-7.4.13}/CONTRIBUTING.md | 0 .../{yum-7.4.0 => yum-7.4.13}/Dangerfile | 0 .../{yum-7.4.0 => yum-7.4.13}/LICENSE | 0 .../{yum-7.4.0 => yum-7.4.13}/README.md | 0 .../{yum-7.4.0 => yum-7.4.13}/TESTING.md | 0 .../attributes/main.rb | 0 .../{yum-7.4.0 => yum-7.4.13}/chefignore | 2 +- .../documentation/.gitkeep | 0 .../documentation/dnf_module.md | 0 .../documentation/yum_globalconfig.md | 0 .../third-party/yum-7.4.13/kitchen.dokken.yml | 113 ++++++++++++++++++ .../third-party/yum-7.4.13/kitchen.exec.yml | 7 ++ .../third-party/yum-7.4.13/kitchen.global.yml | 38 ++++++ .../{yum-7.4.0 => yum-7.4.13}/kitchen.yml | 0 .../{yum-7.4.0 => yum-7.4.13}/metadata.rb | 2 +- .../recipes/default.rb | 0 .../third-party/yum-7.4.13/renovate.json | 17 +++ .../resources/dnf_module.rb | 0 .../resources/globalconfig.rb | 0 .../spec/spec_helper.rb | 0 .../spec/unit/recipes/default_spec.rb | 0 .../spec/unit/resources/dnf_module_spec.rb | 0 .../resources/test_globalconfig_one_spec.rb | 0 .../resources/test_globalconfig_two_spec.rb | 0 .../templates/main.erb | 0 .../test/cookbooks/test/metadata.rb | 0 .../test/cookbooks/test/recipes/dnf_module.rb | 0 .../test/recipes/test_globalconfig_one.rb | 0 .../test/recipes/test_globalconfig_two.rb | 0 .../default/inspec/default_spec.rb | 0 .../dnf_module/inspec/module_spec.rb | 0 metadata.rb | 2 +- 47 files changed, 240 insertions(+), 14 deletions(-) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/Berksfile (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/CHANGELOG.md (92%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/Dangerfile (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/LICENSE (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/README.md (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/TESTING.md (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/attributes/main.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/chefignore (98%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/documentation/.gitkeep (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/documentation/dnf_module.md (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/documentation/yum_globalconfig.md (100%) create mode 100644 cookbooks/third-party/yum-7.4.13/kitchen.dokken.yml create mode 100644 cookbooks/third-party/yum-7.4.13/kitchen.exec.yml create mode 100644 cookbooks/third-party/yum-7.4.13/kitchen.global.yml rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/kitchen.yml (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/metadata.rb (94%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/recipes/default.rb (100%) create mode 100644 cookbooks/third-party/yum-7.4.13/renovate.json rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/resources/dnf_module.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/resources/globalconfig.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/spec/spec_helper.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/spec/unit/recipes/default_spec.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/spec/unit/resources/dnf_module_spec.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/spec/unit/resources/test_globalconfig_one_spec.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/spec/unit/resources/test_globalconfig_two_spec.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/templates/main.erb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/test/cookbooks/test/metadata.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/test/cookbooks/test/recipes/dnf_module.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/test/cookbooks/test/recipes/test_globalconfig_one.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/test/cookbooks/test/recipes/test_globalconfig_two.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/test/integration/default/inspec/default_spec.rb (100%) rename cookbooks/third-party/{yum-7.4.0 => yum-7.4.13}/test/integration/dnf_module/inspec/module_spec.rb (100%) diff --git a/Berksfile b/Berksfile index 6523254c7..5d0c3eedf 100644 --- a/Berksfile +++ b/Berksfile @@ -14,7 +14,7 @@ cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0" cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3" cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3" cookbook "selinux", path: "./cookbooks/third-party/selinux-6.1.12" -cookbook "yum", path: "./cookbooks/third-party/yum-7.4.0" +cookbook "yum", path: "./cookbooks/third-party/yum-7.4.13" cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-4.5.0" cookbook "aws-parallelcluster-awsbatch", path: "./cookbooks/aws-parallelcluster-awsbatch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 68fa3a810..cafea4a60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - line-4.5.13 (from line-4.5.2) - openssh-2.11.3 (from openssh-2.10.3) - pyenv-4.2.3 (from pyenv-3.5.1) + - selinux-6.1.12 (from selinux-6.0.5) **BUG FIXES** @@ -50,6 +51,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - openssh-2.11.3 (from openssh-2.10.3) - pyenv-4.2.3 (from pyenv-3.5.1) - selinux-6.1.12 (from selinux-6.0.5) + - yum-7.4.13 (from yum-7.4.0) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index feada45d6..8ef487df1 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -19,5 +19,5 @@ cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index ddce6920d..633fdc052 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -20,6 +20,6 @@ depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' -depends 'yum', '~> 7.4.0' +depends 'yum', '~> 7.4.13' depends 'yum-epel', '~> 4.5.0' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-computefleet/Berksfile b/cookbooks/aws-parallelcluster-computefleet/Berksfile index 3084f2bae..b6e5202c3 100644 --- a/cookbooks/aws-parallelcluster-computefleet/Berksfile +++ b/cookbooks/aws-parallelcluster-computefleet/Berksfile @@ -6,5 +6,5 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index 4d8da4038..a47d84c40 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -16,7 +16,7 @@ cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" group :integration do diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile index e1cc91a97..e99115ae4 100644 --- a/cookbooks/aws-parallelcluster-environment/Berksfile +++ b/cookbooks/aws-parallelcluster-environment/Berksfile @@ -11,5 +11,5 @@ cookbook "line", path: "../third-party/line-4.5.13" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile index 7ed3e3069..b4d58e9ed 100644 --- a/cookbooks/aws-parallelcluster-platform/Berksfile +++ b/cookbooks/aws-parallelcluster-platform/Berksfile @@ -9,5 +9,5 @@ cookbook "selinux", path: "../third-party/selinux-6.1.12" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-shared/Berksfile b/cookbooks/aws-parallelcluster-shared/Berksfile index 5789425d6..abfca9160 100644 --- a/cookbooks/aws-parallelcluster-shared/Berksfile +++ b/cookbooks/aws-parallelcluster-shared/Berksfile @@ -5,5 +5,5 @@ source chef_repo: "." metadata cookbook "pyenv", path: "../third-party/pyenv-4.2.3" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-shared/metadata.rb b/cookbooks/aws-parallelcluster-shared/metadata.rb index 69572572b..fe4d06cda 100644 --- a/cookbooks/aws-parallelcluster-shared/metadata.rb +++ b/cookbooks/aws-parallelcluster-shared/metadata.rb @@ -15,5 +15,5 @@ supports 'redhat', '= 8.7' depends 'pyenv', '~> 4.2.3' -depends 'yum', '~> 7.4.0' +depends 'yum', '~> 7.4.13' depends 'yum-epel', '~> 4.5.0' diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index 8a343b5ca..a9cfa045a 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -13,5 +13,5 @@ cookbook "nfs", path: "../third-party/nfs-5.0.0" cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" -cookbook "yum", path: "../third-party/yum-7.4.0" +cookbook "yum", path: "../third-party/yum-7.4.13" cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index 3780c9aa1..70bc823f6 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -20,7 +20,7 @@ depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' -depends 'yum', '~> 7.4.0' +depends 'yum', '~> 7.4.13' depends 'yum-epel', '~> 4.5.0' depends 'aws-parallelcluster-computefleet', '~> 3.7.0' depends 'aws-parallelcluster-environment', '~> 3.7.0' diff --git a/cookbooks/third-party/yum-7.4.0/Berksfile b/cookbooks/third-party/yum-7.4.13/Berksfile similarity index 100% rename from cookbooks/third-party/yum-7.4.0/Berksfile rename to cookbooks/third-party/yum-7.4.13/Berksfile diff --git a/cookbooks/third-party/yum-7.4.0/CHANGELOG.md b/cookbooks/third-party/yum-7.4.13/CHANGELOG.md similarity index 92% rename from cookbooks/third-party/yum-7.4.0/CHANGELOG.md rename to cookbooks/third-party/yum-7.4.13/CHANGELOG.md index dceaba2a3..59a79b490 100644 --- a/cookbooks/third-party/yum-7.4.0/CHANGELOG.md +++ b/cookbooks/third-party/yum-7.4.13/CHANGELOG.md @@ -2,6 +2,55 @@ This file is used to list changes made in each version of the yum cookbook. +## 7.4.13 - *2023-04-17* + +## 7.4.12 - *2023-04-07* + +Standardise files with files in sous-chefs/repo-management + +## 7.4.11 - *2023-04-01* + +## 7.4.10 - *2023-04-01* + +Standardise files with files in sous-chefs/repo-management + +## 7.4.9 - *2023-03-20* + +Standardise files with files in sous-chefs/repo-management + +## 7.4.8 - *2023-03-18* + +- Update gaurav-nelson/github-action-markdown-link-check action to v1.0.15 +- Fix yaml + +## 7.4.7 - *2023-03-15* + +- Standardise files with files in sous-chefs/repo-management + +## 7.4.6 - *2023-02-27* + +- remove circleci + +## 7.4.5 - *2023-02-23* + +- Standardise files with files in sous-chefs/repo-management + +## 7.4.4 - *2023-02-16* + +- Standardise files with files in sous-chefs/repo-management + +## 7.4.3 - *2023-02-15* + +- Update Actions + +## 7.4.2 - *2023-02-15* + +- Standardise files with files in sous-chefs/repo-management + +## 7.4.1 - *2022-12-08* + +- Standardise files with files in sous-chefs/repo-management + ## 7.4.0 - *2022-05-09* - Add support for DNF property `best` diff --git a/cookbooks/third-party/yum-7.4.0/CODE_OF_CONDUCT.md b/cookbooks/third-party/yum-7.4.13/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/yum-7.4.0/CODE_OF_CONDUCT.md rename to cookbooks/third-party/yum-7.4.13/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/yum-7.4.0/CONTRIBUTING.md b/cookbooks/third-party/yum-7.4.13/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/yum-7.4.0/CONTRIBUTING.md rename to cookbooks/third-party/yum-7.4.13/CONTRIBUTING.md diff --git a/cookbooks/third-party/yum-7.4.0/Dangerfile b/cookbooks/third-party/yum-7.4.13/Dangerfile similarity index 100% rename from cookbooks/third-party/yum-7.4.0/Dangerfile rename to cookbooks/third-party/yum-7.4.13/Dangerfile diff --git a/cookbooks/third-party/yum-7.4.0/LICENSE b/cookbooks/third-party/yum-7.4.13/LICENSE similarity index 100% rename from cookbooks/third-party/yum-7.4.0/LICENSE rename to cookbooks/third-party/yum-7.4.13/LICENSE diff --git a/cookbooks/third-party/yum-7.4.0/README.md b/cookbooks/third-party/yum-7.4.13/README.md similarity index 100% rename from cookbooks/third-party/yum-7.4.0/README.md rename to cookbooks/third-party/yum-7.4.13/README.md diff --git a/cookbooks/third-party/yum-7.4.0/TESTING.md b/cookbooks/third-party/yum-7.4.13/TESTING.md similarity index 100% rename from cookbooks/third-party/yum-7.4.0/TESTING.md rename to cookbooks/third-party/yum-7.4.13/TESTING.md diff --git a/cookbooks/third-party/yum-7.4.0/attributes/main.rb b/cookbooks/third-party/yum-7.4.13/attributes/main.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/attributes/main.rb rename to cookbooks/third-party/yum-7.4.13/attributes/main.rb diff --git a/cookbooks/third-party/yum-7.4.0/chefignore b/cookbooks/third-party/yum-7.4.13/chefignore similarity index 98% rename from cookbooks/third-party/yum-7.4.0/chefignore rename to cookbooks/third-party/yum-7.4.13/chefignore index cc170ea79..a27b0b258 100644 --- a/cookbooks/third-party/yum-7.4.0/chefignore +++ b/cookbooks/third-party/yum-7.4.13/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile diff --git a/cookbooks/third-party/yum-7.4.0/documentation/.gitkeep b/cookbooks/third-party/yum-7.4.13/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/yum-7.4.0/documentation/.gitkeep rename to cookbooks/third-party/yum-7.4.13/documentation/.gitkeep diff --git a/cookbooks/third-party/yum-7.4.0/documentation/dnf_module.md b/cookbooks/third-party/yum-7.4.13/documentation/dnf_module.md similarity index 100% rename from cookbooks/third-party/yum-7.4.0/documentation/dnf_module.md rename to cookbooks/third-party/yum-7.4.13/documentation/dnf_module.md diff --git a/cookbooks/third-party/yum-7.4.0/documentation/yum_globalconfig.md b/cookbooks/third-party/yum-7.4.13/documentation/yum_globalconfig.md similarity index 100% rename from cookbooks/third-party/yum-7.4.0/documentation/yum_globalconfig.md rename to cookbooks/third-party/yum-7.4.13/documentation/yum_globalconfig.md diff --git a/cookbooks/third-party/yum-7.4.13/kitchen.dokken.yml b/cookbooks/third-party/yum-7.4.13/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/yum-7.4.13/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + 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: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/yum-7.4.13/kitchen.exec.yml b/cookbooks/third-party/yum-7.4.13/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/yum-7.4.13/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/yum-7.4.13/kitchen.global.yml b/cookbooks/third-party/yum-7.4.13/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/yum-7.4.13/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/cookbooks/third-party/yum-7.4.0/kitchen.yml b/cookbooks/third-party/yum-7.4.13/kitchen.yml similarity index 100% rename from cookbooks/third-party/yum-7.4.0/kitchen.yml rename to cookbooks/third-party/yum-7.4.13/kitchen.yml diff --git a/cookbooks/third-party/yum-7.4.0/metadata.rb b/cookbooks/third-party/yum-7.4.13/metadata.rb similarity index 94% rename from cookbooks/third-party/yum-7.4.0/metadata.rb rename to cookbooks/third-party/yum-7.4.13/metadata.rb index 3df5423bc..76432fc0a 100644 --- a/cookbooks/third-party/yum-7.4.0/metadata.rb +++ b/cookbooks/third-party/yum-7.4.13/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Configures various yum components on Red Hat-like systems' -version '7.4.0' +version '7.4.13' source_url 'https://github.com/sous-chefs/yum' issues_url 'https://github.com/sous-chefs/yum/issues' chef_version '>= 15.3' diff --git a/cookbooks/third-party/yum-7.4.0/recipes/default.rb b/cookbooks/third-party/yum-7.4.13/recipes/default.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/recipes/default.rb rename to cookbooks/third-party/yum-7.4.13/recipes/default.rb diff --git a/cookbooks/third-party/yum-7.4.13/renovate.json b/cookbooks/third-party/yum-7.4.13/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/yum-7.4.13/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"] + } + ] +} diff --git a/cookbooks/third-party/yum-7.4.0/resources/dnf_module.rb b/cookbooks/third-party/yum-7.4.13/resources/dnf_module.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/resources/dnf_module.rb rename to cookbooks/third-party/yum-7.4.13/resources/dnf_module.rb diff --git a/cookbooks/third-party/yum-7.4.0/resources/globalconfig.rb b/cookbooks/third-party/yum-7.4.13/resources/globalconfig.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/resources/globalconfig.rb rename to cookbooks/third-party/yum-7.4.13/resources/globalconfig.rb diff --git a/cookbooks/third-party/yum-7.4.0/spec/spec_helper.rb b/cookbooks/third-party/yum-7.4.13/spec/spec_helper.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/spec/spec_helper.rb rename to cookbooks/third-party/yum-7.4.13/spec/spec_helper.rb diff --git a/cookbooks/third-party/yum-7.4.0/spec/unit/recipes/default_spec.rb b/cookbooks/third-party/yum-7.4.13/spec/unit/recipes/default_spec.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/spec/unit/recipes/default_spec.rb rename to cookbooks/third-party/yum-7.4.13/spec/unit/recipes/default_spec.rb diff --git a/cookbooks/third-party/yum-7.4.0/spec/unit/resources/dnf_module_spec.rb b/cookbooks/third-party/yum-7.4.13/spec/unit/resources/dnf_module_spec.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/spec/unit/resources/dnf_module_spec.rb rename to cookbooks/third-party/yum-7.4.13/spec/unit/resources/dnf_module_spec.rb diff --git a/cookbooks/third-party/yum-7.4.0/spec/unit/resources/test_globalconfig_one_spec.rb b/cookbooks/third-party/yum-7.4.13/spec/unit/resources/test_globalconfig_one_spec.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/spec/unit/resources/test_globalconfig_one_spec.rb rename to cookbooks/third-party/yum-7.4.13/spec/unit/resources/test_globalconfig_one_spec.rb diff --git a/cookbooks/third-party/yum-7.4.0/spec/unit/resources/test_globalconfig_two_spec.rb b/cookbooks/third-party/yum-7.4.13/spec/unit/resources/test_globalconfig_two_spec.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/spec/unit/resources/test_globalconfig_two_spec.rb rename to cookbooks/third-party/yum-7.4.13/spec/unit/resources/test_globalconfig_two_spec.rb diff --git a/cookbooks/third-party/yum-7.4.0/templates/main.erb b/cookbooks/third-party/yum-7.4.13/templates/main.erb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/templates/main.erb rename to cookbooks/third-party/yum-7.4.13/templates/main.erb diff --git a/cookbooks/third-party/yum-7.4.0/test/cookbooks/test/metadata.rb b/cookbooks/third-party/yum-7.4.13/test/cookbooks/test/metadata.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/test/cookbooks/test/metadata.rb rename to cookbooks/third-party/yum-7.4.13/test/cookbooks/test/metadata.rb diff --git a/cookbooks/third-party/yum-7.4.0/test/cookbooks/test/recipes/dnf_module.rb b/cookbooks/third-party/yum-7.4.13/test/cookbooks/test/recipes/dnf_module.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/test/cookbooks/test/recipes/dnf_module.rb rename to cookbooks/third-party/yum-7.4.13/test/cookbooks/test/recipes/dnf_module.rb diff --git a/cookbooks/third-party/yum-7.4.0/test/cookbooks/test/recipes/test_globalconfig_one.rb b/cookbooks/third-party/yum-7.4.13/test/cookbooks/test/recipes/test_globalconfig_one.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/test/cookbooks/test/recipes/test_globalconfig_one.rb rename to cookbooks/third-party/yum-7.4.13/test/cookbooks/test/recipes/test_globalconfig_one.rb diff --git a/cookbooks/third-party/yum-7.4.0/test/cookbooks/test/recipes/test_globalconfig_two.rb b/cookbooks/third-party/yum-7.4.13/test/cookbooks/test/recipes/test_globalconfig_two.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/test/cookbooks/test/recipes/test_globalconfig_two.rb rename to cookbooks/third-party/yum-7.4.13/test/cookbooks/test/recipes/test_globalconfig_two.rb diff --git a/cookbooks/third-party/yum-7.4.0/test/integration/default/inspec/default_spec.rb b/cookbooks/third-party/yum-7.4.13/test/integration/default/inspec/default_spec.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/test/integration/default/inspec/default_spec.rb rename to cookbooks/third-party/yum-7.4.13/test/integration/default/inspec/default_spec.rb diff --git a/cookbooks/third-party/yum-7.4.0/test/integration/dnf_module/inspec/module_spec.rb b/cookbooks/third-party/yum-7.4.13/test/integration/dnf_module/inspec/module_spec.rb similarity index 100% rename from cookbooks/third-party/yum-7.4.0/test/integration/dnf_module/inspec/module_spec.rb rename to cookbooks/third-party/yum-7.4.13/test/integration/dnf_module/inspec/module_spec.rb diff --git a/metadata.rb b/metadata.rb index dd8ee9954..44dae715f 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends 'openssh', '~> 2.11.3' depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' -depends 'yum', '~> 7.4.0' +depends 'yum', '~> 7.4.13' depends 'yum-epel', '~> 4.5.0' depends 'aws-parallelcluster-slurm', '~> 3.7.0' depends 'aws-parallelcluster-awsbatch', '~> 3.7.0' From ceda39c79f81af50aa11c190381626b598b27c4e Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Tue, 8 Aug 2023 14:49:26 +0200 Subject: [PATCH 9/9] Upgrade yum-epel cookbook to version 5.0.2 Signed-off-by: Enrico Usai --- Berksfile | 2 +- CHANGELOG.md | 2 + .../aws-parallelcluster-awsbatch/Berksfile | 2 +- .../aws-parallelcluster-awsbatch/metadata.rb | 2 +- .../Berksfile | 2 +- .../aws-parallelcluster-entrypoints/Berksfile | 2 +- .../aws-parallelcluster-environment/Berksfile | 2 +- .../aws-parallelcluster-platform/Berksfile | 2 +- .../aws-parallelcluster-shared/Berksfile | 2 +- .../aws-parallelcluster-shared/metadata.rb | 2 +- cookbooks/aws-parallelcluster-slurm/Berksfile | 2 +- .../aws-parallelcluster-slurm/metadata.rb | 2 +- .../yum-epel-4.5.0/.circleci/config.yml | 10 -- .../third-party/yum-epel-4.5.0/.editorconfig | 19 --- cookbooks/third-party/yum-epel-4.5.0/.envrc | 1 - .../third-party/yum-epel-4.5.0/.gitattributes | 1 - .../yum-epel-4.5.0/.github/CODEOWNERS | 1 - .../yum-epel-4.5.0/.github/workflows/ci.yml | 44 ------- .../.github/workflows/md-links.yml | 19 --- .../.github/workflows/stale.yml | 25 ---- .../third-party/yum-epel-4.5.0/.gitignore | 49 -------- cookbooks/third-party/yum-epel-4.5.0/.mdlrc | 1 - .../yum-epel-4.5.0/.overcommit.yml | 16 --- .../third-party/yum-epel-4.5.0/.yamllint | 13 -- cookbooks/third-party/yum-epel-4.5.0/Gemfile | 9 -- .../attributes/epel-debuginfo.rb | 15 --- .../attributes/epel-modular-debuginfo.rb | 8 -- .../attributes/epel-modular-source.rb | 8 -- .../yum-epel-4.5.0/attributes/epel-modular.rb | 8 -- .../yum-epel-4.5.0/attributes/epel-source.rb | 15 --- .../attributes/epel-testing-debuginfo.rb | 15 --- .../epel-testing-modular-debuginfo.rb | 8 -- .../attributes/epel-testing-modular-source.rb | 8 -- .../attributes/epel-testing-modular.rb | 8 -- .../attributes/epel-testing-source.rb | 15 --- .../yum-epel-4.5.0/attributes/epel-testing.rb | 15 --- .../yum-epel-4.5.0/attributes/epel.rb | 23 ---- .../yum-epel-4.5.0/kitchen.dokken.yml | 51 -------- .../Berksfile | 0 .../CHANGELOG.md | 15 +++ .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../Dangerfile | 0 .../LICENSE | 0 .../README.md | 36 +++--- .../TESTING.md | 0 .../attributes/default.rb | 2 +- .../attributes/epel-debuginfo.rb | 11 ++ .../attributes/epel-next-debuginfo.rb | 6 +- .../attributes/epel-next-source.rb | 6 +- .../attributes/epel-next-testing-debuginfo.rb | 6 +- .../attributes/epel-next-testing-source.rb | 6 +- .../attributes/epel-next-testing.rb | 6 +- .../attributes/epel-next.rb | 4 +- .../yum-epel-5.0.2/attributes/epel-source.rb | 11 ++ .../attributes/epel-testing-debuginfo.rb | 11 ++ .../attributes/epel-testing-source.rb | 11 ++ .../yum-epel-5.0.2/attributes/epel-testing.rb | 11 ++ .../yum-epel-5.0.2/attributes/epel.rb | 19 +++ .../chefignore | 2 +- .../documentation/.gitkeep | 0 .../yum-epel-5.0.2/kitchen.dokken.yml | 113 ++++++++++++++++++ .../yum-epel-5.0.2/kitchen.exec.yml | 7 ++ .../yum-epel-5.0.2/kitchen.global.yml | 38 ++++++ .../kitchen.yml | 18 --- .../libraries/helpers.rb | 21 ++-- .../metadata.rb | 2 +- .../recipes/default.rb | 0 .../third-party/yum-epel-5.0.2/renovate.json | 17 +++ .../spec/default_spec.rb | 0 .../spec/spec_helper.rb | 0 .../test/integration/all/all_spec.rb | 69 +---------- .../test/integration/default/default_spec.rb | 2 +- metadata.rb | 2 +- 74 files changed, 329 insertions(+), 552 deletions(-) delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml delete mode 100755 cookbooks/third-party/yum-epel-4.5.0/.editorconfig delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.envrc delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.gitattributes delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.gitignore delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.mdlrc delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/.yamllint delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/Gemfile delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb delete mode 100644 cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/Berksfile (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/CHANGELOG.md (95%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/CODE_OF_CONDUCT.md (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/CONTRIBUTING.md (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/Dangerfile (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/LICENSE (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/README.md (85%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/TESTING.md (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/default.rb (94%) create mode 100644 cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/epel-next-debuginfo.rb (77%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/epel-next-source.rb (76%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/epel-next-testing-debuginfo.rb (78%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/epel-next-testing-source.rb (77%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/epel-next-testing.rb (76%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/attributes/epel-next.rb (87%) create mode 100644 cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb create mode 100644 cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb create mode 100644 cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb create mode 100644 cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb create mode 100644 cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/chefignore (98%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/documentation/.gitkeep (100%) create mode 100644 cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml create mode 100644 cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml create mode 100644 cookbooks/third-party/yum-epel-5.0.2/kitchen.global.yml rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/kitchen.yml (73%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/libraries/helpers.rb (73%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/metadata.rb (94%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/recipes/default.rb (100%) create mode 100644 cookbooks/third-party/yum-epel-5.0.2/renovate.json rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/spec/default_spec.rb (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/spec/spec_helper.rb (100%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/test/integration/all/all_spec.rb (55%) rename cookbooks/third-party/{yum-epel-4.5.0 => yum-epel-5.0.2}/test/integration/default/default_spec.rb (92%) diff --git a/Berksfile b/Berksfile index 5d0c3eedf..240e6d3a3 100644 --- a/Berksfile +++ b/Berksfile @@ -15,7 +15,7 @@ cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3" cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3" cookbook "selinux", path: "./cookbooks/third-party/selinux-6.1.12" cookbook "yum", path: "./cookbooks/third-party/yum-7.4.13" -cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.2" cookbook "aws-parallelcluster-awsbatch", path: "./cookbooks/aws-parallelcluster-awsbatch" cookbook "aws-parallelcluster-computefleet", path: "./cookbooks/aws-parallelcluster-computefleet" diff --git a/CHANGELOG.md b/CHANGELOG.md index cafea4a60..660bd30e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - openssh-2.11.3 (from openssh-2.10.3) - pyenv-4.2.3 (from pyenv-3.5.1) - selinux-6.1.12 (from selinux-6.0.5) + - yum-7.4.13 (from yum-7.4.0) **BUG FIXES** @@ -52,6 +53,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - pyenv-4.2.3 (from pyenv-3.5.1) - selinux-6.1.12 (from selinux-6.0.5) - yum-7.4.13 (from yum-7.4.0) + - yum-epel-5.0.2 (from yum-epel-4.5.0) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index 8ef487df1..0091cc5c7 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -20,4 +20,4 @@ cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index 633fdc052..8e2d9fdc1 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -21,5 +21,5 @@ depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-computefleet/Berksfile b/cookbooks/aws-parallelcluster-computefleet/Berksfile index b6e5202c3..647a2463c 100644 --- a/cookbooks/aws-parallelcluster-computefleet/Berksfile +++ b/cookbooks/aws-parallelcluster-computefleet/Berksfile @@ -7,4 +7,4 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index a47d84c40..e6168584b 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -17,7 +17,7 @@ cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" group :integration do cookbook 'aws-parallelcluster-tests', path: '../aws-parallelcluster-tests' diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile index e99115ae4..dfad50e05 100644 --- a/cookbooks/aws-parallelcluster-environment/Berksfile +++ b/cookbooks/aws-parallelcluster-environment/Berksfile @@ -12,4 +12,4 @@ cookbook "line", path: "../third-party/line-4.5.13" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile index b4d58e9ed..581b1b3be 100644 --- a/cookbooks/aws-parallelcluster-platform/Berksfile +++ b/cookbooks/aws-parallelcluster-platform/Berksfile @@ -10,4 +10,4 @@ cookbook "selinux", path: "../third-party/selinux-6.1.12" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-shared/Berksfile b/cookbooks/aws-parallelcluster-shared/Berksfile index abfca9160..4d15ee95e 100644 --- a/cookbooks/aws-parallelcluster-shared/Berksfile +++ b/cookbooks/aws-parallelcluster-shared/Berksfile @@ -6,4 +6,4 @@ metadata cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-shared/metadata.rb b/cookbooks/aws-parallelcluster-shared/metadata.rb index fe4d06cda..52fef216b 100644 --- a/cookbooks/aws-parallelcluster-shared/metadata.rb +++ b/cookbooks/aws-parallelcluster-shared/metadata.rb @@ -16,4 +16,4 @@ depends 'pyenv', '~> 4.2.3' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index a9cfa045a..fa669f72a 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -14,4 +14,4 @@ cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index 70bc823f6..d7aeb73c1 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -21,7 +21,7 @@ depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' depends 'aws-parallelcluster-computefleet', '~> 3.7.0' depends 'aws-parallelcluster-environment', '~> 3.7.0' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml b/cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/yum-epel-4.5.0/.editorconfig b/cookbooks/third-party/yum-epel-4.5.0/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/.envrc b/cookbooks/third-party/yum-epel-4.5.0/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/yum-epel-4.5.0/.gitattributes b/cookbooks/third-party/yum-epel-4.5.0/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS b/cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml b/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml deleted file mode 100644 index f94022027..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 - - integration: - needs: 'lint-unit' - runs-on: ubuntu-latest - strategy: - matrix: - os: - - 'almalinux-8' - - 'amazonlinux-2' - - 'centos-7' - - 'centos-stream-8' - - 'oraclelinux-7' - - 'oraclelinux-8' - - 'rockylinux-8' - suite: - - 'default' - - 'all' - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml b/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml b/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/yum-epel-4.5.0/.gitignore b/cookbooks/third-party/yum-epel-4.5.0/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/yum-epel-4.5.0/.mdlrc b/cookbooks/third-party/yum-epel-4.5.0/.mdlrc deleted file mode 100644 index 9cc2c6322..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013", "~MD024", "~MD025" diff --git a/cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml b/cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/yum-epel-4.5.0/.yamllint b/cookbooks/third-party/yum-epel-4.5.0/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/yum-epel-4.5.0/Gemfile b/cookbooks/third-party/yum-epel-4.5.0/Gemfile deleted file mode 100644 index 7938c74fc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This gemfile provides additional gems for testing and releasing this cookbook -# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority -# of the necessary gems for testing this cookbook -# -# Run 'chef exec bundle install' to install these dependencies - -source 'https://rubygems.org' - -gem 'community_cookbook_releaser' diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb deleted file mode 100644 index 01b9b1e85..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo' - -if platform?('amazon') - default['yum']['epel-debuginfo']['description'] = 'Extra Packages for 7 - $basearch - Debug' - default['yum']['epel-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=$basearch' - default['yum']['epel-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-debuginfo']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Debug" - default['yum']['epel-debuginfo']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-debuginfo']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-debuginfo']['gpgcheck'] = true -default['yum']['epel-debuginfo']['enabled'] = false -default['yum']['epel-debuginfo']['managed'] = false -default['yum']['epel-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb deleted file mode 100644 index 04e9f5214..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-modular-debuginfo']['repositoryid'] = 'epel-modular-debuginfo' -default['yum']['epel-modular-debuginfo']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug' -default['yum']['epel-modular-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-modular-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-modular-debuginfo']['gpgcheck'] = true -default['yum']['epel-modular-debuginfo']['enabled'] = false -default['yum']['epel-modular-debuginfo']['managed'] = false -default['yum']['epel-modular-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb deleted file mode 100644 index 150e1ebfc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-modular-source']['repositoryid'] = 'epel-modular-source' -default['yum']['epel-modular-source']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source' -default['yum']['epel-modular-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-modular-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-modular-source']['gpgcheck'] = true -default['yum']['epel-modular-source']['enabled'] = false -default['yum']['epel-modular-source']['managed'] = false -default['yum']['epel-modular-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb deleted file mode 100644 index 9fea914f5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-modular']['repositoryid'] = 'epel-modular' -default['yum']['epel-modular']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - $basearch' -default['yum']['epel-modular']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-modular']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-modular']['gpgcheck'] = true -default['yum']['epel-modular']['enabled'] = false -default['yum']['epel-modular']['managed'] = false -default['yum']['epel-modular']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb deleted file mode 100644 index 6c8998906..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-source']['repositoryid'] = 'epel-source' - -if platform?('amazon') - default['yum']['epel-source']['description'] = 'Extra Packages for 7 - $basearch - Source' - default['yum']['epel-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-7&arch=$basearch' - default['yum']['epel-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-source']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Source" - default['yum']['epel-source']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-source']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-source']['gpgcheck'] = true -default['yum']['epel-source']['enabled'] = false -default['yum']['epel-source']['managed'] = false -default['yum']['epel-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb deleted file mode 100644 index 4330c333e..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo' - -if platform?('amazon') - default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for 7 - $basearch - Testing Debug' - default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel7&arch=$basearch' - default['yum']['epel-testing-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-testing-debuginfo']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing Debug" - default['yum']['epel-testing-debuginfo']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-testing-debuginfo']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-testing-debuginfo']['gpgcheck'] = true -default['yum']['epel-testing-debuginfo']['enabled'] = false -default['yum']['epel-testing-debuginfo']['managed'] = false -default['yum']['epel-testing-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb deleted file mode 100644 index fa938de1c..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-testing-modular-debuginfo']['repositoryid'] = 'epel-testing-modular-debuginfo' -default['yum']['epel-testing-modular-debuginfo']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug' -default['yum']['epel-testing-modular-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-testing-modular-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-testing-modular-debuginfo']['gpgcheck'] = true -default['yum']['epel-testing-modular-debuginfo']['enabled'] = false -default['yum']['epel-testing-modular-debuginfo']['managed'] = false -default['yum']['epel-testing-modular-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb deleted file mode 100644 index 4a4ae41e5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-testing-modular-source']['repositoryid'] = 'epel-testing-modular-source' -default['yum']['epel-testing-modular-source']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever- Testing - $basearch - Source' -default['yum']['epel-testing-modular-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-testing-modular-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-testing-modular-source']['gpgcheck'] = true -default['yum']['epel-testing-modular-source']['enabled'] = false -default['yum']['epel-testing-modular-source']['managed'] = false -default['yum']['epel-testing-modular-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb deleted file mode 100644 index a707c65fd..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-testing-modular']['repositoryid'] = 'epel-testing-modular' -default['yum']['epel-testing-modular']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch' -default['yum']['epel-testing-modular']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-testing-modular']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-testing-modular']['gpgcheck'] = true -default['yum']['epel-testing-modular']['enabled'] = false -default['yum']['epel-testing-modular']['managed'] = false -default['yum']['epel-testing-modular']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb deleted file mode 100644 index 7da8d249e..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source' - -if platform?('amazon') - default['yum']['epel-testing-source']['description'] = 'Extra Packages for 7 - $basearch - Testing Source' - default['yum']['epel-testing-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel7&arch=$basearch' - default['yum']['epel-testing-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-testing-source']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing Source" - default['yum']['epel-testing-source']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-testing-source']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-testing-source']['gpgcheck'] = true -default['yum']['epel-testing-source']['enabled'] = false -default['yum']['epel-testing-source']['managed'] = false -default['yum']['epel-testing-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb deleted file mode 100644 index ae3aa16a4..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-testing']['repositoryid'] = 'epel-testing' - -if platform?('amazon') - default['yum']['epel-testing']['description'] = 'Extra Packages for 7 - $basearch - Testing ' - default['yum']['epel-testing']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=$basearch' - default['yum']['epel-testing']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-testing']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing " - default['yum']['epel-testing']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-testing']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-testing']['gpgcheck'] = true -default['yum']['epel-testing']['enabled'] = false -default['yum']['epel-testing']['managed'] = false -default['yum']['epel-testing']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb deleted file mode 100644 index 119296ddc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb +++ /dev/null @@ -1,23 +0,0 @@ -default['yum']['epel']['repositoryid'] = 'epel' -default['yum']['epel']['gpgcheck'] = true -case node['kernel']['machine'] -when 'armv7l', 'armv7hl' - default['yum']['epel']['baseurl'] = 'https://armv7.dev.centos.org/repodir/epel-pass-1/' - default['yum']['epel']['gpgcheck'] = false -when 's390x' - default['yum']['epel']['baseurl'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/' - default['yum']['epel']['gpgkey'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/RPM-GPG-KEY-redhat-release' -else - if platform?('amazon') - default['yum']['epel']['description'] = 'Extra Packages for 7 - $basearch' - default['yum']['epel']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=$basearch' - default['yum']['epel']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' - else - default['yum']['epel']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch" - default['yum']['epel']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" - end -end -default['yum']['epel']['enabled'] = true -default['yum']['epel']['managed'] = true -default['yum']['epel']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml b/cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml deleted file mode 100644 index 4b33f8aad..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml +++ /dev/null @@ -1,51 +0,0 @@ -driver: - name: dokken - privileged: true # because Docker and SystemD - chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> - chef_license: accept-no-persist - -transport: - name: dokken - -provisioner: - name: dokken - deprecations_as_errors: true - -verifier: - name: inspec - -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: 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: rockylinux-8 - driver: - image: dokken/rockylinux-8 - pid_one_command: /usr/lib/systemd/systemd diff --git a/cookbooks/third-party/yum-epel-4.5.0/Berksfile b/cookbooks/third-party/yum-epel-5.0.2/Berksfile similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/Berksfile rename to cookbooks/third-party/yum-epel-5.0.2/Berksfile diff --git a/cookbooks/third-party/yum-epel-4.5.0/CHANGELOG.md b/cookbooks/third-party/yum-epel-5.0.2/CHANGELOG.md similarity index 95% rename from cookbooks/third-party/yum-epel-4.5.0/CHANGELOG.md rename to cookbooks/third-party/yum-epel-5.0.2/CHANGELOG.md index b16da8cf7..c867ed812 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/CHANGELOG.md +++ b/cookbooks/third-party/yum-epel-5.0.2/CHANGELOG.md @@ -2,6 +2,21 @@ This file is used to list changes made in each version of the yum-epel cookbook. +## 5.0.2 - *2023-07-10* + +## 5.0.1 - *2023-06-08* + +Standardise files with files in sous-chefs/repo-management + +## 5.0.0 - *2023-04-17* + +- Remove EPEL Modular +- Add support for Amazon Linux 2023 + +## 4.5.1 - *2023-04-13* + +- Add renovate.json + ## 4.5.0 - *2022-06-03* - Remove epel-playground per upstream removal diff --git a/cookbooks/third-party/yum-epel-4.5.0/CODE_OF_CONDUCT.md b/cookbooks/third-party/yum-epel-5.0.2/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/CODE_OF_CONDUCT.md rename to cookbooks/third-party/yum-epel-5.0.2/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/yum-epel-4.5.0/CONTRIBUTING.md b/cookbooks/third-party/yum-epel-5.0.2/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/CONTRIBUTING.md rename to cookbooks/third-party/yum-epel-5.0.2/CONTRIBUTING.md diff --git a/cookbooks/third-party/yum-epel-4.5.0/Dangerfile b/cookbooks/third-party/yum-epel-5.0.2/Dangerfile similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/Dangerfile rename to cookbooks/third-party/yum-epel-5.0.2/Dangerfile diff --git a/cookbooks/third-party/yum-epel-4.5.0/LICENSE b/cookbooks/third-party/yum-epel-5.0.2/LICENSE similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/LICENSE rename to cookbooks/third-party/yum-epel-5.0.2/LICENSE diff --git a/cookbooks/third-party/yum-epel-4.5.0/README.md b/cookbooks/third-party/yum-epel-5.0.2/README.md similarity index 85% rename from cookbooks/third-party/yum-epel-4.5.0/README.md rename to cookbooks/third-party/yum-epel-5.0.2/README.md index 1aa948f3f..3f56bee42 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/README.md +++ b/cookbooks/third-party/yum-epel-5.0.2/README.md @@ -12,26 +12,20 @@ The yum-epel cookbook takes over management of the default repositoryids shipped Below is a table showing which repositoryids we manage that are shipped by default via the epel-release package: -| Repo ID | EL 7 | EL 8 | CentOS Stream 8 | -| ------------------------------ | :--------------: | :--------------: | :--------------: | -| epel |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -| epel-debuginfo |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -| epel-modular | :x: |:heavy_check_mark:|:heavy_check_mark:| -| epel-modular-debuginfo | :x: |:heavy_check_mark:|:heavy_check_mark:| -| epel-modular-source | :x: |:heavy_check_mark:|:heavy_check_mark:| -| epel-next | :x: | :x: |:heavy_check_mark:| -| epel-next-debuginfo | :x: | :x: |:heavy_check_mark:| -| epel-next-source | :x: | :x: |:heavy_check_mark:| -| epel-next-testing | :x: | :x: |:heavy_check_mark:| -| epel-next-testing-debug | :x: | :x: |:heavy_check_mark:| -| epel-next-testing-source | :x: | :x: |:heavy_check_mark:| -| epel-source |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -| epel-testing |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -| epel-testing-debuginfo |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -| epel-testing-modular | :x: |:heavy_check_mark:|:heavy_check_mark:| -| epel-testing-modular-debuginfo | :x: |:heavy_check_mark:|:heavy_check_mark:| -| epel-testing-modular-source | :x: |:heavy_check_mark:|:heavy_check_mark:| -| epel-testing-source |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| Repo ID | EL 7 | EL 8 | EL 9 | CentOS Stream 8 | CentOS Stream 9 | +| ------------------------------ | :--------------: | :--------------: | :--------------: | :--------------: | :--------------: | +| epel |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| epel-debuginfo |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| epel-next | :x: | :x: | :x: |:heavy_check_mark:|:heavy_check_mark:| +| epel-next-debuginfo | :x: | :x: | :x: |:heavy_check_mark:|:heavy_check_mark:| +| epel-next-source | :x: | :x: | :x: |:heavy_check_mark:|:heavy_check_mark:| +| epel-next-testing | :x: | :x: | :x: |:heavy_check_mark:|:heavy_check_mark:| +| epel-next-testing-debug | :x: | :x: | :x: |:heavy_check_mark:|:heavy_check_mark:| +| epel-next-testing-source | :x: | :x: | :x: |:heavy_check_mark:|:heavy_check_mark:| +| epel-source |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| epel-testing |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| epel-testing-debuginfo |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +| epel-testing-source |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| ## Requirements @@ -63,7 +57,7 @@ See individual repository attribute files for defaults. To disable the epel repository through a Role or Environment definition -``` +```ruby default_attributes( :yum => { :epel => { diff --git a/cookbooks/third-party/yum-epel-4.5.0/TESTING.md b/cookbooks/third-party/yum-epel-5.0.2/TESTING.md similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/TESTING.md rename to cookbooks/third-party/yum-epel-5.0.2/TESTING.md diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/default.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/default.rb similarity index 94% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/default.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/default.rb index 8d32a0858..74589cc43 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/default.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/default.rb @@ -1,7 +1,7 @@ default['yum-epel']['repos'] = value_for_platform( %w(almalinux redhat centos oracle rocky) => { - '>= 8.0' => epel_8_repos, + '>= 8.0' => epel_repos, '~> 7.0' => %w( epel diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb new file mode 100644 index 000000000..6229f6b98 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb @@ -0,0 +1,11 @@ +default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo' +default['yum']['epel-debuginfo']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Debug" +default['yum']['epel-debuginfo']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-#{yum_epel_release}&arch=$basearch" +default['yum']['epel-debuginfo']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-debuginfo']['gpgcheck'] = true +default['yum']['epel-debuginfo']['enabled'] = false +default['yum']['epel-debuginfo']['managed'] = false +default['yum']['epel-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-debuginfo.rb similarity index 77% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-debuginfo.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-debuginfo.rb index dd4368760..c16bf6f6f 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-debuginfo.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-debuginfo.rb @@ -1,10 +1,10 @@ default['yum']['epel-next-debuginfo']['repositoryid'] = 'epel-next-debuginfo' default['yum']['epel-next-debuginfo']['description'] = - "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Debug" + "Extra Packages for #{yum_epel_release} - $basearch - Next - Debug" default['yum']['epel-next-debuginfo']['mirrorlist'] = - "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-debug-#{node['platform_version'].to_i}&arch=$basearch" + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-debug-#{yum_epel_release}&arch=$basearch" default['yum']['epel-next-debuginfo']['gpgkey'] = - "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" default['yum']['epel-next-debuginfo']['gpgcheck'] = true default['yum']['epel-next-debuginfo']['enabled'] = false default['yum']['epel-next-debuginfo']['managed'] = false diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-source.rb similarity index 76% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-source.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-source.rb index e7c70a76d..22a2571b0 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-source.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-source.rb @@ -1,10 +1,10 @@ default['yum']['epel-next-source']['repositoryid'] = 'epel-next-source' default['yum']['epel-next-source']['description'] = - "Extra Packages for #{node['platform_version'].to_i} $basearch - Next -Source" + "Extra Packages for #{yum_epel_release} $basearch - Next -Source" default['yum']['epel-next-source']['mirrorlist'] = - "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-source-#{node['platform_version'].to_i}&arch=$basearch" + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-source-#{yum_epel_release}&arch=$basearch" default['yum']['epel-next-source']['gpgkey'] = - "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" default['yum']['epel-next-source']['gpgcheck'] = true default['yum']['epel-next-source']['enabled'] = false default['yum']['epel-next-source']['managed'] = false diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-debuginfo.rb similarity index 78% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-debuginfo.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-debuginfo.rb index 118b636e4..115cd8a11 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-debuginfo.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-debuginfo.rb @@ -1,10 +1,10 @@ default['yum']['epel-next-testing-debuginfo']['repositoryid'] = 'epel-next-testing-debuginfo' default['yum']['epel-next-testing-debuginfo']['description'] = - "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Testing Debug" + "Extra Packages for #{yum_epel_release} - $basearch - Next - Testing Debug" default['yum']['epel-next-testing-debuginfo']['mirrorlist'] = - "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-debug-#{node['platform_version'].to_i}&arch=$basearch" + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-debug-#{yum_epel_release}&arch=$basearch" default['yum']['epel-next-testing-debuginfo']['gpgkey'] = - "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" default['yum']['epel-next-testing-debuginfo']['gpgcheck'] = true default['yum']['epel-next-testing-debuginfo']['enabled'] = false default['yum']['epel-next-testing-debuginfo']['managed'] = false diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-source.rb similarity index 77% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-source.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-source.rb index 8548e540b..355b149ec 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-source.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-source.rb @@ -1,10 +1,10 @@ default['yum']['epel-next-testing-source']['repositoryid'] = 'epel-next-testing-source' default['yum']['epel-next-testing-source']['description'] = - "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Testing Source" + "Extra Packages for #{yum_epel_release} - $basearch - Next - Testing Source" default['yum']['epel-next-testing-source']['mirrorlist'] = - "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch" + "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{yum_epel_release}&arch=$basearch" default['yum']['epel-next-testing-source']['gpgkey'] = - "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" default['yum']['epel-next-testing-source']['gpgcheck'] = true default['yum']['epel-next-testing-source']['enabled'] = false default['yum']['epel-next-testing-source']['managed'] = false diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing.rb similarity index 76% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing.rb index 18476e3fd..7d9b6bb29 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing.rb @@ -1,10 +1,10 @@ default['yum']['epel-next-testing']['repositoryid'] = 'epel-next-testing' default['yum']['epel-next-testing']['description'] = - "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Testing" + "Extra Packages for #{yum_epel_release} - $basearch - Next - Testing" default['yum']['epel-next-testing']['mirrorlist'] = - "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-#{node['platform_version'].to_i}&arch=$basearch" + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-#{yum_epel_release}&arch=$basearch" default['yum']['epel-next-testing']['gpgkey'] = - "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" default['yum']['epel-next-testing']['gpgcheck'] = true default['yum']['epel-next-testing']['enabled'] = false default['yum']['epel-next-testing']['managed'] = false diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next.rb similarity index 87% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next.rb index 246f5a346..a4d192b4e 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next.rb @@ -2,9 +2,9 @@ default['yum']['epel-next']['gpgcheck'] = true default['yum']['epel-next']['description'] = 'Extra Packages for $releasever - Next - $basearch' default['yum']['epel-next']['mirrorlist'] = - "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-#{node['platform_version'].to_i}&arch=$basearch" + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-#{yum_epel_release}&arch=$basearch" default['yum']['epel-next']['gpgkey'] = - "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" default['yum']['epel-next']['enabled'] = true default['yum']['epel-next']['managed'] = true default['yum']['epel-next']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb new file mode 100644 index 000000000..4e8f231af --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb @@ -0,0 +1,11 @@ +default['yum']['epel-source']['repositoryid'] = 'epel-source' +default['yum']['epel-source']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Source" +default['yum']['epel-source']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-#{yum_epel_release}&arch=$basearch" +default['yum']['epel-source']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-source']['gpgcheck'] = true +default['yum']['epel-source']['enabled'] = false +default['yum']['epel-source']['managed'] = false +default['yum']['epel-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb new file mode 100644 index 000000000..94b5159ee --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb @@ -0,0 +1,11 @@ +default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo' +default['yum']['epel-testing-debuginfo']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Testing Debug" +default['yum']['epel-testing-debuginfo']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel#{yum_epel_release}&arch=$basearch" +default['yum']['epel-testing-debuginfo']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-testing-debuginfo']['gpgcheck'] = true +default['yum']['epel-testing-debuginfo']['enabled'] = false +default['yum']['epel-testing-debuginfo']['managed'] = false +default['yum']['epel-testing-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb new file mode 100644 index 000000000..805eb0c25 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb @@ -0,0 +1,11 @@ +default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source' +default['yum']['epel-testing-source']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Testing Source" +default['yum']['epel-testing-source']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{yum_epel_release}&arch=$basearch" +default['yum']['epel-testing-source']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-testing-source']['gpgcheck'] = true +default['yum']['epel-testing-source']['enabled'] = false +default['yum']['epel-testing-source']['managed'] = false +default['yum']['epel-testing-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb new file mode 100644 index 000000000..a8ba20f59 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb @@ -0,0 +1,11 @@ +default['yum']['epel-testing']['repositoryid'] = 'epel-testing' +default['yum']['epel-testing']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Testing " +default['yum']['epel-testing']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel#{yum_epel_release}&arch=$basearch" +default['yum']['epel-testing']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-testing']['gpgcheck'] = true +default['yum']['epel-testing']['enabled'] = false +default['yum']['epel-testing']['managed'] = false +default['yum']['epel-testing']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb new file mode 100644 index 000000000..e8976dfd3 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb @@ -0,0 +1,19 @@ +default['yum']['epel']['repositoryid'] = 'epel' +default['yum']['epel']['gpgcheck'] = true +case node['kernel']['machine'] +when 'armv7l', 'armv7hl' + default['yum']['epel']['baseurl'] = 'https://armv7.dev.centos.org/repodir/epel-pass-1/' + default['yum']['epel']['gpgcheck'] = false +when 's390x' + default['yum']['epel']['baseurl'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/' + default['yum']['epel']['gpgkey'] = + 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/RPM-GPG-KEY-redhat-release' +else + default['yum']['epel']['description'] = "Extra Packages for #{yum_epel_release} - $basearch" + default['yum']['epel']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{yum_epel_release}&arch=$basearch" + default['yum']['epel']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +end +default['yum']['epel']['enabled'] = true +default['yum']['epel']['managed'] = true +default['yum']['epel']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/chefignore b/cookbooks/third-party/yum-epel-5.0.2/chefignore similarity index 98% rename from cookbooks/third-party/yum-epel-4.5.0/chefignore rename to cookbooks/third-party/yum-epel-5.0.2/chefignore index cc170ea79..a27b0b258 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/chefignore +++ b/cookbooks/third-party/yum-epel-5.0.2/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile diff --git a/cookbooks/third-party/yum-epel-4.5.0/documentation/.gitkeep b/cookbooks/third-party/yum-epel-5.0.2/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/documentation/.gitkeep rename to cookbooks/third-party/yum-epel-5.0.2/documentation/.gitkeep diff --git a/cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + 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: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/yum-epel-5.0.2/kitchen.global.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/kitchen.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.yml similarity index 73% rename from cookbooks/third-party/yum-epel-4.5.0/kitchen.yml rename to cookbooks/third-party/yum-epel-5.0.2/kitchen.yml index 0452dc392..e966de056 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/kitchen.yml +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.yml @@ -30,15 +30,6 @@ suites: epel-debuginfo: managed: true enabled: true - epel-modular: - managed: true - enabled: true - epel-modular-debuginfo: - managed: true - enabled: true - epel-modular-source: - managed: true - enabled: true epel-next: managed: true enabled: true @@ -66,15 +57,6 @@ suites: epel-testing-debuginfo: managed: true enabled: true - epel-testing-modular: - managed: true - enabled: true - epel-testing-modular-debuginfo: - managed: true - enabled: true - epel-testing-modular-source: - managed: true - enabled: true epel-testing-source: managed: true enabled: true diff --git a/cookbooks/third-party/yum-epel-4.5.0/libraries/helpers.rb b/cookbooks/third-party/yum-epel-5.0.2/libraries/helpers.rb similarity index 73% rename from cookbooks/third-party/yum-epel-4.5.0/libraries/helpers.rb rename to cookbooks/third-party/yum-epel-5.0.2/libraries/helpers.rb index 0efea8a32..c772d31c8 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/libraries/helpers.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/libraries/helpers.rb @@ -1,19 +1,13 @@ module YumEpel module Cookbook module Helpers - def epel_8_repos + def epel_repos repos = %w( epel epel-debuginfo - epel-modular - epel-modular-debuginfo - epel-modular-source epel-source epel-testing epel-testing-debuginfo - epel-testing-modular - epel-testing-modular-debuginfo - epel-testing-modular-source epel-testing-source ) @@ -36,6 +30,19 @@ def epel_8_repos def yum_epel_centos_stream? respond_to?(:centos_stream_platform?) && centos_stream_platform? end + + def yum_epel_release + if platform?('amazon') + case node['platform_version'].to_i + when 2023 + 9 + when 2 + 7 + end + else + node['platform_version'].to_i + end + end end end end diff --git a/cookbooks/third-party/yum-epel-4.5.0/metadata.rb b/cookbooks/third-party/yum-epel-5.0.2/metadata.rb similarity index 94% rename from cookbooks/third-party/yum-epel-4.5.0/metadata.rb rename to cookbooks/third-party/yum-epel-5.0.2/metadata.rb index ac9c9af6c..bc5c476a7 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/metadata.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Installs and configures the EPEL Yum repository' -version '4.5.0' +version '5.0.2' source_url 'https://github.com/sous-chefs/yum-epel' issues_url 'https://github.com/sous-chefs/yum-epel/issues' chef_version '>= 12.15' diff --git a/cookbooks/third-party/yum-epel-4.5.0/recipes/default.rb b/cookbooks/third-party/yum-epel-5.0.2/recipes/default.rb similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/recipes/default.rb rename to cookbooks/third-party/yum-epel-5.0.2/recipes/default.rb diff --git a/cookbooks/third-party/yum-epel-5.0.2/renovate.json b/cookbooks/third-party/yum-epel-5.0.2/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/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"] + } + ] +} diff --git a/cookbooks/third-party/yum-epel-4.5.0/spec/default_spec.rb b/cookbooks/third-party/yum-epel-5.0.2/spec/default_spec.rb similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/spec/default_spec.rb rename to cookbooks/third-party/yum-epel-5.0.2/spec/default_spec.rb diff --git a/cookbooks/third-party/yum-epel-4.5.0/spec/spec_helper.rb b/cookbooks/third-party/yum-epel-5.0.2/spec/spec_helper.rb similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/spec/spec_helper.rb rename to cookbooks/third-party/yum-epel-5.0.2/spec/spec_helper.rb diff --git a/cookbooks/third-party/yum-epel-4.5.0/test/integration/all/all_spec.rb b/cookbooks/third-party/yum-epel-5.0.2/test/integration/all/all_spec.rb similarity index 55% rename from cookbooks/third-party/yum-epel-4.5.0/test/integration/all/all_spec.rb rename to cookbooks/third-party/yum-epel-5.0.2/test/integration/all/all_spec.rb index 4f3c8d7e9..2fbd93911 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/test/integration/all/all_spec.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/test/integration/all/all_spec.rb @@ -1,22 +1,5 @@ -os_release = os.name == 'amazon' ? 7 : os.release.to_i +os_release = os.name == 'amazon' ? 9 : os.release.to_i stream = file('/etc/os-release').content.match?('Stream') -infra = - if os.name == 'oracle' - '$infra' - elsif os.name == 'almalinux' - 'stock' - elsif stream - 'stock' - else - 'container' - end - -content = case os.name - when 'oracle' then '$contentdir' - when 'rocky' then 'pub/rocky' - when 'almalinux' then 'almalinux' - else 'centos' - end describe yum.repo 'epel' do it { should exist } @@ -55,42 +38,6 @@ end if os_release >= 8 - describe yum.repo 'epel-modular' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=epel-modular-8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-modular-debuginfo' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-modular-source' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-testing-modular' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-testing-modular-debuginfo' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-testing-modular-source' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - if stream describe yum.repo 'epel-next' do it { should exist } @@ -128,18 +75,4 @@ its('mirrors') { should cmp "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{os_release}&arch=x86_64" } end end -else - %w( - epel-modular - epel-modular-debuginfo - epel-modular-source - epel-testing-modular - epel-testing-modular-debuginfo - epel-testing-modular-source - ).each do |repo| - describe yum.repo repo do - it { should_not exist } - it { should_not be_enabled } - end - end end diff --git a/cookbooks/third-party/yum-epel-4.5.0/test/integration/default/default_spec.rb b/cookbooks/third-party/yum-epel-5.0.2/test/integration/default/default_spec.rb similarity index 92% rename from cookbooks/third-party/yum-epel-4.5.0/test/integration/default/default_spec.rb rename to cookbooks/third-party/yum-epel-5.0.2/test/integration/default/default_spec.rb index 4436a2644..db334c1e2 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/test/integration/default/default_spec.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/test/integration/default/default_spec.rb @@ -1,4 +1,4 @@ -os_release = os.name == 'amazon' ? '7' : os.release.to_i +os_release = os.name == 'amazon' ? '9' : os.release.to_i stream = file('/etc/os-release').content.match?('Stream') describe yum.repo 'epel' do diff --git a/metadata.rb b/metadata.rb index 44dae715f..d122ef5f3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -21,7 +21,7 @@ depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' depends 'aws-parallelcluster-slurm', '~> 3.7.0' depends 'aws-parallelcluster-awsbatch', '~> 3.7.0' depends 'aws-parallelcluster-platform', '~> 3.7.0'