Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change ansible default version from 2.14 to 2.15 #1272

Merged
merged 3 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions plugins/lookup/azure_keyvault_secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@
import logging
import requests
from azure.keyvault.secrets import SecretClient
from azure.common.exceptions import ClientRequestError
from msrest.exceptions import ClientRequestError
from azure.identity import DefaultAzureCredential, ClientSecretCredential
from azure.keyvault.secrets import SecretClient

Expand Down
2 changes: 0 additions & 2 deletions plugins/module_utils/azure_rm_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ def default_api_version(self):
from azure.mgmt.authorization import AuthorizationManagementClient
from azure.mgmt.sql import SqlManagementClient
from azure.mgmt.servicebus import ServiceBusManagementClient
import azure.mgmt.servicebus.models as ServicebusModel
from azure.mgmt.rdbms.postgresql import PostgreSQLManagementClient
from azure.mgmt.rdbms.mysql import MySQLManagementClient
from azure.mgmt.rdbms.mariadb import MariaDBManagementClient
Expand All @@ -261,7 +260,6 @@ def default_api_version(self):
import azure.mgmt.automation.models as AutomationModel
from azure.mgmt.iothub import IotHubClient
from azure.mgmt.iothub import models as IoTHubModels
from msrestazure import AzureConfiguration
from azure.mgmt.resource.locks import ManagementLockClient
from azure.mgmt.recoveryservicesbackup import RecoveryServicesBackupClient
import azure.mgmt.recoveryservicesbackup.models as RecoveryServicesBackupModels
Expand Down
3 changes: 1 addition & 2 deletions plugins/module_utils/azure_rm_common_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@


from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase
import re
from ansible.module_utils.common.dict_transformations import _camel_to_snake, _snake_to_camel
from ansible.module_utils.common.dict_transformations import _snake_to_camel
from ansible.module_utils.six import string_types


Expand Down
1 change: 0 additions & 1 deletion plugins/module_utils/azure_rm_common_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from azure.core.pipeline.policies import BearerTokenCredentialPolicy
from azure.mgmt.core.polling.arm_polling import ARMPolling
import uuid
import json
from azure.core.configuration import Configuration
except ImportError:
# This is handled in azure_rm_common
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_adapplication.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
import datetime
from dateutil.relativedelta import relativedelta
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_adapplication_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
except ImportError:
# This is handled in azure_rm_common
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_adgroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
from azure.graphrbac.models import GroupCreateParameters
except ImportError:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_adgroup_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
from azure.graphrbac.models import CheckGroupMembershipParameters
except ImportError:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_adpassword.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
import uuid

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
from azure.graphrbac.models import PasswordCredential
from azure.graphrbac.models import ApplicationUpdateParameters
Expand Down
4 changes: 0 additions & 4 deletions plugins/modules/azure_rm_adpassword_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

from __future__ import absolute_import, division, print_function
import datetime

__metaclass__ = type

Expand Down Expand Up @@ -108,10 +107,7 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
from azure.graphrbac.models import PasswordCredential
from azure.graphrbac.models import ApplicationUpdateParameters
except ImportError:
# This is handled in azure_rm_common
pass
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_adserviceprincipal.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,10 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
try:
from azure.graphrbac.models import ServicePrincipalCreateParameters
from azure.graphrbac.models import ServicePrincipalUpdateParameters
except Exception:
pass

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
except ImportError:
# This is handled in azure_rm_common
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_adserviceprincipal_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
except ImportError:
# This is handled in azure_rm_common
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_aduser.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import UserUpdateParameters
from azure.graphrbac.models import UserCreateParameters
from azure.graphrbac.models import PasswordProfile
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_aduser_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.graphrbac.models import GraphErrorException
except ImportError:
# This is handled in azure_rm_common
Expand Down
7 changes: 0 additions & 7 deletions plugins/modules/azure_rm_aksversion_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@

from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase

try:
from msrestazure.azure_exceptions import CloudError
from azure.common import AzureHttpError
except Exception:
# handled in azure_rm_common
pass


class AzureRMAKSVersion(AzureRMModuleBase):

Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/azure_rm_apimanagement.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,7 @@

from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
from copy import deepcopy
import time
import json
import re
try:
from msrestazure.azure_exceptions import CloudError
except ImportError:
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/azure_rm_apimanagement_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@

from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
from copy import deepcopy
import time
import json
import re
try:
from msrestazure.azure_exceptions import CloudError
except ImportError:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_apimanagementservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,8 @@

import time
import json
import re
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
from copy import deepcopy
try:
from msrestazure.azure_exceptions import CloudError
except ImportError:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_apimanagementservice_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,9 @@
sample: null
'''

import time
import json
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
from copy import deepcopy
try:
from msrestazure.azure_exceptions import CloudError
except ImportError:
Expand Down
9 changes: 9 additions & 0 deletions plugins/modules/azure_rm_appgateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@
- Conditions based on which the action set execution will be evaluated.
type: list
elements: dict
default: []
suboptions:
variable:
description:
Expand Down Expand Up @@ -266,6 +267,7 @@
- List of actions to be taken on request headers.
type: list
elements: dict
default: []
suboptions:
header_name:
description:
Expand All @@ -275,11 +277,13 @@
description:
- Value of the header.
- Leave the parameter unset to remove the header.
default: ''
response_header_configurations:
description:
- List of actions to be taken on response headers.
type: list
elements: dict
default: []
suboptions:
header_name:
description:
Expand All @@ -289,6 +293,7 @@
description:
- Value of the header.
- Leave the parameter unset to remove the header.
default: ''
url_configuration:
description:
- Action to be taken on the URL.
Expand Down Expand Up @@ -342,6 +347,7 @@
key_vault_secret_id:
description:
- Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
default: ''
type: str
frontend_ip_configurations:
description:
Expand Down Expand Up @@ -683,6 +689,7 @@
- The disabled rule groups.
type: list
elements: dict
default: []
suboptions:
rule_group_name:
description:
Expand All @@ -693,6 +700,7 @@
- The list of rules that will be disabled. If null, all rules of the rule group will be disabled.
type: list
elements: int
default: []
enabled:
description:
- Whether the web application firewall is enabled or not.
Expand All @@ -702,6 +710,7 @@
- The exclusion list.
type: list
elements: dict
default: []
suboptions:
match_variable:
description:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_applicationsecuritygroup_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@

try:
from azure.core.exceptions import ResourceNotFoundError
from msrestazure.azure_operation import AzureOperationPoller
except ImportError:
# This is handled in azure_rm_common
pass
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_appserviceplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
}
'''

import time
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase

try:
Expand Down
6 changes: 0 additions & 6 deletions plugins/modules/azure_rm_autoscale_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,6 @@
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase
from ansible.module_utils._text import to_native

try:
from msrest.serialization import Model
except ImportError:
# This is handled in azure_rm_common
pass


# duplicated in azure_rm_autoscale
def timedelta_to_minutes(time):
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_azurefirewall.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,8 @@

import time
import json
import re
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from copy import deepcopy
try:
from msrestazure.azure_exceptions import CloudError
except ImportError:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_azurefirewall_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,9 @@

'''

import time
import json
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from copy import deepcopy
try:
from msrestazure.azure_exceptions import CloudError
except Exception:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_backupazurevm.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,7 @@

from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
import re
import json
import time


class Actions:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_backupazurevm_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@

from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt
import re
import json
import time


class Actions:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_backuppolicy.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
sample: Microsoft.RecoveryServices/vaults/backupPolicies
'''

import uuid
from datetime import datetime
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase

Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_backuppolicy_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@
sample: Microsoft.RecoveryServices/vaults/backupPolicies
'''

import uuid
from datetime import datetime
from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase

try:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/azure_rm_cdnendpoint_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@

try:
from azure.mgmt.cdn import CdnManagementClient
from azure.mgmt.cdn.models import ErrorResponseException
from azure.common import AzureHttpError
except ImportError:
# handled in azure_rm_common
pass
Expand Down
1 change: 1 addition & 0 deletions plugins/modules/azure_rm_containerinstance.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
- This option is deprecated, using I(ports) under I(containers)".
type: list
elements: int
default: []
location:
description:
- Valid azure location. Defaults to location of the resource group.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@

try:
from azure.core.exceptions import ResourceNotFoundError
from azure.core.polling import LROPoller
except ImportError:
# This is handled in azure_rm_common
pass
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_datalakestore.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@
'''

from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase
import datetime

try:
from azure.core.exceptions import ResourceNotFoundError
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/azure_rm_ddosprotectionplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@

try:
from azure.core.exceptions import ResourceNotFoundError
from azure.mgmt.network import NetworkManagementClient
except ImportError:
# This is handled in azure_rm_common
pass
Expand Down
Loading