saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into add-file-rmdir-state

Browse source
This commit is contained in:
Nicholas Hughes 2022-06-27 07:52:03 -04:00 • committed by GitHub
commit a373e7ebd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 553 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/61632.fixed Normal file
View file

@ -0,0 +1 @@
modules/aptpkg.SourceEntry: fix parsing lines with arbitrary comments in case HAS_APT=False

1
changelog/62006.fixed Normal file
View file

@ -0,0 +1 @@
modules/lxd.FilesManager: fix memory leak through pylxd.modules.container.Container.FilesManager

1
changelog/62007.fixed Normal file
View file

@ -0,0 +1 @@
utils/jinja.SaltCacheLoader: fix leaking SaltCacheLoader through atexit.register

1
changelog/62021.fixed Normal file
View file

@ -0,0 +1 @@
utils/yamlloader and yamlloader_old: fix leaking DuplicateKeyWarning through a warnings module

1
changelog/62154.fixed Normal file
View file

@ -0,0 +1 @@
Fixed an incompatibility preventing salt-cloud from deploying VMs on Proxmox VE 7

1
changelog/62164.fixed Normal file
View file

@ -0,0 +1 @@
Fix sysctl functions hard-coded relative command name

1
changelog/62183.deprecated Normal file
View file

@ -0,0 +1 @@
Deprecate all Azure cloud modules

7
doc/topics/cloud/azure.rst
View file

@ -4,6 +4,13 @@ Getting Started With Azure
.. versionadded:: 2014.1.0
.. warning::
This cloud provider will be removed from Salt in version 3007 due to
the deprecation of the "Classic" API for Azure. Please migrate to
`Azure Resource Manager by March 1, 2023
<https://docs.microsoft.com/en-us/azure/virtual-machines/classic-vm-deprecation>`_
Azure is a cloud service by Microsoft providing virtual machines, SQL services,
media services, and more. This document describes how to use Salt Cloud to
create a virtual machine on Azure, with Salt installed.

6
doc/topics/cloud/azurearm.rst
View file

@ -4,6 +4,12 @@ Getting Started With Azure ARM
.. versionadded:: 2016.11.0
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
Azure is a cloud service by Microsoft providing virtual machines, SQL services,
media services, and more. Azure ARM (aka, the Azure Resource Manager) is a next
generation version of the Azure portal and API. This document describes how to

33
salt/cloud/clouds/azurearm.py
View file

@ -8,6 +8,13 @@ Azure ARM Cloud Module
The Azure ARM cloud module is used to control access to Microsoft Azure Resource Manager
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0rc6
* `azure-common <https://pypi.python.org/pypi/azure-common>`_ >= 1.1.4
@ -156,6 +163,7 @@ def _get_active_provider_name():
return __active_provider_name__
@salt.utils.azurearm.deprecation_message
def get_api_versions(call=None, kwargs=None): # pylint: disable=unused-argument
"""
Get a resource type api versions
@ -187,6 +195,7 @@ def get_api_versions(call=None, kwargs=None): # pylint: disable=unused-argument
return api_versions
@salt.utils.azurearm.deprecation_message
def get_resource_by_id(resource_id, api_version, extract_value=None):
"""
Get an AzureARM resource by id
@ -210,6 +219,7 @@ def get_resource_by_id(resource_id, api_version, extract_value=None):
return ret
@salt.utils.azurearm.deprecation_message
def get_configured_provider():
"""
Return the first configured provider instance.
@ -233,6 +243,7 @@ def get_configured_provider():
return provider
@salt.utils.azurearm.deprecation_message
def get_dependencies():
"""
Warn if dependencies aren't met.
@ -240,6 +251,7 @@ def get_dependencies():
return config.check_driver_dependencies(__virtualname__, {"azurearm": HAS_LIBS})
@salt.utils.azurearm.deprecation_message
def get_conn(client_type):
"""
Return a connection object for a client type.
@ -287,6 +299,7 @@ def get_conn(client_type):
return client
@salt.utils.azurearm.deprecation_message
def get_location(call=None, kwargs=None): # pylint: disable=unused-argument
"""
Return the location that is configured for this provider
@ -300,6 +313,7 @@ def get_location(call=None, kwargs=None): # pylint: disable=unused-argument
)
@salt.utils.azurearm.deprecation_message
def avail_locations(call=None):
"""
Return a dict of all available regions.
@ -333,6 +347,7 @@ def avail_locations(call=None):
return ret
@salt.utils.azurearm.deprecation_message
def avail_images(call=None):
"""
Return a dict of all available images on the provider
@ -413,6 +428,7 @@ def avail_images(call=None):
return ret
@salt.utils.azurearm.deprecation_message
def avail_sizes(call=None):
"""
Return a list of sizes available from the provider
@ -440,6 +456,7 @@ def avail_sizes(call=None):
return ret
@salt.utils.azurearm.deprecation_message
def list_nodes(call=None):
"""
List VMs on this Azure account
@ -459,6 +476,7 @@ def list_nodes(call=None):
return ret
@salt.utils.azurearm.deprecation_message
def list_nodes_full(call=None):
"""
List all VMs on the subscription with full information
@ -544,6 +562,7 @@ def list_nodes_full(call=None):
return ret
@salt.utils.azurearm.deprecation_message
def list_resource_groups(call=None):
"""
List resource groups associated with the subscription
@ -568,6 +587,7 @@ def list_resource_groups(call=None):
return ret
@salt.utils.azurearm.deprecation_message
def show_instance(name, call=None):
"""
Show the details from AzureARM concerning an instance
@ -587,6 +607,7 @@ def show_instance(name, call=None):
return node
@salt.utils.azurearm.deprecation_message
def delete_interface(call=None, kwargs=None): # pylint: disable=unused-argument
"""
Delete a network interface.
@ -673,6 +694,7 @@ def _get_network_interface(name, resource_group):
return netiface, public_ips, private_ips
@salt.utils.azurearm.deprecation_message
def create_network_interface(call=None, kwargs=None):
"""
Create a network interface.
@ -1260,6 +1282,7 @@ def request_instance(vm_, kwargs=None):
return vm_result
@salt.utils.azurearm.deprecation_message
def create(vm_):
"""
Create a single VM from a data dict.
@ -1378,6 +1401,7 @@ def create(vm_):
return ret
@salt.utils.azurearm.deprecation_message
def destroy(name, call=None, kwargs=None): # pylint: disable=unused-argument
"""
Destroy a VM.
@ -1538,6 +1562,7 @@ def destroy(name, call=None, kwargs=None): # pylint: disable=unused-argument
return ret
@salt.utils.azurearm.deprecation_message
def list_storage_accounts(call=None):
"""
List storage accounts within the subscription.
@ -1623,6 +1648,7 @@ def _get_block_blob_service(kwargs=None):
)
@salt.utils.azurearm.deprecation_message
def list_blobs(call=None, kwargs=None): # pylint: disable=unused-argument
"""
List blobs.
@ -1649,6 +1675,7 @@ def list_blobs(call=None, kwargs=None): # pylint: disable=unused-argument
return ret
@salt.utils.azurearm.deprecation_message
def delete_blob(call=None, kwargs=None): # pylint: disable=unused-argument
"""
Delete a blob from a container.
@ -1668,6 +1695,7 @@ def delete_blob(call=None, kwargs=None): # pylint: disable=unused-argument
return True
@salt.utils.azurearm.deprecation_message
def delete_managed_disk(call=None, kwargs=None): # pylint: disable=unused-argument
"""
Delete a managed disk from a resource group.
@ -1688,6 +1716,7 @@ def delete_managed_disk(call=None, kwargs=None): # pylint: disable=unused-argum
return True
@salt.utils.azurearm.deprecation_message
def list_virtual_networks(call=None, kwargs=None):
"""
List virtual networks.
@ -1719,6 +1748,7 @@ def list_virtual_networks(call=None, kwargs=None):
return ret
@salt.utils.azurearm.deprecation_message
def list_subnets(call=None, kwargs=None):
"""
List subnets in a virtual network.
@ -1765,6 +1795,7 @@ def list_subnets(call=None, kwargs=None):
return ret
@salt.utils.azurearm.deprecation_message
def create_or_update_vmextension(
call=None, kwargs=None
): # pylint: disable=unused-argument
@ -1866,6 +1897,7 @@ def create_or_update_vmextension(
return ret
@salt.utils.azurearm.deprecation_message
def stop(name, call=None):
"""
.. versionadded:: 2019.2.0
@ -1926,6 +1958,7 @@ def stop(name, call=None):
return ret
@salt.utils.azurearm.deprecation_message
def start(name, call=None):
"""
.. versionadded:: 2019.2.0

104
salt/cloud/clouds/msazure.py
View file

@ -4,6 +4,13 @@ Azure Cloud Module
The Azure cloud module is used to control access to Microsoft Azure
.. warning::
This cloud provider will be removed from Salt in version 3007 due to
the deprecation of the "Classic" API for Azure. Please migrate to
`Azure Resource Manager by March 1, 2023
<https://docs.microsoft.com/en-us/azure/virtual-machines/classic-vm-deprecation>`_
:depends:
* `Microsoft Azure SDK for Python <https://pypi.python.org/pypi/azure/1.0.2>`_ >= 1.0.2
* python-requests, for Python < 2.7.9
@ -41,10 +48,13 @@ import copy
import logging
import pprint
import time
from functools import wraps
import salt.config as config
import salt.utils.args
import salt.utils.cloud
import salt.utils.stringutils
import salt.utils.versions
import salt.utils.yaml
from salt.exceptions import SaltCloudSystemExit
@ -93,6 +103,28 @@ def _get_active_provider_name():
return __active_provider_name__
def deprecation_message(function):
"""
Decorator wrapper to warn about msazure deprecation
"""
@wraps(function)
def wrapped(*args, **kwargs):
salt.utils.versions.warn_until(
"Chlorine",
"This cloud provider will be removed from Salt in version 3007 due to "
"the deprecation of the 'Classic' API for Azure. Please migrate to "
"Azure Resource Manager by March 1, 2023 "
"(https://docs.microsoft.com/en-us/azure/virtual-machines/classic-vm-deprecation)",
category=FutureWarning,
)
ret = function(*args, **salt.utils.args.clean_kwargs(**kwargs))
return ret
return wrapped
@deprecation_message
def get_configured_provider():
"""
Return the first configured instance.
@ -104,6 +136,7 @@ def get_configured_provider():
)
@deprecation_message
def get_dependencies():
"""
Warn if dependencies aren't met.
@ -111,6 +144,7 @@ def get_dependencies():
return config.check_driver_dependencies(__virtualname__, {"azure": HAS_LIBS})
@deprecation_message
def get_conn():
"""
Return a conn object for the passed VM data
@ -135,6 +169,7 @@ def get_conn():
)
@deprecation_message
def script(vm_):
"""
Return the script deployment object
@ -149,6 +184,7 @@ def script(vm_):
)
@deprecation_message
def avail_locations(conn=None, call=None):
"""
List available locations for Azure
@ -173,6 +209,7 @@ def avail_locations(conn=None, call=None):
return ret
@deprecation_message
def avail_images(conn=None, call=None):
"""
List available images for Azure
@ -194,6 +231,7 @@ def avail_images(conn=None, call=None):
return ret
@deprecation_message
def avail_sizes(call=None):
"""
Return a list of sizes from Azure
@ -212,6 +250,7 @@ def avail_sizes(call=None):
return ret
@deprecation_message
def list_nodes(conn=None, call=None):
"""
List VMs on this Azure account
@ -230,6 +269,7 @@ def list_nodes(conn=None, call=None):
return ret
@deprecation_message
def list_nodes_full(conn=None, call=None):
"""
List VMs on this Azure account, with full information
@ -280,6 +320,7 @@ def list_nodes_full(conn=None, call=None):
return ret
@deprecation_message
def list_hosted_services(conn=None, call=None):
"""
List VMs on this Azure account, with full information
@ -386,6 +427,7 @@ def list_hosted_services(conn=None, call=None):
return ret
@deprecation_message
def list_nodes_select(conn=None, call=None):
"""
Return a list of the VMs that are on the provider, with select fields
@ -400,6 +442,7 @@ def list_nodes_select(conn=None, call=None):
)
@deprecation_message
def show_instance(name, call=None):
"""
Show the details from the provider concerning an instance
@ -427,6 +470,7 @@ def show_instance(name, call=None):
return nodes[name]
@deprecation_message
def create(vm_):
"""
Create a single VM from a data dict
@ -725,6 +769,7 @@ def create(vm_):
return ret
@deprecation_message
def create_attach_volumes(name, kwargs, call=None, wait_to_finish=True):
"""
Create and attach volumes to created node
@ -825,6 +870,7 @@ def create_attach_volumes(name, kwargs, call=None, wait_to_finish=True):
return ret
@deprecation_message
def create_attach_volumes(name, kwargs, call=None, wait_to_finish=True):
"""
Create and attach volumes to created node
@ -944,6 +990,7 @@ def _wait_for_async(conn, request_id):
)
@deprecation_message
def destroy(name, conn=None, call=None, kwargs=None):
"""
Destroy a VM
@ -1079,6 +1126,7 @@ def destroy(name, conn=None, call=None, kwargs=None):
return ret
@deprecation_message
def list_storage_services(conn=None, call=None):
"""
List VMs on this Azure account, with full information
@ -1105,6 +1153,7 @@ def list_storage_services(conn=None, call=None):
return ret
@deprecation_message
def get_operation_status(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1146,6 +1195,7 @@ def get_operation_status(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def list_storage(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1174,6 +1224,7 @@ def list_storage(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_storage(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1210,6 +1261,7 @@ def show_storage(kwargs=None, conn=None, call=None):
get_storage = show_storage
@deprecation_message
def show_storage_keys(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1255,6 +1307,7 @@ def show_storage_keys(kwargs=None, conn=None, call=None):
get_storage_keys = show_storage_keys
@deprecation_message
def create_storage(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1311,6 +1364,7 @@ def create_storage(kwargs=None, conn=None, call=None):
)
@deprecation_message
def update_storage(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1348,6 +1402,7 @@ def update_storage(kwargs=None, conn=None, call=None):
return show_storage(kwargs={"name": kwargs["name"]}, call="function")
@deprecation_message
def regenerate_storage_keys(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1393,6 +1448,7 @@ def regenerate_storage_keys(kwargs=None, conn=None, call=None):
)
@deprecation_message
def delete_storage(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1426,6 +1482,7 @@ def delete_storage(kwargs=None, conn=None, call=None):
raise SaltCloudSystemExit("{}: {}".format(kwargs["name"], exc.message))
@deprecation_message
def list_services(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1454,6 +1511,7 @@ def list_services(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_service(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1487,6 +1545,7 @@ def show_service(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def create_service(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1537,6 +1596,7 @@ def create_service(kwargs=None, conn=None, call=None):
)
@deprecation_message
def delete_service(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1570,6 +1630,7 @@ def delete_service(kwargs=None, conn=None, call=None):
raise SaltCloudSystemExit("{}: {}".format(kwargs["name"], exc.message))
@deprecation_message
def list_disks(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1597,6 +1658,7 @@ def list_disks(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_disk(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1631,6 +1693,7 @@ def show_disk(kwargs=None, conn=None, call=None):
get_disk = show_disk
@deprecation_message
def cleanup_unattached_disks(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1670,6 +1733,7 @@ def cleanup_unattached_disks(kwargs=None, conn=None, call=None):
return True
@deprecation_message
def delete_disk(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1704,6 +1768,7 @@ def delete_disk(kwargs=None, conn=None, call=None):
raise SaltCloudSystemExit("{}: {}".format(kwargs["name"], exc.message))
@deprecation_message
def update_disk(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1745,6 +1810,7 @@ def update_disk(kwargs=None, conn=None, call=None):
return show_disk(kwargs={"name": kwargs["name"]}, call="function")
@deprecation_message
def list_service_certificates(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1779,6 +1845,7 @@ def list_service_certificates(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_service_certificate(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1826,6 +1893,7 @@ def show_service_certificate(kwargs=None, conn=None, call=None):
get_service_certificate = show_service_certificate
@deprecation_message
def add_service_certificate(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1879,6 +1947,7 @@ def add_service_certificate(kwargs=None, conn=None, call=None):
)
@deprecation_message
def delete_service_certificate(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1926,6 +1995,7 @@ def delete_service_certificate(kwargs=None, conn=None, call=None):
raise SaltCloudSystemExit("{}: {}".format(kwargs["name"], exc.message))
@deprecation_message
def list_management_certificates(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1954,6 +2024,7 @@ def list_management_certificates(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_management_certificate(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -1990,6 +2061,7 @@ def show_management_certificate(kwargs=None, conn=None, call=None):
get_management_certificate = show_management_certificate
@deprecation_message
def add_management_certificate(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2038,6 +2110,7 @@ def add_management_certificate(kwargs=None, conn=None, call=None):
)
@deprecation_message
def delete_management_certificate(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2073,6 +2146,7 @@ def delete_management_certificate(kwargs=None, conn=None, call=None):
raise SaltCloudSystemExit("{}: {}".format(kwargs["thumbprint"], exc.message))
@deprecation_message
def list_virtual_networks(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2095,6 +2169,7 @@ def list_virtual_networks(kwargs=None, conn=None, call=None):
return data
@deprecation_message
def list_input_endpoints(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2154,6 +2229,7 @@ def list_input_endpoints(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_input_endpoint(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2186,6 +2262,7 @@ def show_input_endpoint(kwargs=None, conn=None, call=None):
get_input_endpoint = show_input_endpoint
@deprecation_message
def update_input_endpoint(kwargs=None, conn=None, call=None, activity="update"):
"""
.. versionadded:: 2015.8.0
@ -2310,6 +2387,7 @@ xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
return True
@deprecation_message
def add_input_endpoint(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2334,6 +2412,7 @@ def add_input_endpoint(kwargs=None, conn=None, call=None):
)
@deprecation_message
def delete_input_endpoint(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2356,6 +2435,7 @@ def delete_input_endpoint(kwargs=None, conn=None, call=None):
)
@deprecation_message
def show_deployment(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2398,6 +2478,7 @@ def show_deployment(kwargs=None, conn=None, call=None):
get_deployment = show_deployment
@deprecation_message
def list_affinity_groups(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2425,6 +2506,7 @@ def list_affinity_groups(kwargs=None, conn=None, call=None):
return ret
@deprecation_message
def show_affinity_group(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2460,6 +2542,7 @@ def show_affinity_group(kwargs=None, conn=None, call=None):
get_affinity_group = show_affinity_group
@deprecation_message
def create_affinity_group(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2507,6 +2590,7 @@ def create_affinity_group(kwargs=None, conn=None, call=None):
)
@deprecation_message
def update_affinity_group(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2544,6 +2628,7 @@ def update_affinity_group(kwargs=None, conn=None, call=None):
return show_affinity_group(kwargs={"name": kwargs["name"]}, call="function")
@deprecation_message
def delete_affinity_group(kwargs=None, conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2577,6 +2662,7 @@ def delete_affinity_group(kwargs=None, conn=None, call=None):
raise SaltCloudSystemExit("{}: {}".format(kwargs["name"], exc.message))
@deprecation_message
def get_storage_conn(storage_account=None, storage_key=None, conn_kwargs=None):
"""
.. versionadded:: 2015.8.0
@ -2605,6 +2691,7 @@ def get_storage_conn(storage_account=None, storage_key=None, conn_kwargs=None):
return azure.storage.BlobService(storage_account, storage_key)
@deprecation_message
def make_blob_url(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2661,6 +2748,7 @@ def make_blob_url(kwargs=None, storage_conn=None, call=None):
return ret
@deprecation_message
def list_storage_containers(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2688,6 +2776,7 @@ def list_storage_containers(kwargs=None, storage_conn=None, call=None):
return ret
@deprecation_message
def create_storage_container(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2734,6 +2823,7 @@ def create_storage_container(kwargs=None, storage_conn=None, call=None):
)
@deprecation_message
def show_storage_container(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2776,6 +2866,7 @@ def show_storage_container(kwargs=None, storage_conn=None, call=None):
get_storage_container = show_storage_container
@deprecation_message
def show_storage_container_metadata(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2821,6 +2912,7 @@ def show_storage_container_metadata(kwargs=None, storage_conn=None, call=None):
get_storage_container_metadata = show_storage_container_metadata
@deprecation_message
def set_storage_container_metadata(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2875,6 +2967,7 @@ def set_storage_container_metadata(kwargs=None, storage_conn=None, call=None):
raise SaltCloudSystemExit("There was a conflict.")
@deprecation_message
def show_storage_container_acl(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2920,6 +3013,7 @@ def show_storage_container_acl(kwargs=None, storage_conn=None, call=None):
get_storage_container_acl = show_storage_container_acl
@deprecation_message
def set_storage_container_acl(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -2963,6 +3057,7 @@ def set_storage_container_acl(kwargs=None, storage_conn=None, call=None):
raise SaltCloudSystemExit("There was a conflict.")
@deprecation_message
def delete_storage_container(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3008,6 +3103,7 @@ def delete_storage_container(kwargs=None, storage_conn=None, call=None):
return data
@deprecation_message
def lease_storage_container(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3087,6 +3183,7 @@ def lease_storage_container(kwargs=None, storage_conn=None, call=None):
return data
@deprecation_message
def list_blobs(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3162,6 +3259,7 @@ def list_blobs(kwargs=None, storage_conn=None, call=None):
return salt.utils.msazure.list_blobs(storage_conn=storage_conn, **kwargs)
@deprecation_message
def show_blob_service_properties(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3193,6 +3291,7 @@ def show_blob_service_properties(kwargs=None, storage_conn=None, call=None):
get_blob_service_properties = show_blob_service_properties
@deprecation_message
def set_blob_service_properties(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3237,6 +3336,7 @@ def set_blob_service_properties(kwargs=None, storage_conn=None, call=None):
return data
@deprecation_message
def show_blob_properties(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3290,6 +3390,7 @@ def show_blob_properties(kwargs=None, storage_conn=None, call=None):
get_blob_properties = show_blob_properties
@deprecation_message
def set_blob_properties(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3361,6 +3462,7 @@ def set_blob_properties(kwargs=None, storage_conn=None, call=None):
return data
@deprecation_message
def put_blob(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3438,6 +3540,7 @@ def put_blob(kwargs=None, storage_conn=None, call=None):
return salt.utils.msazure.put_blob(storage_conn=storage_conn, **kwargs)
@deprecation_message
def get_blob(kwargs=None, storage_conn=None, call=None):
"""
.. versionadded:: 2015.8.0
@ -3510,6 +3613,7 @@ def get_blob(kwargs=None, storage_conn=None, call=None):
return salt.utils.msazure.get_blob(storage_conn=storage_conn, **kwargs)
@deprecation_message
def query(path, method="GET", data=None, params=None, header_dict=None, decode=True):
"""
Perform a query directly against the Azure REST API

2
salt/cloud/clouds/proxmox.py
View file

@ -848,7 +848,7 @@ def _import_api():
full_url = "https://{}:{}/pve-docs/api-viewer/apidoc.js".format(url, port)
returned_data = requests.get(full_url, verify=verify_ssl)
re_filter = re.compile("(?<=pveapi =)(.*)(?=^;)", re.DOTALL | re.MULTILINE)
re_filter = re.compile(" (?:pveapi|apiSchema) = (.*)^;", re.DOTALL | re.MULTILINE)
api_json = re_filter.findall(returned_data.text)[0]
api = salt.utils.json.loads(api_json)

27
salt/modules/aptpkg.py
View file

@ -174,17 +174,33 @@ if not HAS_APT:
Parse lines from sources files
"""
self.disabled = False
repo_line = self.line.strip().split()
if not repo_line:
line = self.line.strip()
if not line:
self.invalid = True
return False
if repo_line[0].startswith("#"):
repo_line.pop(0)
if line.startswith("#"):
self.disabled = True
if repo_line[0] not in ["deb", "deb-src", "rpm", "rpm-src"]:
line = line[1:]
idx = line.find("#")
if idx > 0:
self.comment = line[idx + 1 :]
line = line[:idx]
repo_line = line.strip().split()
if (
not repo_line
or repo_line[0] not in ["deb", "deb-src", "rpm", "rpm-src"]
or len(repo_line) < 3
):
self.invalid = True
return False
if repo_line[1].startswith("["):
if not any(x.endswith("]") for x in repo_line[1:]):
self.invalid = True
return False
repo_line = [x for x in (line.strip("[]") for line in repo_line) if x]
opts = _get_opts(self.line)
self.architectures.extend(opts["arch"]["value"])
@ -200,6 +216,7 @@ if not HAS_APT:
self.uri = repo_line[1]
self.dist = repo_line[2]
self.comps = repo_line[3:]
return True
class SourcesList: # pylint: disable=function-redefined
def __init__(self):

27
salt/modules/azurearm_compute.py
View file

@ -3,7 +3,13 @@ Azure (ARM) Compute Execution Module
.. versionadded:: 2019.2.0
:maintainer: <devops@decisionlab.io>
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0
@ -49,6 +55,8 @@ Azure (ARM) Compute Execution Module
import logging
import salt.utils.azurearm
# Azure libs
HAS_LIBS = False
try:
@ -77,6 +85,7 @@ def __virtual__():
return __virtualname__
@salt.utils.azurearm.deprecation_message
def availability_set_create_or_update(
name, resource_group, **kwargs
): # pylint: disable=invalid-name
@ -147,6 +156,7 @@ def availability_set_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def availability_set_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -179,6 +189,7 @@ def availability_set_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def availability_set_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -211,6 +222,7 @@ def availability_set_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def availability_sets_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -243,6 +255,7 @@ def availability_sets_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def availability_sets_list_available_sizes(
name, resource_group, **kwargs
): # pylint: disable=invalid-name
@ -283,6 +296,7 @@ def availability_sets_list_available_sizes(
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_capture(
name, destination_name, resource_group, prefix="capture-", overwrite=False, **kwargs
):
@ -337,6 +351,7 @@ def virtual_machine_capture(
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -372,6 +387,7 @@ def virtual_machine_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_convert_to_managed_disks(
name, resource_group, **kwargs
): # pylint: disable=invalid-name
@ -409,6 +425,7 @@ def virtual_machine_convert_to_managed_disks(
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_deallocate(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -443,6 +460,7 @@ def virtual_machine_deallocate(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_generalize(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -474,6 +492,7 @@ def virtual_machine_generalize(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machines_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -505,6 +524,7 @@ def virtual_machines_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machines_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -533,6 +553,7 @@ def virtual_machines_list_all(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machines_list_available_sizes(
name, resource_group, **kwargs
): # pylint: disable=invalid-name
@ -571,6 +592,7 @@ def virtual_machines_list_available_sizes(
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_power_off(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -605,6 +627,7 @@ def virtual_machine_power_off(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_restart(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -639,6 +662,7 @@ def virtual_machine_restart(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_start(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -673,6 +697,7 @@ def virtual_machine_start(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_machine_redeploy(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0

18
salt/modules/azurearm_dns.py
View file

@ -3,6 +3,12 @@ Azure (ARM) DNS Execution Module
.. versionadded:: 3000
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
@ -55,6 +61,8 @@ Optional provider parameters:
import logging
import salt.utils.azurearm
# Azure libs
HAS_LIBS = False
try:
@ -83,6 +91,7 @@ def __virtual__():
return __virtualname__
@salt.utils.azurearm.deprecation_message
def record_set_create_or_update(name, zone_name, resource_group, record_type, **kwargs):
"""
.. versionadded:: 3000
@ -140,6 +149,7 @@ def record_set_create_or_update(name, zone_name, resource_group, record_type, **
return result
@salt.utils.azurearm.deprecation_message
def record_set_delete(name, zone_name, resource_group, record_type, **kwargs):
"""
.. versionadded:: 3000
@ -181,6 +191,7 @@ def record_set_delete(name, zone_name, resource_group, record_type, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def record_set_get(name, zone_name, resource_group, record_type, **kwargs):
"""
.. versionadded:: 3000
@ -221,6 +232,7 @@ def record_set_get(name, zone_name, resource_group, record_type, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def record_sets_list_by_type(
zone_name, resource_group, record_type, top=None, recordsetnamesuffix=None, **kwargs
):
@ -274,6 +286,7 @@ def record_sets_list_by_type(
return result
@salt.utils.azurearm.deprecation_message
def record_sets_list_by_dns_zone(
zone_name, resource_group, top=None, recordsetnamesuffix=None, **kwargs
):
@ -322,6 +335,7 @@ def record_sets_list_by_dns_zone(
return result
@salt.utils.azurearm.deprecation_message
def zone_create_or_update(name, resource_group, **kwargs):
"""
.. versionadded:: 3000
@ -381,6 +395,7 @@ def zone_create_or_update(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def zone_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 3000
@ -414,6 +429,7 @@ def zone_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def zone_get(name, resource_group, **kwargs):
"""
.. versionadded:: 3000
@ -444,6 +460,7 @@ def zone_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def zones_list_by_resource_group(resource_group, top=None, **kwargs):
"""
.. versionadded:: 3000
@ -481,6 +498,7 @@ def zones_list_by_resource_group(resource_group, top=None, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def zones_list(top=None, **kwargs):
"""
.. versionadded:: 3000

70
salt/modules/azurearm_network.py
View file

@ -3,7 +3,13 @@ Azure (ARM) Network Execution Module
.. versionadded:: 2019.2.0
:maintainer: <devops@decisionlab.io>
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0
@ -50,6 +56,7 @@ Azure (ARM) Network Execution Module
import logging
# Salt libs
import salt.utils.azurearm
from salt.exceptions import SaltInvocationError # pylint: disable=unused-import
# Azure libs
@ -80,6 +87,7 @@ def __virtual__():
return __virtualname__
@salt.utils.azurearm.deprecation_message
def check_dns_name_availability(name, region, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -110,6 +118,7 @@ def check_dns_name_availability(name, region, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def check_ip_address_availability(
ip_address, virtual_network, resource_group, **kwargs
):
@ -149,6 +158,7 @@ def check_ip_address_availability(
return result
@salt.utils.azurearm.deprecation_message
def default_security_rule_get(name, security_group, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -192,6 +202,7 @@ def default_security_rule_get(name, security_group, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def default_security_rules_list(security_group, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -228,6 +239,7 @@ def default_security_rules_list(security_group, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def security_rules_list(security_group, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -260,6 +272,7 @@ def security_rules_list(security_group, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def security_rule_create_or_update(
name,
access,
@ -411,6 +424,7 @@ def security_rule_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def security_rule_delete(security_rule, security_group, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -448,6 +462,7 @@ def security_rule_delete(security_rule, security_group, resource_group, **kwargs
return result
@salt.utils.azurearm.deprecation_message
def security_rule_get(security_rule, security_group, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -484,6 +499,7 @@ def security_rule_get(security_rule, security_group, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_security_group_create_or_update(
name, resource_group, **kwargs
): # pylint: disable=invalid-name
@ -544,6 +560,7 @@ def network_security_group_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def network_security_group_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -576,6 +593,7 @@ def network_security_group_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_security_group_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -607,6 +625,7 @@ def network_security_group_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_security_groups_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -638,6 +657,7 @@ def network_security_groups_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_security_groups_list_all(**kwargs): # pylint: disable=invalid-name
"""
.. versionadded:: 2019.2.0
@ -666,6 +686,7 @@ def network_security_groups_list_all(**kwargs): # pylint: disable=invalid-name
return result
@salt.utils.azurearm.deprecation_message
def subnets_list(virtual_network, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -702,6 +723,7 @@ def subnets_list(virtual_network, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def subnet_get(name, virtual_network, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -739,6 +761,7 @@ def subnet_get(name, virtual_network, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def subnet_create_or_update(
name, address_prefix, virtual_network, resource_group, **kwargs
):
@ -818,6 +841,7 @@ def subnet_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def subnet_delete(name, virtual_network, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -855,6 +879,7 @@ def subnet_delete(name, virtual_network, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_networks_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -884,6 +909,7 @@ def virtual_networks_list_all(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_networks_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -917,6 +943,7 @@ def virtual_networks_list(resource_group, **kwargs):
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def virtual_network_create_or_update(name, address_prefixes, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -991,6 +1018,7 @@ def virtual_network_create_or_update(name, address_prefixes, resource_group, **k
return result
@salt.utils.azurearm.deprecation_message
def virtual_network_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1023,6 +1051,7 @@ def virtual_network_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def virtual_network_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1054,6 +1083,7 @@ def virtual_network_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def load_balancers_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -1083,6 +1113,7 @@ def load_balancers_list_all(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def load_balancers_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1115,6 +1146,7 @@ def load_balancers_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def load_balancer_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1146,6 +1178,7 @@ def load_balancer_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def load_balancer_create_or_update(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1332,6 +1365,7 @@ def load_balancer_create_or_update(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def load_balancer_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1364,6 +1398,7 @@ def load_balancer_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def usages_list(location, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1391,6 +1426,7 @@ def usages_list(location, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_interface_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1424,6 +1460,7 @@ def network_interface_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_interface_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1456,6 +1493,7 @@ def network_interface_get(name, resource_group, **kwargs):
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def network_interface_create_or_update(
name, ip_configurations, subnet, virtual_network, resource_group, **kwargs
):
@ -1580,6 +1618,7 @@ def network_interface_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def network_interfaces_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -1609,6 +1648,7 @@ def network_interfaces_list_all(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def network_interfaces_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1642,6 +1682,7 @@ def network_interfaces_list(resource_group, **kwargs):
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def network_interface_get_effective_route_table(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1677,6 +1718,7 @@ def network_interface_get_effective_route_table(name, resource_group, **kwargs):
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def network_interface_list_effective_network_security_groups(
name, resource_group, **kwargs
):
@ -1714,6 +1756,7 @@ def network_interface_list_effective_network_security_groups(
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def list_virtual_machine_scale_set_vm_network_interfaces(
scale_set, vm_index, resource_group, **kwargs
):
@ -1757,6 +1800,7 @@ def list_virtual_machine_scale_set_vm_network_interfaces(
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def list_virtual_machine_scale_set_network_interfaces(
scale_set, resource_group, **kwargs
):
@ -1797,6 +1841,7 @@ def list_virtual_machine_scale_set_network_interfaces(
# pylint: disable=invalid-name
@salt.utils.azurearm.deprecation_message
def get_virtual_machine_scale_set_network_interface(
name, scale_set, vm_index, resource_group, **kwargs
):
@ -1841,6 +1886,7 @@ def get_virtual_machine_scale_set_network_interface(
return result
@salt.utils.azurearm.deprecation_message
def public_ip_address_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1873,6 +1919,7 @@ def public_ip_address_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def public_ip_address_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1909,6 +1956,7 @@ def public_ip_address_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def public_ip_address_create_or_update(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1967,6 +2015,7 @@ def public_ip_address_create_or_update(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def public_ip_addresses_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -1996,6 +2045,7 @@ def public_ip_addresses_list_all(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def public_ip_addresses_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2028,6 +2078,7 @@ def public_ip_addresses_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filter_rule_delete(name, route_filter, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2064,6 +2115,7 @@ def route_filter_rule_delete(name, route_filter, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filter_rule_get(name, route_filter, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2101,6 +2153,7 @@ def route_filter_rule_get(name, route_filter, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filter_rule_create_or_update(
name, access, communities, route_filter, resource_group, **kwargs
):
@ -2180,6 +2233,7 @@ def route_filter_rule_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def route_filter_rules_list(route_filter, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2216,6 +2270,7 @@ def route_filter_rules_list(route_filter, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filter_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2248,6 +2303,7 @@ def route_filter_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filter_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2282,6 +2338,7 @@ def route_filter_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filter_create_or_update(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2340,6 +2397,7 @@ def route_filter_create_or_update(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filters_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2374,6 +2432,7 @@ def route_filters_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_filters_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -2403,6 +2462,7 @@ def route_filters_list_all(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_delete(name, route_table, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2439,6 +2499,7 @@ def route_delete(name, route_table, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_get(name, route_table, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2476,6 +2537,7 @@ def route_get(name, route_table, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_create_or_update(
name,
address_prefix,
@ -2548,6 +2610,7 @@ def route_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def routes_list(route_table, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2584,6 +2647,7 @@ def routes_list(route_table, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_table_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2616,6 +2680,7 @@ def route_table_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_table_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2650,6 +2715,7 @@ def route_table_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_table_create_or_update(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2708,6 +2774,7 @@ def route_table_create_or_update(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_tables_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -2740,6 +2807,7 @@ def route_tables_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def route_tables_list_all(**kwargs):
"""
.. versionadded:: 2019.2.0

37
salt/modules/azurearm_resource.py
View file

@ -3,7 +3,13 @@ Azure (ARM) Resource Execution Module
.. versionadded:: 2019.2.0
:maintainer: <devops@decisionlab.io>
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0
@ -50,6 +56,7 @@ Azure (ARM) Resource Execution Module
import logging
# Salt Libs
import salt.utils.azurearm
import salt.utils.json
# Azure libs
@ -80,6 +87,7 @@ def __virtual__():
return __virtualname__
@salt.utils.azurearm.deprecation_message
def resource_groups_list(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -109,6 +117,7 @@ def resource_groups_list(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def resource_group_check_existence(name, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -135,6 +144,7 @@ def resource_group_check_existence(name, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def resource_group_get(name, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -163,6 +173,7 @@ def resource_group_get(name, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def resource_group_create_or_update(
name, location, **kwargs
): # pylint: disable=invalid-name
@ -200,6 +211,7 @@ def resource_group_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def resource_group_delete(name, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -227,6 +239,7 @@ def resource_group_delete(name, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_operation_get(operation, deployment, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -263,6 +276,7 @@ def deployment_operation_get(operation, deployment, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_operations_list(name, resource_group, result_limit=10, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -304,6 +318,7 @@ def deployment_operations_list(name, resource_group, result_limit=10, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_delete(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -336,6 +351,7 @@ def deployment_delete(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_check_existence(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -366,6 +382,7 @@ def deployment_check_existence(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_create_or_update(
name,
resource_group,
@ -479,6 +496,7 @@ def deployment_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def deployment_get(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -510,6 +528,7 @@ def deployment_get(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_cancel(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -541,6 +560,7 @@ def deployment_cancel(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployment_validate(
name,
resource_group,
@ -651,6 +671,7 @@ def deployment_validate(
return result
@salt.utils.azurearm.deprecation_message
def deployment_export_template(name, resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -682,6 +703,7 @@ def deployment_export_template(name, resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def deployments_list(resource_group, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -713,6 +735,7 @@ def deployments_list(resource_group, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def subscriptions_list_locations(subscription_id=None, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -752,6 +775,7 @@ def subscriptions_list_locations(subscription_id=None, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def subscription_get(subscription_id=None, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -788,6 +812,7 @@ def subscription_get(subscription_id=None, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def subscriptions_list(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -815,6 +840,7 @@ def subscriptions_list(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def tenants_list(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -842,6 +868,7 @@ def tenants_list(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_assignment_delete(name, scope, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -874,6 +901,7 @@ def policy_assignment_delete(name, scope, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_assignment_create(name, scope, definition_name, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -958,6 +986,7 @@ def policy_assignment_create(name, scope, definition_name, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_assignment_get(name, scope, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -989,6 +1018,7 @@ def policy_assignment_get(name, scope, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_assignments_list_for_resource_group(
resource_group, **kwargs
): # pylint: disable=invalid-name
@ -1024,6 +1054,7 @@ def policy_assignments_list_for_resource_group(
return result
@salt.utils.azurearm.deprecation_message
def policy_assignments_list(**kwargs):
"""
.. versionadded:: 2019.2.0
@ -1053,6 +1084,7 @@ def policy_assignments_list(**kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_definition_create_or_update(
name, policy_rule, **kwargs
): # pylint: disable=invalid-name
@ -1111,6 +1143,7 @@ def policy_definition_create_or_update(
return result
@salt.utils.azurearm.deprecation_message
def policy_definition_delete(name, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1138,6 +1171,7 @@ def policy_definition_delete(name, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_definition_get(name, **kwargs):
"""
.. versionadded:: 2019.2.0
@ -1164,6 +1198,7 @@ def policy_definition_get(name, **kwargs):
return result
@salt.utils.azurearm.deprecation_message
def policy_definitions_list(hide_builtin=False, **kwargs):
"""
.. versionadded:: 2019.2.0

17
salt/modules/linux_sysctl.py
View file

@ -8,6 +8,7 @@ import re
import salt.utils.data
import salt.utils.files
import salt.utils.path
import salt.utils.stringutils
import salt.utils.systemd
from salt.exceptions import CommandExecutionError
@ -34,6 +35,16 @@ def __virtual__():
return __virtualname__
def _which(cmd):
"""
Utility function wrapper to error out early if a command is not found
"""
_cmd = salt.utils.path.which(cmd)
if not _cmd:
raise CommandExecutionError("Command '{}' cannot be found".format(cmd))
return _cmd
def default_config():
"""
Linux hosts using systemd 207 or later ignore ``/etc/sysctl.conf`` and only
@ -91,7 +102,7 @@ def show(config_file=False):
log.error("Could not open sysctl file")
return None
else:
cmd = "sysctl -a"
cmd = "{} -a".format(_which("sysctl"))
out = __salt__["cmd.run_stdout"](cmd, output_loglevel="trace")
for line in out.splitlines():
if not line or " = " not in line:
@ -111,7 +122,7 @@ def get(name):
salt '*' sysctl.get net.ipv4.ip_forward
"""
cmd = "sysctl -n {}".format(name)
cmd = "{} -n {}".format(_which("sysctl"), name)
out = __salt__["cmd.run"](cmd, python_shell=False)
return out
@ -135,7 +146,7 @@ def assign(name, value):
raise CommandExecutionError("sysctl {} does not exist".format(name))
ret = {}
cmd = 'sysctl -w {}="{}"'.format(name, value)
cmd = '{} -w {}="{}"'.format(_which("sysctl"), name, value)
data = __salt__["cmd.run_all"](cmd, python_shell=False)
out = data["stdout"]
err = data["stderr"]

35
salt/modules/lxd.py
View file

@ -3628,22 +3628,21 @@ if HAS_PYLXD:
except ImportError:
from pylxd.models.container import Container
class FilesManager(Container.FilesManager):
def put(self, filepath, data, mode=None, uid=None, gid=None):
headers = {}
if mode is not None:
if isinstance(mode, int):
mode = oct(mode)
elif not mode.startswith("0"):
mode = "0{}".format(mode)
headers["X-LXD-mode"] = mode
if uid is not None:
headers["X-LXD-uid"] = str(uid)
if gid is not None:
headers["X-LXD-gid"] = str(gid)
response = self._client.api.containers[self._container.name].files.post(
params={"path": filepath}, data=data, headers=headers
)
return response.status_code == 200
def put(self, filepath, data, mode=None, uid=None, gid=None):
headers = {}
if mode is not None:
if isinstance(mode, int):
mode = oct(mode)
elif not mode.startswith("0"):
mode = "0{}".format(mode)
headers["X-LXD-mode"] = mode
if uid is not None:
headers["X-LXD-uid"] = str(uid)
if gid is not None:
headers["X-LXD-gid"] = str(gid)
response = self._client.api.containers[self._container.name].files.post(
params={"path": filepath}, data=data, headers=headers
)
return response.status_code == 200
Container.FilesManager = FilesManager
Container.FilesManager.put = put

12
salt/states/azurearm_compute.py
View file

@ -3,7 +3,13 @@ Azure (ARM) Compute State Module
.. versionadded:: 2019.2.0
:maintainer: <devops@decisionlab.io>
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0
@ -88,6 +94,8 @@ Azure (ARM) Compute State Module
import logging
import salt.utils.azurearm
__virtualname__ = "azurearm_compute"
log = logging.getLogger(__name__)
@ -102,6 +110,7 @@ def __virtual__():
return (False, "azurearm module could not be loaded")
@salt.utils.azurearm.deprecation_message
def availability_set_present(
name,
resource_group,
@ -274,6 +283,7 @@ def availability_set_present(
return ret
@salt.utils.azurearm.deprecation_message
def availability_set_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0

12
salt/states/azurearm_dns.py
View file

@ -3,6 +3,12 @@ Azure (ARM) DNS State Module
.. versionadded:: 3000
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
@ -112,6 +118,8 @@ Optional provider parameters:
"""
import logging
import salt.utils.azurearm
__virtualname__ = "azurearm_dns"
log = logging.getLogger(__name__)
@ -126,6 +134,7 @@ def __virtual__():
return (False, "azurearm_dns module could not be loaded")
@salt.utils.azurearm.deprecation_message
def zone_present(
name,
resource_group,
@ -326,6 +335,7 @@ def zone_present(
return ret
@salt.utils.azurearm.deprecation_message
def zone_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 3000
@ -382,6 +392,7 @@ def zone_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def record_set_present(
name,
zone_name,
@ -667,6 +678,7 @@ def record_set_present(
return ret
@salt.utils.azurearm.deprecation_message
def record_set_absent(name, zone_name, resource_group, connection_auth=None):
"""
.. versionadded:: 3000

28
salt/states/azurearm_network.py
View file

@ -3,7 +3,13 @@ Azure (ARM) Network State Module
.. versionadded:: 2019.2.0
:maintainer: <devops@decisionlab.io>
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0
@ -87,6 +93,8 @@ Azure (ARM) Network State Module
"""
import logging
import salt.utils.azurearm
__virtualname__ = "azurearm_network"
log = logging.getLogger(__name__)
@ -101,6 +109,7 @@ def __virtual__():
return (False, "azurearm_network module could not be loaded")
@salt.utils.azurearm.deprecation_message
def virtual_network_present(
name,
address_prefixes,
@ -261,6 +270,7 @@ def virtual_network_present(
return ret
@salt.utils.azurearm.deprecation_message
def virtual_network_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -317,6 +327,7 @@ def virtual_network_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def subnet_present(
name,
address_prefix,
@ -461,6 +472,7 @@ def subnet_present(
return ret
@salt.utils.azurearm.deprecation_message
def subnet_absent(name, virtual_network, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -524,6 +536,7 @@ def subnet_absent(name, virtual_network, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def network_security_group_present(
name, resource_group, tags=None, security_rules=None, connection_auth=None, **kwargs
):
@ -666,6 +679,7 @@ def network_security_group_present(
return ret
@salt.utils.azurearm.deprecation_message
def network_security_group_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -722,6 +736,7 @@ def network_security_group_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def security_rule_present(
name,
access,
@ -1067,6 +1082,7 @@ def security_rule_present(
return ret
@salt.utils.azurearm.deprecation_message
def security_rule_absent(name, security_group, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -1130,6 +1146,7 @@ def security_rule_absent(name, security_group, resource_group, connection_auth=N
return ret
@salt.utils.azurearm.deprecation_message
def load_balancer_present(
name,
resource_group,
@ -1506,6 +1523,7 @@ def load_balancer_present(
return ret
@salt.utils.azurearm.deprecation_message
def load_balancer_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -1562,6 +1580,7 @@ def load_balancer_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def public_ip_address_present(
name,
resource_group,
@ -1762,6 +1781,7 @@ def public_ip_address_present(
return ret
@salt.utils.azurearm.deprecation_message
def public_ip_address_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -1818,6 +1838,7 @@ def public_ip_address_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def network_interface_present(
name,
ip_configurations,
@ -2088,6 +2109,7 @@ def network_interface_present(
return ret
@salt.utils.azurearm.deprecation_message
def network_interface_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -2144,6 +2166,7 @@ def network_interface_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def route_table_present(
name,
resource_group,
@ -2294,6 +2317,7 @@ def route_table_present(
return ret
@salt.utils.azurearm.deprecation_message
def route_table_absent(name, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -2350,6 +2374,7 @@ def route_table_absent(name, resource_group, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def route_present(
name,
address_prefix,
@ -2487,6 +2512,7 @@ def route_present(
return ret
@salt.utils.azurearm.deprecation_message
def route_absent(name, route_table, resource_group, connection_auth=None):
"""
.. versionadded:: 2019.2.0

15
salt/states/azurearm_resource.py
View file

@ -3,7 +3,13 @@ Azure (ARM) Resource State Module
.. versionadded:: 2019.2.0
:maintainer: <devops@decisionlab.io>
.. warning::
This cloud provider will be removed from Salt in version 3007 in favor of
the `saltext.azurerm Salt Extension
<https://github.com/salt-extensions/saltext-azurerm>`_
:maintainer: <devops@eitr.tech>
:maturity: new
:depends:
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0
@ -84,6 +90,7 @@ Azure (ARM) Resource State Module
import json
import logging
import salt.utils.azurearm
import salt.utils.files
__virtualname__ = "azurearm_resource"
@ -100,6 +107,7 @@ def __virtual__():
return (False, "azurearm_resource module could not be loaded")
@salt.utils.azurearm.deprecation_message
def resource_group_present(
name, location, managed_by=None, tags=None, connection_auth=None, **kwargs
):
@ -208,6 +216,7 @@ def resource_group_present(
return ret
@salt.utils.azurearm.deprecation_message
def resource_group_absent(name, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -275,6 +284,7 @@ def resource_group_absent(name, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def policy_definition_present(
name,
policy_rule=None,
@ -581,6 +591,7 @@ def policy_definition_present(
return ret
@salt.utils.azurearm.deprecation_message
def policy_definition_absent(name, connection_auth=None):
"""
.. versionadded:: 2019.2.0
@ -634,6 +645,7 @@ def policy_definition_absent(name, connection_auth=None):
return ret
@salt.utils.azurearm.deprecation_message
def policy_assignment_present(
name,
scope,
@ -789,6 +801,7 @@ def policy_assignment_present(
return ret
@salt.utils.azurearm.deprecation_message
def policy_assignment_absent(name, scope, connection_auth=None):
"""
.. versionadded:: 2019.2.0

24
salt/utils/azurearm.py
View file

@ -23,11 +23,14 @@ Azure (ARM) Utilities
import importlib
import logging
import sys
from functools import wraps
from operator import itemgetter
import salt.config
import salt.loader
import salt.utils.args
import salt.utils.stringutils
import salt.utils.versions
import salt.version
from salt.exceptions import SaltInvocationError, SaltSystemExit
@ -334,3 +337,24 @@ def compare_list_of_dicts(old, new, convert_id_to_name=None):
return ret
return ret
def deprecation_message(function):
"""
Decorator wrapper to warn about azurearm deprecation
"""
@wraps(function)
def wrapped(*args, **kwargs):
salt.utils.versions.warn_until(
"Chlorine",
"The 'azurearm' functionality in Salt has been deprecated and its "
"functionality will be removed in version 3007 in favor of the "
"saltext.azurerm Salt Extension. "
"(https://github.com/salt-extensions/saltext-azurerm)",
category=FutureWarning,
)
ret = function(*args, **salt.utils.args.clean_kwargs(**kwargs))
return ret
return wrapped

4
salt/utils/jinja.py
View file

@ -3,7 +3,6 @@ Jinja loading utils to enable a more powerful backend for jinja templates
"""
import atexit
import itertools
import logging
import os.path
@ -222,9 +221,6 @@ class SaltCacheLoader(BaseLoader):
raise TemplateNotFound(template)
atexit.register(SaltCacheLoader.shutdown)
class PrintableDict(OrderedDict):
"""
Ensures that dict str() and repr() are YAML friendly.

11
salt/utils/yamlloader.py
View file

@ -3,8 +3,6 @@ Custom YAML loading in Salt
"""
import warnings
import salt.utils.stringutils
import yaml # pylint: disable=blacklisted-import
from yaml.constructor import ConstructorError
@ -17,15 +15,6 @@ BaseLoader = getattr(yaml, "CSafeLoader", yaml.SafeLoader)
__all__ = ["SaltYamlSafeLoader", "load", "safe_load"]
class DuplicateKeyWarning(RuntimeWarning):
"""
Warned when duplicate keys exist
"""
warnings.simplefilter("always", category=DuplicateKeyWarning)
# with code integrated from https://gist.github.com/844388
class SaltYamlSafeLoader(BaseLoader):
"""

10
salt/utils/yamlloader_old.py
View file

@ -4,7 +4,6 @@ Custom YAML loading in Salt
import re
import warnings
import salt.utils.stringutils
import yaml # pylint: disable=blacklisted-import
@ -21,15 +20,6 @@ except Exception: # pylint: disable=broad-except
__all__ = ["SaltYamlSafeLoader", "load", "safe_load"]
class DuplicateKeyWarning(RuntimeWarning):
"""
Warned when duplicate keys exist
"""
warnings.simplefilter("always", category=DuplicateKeyWarning)
# with code integrated from https://gist.github.com/844388
class SaltYamlSafeLoader(yaml.SafeLoader):
"""

44
tests/pytests/unit/modules/test_aptpkg.py
View file

@ -7,6 +7,7 @@
import copy
import importlib
import logging
import os
import pathlib
@ -838,6 +839,49 @@ def test__skip_source():
assert ret is False
def test__parse_source():
cases = (
{"ok": False, "line": "", "invalid": True, "disabled": False},
{"ok": False, "line": "#", "invalid": True, "disabled": True},
{"ok": False, "line": "##", "invalid": True, "disabled": True},
{"ok": False, "line": "# comment", "invalid": True, "disabled": True},
{"ok": False, "line": "## comment", "invalid": True, "disabled": True},
{"ok": False, "line": "deb #", "invalid": True, "disabled": False},
{"ok": False, "line": "# deb #", "invalid": True, "disabled": True},
{"ok": False, "line": "deb [ invalid line", "invalid": True, "disabled": False},
{
"ok": True,
"line": "# deb http://debian.org/debian/ stretch main\n",
"invalid": False,
"disabled": True,
},
{
"ok": True,
"line": "deb http://debian.org/debian/ stretch main # comment\n",
"invalid": False,
"disabled": False,
},
{
"ok": True,
"line": "deb [trusted=yes] http://debian.org/debian/ stretch main\n",
"invalid": False,
"disabled": False,
},
)
with patch.dict("sys.modules", {"aptsources.sourceslist": None}):
importlib.reload(aptpkg)
NoAptSourceEntry = aptpkg.SourceEntry
importlib.reload(aptpkg)
for case in cases:
source = NoAptSourceEntry(case["line"])
ok = source._parse_sources(case["line"])
assert ok is case["ok"]
assert source.invalid is case["invalid"]
assert source.disabled is case["disabled"]
def test_normalize_name():
"""
Test that package is normalized only when it should be

15
tests/pytests/unit/modules/test_linux_sysctl.py
View file

@ -10,6 +10,10 @@ import salt.modules.systemd_service as systemd
from salt.exceptions import CommandExecutionError
from tests.support.mock import MagicMock, mock_open, patch
pytestmark = [
pytest.mark.skip_on_windows(reason="sysctl not available on Windows"),
]
@pytest.fixture
def configure_loader_modules():
@ -25,6 +29,15 @@ def test_get():
assert linux_sysctl.get("net.ipv4.ip_forward") == 1
def test_get_no_sysctl_binary():
"""
Tests the failure of get function when no binary exists
"""
with patch("salt.utils.path.which", MagicMock(return_value=None)):
with pytest.raises(CommandExecutionError):
linux_sysctl.get("net.ipv4.ip_forward")
def test_assign_proc_sys_failed():
"""
Tests if /proc/sys/<kernel-subsystem> exists or not
@ -105,7 +118,7 @@ def test_persist_no_conf_success():
config = "/etc/sysctl.conf"
with patch("os.path.isfile", MagicMock(return_value=False)), patch(
"os.path.exists", MagicMock(return_value=True)
):
), patch("salt.utils.path.which", MagicMock(return_value="/bin/sysctl")):
asn_cmd = {
"pid": 1337,
"retcode": 0,

47
tests/unit/cloud/clouds/test_proxmox.py
View file

@ -2,6 +2,7 @@
:codeauthor: Tyler Johnson <tjohnson@saltstack.com>
"""
import textwrap
from salt.cloud.clouds import proxmox
from tests.support.mixins import LoaderModuleMockMixin
@ -215,3 +216,49 @@ class ProxmoxTest(TestCase, LoaderModuleMockMixin):
verify=True,
data={"username": ("fakeuser",), "password": "secretpassword"},
)
def test__import_api_v6(self):
"""
Test _import_api handling of a Proxmox VE 6 response.
"""
response = textwrap.dedent(
"""\
var pveapi = [
{
"info" : {
}
}
]
;
"""
)
self._test__import_api(response)
def test__import_api_v7(self):
"""
Test _import_api handling of a Proxmox VE 7 response.
"""
response = textwrap.dedent(
"""\
const apiSchema = [
{
"info" : {
}
}
]
;
"""
)
self._test__import_api(response)
def _test__import_api(self, response):
"""
Test _import_api recognition of varying Proxmox VE responses.
"""
requests_get_mock = MagicMock()
requests_get_mock.return_value.status_code = 200
requests_get_mock.return_value.text = response
with patch("requests.get", requests_get_mock):
proxmox._import_api()
self.assertEqual(proxmox.api, [{"info": {}}])
return