Merge pull request #2905 from lorengordon/release/0.27.2

Releases watchmaker 0.27.2

Author: lorengordon

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.27.1
+current_version = 0.27.2
 commit = False
 tag = False
 tag_name = {new_version}

.travis.yml

@@ -72,19 +72,19 @@ jobs:
   include:
     - stage: test
       name: lint
-      python: 3.8
+      python: 3.10
       env:
         - TOXENV=check
 
     - stage: test
       name: docs
-      python: 3.8
+      python: 3.10
       env:
         - TOXENV=docs
 
     - stage: test
       name: build standalone
-      python: 3.8
+      python: 3.10
       install:
         - docker --version
         - chmod +x ci/prep_docker.sh
@@ -142,7 +142,7 @@ jobs:
     - stage: deploy
       name: deploy to pypi
       if: type != pull_request AND (branch = main OR tag is present)
-      python: 3.8
+      python: 3.10
       install: skip
       script: skip
       before_deploy: echo Deploying "$(grep 'version = ' setup.cfg)"

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.27.2](https://github.com/plus3it/watchmaker/releases/tag/0.27.2)
+
+**Released**: 2023.05.18
+
+**Summary**:
+
+*   Adds support for salt 3006
+*   Builds standalone executable using Python 3.10
+*   Documents additional expected findings for EL8 systems
+*   Uses Python 3.10 in all documentation references
+*   Updates default config to use salt 3006.1
+*   Uses SCC 5.7.1 in default salt content
+*   ash-linux-formula
+    -   Simplifies logic for managing faillock.conf
+*   ash-windows-formula
+    -   Updates custom modules for compatibility with Salt 3006 while remaining
+        backwards compatible with salt 3005 and earlier
+*   splunkforwarder-formula
+    -   Sets splunk user/group on files and directories, eliminating "Changes"
+        when re-executing the formula
+
 ## [0.27.1](https://github.com/plus3it/watchmaker/releases/tag/0.27.1)
 
 **Released**: 2023.05.08
@@ -23,7 +44,8 @@
 *   forescout-secure-connector-formula
     -   Establishes symlink so logs are written to `/var/log` partition
 *   scap-formula
-    - Updates openscap content to v0.1.67, using scap 1.3 datastreams
+    -   Updates openscap content to v0.1.67, using scap 1.3 datastreams. This also
+        addresses issues with expiry on passwordless local users
 
 ## [0.27.0](https://github.com/plus3it/watchmaker/releases/tag/0.27.0)
 

CONTRIBUTING.md

@@ -189,8 +189,8 @@ specify something like this for EC2 userdata:
     $GitBranch = "<your-branch>"
 
     $BootstrapUrl = "https://watchmaker.cloudarmor.io/releases/latest/watchmaker-bootstrap.ps1"
-    $PythonUrl = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe"
-    $GitUrl = "https://github.com/git-for-windows/git/releases/download/v2.37.1.windows.1/Git-2.37.1-64-bit.exe"
+    $PythonUrl = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe"
+    $GitUrl = "https://github.com/git-for-windows/git/releases/download/v2.40.1.windows.1/Git-2.40.1-64-bit.exe"
     $PypiUrl = "https://pypi.org/simple"
 
     # Use TLS 1.2+
@@ -214,7 +214,7 @@ specify something like this for EC2 userdata:
 
     # Install watchmaker
     cd watchmaker
-    pip install --index-url "$PypiUrl" --editable .
+    python -m pip install --index-url "$PypiUrl" --editable .
 
     # Run watchmaker
     watchmaker --log-level debug --log-dir=C:\Watchmaker\Logs

azure-pipelines.yml

@@ -55,7 +55,7 @@ jobs:
   pool:
     vmImage: 'windows-2019'
   variables:
-    py: "3.8"
+    py: "3.10"
     architecture: "x64"
     venv: $(System.DefaultWorkingDirectory)\venv
     artifactDirFull: $(System.DefaultWorkingDirectory)\$(artifactDir)

docs/conf.py

@@ -92,7 +92,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.27.1'
+version = '0.27.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 

docs/files/bootstrap/watchmaker-bootstrap.ps1

@@ -1,6 +1,6 @@
 [CmdLetBinding()]
 Param(
-  [String]$PythonUrl = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe"
+  [String]$PythonUrl = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe"
   ,
   [String]$GitUrl
   ,
@@ -86,7 +86,7 @@ function Install-Git {
   Download-File -Url ${GitUrl} -SavePath ${GitFile}
 
   $Arguments = @()
-  $Arguments += "/SILENT"
+  $Arguments += "/VERYSILENT"
   $Arguments += "/NOCANCEL"
   $Arguments += "/NORESTART"
   $Arguments += "/SAVEINF=${SaveDir}\git_params.txt"

docs/usage.md

@@ -176,7 +176,7 @@ simple bootstrap script to do that for you. After installing Python, install
 ```shell
 <powershell>
 $BootstrapUrl = "https://watchmaker.cloudarmor.io/releases/latest/watchmaker-bootstrap.ps1"
-$PythonUrl = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe"
+$PythonUrl = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe"
 $PypiUrl = "https://pypi.org/simple"
 
 # Use TLS 1.2+
@@ -191,7 +191,7 @@ $BootstrapFile = "${Env:Temp}\$(${BootstrapUrl}.split('/')[-1])"
 
 # Install Watchmaker
 python -m pip install --index-url="$PypiUrl" --upgrade pip setuptools
-pip install --index-url="$PypiUrl" --upgrade watchmaker
+python -m pip install --index-url="$PypiUrl" --upgrade watchmaker
 
 # Run Watchmaker
 watchmaker --log-level debug --log-dir=C:\Watchmaker\Logs

setup.cfg

@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.27.1
+version = 0.27.2
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker

src/watchmaker/static/config.yaml

@@ -1,4 +1,4 @@
-watchmaker_version: ">= 0.24.0.dev"
+watchmaker_version: ">= 0.27.2.dev"
 
 all:
   - salt:
@@ -9,6 +9,7 @@ all:
       ou_path: null
       salt_content: null
       salt_states: Highstate
+      salt_version: '3006.1'
       user_formulas:
         # To add extra formulas, specify them as a map of
         #    <formula_name>: <archive_url>
@@ -28,7 +29,7 @@ linux:
             - redhat
             - centos
           el_version: 7
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/3005.1-4/salt-reposync-el7-onedir.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/3006.1/salt-reposync-el7-onedir.repo
         #SaltEL8:
         - dist:
             - almalinux
@@ -37,7 +38,7 @@ linux:
             - redhat
             - rocky
           el_version: 8
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/3005.1-4/salt-reposync-el8-onedir.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/3006.1/salt-reposync-el8-onedir.repo
   - salt:
       pip_install:
         - dnspython
@@ -50,7 +51,7 @@ linux:
 windows:
   - salt:
       salt_debug_log: null
-      installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/salt-3005.1-2-windows-amd64.exe
+      installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-3006.1-Py3-AMD64-Setup.exe
 
 status:
   providers: