CodeGen from PR 11939 in Azure/azure-rest-api-specs

[Hub Generated] Public private branch 'credscan-fix' (Azure#11939) * Fix credscan * Fix more credentials
AzureSDKAutomation · Dec 7, 2020 · 253c127 · 253c127
1 parent e1f2009
commit 253c127
Show file tree

Hide file tree

Showing 9 changed files with 438 additions and 273 deletions.
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
@@ -105,7 +105,6 @@
 from .operations import ManagedDatabaseRestoreDetailsOperations
 from .operations import ManagedDatabasesOperations
 from .operations import ServerAzureADOnlyAuthenticationsOperations
-from .operations import ImportExportOperations
 from .operations import ManagedInstanceAzureADOnlyAuthenticationsOperations
 from .operations import ServerTrustGroupsOperations
 from . import models
@@ -301,8 +300,6 @@ class SqlManagementClient(SDKClient):
     :vartype managed_databases: azure.mgmt.sql.operations.ManagedDatabasesOperations
     :ivar server_azure_ad_only_authentications: ServerAzureADOnlyAuthentications operations
     :vartype server_azure_ad_only_authentications: azure.mgmt.sql.operations.ServerAzureADOnlyAuthenticationsOperations
-    :ivar import_export: ImportExport operations
-    :vartype import_export: azure.mgmt.sql.operations.ImportExportOperations
     :ivar managed_instance_azure_ad_only_authentications: ManagedInstanceAzureADOnlyAuthentications operations
     :vartype managed_instance_azure_ad_only_authentications: azure.mgmt.sql.operations.ManagedInstanceAzureADOnlyAuthenticationsOperations
     :ivar server_trust_groups: ServerTrustGroups operations
@@ -511,8 +508,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.server_azure_ad_only_authentications = ServerAzureADOnlyAuthenticationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.import_export = ImportExportOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.managed_instance_azure_ad_only_authentications = ManagedInstanceAzureADOnlyAuthenticationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.server_trust_groups = ServerTrustGroupsOperations(

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
@@ -544,13 +544,13 @@
     ManagedInstanceLicenseType,
     ManagedInstanceProxyOverride,
     StorageAccountType,
-    StorageKeyType,
     CreateMode,
     SampleName,
     DatabaseStatus,
     DatabaseLicenseType,
     DatabaseReadScale,
     SecondaryType,
+    StorageKeyType,
     ElasticPoolState,
     ElasticPoolLicenseType,
     LongTermRetentionDatabaseState,
@@ -911,13 +911,13 @@
     'ManagedInstanceLicenseType',
     'ManagedInstanceProxyOverride',
     'StorageAccountType',
-    'StorageKeyType',
     'CreateMode',
     'SampleName',
     'DatabaseStatus',
     'DatabaseLicenseType',
     'DatabaseReadScale',
     'SecondaryType',
+    'StorageKeyType',
     'ElasticPoolState',
     'ElasticPoolLicenseType',
     'LongTermRetentionDatabaseState',

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
@@ -625,8 +625,7 @@ class Database(TrackedResource):
      automatically paused. A value of -1 means that automatic pause is disabled
     :type auto_pause_delay: int
     :param storage_account_type: The storage account type used to store
-     backups for this database. Currently the only supported option is GRS
-     (GeoRedundantStorage). Possible values include: 'GRS', 'LRS', 'ZRS'
+     backups for this database. Possible values include: 'GRS', 'LRS', 'ZRS'
     :type storage_account_type: str or
      ~azure.mgmt.sql.models.StorageAccountType
     :param min_capacity: Minimal capacity that database will always have
@@ -640,7 +639,7 @@ class Database(TrackedResource):
     :vartype resumed_date: datetime
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the database. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will occur.
     :type maintenance_configuration_id: str
     """
 
@@ -1289,8 +1288,7 @@ class DatabaseUpdate(Model):
      automatically paused. A value of -1 means that automatic pause is disabled
     :type auto_pause_delay: int
     :param storage_account_type: The storage account type used to store
-     backups for this database. Currently the only supported option is GRS
-     (GeoRedundantStorage). Possible values include: 'GRS', 'LRS', 'ZRS'
+     backups for this database. Possible values include: 'GRS', 'LRS', 'ZRS'
     :type storage_account_type: str or
      ~azure.mgmt.sql.models.StorageAccountType
     :param min_capacity: Minimal capacity that database will always have
@@ -1304,7 +1302,7 @@ class DatabaseUpdate(Model):
     :vartype resumed_date: datetime
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the database. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will occur.
     :type maintenance_configuration_id: str
     :param tags: Resource tags.
     :type tags: dict[str, str]
@@ -1905,7 +1903,7 @@ class ElasticPool(TrackedResource):
     :type license_type: str or ~azure.mgmt.sql.models.ElasticPoolLicenseType
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the elastic pool. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will will occur.
     :type maintenance_configuration_id: str
     """
 
@@ -2557,7 +2555,7 @@ class ElasticPoolUpdate(Model):
     :type license_type: str or ~azure.mgmt.sql.models.ElasticPoolLicenseType
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the elastic pool. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will will occur.
     :type maintenance_configuration_id: str
     :param tags: Resource tags.
     :type tags: dict[str, str]

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
@@ -625,8 +625,7 @@ class Database(TrackedResource):
      automatically paused. A value of -1 means that automatic pause is disabled
     :type auto_pause_delay: int
     :param storage_account_type: The storage account type used to store
-     backups for this database. Currently the only supported option is GRS
-     (GeoRedundantStorage). Possible values include: 'GRS', 'LRS', 'ZRS'
+     backups for this database. Possible values include: 'GRS', 'LRS', 'ZRS'
     :type storage_account_type: str or
      ~azure.mgmt.sql.models.StorageAccountType
     :param min_capacity: Minimal capacity that database will always have
@@ -640,7 +639,7 @@ class Database(TrackedResource):
     :vartype resumed_date: datetime
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the database. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will occur.
     :type maintenance_configuration_id: str
     """
 
@@ -1289,8 +1288,7 @@ class DatabaseUpdate(Model):
      automatically paused. A value of -1 means that automatic pause is disabled
     :type auto_pause_delay: int
     :param storage_account_type: The storage account type used to store
-     backups for this database. Currently the only supported option is GRS
-     (GeoRedundantStorage). Possible values include: 'GRS', 'LRS', 'ZRS'
+     backups for this database. Possible values include: 'GRS', 'LRS', 'ZRS'
     :type storage_account_type: str or
      ~azure.mgmt.sql.models.StorageAccountType
     :param min_capacity: Minimal capacity that database will always have
@@ -1304,7 +1302,7 @@ class DatabaseUpdate(Model):
     :vartype resumed_date: datetime
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the database. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will occur.
     :type maintenance_configuration_id: str
     :param tags: Resource tags.
     :type tags: dict[str, str]
@@ -1905,7 +1903,7 @@ class ElasticPool(TrackedResource):
     :type license_type: str or ~azure.mgmt.sql.models.ElasticPoolLicenseType
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the elastic pool. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will will occur.
     :type maintenance_configuration_id: str
     """
 
@@ -2557,7 +2555,7 @@ class ElasticPoolUpdate(Model):
     :type license_type: str or ~azure.mgmt.sql.models.ElasticPoolLicenseType
     :param maintenance_configuration_id: Maintenance configuration id assigned
      to the elastic pool. This configuration defines the period when the
-     maintenance updates will be rolled out.
+     maintenance updates will will occur.
     :type maintenance_configuration_id: str
     :param tags: Resource tags.
     :type tags: dict[str, str]

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
@@ -635,12 +635,6 @@ class StorageAccountType(str, Enum):
     zrs = "ZRS"
 
 
-class StorageKeyType(str, Enum):
-
-    shared_access_key = "SharedAccessKey"
-    storage_access_key = "StorageAccessKey"
-
-
 class CreateMode(str, Enum):
 
     default = "Default"
@@ -705,6 +699,12 @@ class SecondaryType(str, Enum):
     named = "Named"
 
 
+class StorageKeyType(str, Enum):
+
+    shared_access_key = "SharedAccessKey"
+    storage_access_key = "StorageAccessKey"
+
+
 class ElasticPoolState(str, Enum):
 
     creating = "Creating"

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
@@ -101,7 +101,6 @@
 from ._managed_database_restore_details_operations import ManagedDatabaseRestoreDetailsOperations
 from ._managed_databases_operations import ManagedDatabasesOperations
 from ._server_azure_ad_only_authentications_operations import ServerAzureADOnlyAuthenticationsOperations
-from ._import_export_operations import ImportExportOperations
 from ._managed_instance_azure_ad_only_authentications_operations import ManagedInstanceAzureADOnlyAuthenticationsOperations
 from ._server_trust_groups_operations import ServerTrustGroupsOperations
 
@@ -198,7 +197,6 @@
     'ManagedDatabaseRestoreDetailsOperations',
     'ManagedDatabasesOperations',
     'ServerAzureADOnlyAuthenticationsOperations',
-    'ImportExportOperations',
     'ManagedInstanceAzureADOnlyAuthenticationsOperations',
     'ServerTrustGroupsOperations',
 ]