Merge branch 'master' into fix-module-mac_brew_pkg

saltstack · Jul 16, 2020 · ad35e5a · ad35e5a
2 parents f890d42 + 45efc4c
commit ad35e5a
Show file tree

Hide file tree

Showing 52 changed files with 523 additions and 377 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,64 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+Salt 3001.1 (2020-07-15)
+========================
+
+Changed
+-------
+
+- Change the ``enable_fqdns_grains`` setting to default to ``False`` on Windows
+  to address some issues with slowness. (#56296, #57529)
+- Handle the UCRT libraries the same way they are handled in the Python 3
+  installer (#57594)
+- Changes the 'SSDs' grain name to 'ssds' as all grains needs to be 
+  resolved in lowered case. (#57612)
+
+
+Fixed
+-----
+
+- When running scheduled jobs from a proxy minion with multiprocessing turned off (default) a recursive error occurs as __pub_fun_args is repeated over and over again in the kwargs element in the data dictionary.  Now we make a copy of data['kwargs'] instead of using a reference. (#57941)
+- The `x509.certificate_managed` state no longer triggers a change because of sorting issues if the certificate being evaluated was previously generated under Python 2. (#56556)
+- Added support to lo ip alias in network.managed state by checking if lo inet data
+  from network.interfaces contains label with the name of managed interface.
+  Return status True if match found. (#56901)
+- Redact passwords in the return when setting credentials using
+  ``win_iis.container_setting`` (#57285)
+- Fixes issue with cmd.powershell. Some powershell commands do not return
+  anything in stdout. This causes the JSON parser to fail because an empty string
+  is not valid JSON. This changes an empty string to `{}` which is valid JSON and
+  will not cause the JSON loader to stacktrace. (#57493)
+- Improves performance. Profiling `test.ping` on Windows shows that 13 of 17 
+  seconds are wasted when the esxi grain loads vsphere before noting that
+  the OS is not a esxi host. (#57529)
+- Fixed permissions issue with certain pip/virtualenv states/modules when configured for non-root user. (#57550)
+- Allow running nox sessions either using our `nox-py2 fork <https://github.com/s0undt3ch/nox/tree/hotfix/py2-release>`_ or upstream `nox <https://github.com/theacodes/nox>`_. (#57583)
+- Fixes issue with lgpo.get when there are unicode characters in the hostname (#57591)
+- Fixes issue with virtual block devices, like loopbacks and LVMs, wrongly
+  populating the "disks" or "ssds" grains. (#57612)
+- Due to some optimization the `virtual` grain was never updated on illumos. Move the fallback in prtdiag output parsing outside the loop that now gets skipped due to the command exiting non-zero. (#57714)
+- Grains module delkey and delval methods now support the force option. This is
+  needed for deleting grains with complex (nested) values. (#57718)
+- Moving import salt.modules.vsphere into `__virtual__` so we have access to test proxytype in opts,
+  previously this was causing a traceback when run on proxy minion as `__opts__` does not exist
+  outside of any functions. Introducing a new utils function, is_proxytype, to check that the
+  device is a proxy minion and also that the proxy type matches. (#57743)
+- Fixed fail_with_changes in the test state to use the comment argument when passed. (#57766)
+- Adds a fix so salt can run on the latest macOS version Big Sur. (#57787)
+- Fixes UnpackValueError when using GPG cache by using atomic open. (#57798)
+- The ``gid_from_name`` argument was removed from the ``user.present`` state in
+  version 3001, with no deprecation path. It has been restored and put on a
+  proper deprecation path. (#57843)
+- Fixes dictionary being changed during iteration. (#57845)
+
+
+Added
+-----
+
+- Added docs demonstrating how to apply an MSI patch with winrepo (#32780)
+
+
 Salt 3001 (2020-06-17)
 ======================
 

diff --git a/changelog/32780.added b/changelog/32780.added
diff --git a/changelog/56296.changed b/changelog/56296.changed
diff --git a/changelog/56556.fixed b/changelog/56556.fixed
diff --git a/changelog/56901.fixed b/changelog/56901.fixed
diff --git a/changelog/57285.fixed b/changelog/57285.fixed
diff --git a/changelog/57493.fixed b/changelog/57493.fixed
diff --git a/changelog/57529.changed b/changelog/57529.changed
diff --git a/changelog/57529.fixed b/changelog/57529.fixed
diff --git a/changelog/57550.fixed b/changelog/57550.fixed
diff --git a/changelog/57583.fixed b/changelog/57583.fixed
diff --git a/changelog/57591.fixed b/changelog/57591.fixed
diff --git a/changelog/57594.changed b/changelog/57594.changed
diff --git a/changelog/57612.changed b/changelog/57612.changed
diff --git a/changelog/57612.fixed b/changelog/57612.fixed
diff --git a/changelog/57714.fixed b/changelog/57714.fixed
diff --git a/changelog/57718.fixed b/changelog/57718.fixed
diff --git a/changelog/57743.fixed b/changelog/57743.fixed
diff --git a/changelog/57766.fixed b/changelog/57766.fixed
diff --git a/changelog/57787.fixed b/changelog/57787.fixed
diff --git a/changelog/57798.fixed b/changelog/57798.fixed
diff --git a/changelog/57843.fixed b/changelog/57843.fixed
diff --git a/changelog/57845.fixed b/changelog/57845.fixed
diff --git a/doc/topics/releases/3001.1.rst b/doc/topics/releases/3001.1.rst
@@ -0,0 +1,63 @@
+.. _release-3001-1:
+
+=========================
+Salt 3001.1 Release Notes
+=========================
+
+Version 3001.1 is a bugfix release for :ref:`3001 <release-3001>`.
+
+
+Changed
+-------
+
+- Change the ``enable_fqdns_grains`` setting to default to ``False`` on Windows
+  to address some issues with slowness. (#56296, #57529)
+- Handle the UCRT libraries the same way they are handled in the Python 3
+  installer (#57594)
+- Changes the 'SSDs' grain name to 'ssds' as all grains needs to be 
+  resolved in lowered case. (#57612)
+
+
+Fixed
+-----
+
+- When running scheduled jobs from a proxy minion with multiprocessing turned off (default) a recursive error occurs as __pub_fun_args is repeated over and over again in the kwargs element in the data dictionary.  Now we make a copy of data['kwargs'] instead of using a reference. (#57941)
+- The `x509.certificate_managed` state no longer triggers a change because of sorting issues if the certificate being evaluated was previously generated under Python 2. (#56556)
+- Added support to lo ip alias in network.managed state by checking if lo inet data
+  from network.interfaces contains label with the name of managed interface.
+  Return status True if match found. (#56901)
+- Redact passwords in the return when setting credentials using
+  ``win_iis.container_setting`` (#57285)
+- Fixes issue with cmd.powershell. Some powershell commands do not return
+  anything in stdout. This causes the JSON parser to fail because an empty string
+  is not valid JSON. This changes an empty string to `{}` which is valid JSON and
+  will not cause the JSON loader to stacktrace. (#57493)
+- Improves performance. Profiling `test.ping` on Windows shows that 13 of 17 
+  seconds are wasted when the esxi grain loads vsphere before noting that
+  the OS is not a esxi host. (#57529)
+- Fixed permissions issue with certain pip/virtualenv states/modules when configured for non-root user. (#57550)
+- Allow running nox sessions either using our `nox-py2 fork <https://github.com/s0undt3ch/nox/tree/hotfix/py2-release>`_ or upstream `nox <https://github.com/theacodes/nox>`_. (#57583)
+- Fixes issue with lgpo.get when there are unicode characters in the hostname (#57591)
+- Fixes issue with virtual block devices, like loopbacks and LVMs, wrongly
+  populating the "disks" or "ssds" grains. (#57612)
+- Due to some optimization the `virtual` grain was never updated on illumos. Move the fallback in prtdiag output parsing outside the loop that now gets skipped due to the command exiting non-zero. (#57714)
+- Grains module delkey and delval methods now support the force option. This is
+  needed for deleting grains with complex (nested) values. (#57718)
+- Moving import salt.modules.vsphere into `__virtual__` so we have access to test proxytype in opts,
+  previously this was causing a traceback when run on proxy minion as `__opts__` does not exist
+  outside of any functions. Introducing a new utils function, is_proxytype, to check that the
+  device is a proxy minion and also that the proxy type matches. (#57743)
+- Fixed fail_with_changes in the test state to use the comment argument when passed. (#57766)
+- Adds a fix so salt can run on the latest macOS version Big Sur. (#57787)
+- Fixes UnpackValueError when using GPG cache by using atomic open. (#57798)
+- The ``gid_from_name`` argument was removed from the ``user.present`` state in
+  version 3001, with no deprecation path. It has been restored and put on a
+  proper deprecation path. (#57843)
+- Fixes dictionary being changed during iteration. (#57845)
+
+
+Added
+-----
+
+- Added docs demonstrating how to apply an MSI patch with winrepo (#32780)
+
diff --git a/pkg/windows/req.txt b/pkg/windows/req.txt
@@ -13,7 +13,7 @@ libnacl==1.7.1
 lxml==4.3.0
 Mako==1.0.7
 markupsafe==1.1.1
-msgpack-python==0.5.6
+msgpack==1.0.0
 psutil==5.6.6
 pyasn1==0.4.5
 pycparser==2.19
@@ -29,7 +29,6 @@ pyzmq==18.0.1 ; python_version < "3.8"
 pyzmq==19.0.0 ; python_version >= "3.8"
 requests==2.21.0
 setproctitle
-singledispatch==3.4.0.3; python_version < '3.4'
 timelib==0.2.4
 watchdog==0.9.0
 wheel==0.33.4

diff --git a/requirements/pytest.txt b/requirements/pytest.txt
@@ -4,6 +4,6 @@ pytest >= 5.4.2; sys_platform != "win32"
 # https://github.com/pytest-dev/pytest/issues/6964#issuecomment-632727439
 pytest >=4.6.9,<4.7; sys_platform == "win32"
 pytest-salt
-pytest-salt-factories >= 0.10.6
+pytest-salt-factories >= 0.10.7
 pytest-tempdir >= 2019.10.12
 pytest-helpers-namespace >= 2019.1.8
diff --git a/requirements/static/cloud.in b/requirements/static/cloud.in
@@ -1,5 +1,4 @@
 # This is a compilation of requirements installed on salt-jenkins git.salt state run
-impacket; python_version < '3.0'
 netaddr
 profitbricks
 pypsexec

diff --git a/requirements/static/darwin.in b/requirements/static/darwin.in
@@ -5,7 +5,6 @@ clustershell
 croniter>=0.3.0,!=0.3.22
 dnspython
 docker
-futures>=2.0; python_version < '3.0'
 jmespath
 jsonschema
 junos-eznc==2.4.0
@@ -24,7 +23,6 @@ pyvmomi
 rfc3987
 salttesting==2017.6.1
 strict_rfc3339
-supervisor==3.3.5; python_version < '3'
 toml
 virtualenv>=20.0.20
 watchdog
@@ -35,7 +33,6 @@ vcert~=0.7.0
 Genshi
 Cheetah3==3.1.0
 Mako
-wempy; python_version <'3'
 
 # cassandra
-cassandra-driver>=2.0
+cassandra-driver>=2.0
diff --git a/requirements/static/freebsd.in b/requirements/static/freebsd.in
@@ -7,7 +7,6 @@ cherrypy==17.3.0
 croniter>=0.3.0,!=0.3.22
 dnspython
 docker
-futures>=2.0; python_version < '3.0'
 GitPython
 hgtools
 jmespath
@@ -35,7 +34,6 @@ salttesting==2017.6.1
 setproctitle
 setuptools-scm
 strict_rfc3339
-supervisor==3.3.5; python_version < '3'
 timelib
 toml
 vcert~=0.7.0
@@ -46,4 +44,3 @@ watchdog
 Genshi
 Cheetah3==3.1.0
 Mako
-wempy; python_version <'3'
diff --git a/requirements/static/linux.in b/requirements/static/linux.in
@@ -8,7 +8,6 @@ cherrypy==17.3.0
 croniter>=0.3.0,!=0.3.22
 dnspython
 docker
-futures>=2.0; python_version < '3.0'
 GitPython
 hgtools
 jmespath
@@ -38,7 +37,6 @@ salttesting==2017.6.1
 setproctitle
 setuptools-scm
 strict_rfc3339
-supervisor==3.3.5; python_version < '3'
 timelib
 toml
 vcert~=0.7.0
@@ -49,7 +47,6 @@ watchdog
 Genshi
 Cheetah3==3.1.0
 Mako
-wempy; python_version <'3'
 
 # cassandra
 cassandra-driver>=2.0