diff --git a/src/zones/HISTORY.rst b/src/zones/HISTORY.rst index a14fe2e0890..9910bd4c279 100644 --- a/src/zones/HISTORY.rst +++ b/src/zones/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +1.0.0b3 +++++++ +* Minor bugfixes to improve command loading + 1.0.0b2 ++++++ * Minor bugfixes to improve command loading diff --git a/src/zones/azext_zones/resource_type_validators/__init__.py b/src/zones/azext_zones/resource_type_validators/__init__.py new file mode 100644 index 00000000000..d906ea2b892 --- /dev/null +++ b/src/zones/azext_zones/resource_type_validators/__init__.py @@ -0,0 +1,5 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- +"""Validators for resource types supported by Zones""" diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_apimanagement.py b/src/zones/azext_zones/resource_type_validators/microsoft_apimanagement.py index d0fcb47b7da..82705e39d34 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_apimanagement.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_apimanagement.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.apimanagement") class microsoft_apimanagement: @staticmethod @@ -33,7 +34,6 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1 and resource["sku"]["name"] == "Premium": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_app.py b/src/zones/azext_zones/resource_type_validators/microsoft_app.py index a6f4ef31622..7a11df01f31 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_app.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_app.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.app") class microsoft_app: @staticmethod @@ -32,7 +33,6 @@ def validate(resource): # https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps#availability-zone-support if resource["properties"].get("zoneRedundant", {}) is True: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_authorization.py b/src/zones/azext_zones/resource_type_validators/microsoft_authorization.py index 580523c065b..956304d7c3a 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_authorization.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_authorization.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.authorization") class microsoft_authorization: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_automation.py b/src/zones/azext_zones/resource_type_validators/microsoft_automation.py index 62e9e281ec6..885adfa0df7 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_automation.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_automation.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.automation") class microsoft_automation: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_botservice.py b/src/zones/azext_zones/resource_type_validators/microsoft_botservice.py index edac1eb6f07..0537dbf661d 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_botservice.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_botservice.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.botservice") class microsoft_botservice: @staticmethod @@ -32,8 +33,8 @@ def validate(resource): "Your bot service resource in westeurope may be zone redundant, \ but only if it's configured as a regional (not global) bot. Please check manually." ) - else: - # Bot services cannot be ZR in any other region - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.Unknown + # Bot services cannot be ZR in any other region + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_cache.py b/src/zones/azext_zones/resource_type_validators/microsoft_cache.py index 1e11e4df040..518faf361b4 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_cache.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_cache.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.cache") class microsoft_cache: @staticmethod @@ -27,15 +28,13 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Redis Enterprise if resourceSubType == "redisenterprise": zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_cdn.py b/src/zones/azext_zones/resource_type_validators/microsoft_cdn.py index cf5d35c4960..6989bcccd14 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_cdn.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_cdn.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.cdn") class microsoft_cdn: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_chaos.py b/src/zones/azext_zones/resource_type_validators/microsoft_chaos.py index 9bb8c1cb196..ebcd2bc4f1e 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_chaos.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_chaos.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.chaos") class microsoft_chaos: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_compute.py b/src/zones/azext_zones/resource_type_validators/microsoft_compute.py index c0fbe8423a0..dab619adf16 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_compute.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_compute.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods,too-many-return-statements @register_resource_type("microsoft.compute") class microsoft_compute: @staticmethod @@ -25,8 +26,7 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # VM ScaleSets if resourceSubType == "virtualmachinescalesets": @@ -34,8 +34,7 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Virtual Machines if resourceSubType == "virtualmachines": @@ -43,8 +42,7 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # VM Extensions if resourceSubType == "virtualmachines/extensions": diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_containerinstance.py b/src/zones/azext_zones/resource_type_validators/microsoft_containerinstance.py index 4e6b296d2dc..76123a2b1a0 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_containerinstance.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_containerinstance.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.containerinstance") class microsoft_containerinstance: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_containerregistry.py b/src/zones/azext_zones/resource_type_validators/microsoft_containerregistry.py index 0c860e17177..6ffdf8d23ae 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_containerregistry.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_containerregistry.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.containerregistry") class microsoft_containerregistry: @staticmethod @@ -28,14 +29,12 @@ def validate(resource): # https://learn.microsoft.com/azure/container-registry/zone-redundancy if resource["properties"]["zoneRedundancy"] == "Enabled": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Registry Regional Replications if resourceSubType == "registries/replications": if resource["properties"]["zoneRedundancy"] == "Enabled": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_containerservice.py b/src/zones/azext_zones/resource_type_validators/microsoft_containerservice.py index aba6bda5db7..166cc9349c8 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_containerservice.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_containerservice.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.containerservice") class microsoft_containerservice: @staticmethod @@ -32,10 +33,8 @@ def validate(resource): or [] ) poolZoneCount = len(poolZones) - return ( - ZoneRedundancyValidationResult.Yes - if poolZoneCount > 1 - else ZoneRedundancyValidationResult.No - ) + if poolZoneCount > 1: + return ZoneRedundancyValidationResult.Yes + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_dashboard.py b/src/zones/azext_zones/resource_type_validators/microsoft_dashboard.py index 66f6255eeea..f17ab0c6fb7 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_dashboard.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_dashboard.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.dashboard") class microsoft_dashboard: @staticmethod @@ -27,7 +28,6 @@ def validate(resource): zr = resource.get("properties", {}).get("zoneRedundancy", "") if zr == "Enabled": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_dbformysql.py b/src/zones/azext_zones/resource_type_validators/microsoft_dbformysql.py index b6f071666ff..77e903d1f74 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_dbformysql.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_dbformysql.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.dbformysql") class microsoft_mysql: @staticmethod @@ -27,8 +28,7 @@ def validate(resource): ) if haConfig == "ZoneRedundant": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Azure Database for MySQL Single Servers if resourceSubType == "servers": diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_dbforpostgresql.py b/src/zones/azext_zones/resource_type_validators/microsoft_dbforpostgresql.py index 7d7b7d2558c..3955ee988b0 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_dbforpostgresql.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_dbforpostgresql.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.dbforpostgresql") class microsoft_dbforpostgresql: @staticmethod @@ -29,8 +30,7 @@ def validate(resource): == "ZoneRedundant" ): return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # PostgreSQL Single Servers if resourceSubType == "servers": diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_documentdb.py b/src/zones/azext_zones/resource_type_validators/microsoft_documentdb.py index 187c96fa648..a76750834b2 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_documentdb.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_documentdb.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.documentdb") class microsoft_documentdb: @staticmethod @@ -29,8 +30,7 @@ def validate(resource): # setting enabled on the region if resource["properties"]["locations"][0]["isZoneRedundant"]: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # CosmosDB MongoDB API Accounts if resourceSubType == "mongoClusters": @@ -38,7 +38,6 @@ def validate(resource): highAvailability = resource["properties"].get("highAvailability", "") if highAvailability.get("targetMode", "") == "ZoneRedundantPreferred": return ZoneRedundancyValidationResult.Yes - else: - ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_eventgrid.py b/src/zones/azext_zones/resource_type_validators/microsoft_eventgrid.py index 2328b960624..632b0371572 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_eventgrid.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_eventgrid.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.eventgrid") class microsoft_eventgrid: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_eventhub.py b/src/zones/azext_zones/resource_type_validators/microsoft_eventhub.py index 448ba1a3fb5..048a13bf45d 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_eventhub.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_eventhub.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.eventhub") class microsoft_eventhub: @staticmethod @@ -22,6 +23,7 @@ def validate(resource): "Validating Microsoft.eventhub resource type: %s", resourceSubType ) - # If you create an Event Hubs namespace in a region that supports availability zones, zone redundancy is automatically enabled. + # If you create an Event Hubs namespace in a region that supports availability zones, + # zone redundancy is automatically enabled. # https://learn.microsoft.com/azure/reliability/reliability-event-hubs#availability-zone-support return ZoneRedundancyValidationResult.Always diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_hdinsight.py b/src/zones/azext_zones/resource_type_validators/microsoft_hdinsight.py index 2692248a4ac..d895005c28e 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_hdinsight.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_hdinsight.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.hdinsight") class microsoft_hdinsight: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_insights.py b/src/zones/azext_zones/resource_type_validators/microsoft_insights.py index 0c76089dace..3d861189ccc 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_insights.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_insights.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.insights") class microsoft_insights: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_iothub.py b/src/zones/azext_zones/resource_type_validators/microsoft_iothub.py index 241c1513c22..1df97de55ec 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_iothub.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_iothub.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.iothub") class microsoft_iothub: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_keyvault.py b/src/zones/azext_zones/resource_type_validators/microsoft_keyvault.py index 938bb6358e7..ed0c00bfad8 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_keyvault.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_keyvault.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.keyvault") class microsoft_keyvault: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_kusto.py b/src/zones/azext_zones/resource_type_validators/microsoft_kusto.py index 9774672b4cd..ca4552e07e1 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_kusto.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_kusto.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.kusto") class microsoft_kusto: @staticmethod @@ -28,7 +29,6 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_loadtestservice.py b/src/zones/azext_zones/resource_type_validators/microsoft_loadtestservice.py index 64b15779a02..2bb77dcef82 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_loadtestservice.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_loadtestservice.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.loadtestservice") class microsoft_loadtestservice: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_machinelearningservices.py b/src/zones/azext_zones/resource_type_validators/microsoft_machinelearningservices.py index 2f29049dbc0..42e17602ec5 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_machinelearningservices.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_machinelearningservices.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.machinelearningservices") class microsoft_machinelearningservices: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_managedidentity.py b/src/zones/azext_zones/resource_type_validators/microsoft_managedidentity.py index 16e7a8c839c..809bb1f2898 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_managedidentity.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_managedidentity.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.managedidentity") class microsoft_managedidentity: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_maps.py b/src/zones/azext_zones/resource_type_validators/microsoft_maps.py index 2bc634375e2..24c4917464b 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_maps.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_maps.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.maps") class microsoft_maps: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_network.py b/src/zones/azext_zones/resource_type_validators/microsoft_network.py index 54793d8638a..382d7d7ac49 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_network.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_network.py @@ -10,10 +10,11 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.network") class microsoft_network: @staticmethod - def validate(resource): + def validate(resource): # pylint: disable=too-many-return-statements,too-many-branches resourceType = resource["type"] resourceSubType = resourceType[resourceType.index("/") + 1:] @@ -25,16 +26,14 @@ def validate(resource): zones = resource.get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Azure Firewalls if resourceSubType == "azurefirewalls": zones = resource.get("zones") or [] if len(zones) > 1 and resource["sku"]["capacity"] > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Network Connections if resourceSubType == "connections": @@ -60,8 +59,7 @@ def validate(resource): zones = frontend_ip_configs[0].get("zones") or [] if len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Local Network Gateways if resourceSubType == "localnetworkgateways": @@ -107,8 +105,7 @@ def validate(resource): zones = resource.get("zones") or [] if resource["sku"]["name"] in ["Standard"] and len(zones) > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Virtual Networks if resourceSubType == "virtualnetworks": @@ -121,7 +118,6 @@ def validate(resource): sku = resource["properties"]["sku"]["name"] if sku.endswith("AZ"): return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_operationalinsights.py b/src/zones/azext_zones/resource_type_validators/microsoft_operationalinsights.py index 606c94d44dc..82be9f1274c 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_operationalinsights.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_operationalinsights.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.operationalinsights") class microsoft_operationalinsights: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_recoveryservices.py b/src/zones/azext_zones/resource_type_validators/microsoft_recoveryservices.py index 35fe1a4eae2..8a83de0240b 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_recoveryservices.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_recoveryservices.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.recoveryservices") class microsoft_recoveryservices: @staticmethod @@ -27,13 +28,13 @@ def validate(resource): # https://learn.microsoft.com/azure/reliability/reliability-backup#availability-zone-support # Recovery Services vaults are zone redundant if the storage # redundancy was set to ZoneRedundant - return ( - ZoneRedundancyValidationResult.Yes - if resource["properties"]["redundancySettings"][ + if ( + resource["properties"]["redundancySettings"][ "standardTierStorageRedundancy" ] == "ZoneRedundant" - else ZoneRedundancyValidationResult.No - ) + ): + return ZoneRedundancyValidationResult.Yes + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_search.py b/src/zones/azext_zones/resource_type_validators/microsoft_search.py index 126cb7b89f4..a86d9822406 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_search.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_search.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.search") class microsoft_search: @staticmethod @@ -28,7 +29,6 @@ def validate(resource): replicaCount = resource["properties"].get("replicaCount", 0) if sku not in ["Free", "Basic"] and replicaCount > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_servicebus.py b/src/zones/azext_zones/resource_type_validators/microsoft_servicebus.py index 30915e3d40d..8ea0b1a0bb1 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_servicebus.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_servicebus.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.servicebus") class microsoft_servicebus: @staticmethod diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_signalrservice.py b/src/zones/azext_zones/resource_type_validators/microsoft_signalrservice.py index 3e319b9ab78..53c117381e1 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_signalrservice.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_signalrservice.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.signalrservice") class microsoft_signalrservice: @staticmethod @@ -28,7 +29,6 @@ def validate(resource): # https://learn.microsoft.com/azure/azure-signalr/availability-zones if resource["sku"]["name"] == "Premium": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_sql.py b/src/zones/azext_zones/resource_type_validators/microsoft_sql.py index a327228d6a1..9478d460822 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_sql.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_sql.py @@ -10,10 +10,11 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.sql") class microsoft_sql: @staticmethod - def validate(resource): + def validate(resource): # pylint: disable=too-many-return-statements resourceType = resource["type"] resourceSubType = resourceType[resourceType.index("/") + 1:] @@ -25,8 +26,7 @@ def validate(resource): # https://learn.microsoft.com/azure/azure-sql/database/high-availability-sla-local-zone-redundancy#high-availability-through-zone-redundancy if resource["properties"]["zoneRedundant"]: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # SQL Servers if resourceSubType == "servers": @@ -40,8 +40,7 @@ def validate(resource): # https://learn.microsoft.com/azure/azure-sql/managed-instance/high-availability-sla-local-zone-redundancy?view=azuresql#zone-redundant-availability if resource["properties"].get("zoneRedundant", {}) is True: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # SQL Managed Instance Pools if resourceSubType == "instancepools": diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_storage.py b/src/zones/azext_zones/resource_type_validators/microsoft_storage.py index d40390b21ff..f516b0ab23a 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_storage.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_storage.py @@ -10,6 +10,7 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.storage") class microsoft_storage: @staticmethod @@ -26,7 +27,6 @@ def validate(resource): # SKU if resource["sku"]["name"] == "Standard_ZRS": return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No return ZoneRedundancyValidationResult.Unknown diff --git a/src/zones/azext_zones/resource_type_validators/microsoft_web.py b/src/zones/azext_zones/resource_type_validators/microsoft_web.py index c1fed9c949e..983ba88b8de 100644 --- a/src/zones/azext_zones/resource_type_validators/microsoft_web.py +++ b/src/zones/azext_zones/resource_type_validators/microsoft_web.py @@ -10,10 +10,11 @@ from knack.log import get_logger +# pylint: disable=too-few-public-methods @register_resource_type("microsoft.web") class microsoft_web: @staticmethod - def validate(resource): + def validate(resource): # pylint: disable=too-many-return-statements resourceType = resource["type"] resourceSubType = resourceType[resourceType.index("/") + 1:] @@ -28,8 +29,7 @@ def validate(resource): instanceCount = resource["sku"].get("capacity", 0) if zrEnabled and instanceCount > 1: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # App Services if resourceSubType == "sites": @@ -42,8 +42,7 @@ def validate(resource): zrStatus = resource["properties"].get("zoneRedundant", False) if zrStatus: return ZoneRedundancyValidationResult.Yes - else: - return ZoneRedundancyValidationResult.No + return ZoneRedundancyValidationResult.No # Static Web Apps if resourceSubType == "staticsites": diff --git a/src/zones/setup.py b/src/zones/setup.py index 55b69e13e8b..86ceed198dd 100644 --- a/src/zones/setup.py +++ b/src/zones/setup.py @@ -14,9 +14,7 @@ from distutils import log as logger logger.warn("Wheel is not available, disabling bdist_wheel hook") -# TODO: Confirm this is the right version number you want and it matches your -# HISTORY.rst entry. -VERSION = '1.0.0b2' +VERSION = '1.0.0b3' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers