From f28ce82ad5246d21ca30bfa89d70c6c252fce821 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 10 Jun 2021 21:57:08 +0000 Subject: [PATCH] CodeGen from PR 14671 in Azure/azure-rest-api-specs Merge a4f4bea23c0ae3b15d64a7cd19c2339e459671a8 into 297c0866ffaca818bd42ba20ea5d22f850aa4e18 --- sdk/sql/azure-mgmt-sql/_meta.json | 6 +-- .../azure/mgmt/sql/_metadata.json | 4 +- .../azure/mgmt/sql/_sql_management_client.py | 20 +++++----- .../azure-mgmt-sql/azure/mgmt/sql/_version.py | 2 +- .../mgmt/sql/aio/_sql_management_client.py | 20 +++++----- .../azure/mgmt/sql/aio/operations/__init__.py | 8 ++-- ...hort_term_retention_policies_operations.py | 8 ++-- .../sql/aio/operations/_servers_operations.py | 16 ++++---- .../aio/operations/_sync_groups_operations.py | 4 +- .../azure/mgmt/sql/models/__init__.py | 10 +++-- .../azure/mgmt/sql/models/_models.py | 30 +++++++++++++- .../azure/mgmt/sql/models/_models_py3.py | 39 +++++++++++++++++-- .../models/_sql_management_client_enums.py | 13 ++++++- .../azure/mgmt/sql/operations/__init__.py | 8 ++-- ...hort_term_retention_policies_operations.py | 8 ++-- .../sql/operations/_servers_operations.py | 16 ++++---- .../sql/operations/_sync_groups_operations.py | 4 +- 17 files changed, 142 insertions(+), 74 deletions(-) diff --git a/sdk/sql/azure-mgmt-sql/_meta.json b/sdk/sql/azure-mgmt-sql/_meta.json index 73f3d6c3f8a4..8c659c9f34d6 100644 --- a/sdk/sql/azure-mgmt-sql/_meta.json +++ b/sdk/sql/azure-mgmt-sql/_meta.json @@ -2,10 +2,10 @@ "autorest": "3.4.2", "use": [ "@autorest/python@5.8.0", - "@autorest/modelerfour@4.19.1" + "@autorest/modelerfour@4.19.2" ], - "commit": "1c801aa70be460b277f1d81f9cced889ca5008fe", + "commit": "16f598966abf1dedf1dc1564f6c6c7ce2c7a215d", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/sql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.0 --use=@autorest/modelerfour@4.19.1 --version=3.4.2", + "autorest_command": "autorest specification/sql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.0 --use=@autorest/modelerfour@4.19.2 --version=3.4.2", "readme": "specification/sql/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_metadata.json b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_metadata.json index 1b930ac93a06..4d0c4303c3ab 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_metadata.json +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_metadata.json @@ -113,7 +113,6 @@ "transparent_data_encryptions": "TransparentDataEncryptionsOperations", "transparent_data_encryption_activities": "TransparentDataEncryptionActivitiesOperations", "server_usages": "ServerUsagesOperations", - "backup_short_term_retention_policies": "BackupShortTermRetentionPoliciesOperations", "extended_database_blob_auditing_policies": "ExtendedDatabaseBlobAuditingPoliciesOperations", "extended_server_blob_auditing_policies": "ExtendedServerBlobAuditingPoliciesOperations", "server_blob_auditing_policies": "ServerBlobAuditingPoliciesOperations", @@ -195,7 +194,6 @@ "server_dns_aliases": "ServerDnsAliasesOperations", "server_keys": "ServerKeysOperations", "server_operations": "ServerOperationsOperations", - "servers": "ServersOperations", "server_security_alert_policies": "ServerSecurityAlertPoliciesOperations", "server_trust_groups": "ServerTrustGroupsOperations", "server_vulnerability_assessments": "ServerVulnerabilityAssessmentsOperations", @@ -210,6 +208,7 @@ "virtual_network_rules": "VirtualNetworkRulesOperations", "workload_classifiers": "WorkloadClassifiersOperations", "workload_groups": "WorkloadGroupsOperations", + "backup_short_term_retention_policies": "BackupShortTermRetentionPoliciesOperations", "database_extensions": "DatabaseExtensionsOperations", "database_operations": "DatabaseOperationsOperations", "database_usages": "DatabaseUsagesOperations", @@ -217,6 +216,7 @@ "outbound_firewall_rules": "OutboundFirewallRulesOperations", "restorable_dropped_databases": "RestorableDroppedDatabasesOperations", "restorable_dropped_managed_databases": "RestorableDroppedManagedDatabasesOperations", + "servers": "ServersOperations", "usages": "UsagesOperations" } } \ No newline at end of file diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py index 4b81736ec8e8..7cc74c21d044 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py @@ -34,7 +34,6 @@ from .operations import TransparentDataEncryptionsOperations from .operations import TransparentDataEncryptionActivitiesOperations from .operations import ServerUsagesOperations -from .operations import BackupShortTermRetentionPoliciesOperations from .operations import ExtendedDatabaseBlobAuditingPoliciesOperations from .operations import ExtendedServerBlobAuditingPoliciesOperations from .operations import ServerBlobAuditingPoliciesOperations @@ -116,7 +115,6 @@ from .operations import ServerDnsAliasesOperations from .operations import ServerKeysOperations from .operations import ServerOperationsOperations -from .operations import ServersOperations from .operations import ServerSecurityAlertPoliciesOperations from .operations import ServerTrustGroupsOperations from .operations import ServerVulnerabilityAssessmentsOperations @@ -131,6 +129,7 @@ from .operations import VirtualNetworkRulesOperations from .operations import WorkloadClassifiersOperations from .operations import WorkloadGroupsOperations +from .operations import BackupShortTermRetentionPoliciesOperations from .operations import DatabaseExtensionsOperations from .operations import DatabaseOperationsOperations from .operations import DatabaseUsagesOperations @@ -138,6 +137,7 @@ from .operations import OutboundFirewallRulesOperations from .operations import RestorableDroppedDatabasesOperations from .operations import RestorableDroppedManagedDatabasesOperations +from .operations import ServersOperations from .operations import UsagesOperations from . import models @@ -175,8 +175,6 @@ class SqlManagementClient(object): :vartype transparent_data_encryption_activities: azure.mgmt.sql.operations.TransparentDataEncryptionActivitiesOperations :ivar server_usages: ServerUsagesOperations operations :vartype server_usages: azure.mgmt.sql.operations.ServerUsagesOperations - :ivar backup_short_term_retention_policies: BackupShortTermRetentionPoliciesOperations operations - :vartype backup_short_term_retention_policies: azure.mgmt.sql.operations.BackupShortTermRetentionPoliciesOperations :ivar extended_database_blob_auditing_policies: ExtendedDatabaseBlobAuditingPoliciesOperations operations :vartype extended_database_blob_auditing_policies: azure.mgmt.sql.operations.ExtendedDatabaseBlobAuditingPoliciesOperations :ivar extended_server_blob_auditing_policies: ExtendedServerBlobAuditingPoliciesOperations operations @@ -339,8 +337,6 @@ class SqlManagementClient(object): :vartype server_keys: azure.mgmt.sql.operations.ServerKeysOperations :ivar server_operations: ServerOperationsOperations operations :vartype server_operations: azure.mgmt.sql.operations.ServerOperationsOperations - :ivar servers: ServersOperations operations - :vartype servers: azure.mgmt.sql.operations.ServersOperations :ivar server_security_alert_policies: ServerSecurityAlertPoliciesOperations operations :vartype server_security_alert_policies: azure.mgmt.sql.operations.ServerSecurityAlertPoliciesOperations :ivar server_trust_groups: ServerTrustGroupsOperations operations @@ -369,6 +365,8 @@ class SqlManagementClient(object): :vartype workload_classifiers: azure.mgmt.sql.operations.WorkloadClassifiersOperations :ivar workload_groups: WorkloadGroupsOperations operations :vartype workload_groups: azure.mgmt.sql.operations.WorkloadGroupsOperations + :ivar backup_short_term_retention_policies: BackupShortTermRetentionPoliciesOperations operations + :vartype backup_short_term_retention_policies: azure.mgmt.sql.operations.BackupShortTermRetentionPoliciesOperations :ivar database_extensions: DatabaseExtensionsOperations operations :vartype database_extensions: azure.mgmt.sql.operations.DatabaseExtensionsOperations :ivar database_operations: DatabaseOperationsOperations operations @@ -383,6 +381,8 @@ class SqlManagementClient(object): :vartype restorable_dropped_databases: azure.mgmt.sql.operations.RestorableDroppedDatabasesOperations :ivar restorable_dropped_managed_databases: RestorableDroppedManagedDatabasesOperations operations :vartype restorable_dropped_managed_databases: azure.mgmt.sql.operations.RestorableDroppedManagedDatabasesOperations + :ivar servers: ServersOperations operations + :vartype servers: azure.mgmt.sql.operations.ServersOperations :ivar usages: UsagesOperations operations :vartype usages: azure.mgmt.sql.operations.UsagesOperations :param credential: Credential needed for the client to connect to Azure. @@ -441,8 +441,6 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.server_usages = ServerUsagesOperations( self._client, self._config, self._serialize, self._deserialize) - self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations( - self._client, self._config, self._serialize, self._deserialize) self.extended_database_blob_auditing_policies = ExtendedDatabaseBlobAuditingPoliciesOperations( self._client, self._config, self._serialize, self._deserialize) self.extended_server_blob_auditing_policies = ExtendedServerBlobAuditingPoliciesOperations( @@ -605,8 +603,6 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.server_operations = ServerOperationsOperations( self._client, self._config, self._serialize, self._deserialize) - self.servers = ServersOperations( - self._client, self._config, self._serialize, self._deserialize) self.server_security_alert_policies = ServerSecurityAlertPoliciesOperations( self._client, self._config, self._serialize, self._deserialize) self.server_trust_groups = ServerTrustGroupsOperations( @@ -635,6 +631,8 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.workload_groups = WorkloadGroupsOperations( self._client, self._config, self._serialize, self._deserialize) + self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations( + self._client, self._config, self._serialize, self._deserialize) self.database_extensions = DatabaseExtensionsOperations( self._client, self._config, self._serialize, self._deserialize) self.database_operations = DatabaseOperationsOperations( @@ -649,6 +647,8 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.restorable_dropped_managed_databases = RestorableDroppedManagedDatabasesOperations( self._client, self._config, self._serialize, self._deserialize) + self.servers = ServersOperations( + self._client, self._config, self._serialize, self._deserialize) self.usages = UsagesOperations( self._client, self._config, self._serialize, self._deserialize) diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py index 83f24ab50946..c78e629b6f08 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.1.0" +VERSION = "0.9.0" diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/_sql_management_client.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/_sql_management_client.py index 8f25ba4aee57..c43d2b6edb43 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/_sql_management_client.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/_sql_management_client.py @@ -32,7 +32,6 @@ from .operations import TransparentDataEncryptionsOperations from .operations import TransparentDataEncryptionActivitiesOperations from .operations import ServerUsagesOperations -from .operations import BackupShortTermRetentionPoliciesOperations from .operations import ExtendedDatabaseBlobAuditingPoliciesOperations from .operations import ExtendedServerBlobAuditingPoliciesOperations from .operations import ServerBlobAuditingPoliciesOperations @@ -114,7 +113,6 @@ from .operations import ServerDnsAliasesOperations from .operations import ServerKeysOperations from .operations import ServerOperationsOperations -from .operations import ServersOperations from .operations import ServerSecurityAlertPoliciesOperations from .operations import ServerTrustGroupsOperations from .operations import ServerVulnerabilityAssessmentsOperations @@ -129,6 +127,7 @@ from .operations import VirtualNetworkRulesOperations from .operations import WorkloadClassifiersOperations from .operations import WorkloadGroupsOperations +from .operations import BackupShortTermRetentionPoliciesOperations from .operations import DatabaseExtensionsOperations from .operations import DatabaseOperationsOperations from .operations import DatabaseUsagesOperations @@ -136,6 +135,7 @@ from .operations import OutboundFirewallRulesOperations from .operations import RestorableDroppedDatabasesOperations from .operations import RestorableDroppedManagedDatabasesOperations +from .operations import ServersOperations from .operations import UsagesOperations from .. import models @@ -173,8 +173,6 @@ class SqlManagementClient(object): :vartype transparent_data_encryption_activities: azure.mgmt.sql.aio.operations.TransparentDataEncryptionActivitiesOperations :ivar server_usages: ServerUsagesOperations operations :vartype server_usages: azure.mgmt.sql.aio.operations.ServerUsagesOperations - :ivar backup_short_term_retention_policies: BackupShortTermRetentionPoliciesOperations operations - :vartype backup_short_term_retention_policies: azure.mgmt.sql.aio.operations.BackupShortTermRetentionPoliciesOperations :ivar extended_database_blob_auditing_policies: ExtendedDatabaseBlobAuditingPoliciesOperations operations :vartype extended_database_blob_auditing_policies: azure.mgmt.sql.aio.operations.ExtendedDatabaseBlobAuditingPoliciesOperations :ivar extended_server_blob_auditing_policies: ExtendedServerBlobAuditingPoliciesOperations operations @@ -337,8 +335,6 @@ class SqlManagementClient(object): :vartype server_keys: azure.mgmt.sql.aio.operations.ServerKeysOperations :ivar server_operations: ServerOperationsOperations operations :vartype server_operations: azure.mgmt.sql.aio.operations.ServerOperationsOperations - :ivar servers: ServersOperations operations - :vartype servers: azure.mgmt.sql.aio.operations.ServersOperations :ivar server_security_alert_policies: ServerSecurityAlertPoliciesOperations operations :vartype server_security_alert_policies: azure.mgmt.sql.aio.operations.ServerSecurityAlertPoliciesOperations :ivar server_trust_groups: ServerTrustGroupsOperations operations @@ -367,6 +363,8 @@ class SqlManagementClient(object): :vartype workload_classifiers: azure.mgmt.sql.aio.operations.WorkloadClassifiersOperations :ivar workload_groups: WorkloadGroupsOperations operations :vartype workload_groups: azure.mgmt.sql.aio.operations.WorkloadGroupsOperations + :ivar backup_short_term_retention_policies: BackupShortTermRetentionPoliciesOperations operations + :vartype backup_short_term_retention_policies: azure.mgmt.sql.aio.operations.BackupShortTermRetentionPoliciesOperations :ivar database_extensions: DatabaseExtensionsOperations operations :vartype database_extensions: azure.mgmt.sql.aio.operations.DatabaseExtensionsOperations :ivar database_operations: DatabaseOperationsOperations operations @@ -381,6 +379,8 @@ class SqlManagementClient(object): :vartype restorable_dropped_databases: azure.mgmt.sql.aio.operations.RestorableDroppedDatabasesOperations :ivar restorable_dropped_managed_databases: RestorableDroppedManagedDatabasesOperations operations :vartype restorable_dropped_managed_databases: azure.mgmt.sql.aio.operations.RestorableDroppedManagedDatabasesOperations + :ivar servers: ServersOperations operations + :vartype servers: azure.mgmt.sql.aio.operations.ServersOperations :ivar usages: UsagesOperations operations :vartype usages: azure.mgmt.sql.aio.operations.UsagesOperations :param credential: Credential needed for the client to connect to Azure. @@ -438,8 +438,6 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.server_usages = ServerUsagesOperations( self._client, self._config, self._serialize, self._deserialize) - self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations( - self._client, self._config, self._serialize, self._deserialize) self.extended_database_blob_auditing_policies = ExtendedDatabaseBlobAuditingPoliciesOperations( self._client, self._config, self._serialize, self._deserialize) self.extended_server_blob_auditing_policies = ExtendedServerBlobAuditingPoliciesOperations( @@ -602,8 +600,6 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.server_operations = ServerOperationsOperations( self._client, self._config, self._serialize, self._deserialize) - self.servers = ServersOperations( - self._client, self._config, self._serialize, self._deserialize) self.server_security_alert_policies = ServerSecurityAlertPoliciesOperations( self._client, self._config, self._serialize, self._deserialize) self.server_trust_groups = ServerTrustGroupsOperations( @@ -632,6 +628,8 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.workload_groups = WorkloadGroupsOperations( self._client, self._config, self._serialize, self._deserialize) + self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations( + self._client, self._config, self._serialize, self._deserialize) self.database_extensions = DatabaseExtensionsOperations( self._client, self._config, self._serialize, self._deserialize) self.database_operations = DatabaseOperationsOperations( @@ -646,6 +644,8 @@ def __init__( self._client, self._config, self._serialize, self._deserialize) self.restorable_dropped_managed_databases = RestorableDroppedManagedDatabasesOperations( self._client, self._config, self._serialize, self._deserialize) + self.servers = ServersOperations( + self._client, self._config, self._serialize, self._deserialize) self.usages = UsagesOperations( self._client, self._config, self._serialize, self._deserialize) diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/__init__.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/__init__.py index eec1a7bd1b91..92dc7fbad3cb 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/__init__.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/__init__.py @@ -21,7 +21,6 @@ from ._transparent_data_encryptions_operations import TransparentDataEncryptionsOperations from ._transparent_data_encryption_activities_operations import TransparentDataEncryptionActivitiesOperations from ._server_usages_operations import ServerUsagesOperations -from ._backup_short_term_retention_policies_operations import BackupShortTermRetentionPoliciesOperations from ._extended_database_blob_auditing_policies_operations import ExtendedDatabaseBlobAuditingPoliciesOperations from ._extended_server_blob_auditing_policies_operations import ExtendedServerBlobAuditingPoliciesOperations from ._server_blob_auditing_policies_operations import ServerBlobAuditingPoliciesOperations @@ -103,7 +102,6 @@ from ._server_dns_aliases_operations import ServerDnsAliasesOperations from ._server_keys_operations import ServerKeysOperations from ._server_operations_operations import ServerOperationsOperations -from ._servers_operations import ServersOperations from ._server_security_alert_policies_operations import ServerSecurityAlertPoliciesOperations from ._server_trust_groups_operations import ServerTrustGroupsOperations from ._server_vulnerability_assessments_operations import ServerVulnerabilityAssessmentsOperations @@ -118,6 +116,7 @@ from ._virtual_network_rules_operations import VirtualNetworkRulesOperations from ._workload_classifiers_operations import WorkloadClassifiersOperations from ._workload_groups_operations import WorkloadGroupsOperations +from ._backup_short_term_retention_policies_operations import BackupShortTermRetentionPoliciesOperations from ._database_extensions_operations import DatabaseExtensionsOperations from ._database_operations_operations import DatabaseOperationsOperations from ._database_usages_operations import DatabaseUsagesOperations @@ -125,6 +124,7 @@ from ._outbound_firewall_rules_operations import OutboundFirewallRulesOperations from ._restorable_dropped_databases_operations import RestorableDroppedDatabasesOperations from ._restorable_dropped_managed_databases_operations import RestorableDroppedManagedDatabasesOperations +from ._servers_operations import ServersOperations from ._usages_operations import UsagesOperations __all__ = [ @@ -143,7 +143,6 @@ 'TransparentDataEncryptionsOperations', 'TransparentDataEncryptionActivitiesOperations', 'ServerUsagesOperations', - 'BackupShortTermRetentionPoliciesOperations', 'ExtendedDatabaseBlobAuditingPoliciesOperations', 'ExtendedServerBlobAuditingPoliciesOperations', 'ServerBlobAuditingPoliciesOperations', @@ -225,7 +224,6 @@ 'ServerDnsAliasesOperations', 'ServerKeysOperations', 'ServerOperationsOperations', - 'ServersOperations', 'ServerSecurityAlertPoliciesOperations', 'ServerTrustGroupsOperations', 'ServerVulnerabilityAssessmentsOperations', @@ -240,6 +238,7 @@ 'VirtualNetworkRulesOperations', 'WorkloadClassifiersOperations', 'WorkloadGroupsOperations', + 'BackupShortTermRetentionPoliciesOperations', 'DatabaseExtensionsOperations', 'DatabaseOperationsOperations', 'DatabaseUsagesOperations', @@ -247,5 +246,6 @@ 'OutboundFirewallRulesOperations', 'RestorableDroppedDatabasesOperations', 'RestorableDroppedManagedDatabasesOperations', + 'ServersOperations', 'UsagesOperations', ] diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_backup_short_term_retention_policies_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_backup_short_term_retention_policies_operations.py index 823c1ef178ee..a6f3c926790e 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_backup_short_term_retention_policies_operations.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_backup_short_term_retention_policies_operations.py @@ -72,7 +72,7 @@ async def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" # Construct URL @@ -124,7 +124,7 @@ async def _create_or_update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -265,7 +265,7 @@ async def _update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -418,7 +418,7 @@ def list_by_database( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_servers_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_servers_operations.py index 27badfdc3a96..112e6c5d3d49 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_servers_operations.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_servers_operations.py @@ -66,7 +66,7 @@ def list_by_resource_group( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -145,7 +145,7 @@ async def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" # Construct URL @@ -195,7 +195,7 @@ async def _create_or_update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -324,7 +324,7 @@ async def _delete_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" # Construct URL url = self._delete_initial.metadata['url'] # type: ignore @@ -432,7 +432,7 @@ async def _update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -566,7 +566,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -630,7 +630,7 @@ async def _import_database_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -764,7 +764,7 @@ async def check_name_availability( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_sync_groups_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_sync_groups_operations.py index ff03c1945865..2a714c6b13da 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_sync_groups_operations.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_sync_groups_operations.py @@ -325,7 +325,7 @@ def list_logs( sync_group_name: str, start_time: str, end_time: str, - type: Union[str, "_models.Enum81"], + type: Union[str, "_models.Enum77"], continuation_token_parameter: Optional[str] = None, **kwargs: Any ) -> AsyncIterable["_models.SyncGroupLogListResult"]: @@ -345,7 +345,7 @@ def list_logs( :param end_time: Get logs generated before this time. :type end_time: str :param type: The types of logs to retrieve. - :type type: str or ~azure.mgmt.sql.models.Enum81 + :type type: str or ~azure.mgmt.sql.models.Enum77 :param continuation_token_parameter: The continuation token for this operation. :type continuation_token_parameter: str :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py index fb48a34cc9e3..e7eccc36e0da 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py @@ -725,11 +725,12 @@ DatabaseState, DatabaseStatus, DayOfWeek, + DiffBackupIntervalInHours, DnsRefreshConfigurationPropertiesStatus, ElasticPoolLicenseType, ElasticPoolState, EncryptionProtectorName, - Enum81, + Enum77, FailoverGroupReplicationRole, GeoBackupPolicyName, GeoBackupPolicyState, @@ -796,7 +797,7 @@ SensitivityLabelUpdateKind, ServerConnectionType, ServerKeyType, - ServerPublicNetworkAccess, + ServerNetworkAccessFlag, ServerTrustGroupPropertiesTrustScopesItem, ServerWorkspaceFeature, ServiceObjectiveName, @@ -1203,11 +1204,12 @@ 'DatabaseState', 'DatabaseStatus', 'DayOfWeek', + 'DiffBackupIntervalInHours', 'DnsRefreshConfigurationPropertiesStatus', 'ElasticPoolLicenseType', 'ElasticPoolState', 'EncryptionProtectorName', - 'Enum81', + 'Enum77', 'FailoverGroupReplicationRole', 'GeoBackupPolicyName', 'GeoBackupPolicyState', @@ -1274,7 +1276,7 @@ 'SensitivityLabelUpdateKind', 'ServerConnectionType', 'ServerKeyType', - 'ServerPublicNetworkAccess', + 'ServerNetworkAccessFlag', 'ServerTrustGroupPropertiesTrustScopesItem', 'ServerWorkspaceFeature', 'ServiceObjectiveName', diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py index a4f0d6da44e7..065871b4e2da 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py @@ -368,6 +368,10 @@ class BackupShortTermRetentionPolicy(ProxyResource): :param retention_days: The backup retention period in days. This is how many days Point-in-Time Restore will be supported. :type retention_days: int + :param diff_backup_interval_in_hours: The differential backup interval in hours. This is how + many interval hours between each differential backup will be supported. This is only applicable + to live databases but not dropped databases. Possible values include: 12, 24. + :type diff_backup_interval_in_hours: str or ~azure.mgmt.sql.models.DiffBackupIntervalInHours """ _validation = { @@ -381,6 +385,7 @@ class BackupShortTermRetentionPolicy(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'retention_days': {'key': 'properties.retentionDays', 'type': 'int'}, + 'diff_backup_interval_in_hours': {'key': 'properties.diffBackupIntervalInHours', 'type': 'int'}, } def __init__( @@ -389,6 +394,7 @@ def __init__( ): super(BackupShortTermRetentionPolicy, self).__init__(**kwargs) self.retention_days = kwargs.get('retention_days', None) + self.diff_backup_interval_in_hours = kwargs.get('diff_backup_interval_in_hours', None) class BackupShortTermRetentionPolicyListResult(msrest.serialization.Model): @@ -12084,17 +12090,23 @@ class Server(TrackedResource): :param public_network_access: Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible values include: "Enabled", "Disabled". - :type public_network_access: str or ~azure.mgmt.sql.models.ServerPublicNetworkAccess + :type public_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag :ivar workspace_feature: Whether or not existing server has a workspace created and if it allows connection from workspace. Possible values include: "Connected", "Disconnected". :vartype workspace_feature: str or ~azure.mgmt.sql.models.ServerWorkspaceFeature :param primary_user_assigned_identity_id: The resource id of a user assigned identity to be used by default. :type primary_user_assigned_identity_id: str + :param federated_client_id: The Client id used for cross tenant CMK scenario. + :type federated_client_id: str :param key_id: A CMK URI of the key to use for encryption. :type key_id: str :param administrators: The Azure Active Directory identity of the server. :type administrators: ~azure.mgmt.sql.models.ServerExternalAdministrator + :param restrict_outbound_network_access: Whether or not to restrict outbound network access for + this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible + values include: "Enabled", "Disabled". + :type restrict_outbound_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag """ _validation = { @@ -12127,8 +12139,10 @@ class Server(TrackedResource): 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, 'workspace_feature': {'key': 'properties.workspaceFeature', 'type': 'str'}, 'primary_user_assigned_identity_id': {'key': 'properties.primaryUserAssignedIdentityId', 'type': 'str'}, + 'federated_client_id': {'key': 'properties.federatedClientId', 'type': 'str'}, 'key_id': {'key': 'properties.keyId', 'type': 'str'}, 'administrators': {'key': 'properties.administrators', 'type': 'ServerExternalAdministrator'}, + 'restrict_outbound_network_access': {'key': 'properties.restrictOutboundNetworkAccess', 'type': 'str'}, } def __init__( @@ -12148,8 +12162,10 @@ def __init__( self.public_network_access = kwargs.get('public_network_access', None) self.workspace_feature = None self.primary_user_assigned_identity_id = kwargs.get('primary_user_assigned_identity_id', None) + self.federated_client_id = kwargs.get('federated_client_id', None) self.key_id = kwargs.get('key_id', None) self.administrators = kwargs.get('administrators', None) + self.restrict_outbound_network_access = kwargs.get('restrict_outbound_network_access', None) class ServerAutomaticTuning(ProxyResource): @@ -13366,17 +13382,23 @@ class ServerUpdate(msrest.serialization.Model): :param public_network_access: Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible values include: "Enabled", "Disabled". - :type public_network_access: str or ~azure.mgmt.sql.models.ServerPublicNetworkAccess + :type public_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag :ivar workspace_feature: Whether or not existing server has a workspace created and if it allows connection from workspace. Possible values include: "Connected", "Disconnected". :vartype workspace_feature: str or ~azure.mgmt.sql.models.ServerWorkspaceFeature :param primary_user_assigned_identity_id: The resource id of a user assigned identity to be used by default. :type primary_user_assigned_identity_id: str + :param federated_client_id: The Client id used for cross tenant CMK scenario. + :type federated_client_id: str :param key_id: A CMK URI of the key to use for encryption. :type key_id: str :param administrators: The Azure Active Directory identity of the server. :type administrators: ~azure.mgmt.sql.models.ServerExternalAdministrator + :param restrict_outbound_network_access: Whether or not to restrict outbound network access for + this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible + values include: "Enabled", "Disabled". + :type restrict_outbound_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag """ _validation = { @@ -13399,8 +13421,10 @@ class ServerUpdate(msrest.serialization.Model): 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, 'workspace_feature': {'key': 'properties.workspaceFeature', 'type': 'str'}, 'primary_user_assigned_identity_id': {'key': 'properties.primaryUserAssignedIdentityId', 'type': 'str'}, + 'federated_client_id': {'key': 'properties.federatedClientId', 'type': 'str'}, 'key_id': {'key': 'properties.keyId', 'type': 'str'}, 'administrators': {'key': 'properties.administrators', 'type': 'ServerExternalAdministrator'}, + 'restrict_outbound_network_access': {'key': 'properties.restrictOutboundNetworkAccess', 'type': 'str'}, } def __init__( @@ -13420,8 +13444,10 @@ def __init__( self.public_network_access = kwargs.get('public_network_access', None) self.workspace_feature = None self.primary_user_assigned_identity_id = kwargs.get('primary_user_assigned_identity_id', None) + self.federated_client_id = kwargs.get('federated_client_id', None) self.key_id = kwargs.get('key_id', None) self.administrators = kwargs.get('administrators', None) + self.restrict_outbound_network_access = kwargs.get('restrict_outbound_network_access', None) class ServerUsage(msrest.serialization.Model): diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models_py3.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models_py3.py index 23976b7d80b6..8ac8a364b69f 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models_py3.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models_py3.py @@ -379,6 +379,10 @@ class BackupShortTermRetentionPolicy(ProxyResource): :param retention_days: The backup retention period in days. This is how many days Point-in-Time Restore will be supported. :type retention_days: int + :param diff_backup_interval_in_hours: The differential backup interval in hours. This is how + many interval hours between each differential backup will be supported. This is only applicable + to live databases but not dropped databases. Possible values include: 12, 24. + :type diff_backup_interval_in_hours: str or ~azure.mgmt.sql.models.DiffBackupIntervalInHours """ _validation = { @@ -392,16 +396,19 @@ class BackupShortTermRetentionPolicy(ProxyResource): 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'retention_days': {'key': 'properties.retentionDays', 'type': 'int'}, + 'diff_backup_interval_in_hours': {'key': 'properties.diffBackupIntervalInHours', 'type': 'int'}, } def __init__( self, *, retention_days: Optional[int] = None, + diff_backup_interval_in_hours: Optional[Union[int, "DiffBackupIntervalInHours"]] = None, **kwargs ): super(BackupShortTermRetentionPolicy, self).__init__(**kwargs) self.retention_days = retention_days + self.diff_backup_interval_in_hours = diff_backup_interval_in_hours class BackupShortTermRetentionPolicyListResult(msrest.serialization.Model): @@ -12701,17 +12708,23 @@ class Server(TrackedResource): :param public_network_access: Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible values include: "Enabled", "Disabled". - :type public_network_access: str or ~azure.mgmt.sql.models.ServerPublicNetworkAccess + :type public_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag :ivar workspace_feature: Whether or not existing server has a workspace created and if it allows connection from workspace. Possible values include: "Connected", "Disconnected". :vartype workspace_feature: str or ~azure.mgmt.sql.models.ServerWorkspaceFeature :param primary_user_assigned_identity_id: The resource id of a user assigned identity to be used by default. :type primary_user_assigned_identity_id: str + :param federated_client_id: The Client id used for cross tenant CMK scenario. + :type federated_client_id: str :param key_id: A CMK URI of the key to use for encryption. :type key_id: str :param administrators: The Azure Active Directory identity of the server. :type administrators: ~azure.mgmt.sql.models.ServerExternalAdministrator + :param restrict_outbound_network_access: Whether or not to restrict outbound network access for + this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible + values include: "Enabled", "Disabled". + :type restrict_outbound_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag """ _validation = { @@ -12744,8 +12757,10 @@ class Server(TrackedResource): 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, 'workspace_feature': {'key': 'properties.workspaceFeature', 'type': 'str'}, 'primary_user_assigned_identity_id': {'key': 'properties.primaryUserAssignedIdentityId', 'type': 'str'}, + 'federated_client_id': {'key': 'properties.federatedClientId', 'type': 'str'}, 'key_id': {'key': 'properties.keyId', 'type': 'str'}, 'administrators': {'key': 'properties.administrators', 'type': 'ServerExternalAdministrator'}, + 'restrict_outbound_network_access': {'key': 'properties.restrictOutboundNetworkAccess', 'type': 'str'}, } def __init__( @@ -12758,10 +12773,12 @@ def __init__( administrator_login_password: Optional[str] = None, version: Optional[str] = None, minimal_tls_version: Optional[str] = None, - public_network_access: Optional[Union[str, "ServerPublicNetworkAccess"]] = None, + public_network_access: Optional[Union[str, "ServerNetworkAccessFlag"]] = None, primary_user_assigned_identity_id: Optional[str] = None, + federated_client_id: Optional[str] = None, key_id: Optional[str] = None, administrators: Optional["ServerExternalAdministrator"] = None, + restrict_outbound_network_access: Optional[Union[str, "ServerNetworkAccessFlag"]] = None, **kwargs ): super(Server, self).__init__(location=location, tags=tags, **kwargs) @@ -12777,8 +12794,10 @@ def __init__( self.public_network_access = public_network_access self.workspace_feature = None self.primary_user_assigned_identity_id = primary_user_assigned_identity_id + self.federated_client_id = federated_client_id self.key_id = key_id self.administrators = administrators + self.restrict_outbound_network_access = restrict_outbound_network_access class ServerAutomaticTuning(ProxyResource): @@ -14053,17 +14072,23 @@ class ServerUpdate(msrest.serialization.Model): :param public_network_access: Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible values include: "Enabled", "Disabled". - :type public_network_access: str or ~azure.mgmt.sql.models.ServerPublicNetworkAccess + :type public_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag :ivar workspace_feature: Whether or not existing server has a workspace created and if it allows connection from workspace. Possible values include: "Connected", "Disconnected". :vartype workspace_feature: str or ~azure.mgmt.sql.models.ServerWorkspaceFeature :param primary_user_assigned_identity_id: The resource id of a user assigned identity to be used by default. :type primary_user_assigned_identity_id: str + :param federated_client_id: The Client id used for cross tenant CMK scenario. + :type federated_client_id: str :param key_id: A CMK URI of the key to use for encryption. :type key_id: str :param administrators: The Azure Active Directory identity of the server. :type administrators: ~azure.mgmt.sql.models.ServerExternalAdministrator + :param restrict_outbound_network_access: Whether or not to restrict outbound network access for + this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. Possible + values include: "Enabled", "Disabled". + :type restrict_outbound_network_access: str or ~azure.mgmt.sql.models.ServerNetworkAccessFlag """ _validation = { @@ -14086,8 +14111,10 @@ class ServerUpdate(msrest.serialization.Model): 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, 'workspace_feature': {'key': 'properties.workspaceFeature', 'type': 'str'}, 'primary_user_assigned_identity_id': {'key': 'properties.primaryUserAssignedIdentityId', 'type': 'str'}, + 'federated_client_id': {'key': 'properties.federatedClientId', 'type': 'str'}, 'key_id': {'key': 'properties.keyId', 'type': 'str'}, 'administrators': {'key': 'properties.administrators', 'type': 'ServerExternalAdministrator'}, + 'restrict_outbound_network_access': {'key': 'properties.restrictOutboundNetworkAccess', 'type': 'str'}, } def __init__( @@ -14099,10 +14126,12 @@ def __init__( administrator_login_password: Optional[str] = None, version: Optional[str] = None, minimal_tls_version: Optional[str] = None, - public_network_access: Optional[Union[str, "ServerPublicNetworkAccess"]] = None, + public_network_access: Optional[Union[str, "ServerNetworkAccessFlag"]] = None, primary_user_assigned_identity_id: Optional[str] = None, + federated_client_id: Optional[str] = None, key_id: Optional[str] = None, administrators: Optional["ServerExternalAdministrator"] = None, + restrict_outbound_network_access: Optional[Union[str, "ServerNetworkAccessFlag"]] = None, **kwargs ): super(ServerUpdate, self).__init__(**kwargs) @@ -14118,8 +14147,10 @@ def __init__( self.public_network_access = public_network_access self.workspace_feature = None self.primary_user_assigned_identity_id = primary_user_assigned_identity_id + self.federated_client_id = federated_client_id self.key_id = key_id self.administrators = administrators + self.restrict_outbound_network_access = restrict_outbound_network_access class ServerUsage(msrest.serialization.Model): diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_sql_management_client_enums.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_sql_management_client_enums.py index 795b3fc170c9..c7e199af336d 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_sql_management_client_enums.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_sql_management_client_enums.py @@ -376,6 +376,15 @@ class DayOfWeek(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): FRIDAY = "Friday" SATURDAY = "Saturday" +class DiffBackupIntervalInHours(with_metaclass(_CaseInsensitiveEnumMeta, int, Enum)): + """The differential backup interval in hours. This is how many interval hours between each + differential backup will be supported. This is only applicable to live databases but not + dropped databases. + """ + + TWELVE = 12 + TWENTY_FOUR = 24 + class DnsRefreshConfigurationPropertiesStatus(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """The status of the DNS refresh operation. """ @@ -402,7 +411,7 @@ class EncryptionProtectorName(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum CURRENT = "current" -class Enum81(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): +class Enum77(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): ALL = "All" ERROR = "Error" @@ -931,7 +940,7 @@ class ServerKeyType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): SERVICE_MANAGED = "ServiceManaged" AZURE_KEY_VAULT = "AzureKeyVault" -class ServerPublicNetworkAccess(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): +class ServerNetworkAccessFlag(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled' """ diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py index eec1a7bd1b91..92dc7fbad3cb 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py @@ -21,7 +21,6 @@ from ._transparent_data_encryptions_operations import TransparentDataEncryptionsOperations from ._transparent_data_encryption_activities_operations import TransparentDataEncryptionActivitiesOperations from ._server_usages_operations import ServerUsagesOperations -from ._backup_short_term_retention_policies_operations import BackupShortTermRetentionPoliciesOperations from ._extended_database_blob_auditing_policies_operations import ExtendedDatabaseBlobAuditingPoliciesOperations from ._extended_server_blob_auditing_policies_operations import ExtendedServerBlobAuditingPoliciesOperations from ._server_blob_auditing_policies_operations import ServerBlobAuditingPoliciesOperations @@ -103,7 +102,6 @@ from ._server_dns_aliases_operations import ServerDnsAliasesOperations from ._server_keys_operations import ServerKeysOperations from ._server_operations_operations import ServerOperationsOperations -from ._servers_operations import ServersOperations from ._server_security_alert_policies_operations import ServerSecurityAlertPoliciesOperations from ._server_trust_groups_operations import ServerTrustGroupsOperations from ._server_vulnerability_assessments_operations import ServerVulnerabilityAssessmentsOperations @@ -118,6 +116,7 @@ from ._virtual_network_rules_operations import VirtualNetworkRulesOperations from ._workload_classifiers_operations import WorkloadClassifiersOperations from ._workload_groups_operations import WorkloadGroupsOperations +from ._backup_short_term_retention_policies_operations import BackupShortTermRetentionPoliciesOperations from ._database_extensions_operations import DatabaseExtensionsOperations from ._database_operations_operations import DatabaseOperationsOperations from ._database_usages_operations import DatabaseUsagesOperations @@ -125,6 +124,7 @@ from ._outbound_firewall_rules_operations import OutboundFirewallRulesOperations from ._restorable_dropped_databases_operations import RestorableDroppedDatabasesOperations from ._restorable_dropped_managed_databases_operations import RestorableDroppedManagedDatabasesOperations +from ._servers_operations import ServersOperations from ._usages_operations import UsagesOperations __all__ = [ @@ -143,7 +143,6 @@ 'TransparentDataEncryptionsOperations', 'TransparentDataEncryptionActivitiesOperations', 'ServerUsagesOperations', - 'BackupShortTermRetentionPoliciesOperations', 'ExtendedDatabaseBlobAuditingPoliciesOperations', 'ExtendedServerBlobAuditingPoliciesOperations', 'ServerBlobAuditingPoliciesOperations', @@ -225,7 +224,6 @@ 'ServerDnsAliasesOperations', 'ServerKeysOperations', 'ServerOperationsOperations', - 'ServersOperations', 'ServerSecurityAlertPoliciesOperations', 'ServerTrustGroupsOperations', 'ServerVulnerabilityAssessmentsOperations', @@ -240,6 +238,7 @@ 'VirtualNetworkRulesOperations', 'WorkloadClassifiersOperations', 'WorkloadGroupsOperations', + 'BackupShortTermRetentionPoliciesOperations', 'DatabaseExtensionsOperations', 'DatabaseOperationsOperations', 'DatabaseUsagesOperations', @@ -247,5 +246,6 @@ 'OutboundFirewallRulesOperations', 'RestorableDroppedDatabasesOperations', 'RestorableDroppedManagedDatabasesOperations', + 'ServersOperations', 'UsagesOperations', ] diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_backup_short_term_retention_policies_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_backup_short_term_retention_policies_operations.py index 67b397b21cf1..2ba2ce255fb3 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_backup_short_term_retention_policies_operations.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_backup_short_term_retention_policies_operations.py @@ -77,7 +77,7 @@ def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" # Construct URL @@ -130,7 +130,7 @@ def _create_or_update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -273,7 +273,7 @@ def _update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -428,7 +428,7 @@ def list_by_database( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_servers_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_servers_operations.py index b562c9484930..96a82d70fa4d 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_servers_operations.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_servers_operations.py @@ -71,7 +71,7 @@ def list_by_resource_group( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -151,7 +151,7 @@ def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" # Construct URL @@ -202,7 +202,7 @@ def _create_or_update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -333,7 +333,7 @@ def _delete_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" # Construct URL url = self._delete_initial.metadata['url'] # type: ignore @@ -443,7 +443,7 @@ def _update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -579,7 +579,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -644,7 +644,7 @@ def _import_database_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -780,7 +780,7 @@ def check_name_availability( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2020-11-01-preview" + api_version = "2021-02-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_sync_groups_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_sync_groups_operations.py index 549c1297970f..a3256265690f 100644 --- a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_sync_groups_operations.py +++ b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_sync_groups_operations.py @@ -333,7 +333,7 @@ def list_logs( sync_group_name, # type: str start_time, # type: str end_time, # type: str - type, # type: Union[str, "_models.Enum81"] + type, # type: Union[str, "_models.Enum77"] continuation_token_parameter=None, # type: Optional[str] **kwargs # type: Any ): @@ -354,7 +354,7 @@ def list_logs( :param end_time: Get logs generated before this time. :type end_time: str :param type: The types of logs to retrieve. - :type type: str or ~azure.mgmt.sql.models.Enum81 + :type type: str or ~azure.mgmt.sql.models.Enum77 :param continuation_token_parameter: The continuation token for this operation. :type continuation_token_parameter: str :keyword callable cls: A custom type or function that will be passed the direct response