Merge branch 'master' into schedule_modify_no_function_fix

Author: dwoz

CHANGELOG.md

@@ -26,6 +26,8 @@ Versions are `MAJOR.PATCH`.
 
 ### Changed
 
+- [#54013](https://github.com/saltstack/salt/pull/54103) - Set `session_id`
+  cookie in the rest_tornado backend.
 - [SEP 14](https://github.com/saltstack/salt-enhancement-proposals/pull/20) - Changed to numeric versions.
 - [SEP 1](https://github.com/saltstack/salt-enhancement-proposals/blob/master/accepted/0001-changelog-format.md), [SEP 14](https://github.com/saltstack/salt-enhancement-proposals/pull/20) - Adopted keepachangelog format.
 

doc/man/salt.7

@@ -387835,7 +387835,6 @@ A more involved example involves pulling from a custom repository.
 .ft C
 base:
   pkgrepo.managed:
-    \- humanname: Logstash PPA
     \- name: ppa:wolfnet/logstash
     \- dist: precise
     \- file: /etc/apt/sources.list.d/logstash.list
@@ -387859,7 +387858,6 @@ state module
 .ft C
 dotdeb.repo:
   pkgrepo.managed:
-    \- humanname: Dotdeb
     \- name: deb http://packages.dotdeb.org wheezy\-php55 all
     \- dist: wheezy\-php55
     \- file: /etc/apt/sources.list.d/dotbeb.list
@@ -389734,7 +389732,6 @@ base:
 .ft C
 base:
   pkgrepo.managed:
-    \- humanname: Logstash PPA
     \- name: deb http://ppa.launchpad.net/wolfnet/logstash/ubuntu precise main
     \- dist: precise
     \- file: /etc/apt/sources.list.d/logstash.list
@@ -389757,7 +389754,6 @@ base:
 .ft C
 base:
   pkgrepo.managed:
-    \- humanname: deb\-multimedia
     \- name: deb http://www.deb\-multimedia.org stable main
     \- file: /etc/apt/sources.list.d/deb\-multimedia.list
     \- key_url: salt://deb\-multimedia/files/marillat.pub
@@ -389772,7 +389768,6 @@ base:
 .ft C
 base:
   pkgrepo.managed:
-    \- humanname: Google Chrome
     \- name: deb http://dl.google.com/linux/chrome/deb/ stable main
     \- dist: stable
     \- file: /etc/apt/sources.list.d/chrome\-browser.list

doc/ref/modules/all/index.rst

@@ -48,6 +48,7 @@ execution modules
     bigip
     bluez_bluetooth
     boto3_elasticache
+    boto3_elasticsearch
     boto3_route53
     boto_apigateway
     boto_asg

doc/ref/modules/all/salt.modules.boto3_elasticsearch.rst

@@ -0,0 +1,5 @@
+salt.modules.boto3_elasticsearch module
+=======================================
+
+.. automodule:: salt.modules.boto3_elasticsearch
+    :members:

doc/ref/states/all/index.rst

@@ -31,6 +31,7 @@ state modules
     bigip
     blockdev
     boto3_elasticache
+    boto3_elasticsearch
     boto3_route53
     boto_apigateway
     boto_asg
@@ -244,6 +245,7 @@ state modules
     rabbitmq_cluster
     rabbitmq_plugin
     rabbitmq_policy
+    rabbitmq_upstream
     rabbitmq_user
     rabbitmq_vhost
     rbac_solaris

doc/ref/states/all/salt.states.boto3_elasticsearch.rst

@@ -0,0 +1,6 @@
+salt.states.boto3_elasticsearch module
+======================================
+
+.. automodule:: salt.states.boto3_elasticsearch
+    :members:
+    :undoc-members:

doc/ref/states/all/salt.states.rabbitmq_upstream.rst

@@ -0,0 +1,6 @@
+=============================
+salt.states.rabbitmq_upstream
+=============================
+
+.. automodule:: salt.states.rabbitmq_upstream
+    :members:

doc/topics/cloud/cloudstack.rst

@@ -22,7 +22,7 @@ Using Salt for CloudStack, requires an ``API key`` and a ``secret key`` along wi
 
     exoscale:
       driver: cloudstack
-      host: api.exoscale.ch
+      host: api.exoscale.com
       path: /compute
       apikey: EXOAPIKEY
       secretkey: EXOSECRETKEYINYOURACCOUNT
@@ -48,9 +48,10 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or in the
 
     exoscale-ubuntu:
       provider: exoscale-config
-      image: Ubuntu 16.04 
+      image: Linux Ubuntu 18.04
       size: Small
       location: ch-gva-2
+      ssh_username: ubuntu
 
 Locations can be obtained using the ``--list-locations`` option for the ``salt-cloud``
 command:

doc/topics/cloud/saltify.rst

@@ -168,6 +168,13 @@ example of how to use the Saltify driver with a map file follows:
           ssh_username: root
           password: another-bad-pass
 
+In this example, the names ``my-instance-0`` and ``my-instance-1`` will be the
+identifiers of the deployed minions.
+
+Note: The ``ssh_host`` directive is also used for Windows hosts, even though they do
+not typically run the SSH service. It indicates IP address or host name for the target
+system.
+
 Note: When using a cloud map with the Saltify driver, the name of the profile
 to use, in this case ``make_salty``, must be defined in a profile config. For
 example:
@@ -197,6 +204,47 @@ Connectivity to the new "Salted" instances can now be verified with Salt:
 
     salt 'my-instance-*' test.version
 
+Bulk Deployments
+----------------
+
+When deploying large numbers of Salt Minions using Saltify, it may be
+preferable to organize the configuration in a way that duplicates data
+as little as possible. For example, if a group of target systems have 
+the same credentials, they can be specified in the profile, rather than
+in a map file.
+
+.. code-block:: yaml
+
+    # /etc/salt/cloud.profiles.d/saltify.conf
+
+    make_salty:
+      provider: my-saltify-config
+      ssh_username: root
+      password: very-bad-password
+
+.. code-block:: yaml
+
+    # /etc/salt/saltify-map
+
+    make_salty:
+      - my-instance-0:
+          ssh_host: 12.34.56.78
+      - my-instance-1:
+          ssh_host: 44.33.22.11
+
+If ``ssh_host`` is not provided, its default value will be the Minion identifier
+(``my-instance-0`` and ``my-instance-1``, in the example above). For deployments with
+working DNS resolution, this can save a lot of redundant data in the map. Here is an
+example map file using DNS names instead of IP addresses:
+
+.. code-block:: yaml
+
+    # /etc/salt/saltify-map
+
+    make_salty:
+      - my-instance-0
+      - my-instance-1
+
 Credential Verification
 =======================
 

doc/topics/execution/remote_execution.rst

@@ -81,9 +81,9 @@ Arguments are formatted as YAML:
 
 .. code-block:: bash
 
-    salt '*' cmd.run 'echo "Hello: $FIRST_NAME"' saltenv='{FIRST_NAME: "Joe"}'
+    salt '*' cmd.run 'echo "Hello: $FIRST_NAME"' env='{FIRST_NAME: "Joe"}'
 
-Note: dictionaries must have curly braces around them (like the ``saltenv``
+Note: dictionaries must have curly braces around them (like the ``env``
 keyword argument above).  This was changed in 0.15.1: in the above example,
 the first argument used to be parsed as the dictionary
 ``{'echo "Hello': '$FIRST_NAME"'}``. This was generally not the expected
@@ -94,7 +94,7 @@ If you want to test what parameters are actually passed to a module, use the
 
 .. code-block:: bash
 
-    salt '*' test.arg_repr 'echo "Hello: $FIRST_NAME"' saltenv='{FIRST_NAME: "Joe"}'
+    salt '*' test.arg_repr 'echo "Hello: $FIRST_NAME"' env='{FIRST_NAME: "Joe"}'
 
 Finding available minion functions
 ``````````````````````````````````

doc/topics/jinja/index.rst

@@ -1343,9 +1343,52 @@ Returns:
 
   'default'
 
+
+.. jinja_ref:: json_query
+
+``json_query``
+--------------
+
+.. versionadded:: Neon
+
+A port of Ansible ``json_query`` Jinja filter to make queries against JSON data using `JMESPath language`_.
+Could be used to filter ``pillar`` data, ``yaml`` maps, and together with :jinja_ref:`http_query`.
+Depends on the `jmespath`_ Python module.
+
+Examples:
+
+.. code-block:: jinja
+
+  Example 1: {{ [1, 2, 3, 4, [5, 6]] | json_query('[]') }}
+
+  Example 2: {{
+  {"machines": [
+    {"name": "a", "state": "running"},
+    {"name": "b", "state": "stopped"},
+    {"name": "c", "state": "running"}
+  ]} | json_query("machines[?state=='running'].name") }}
+
+  Example 3: {{
+  {"services": [
+    {"name": "http", "host": "1.2.3.4", "port": 80},
+    {"name": "smtp", "host": "1.2.3.5", "port": 25},
+    {"name": "ssh",  "host": "1.2.3.6", "port": 22},
+  ]} | json_query("services[].port") }}
+
+Returns:
+
+.. code-block:: text
+
+  Example 1: [1, 2, 3, 4, 5, 6]
+
+  Example 2: ['a', 'c']
+
+  Example 3: [80, 25, 22]
+
 .. _`builtin filters`: http://jinja.pocoo.org/docs/templates/#builtin-filters
 .. _`timelib`: https://github.com/pediapress/timelib/
-
+.. _`JMESPath language`: http://jmespath.org/
+.. _`jmespath`: https://github.com/jmespath/jmespath.py
 
 .. jinja_ref:: to_snake_case
 

doc/topics/releases/neon.rst

@@ -82,8 +82,11 @@ as well as managing keystore files.
             -----END CERTIFICATE-----
 
 
+Jinja enhancements
+==================
+
 Troubleshooting Jinja map files
-===============================
+-------------------------------
 
 A new :py:func:`execution module <salt.modules.jinja>` for ``map.jinja`` troubleshooting
 has been added.
@@ -109,6 +112,18 @@ The module can be also used to test ``json`` and ``yaml`` maps:
   salt myminion jinja.import_json myformula/defaults.json
 
 
+json_query filter
+-----------------
+
+A port of Ansible :jinja_ref:`json_query` Jinja filter has been added. It allows
+making queries against JSON data using `JMESPath language`_. Could be used to
+filter ``pillar`` data, ``yaml`` maps, and also useful with :jinja_ref:`http_query`.
+
+Depends on the `jmespath`_ Python module.
+
+.. _`JMESPath language`: http://jmespath.org/
+.. _`jmespath`: https://github.com/jmespath/jmespath.py
+
 Slot Syntax Updates
 ===================
 
@@ -135,13 +150,38 @@ The slot syntax has been updated to support parsing dictionary responses and to
     Duration: 1.229 ms
      Changes:
 
+Also, slot parsing is now supported inside of nested state data structures (dicts, lists, unless/onlyif args):
+
+.. code-block:: yaml
+
+  demo slot parsing for nested elements:
+    file.managed:
+      - name: /tmp/slot.txt
+      - source: salt://slot.j2
+      - template: jinja
+      - context:
+          # Slot inside of the nested context dictionary
+          variable: __slot__:salt:test.echo(a_value)
+      - unless:
+        - fun: file.search
+          args:
+            # Slot as unless argument
+            - __slot__:salt:test.echo(/tmp/slot.txt)
+            - "DO NOT OVERRIDE"
+          ignore_if_missing: True
+
 
 State Changes
 =============
 
 - Added new :py:func:`ssh_auth.manage <salt.states.ssh_auth.manage>` state to
   ensure only the specified ssh keys are present for the specified user.
 
+Module Changes
+==============
+
+- Added new :py:func:`boto_ssm <salt.modules.boto_ssm>` module to set and query
+  secrets in AWS SSM parameters.
 
 Deprecations
 ============

noxfile.py

@@ -349,7 +349,7 @@ def _install_requirements(session, transport, *extra_requirements):
 
 
 def _run_with_coverage(session, *test_cmd):
-    session.install('--progress-bar=off', 'coverage==4.5.3', silent=PIP_INSTALL_SILENT)
+    session.install('--progress-bar=off', 'coverage==5.0.1', silent=PIP_INSTALL_SILENT)
     session.run('coverage', 'erase')
     python_path_env_var = os.environ.get('PYTHONPATH') or None
     if python_path_env_var is None:

pkg/windows/modules/start-process-and-test-exitcode.psm1

@@ -15,10 +15,10 @@ Function Start_Process_and_test_exitcode {
     Begin { Write-Host "Executing Command: $fun $args" }
 
     Process {
-        $p = Start-Process "$fun" -ArgumentList "$args" -Wait -NoNewWindow -PassThru
-        If ( $($p.ExitCode) -ne 0) {
-            Write-Error "$descr returned exitcode $($p.ExitCode). "
-            exit $($p.ExitCode)
+        $p = Start-Process "$fun" -ArgumentList "$args" -Wait -PassThru
+        If ($p.ExitCode -ne 0) {
+            Write-Error "$descr returned exitcode $p.ExitCode."
+            exit $p.ExitCode
         }
     }
 

requirements/pytest.txt

@@ -1,6 +1,6 @@
 # PyTest
 pytest >=4.6.6,<4.7   # PyTest 4.6.x are the last Py2 and Py3 releases
-pytest-salt >= 2019.12.18
+pytest-salt >= 2019.12.27
 pytest-tempdir >= 2019.10.12
 pytest-helpers-namespace >= 2019.1.8
 pytest-salt-runtests-bridge >= 2019.7.10

requirements/static/darwin.in

@@ -6,6 +6,7 @@ croniter>=0.3.0,!=0.3.22
 dnspython
 docker
 futures>=2.0; python_version < '3.0'
+jmespath
 jsonschema
 junos-eznc
 jxmlease

requirements/static/linux.in

@@ -10,6 +10,7 @@ docker
 futures>=2.0; python_version < '3.0'
 GitPython
 hgtools
+jmespath
 jsonschema
 junos-eznc
 jxmlease

requirements/static/py2.7/darwin.txt

@@ -53,7 +53,7 @@ importlib-metadata==0.23  # via pluggy, pytest
 ipaddress==1.0.22
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
+jmespath==0.9.4
 jsondiff==1.1.1           # via moto
 jsonpickle==1.1           # via aws-xray-sdk
 jsonschema==2.6.0
@@ -92,7 +92,7 @@ pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.12.18
+pytest-salt==2019.12.27
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0