Generated from 4c5c73359f24eb1f7aaabf09219ef4b8c7e5e957

try-fix-cosmos-db-two-subscription-id
AzureSDKAutomation · Apr 30, 2020 · a8a49a5 · a8a49a5
1 parent 6393fa4
commit a8a49a5
Show file tree

Hide file tree

Showing 25 changed files with 479 additions and 356 deletions.
diff --git a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_configuration.py b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_configuration.py
@@ -21,7 +21,7 @@ class CosmosDBManagementClientConfiguration(AzureConfiguration):
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
      object<msrestazure.azure_active_directory>`
-    :param subscription_id: Azure subscription ID.
+    :param subscription_id: The ID of the target subscription.
     :type subscription_id: str
     :param str base_url: Service URL
     """

diff --git a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_cosmos_db_management_client.py b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_cosmos_db_management_client.py
@@ -89,7 +89,7 @@ class CosmosDBManagementClient(SDKClient):
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
      object<msrestazure.azure_active_directory>`
-    :param subscription_id: Azure subscription ID.
+    :param subscription_id: The ID of the target subscription.
     :type subscription_id: str
     :param str base_url: Service URL
     """

diff --git a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/_models.py b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/_models.py
@@ -1038,6 +1038,10 @@ class DatabaseAccountGetResults(ARMResourceProperties):
      for the Cosmos DB account.
     :type virtual_network_rules:
      list[~azure.mgmt.cosmosdb.models.VirtualNetworkRule]
+    :ivar private_endpoint_connections: List of Private Endpoint Connections
+     configured for the Cosmos DB account.
+    :vartype private_endpoint_connections:
+     list[~azure.mgmt.cosmosdb.models.PrivateEndpointConnection]
     :param enable_multiple_write_locations: Enables the account to write in
      multiple locations
     :type enable_multiple_write_locations: bool
@@ -1068,6 +1072,7 @@ class DatabaseAccountGetResults(ARMResourceProperties):
         'read_locations': {'readonly': True},
         'locations': {'readonly': True},
         'failover_policies': {'readonly': True},
+        'private_endpoint_connections': {'readonly': True},
     }
 
     _attribute_map = {
@@ -1090,6 +1095,7 @@ class DatabaseAccountGetResults(ARMResourceProperties):
         'locations': {'key': 'properties.locations', 'type': '[Location]'},
         'failover_policies': {'key': 'properties.failoverPolicies', 'type': '[FailoverPolicy]'},
         'virtual_network_rules': {'key': 'properties.virtualNetworkRules', 'type': '[VirtualNetworkRule]'},
+        'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'},
         'enable_multiple_write_locations': {'key': 'properties.enableMultipleWriteLocations', 'type': 'bool'},
         'enable_cassandra_connector': {'key': 'properties.enableCassandraConnector', 'type': 'bool'},
         'connector_offer': {'key': 'properties.connectorOffer', 'type': 'str'},
@@ -1114,6 +1120,7 @@ def __init__(self, **kwargs):
         self.locations = None
         self.failover_policies = None
         self.virtual_network_rules = kwargs.get('virtual_network_rules', None)
+        self.private_endpoint_connections = None
         self.enable_multiple_write_locations = kwargs.get('enable_multiple_write_locations', None)
         self.enable_cassandra_connector = kwargs.get('enable_cassandra_connector', None)
         self.connector_offer = kwargs.get('connector_offer', None)
@@ -3228,11 +3235,11 @@ class PrivateLinkServiceConnectionStateProperty(Model):
 
     :param status: The private link service connection status.
     :type status: str
-    :param description: The private link service connection description.
-    :type description: str
     :ivar actions_required: Any action that is required beyond basic workflow
      (approve/ reject/ disconnect)
     :vartype actions_required: str
+    :param description: The private link service connection description.
+    :type description: str
     """
 
     _validation = {
@@ -3241,15 +3248,15 @@ class PrivateLinkServiceConnectionStateProperty(Model):
 
     _attribute_map = {
         'status': {'key': 'status', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
         'actions_required': {'key': 'actionsRequired', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(PrivateLinkServiceConnectionStateProperty, self).__init__(**kwargs)
         self.status = kwargs.get('status', None)
-        self.description = kwargs.get('description', None)
         self.actions_required = None
+        self.description = kwargs.get('description', None)
 
 
 class ProvisionedThroughputSettingsResource(Model):

diff --git a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/_models_py3.py b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/_models_py3.py
@@ -1038,6 +1038,10 @@ class DatabaseAccountGetResults(ARMResourceProperties):
      for the Cosmos DB account.
     :type virtual_network_rules:
      list[~azure.mgmt.cosmosdb.models.VirtualNetworkRule]
+    :ivar private_endpoint_connections: List of Private Endpoint Connections
+     configured for the Cosmos DB account.
+    :vartype private_endpoint_connections:
+     list[~azure.mgmt.cosmosdb.models.PrivateEndpointConnection]
     :param enable_multiple_write_locations: Enables the account to write in
      multiple locations
     :type enable_multiple_write_locations: bool
@@ -1068,6 +1072,7 @@ class DatabaseAccountGetResults(ARMResourceProperties):
         'read_locations': {'readonly': True},
         'locations': {'readonly': True},
         'failover_policies': {'readonly': True},
+        'private_endpoint_connections': {'readonly': True},
     }
 
     _attribute_map = {
@@ -1090,6 +1095,7 @@ class DatabaseAccountGetResults(ARMResourceProperties):
         'locations': {'key': 'properties.locations', 'type': '[Location]'},
         'failover_policies': {'key': 'properties.failoverPolicies', 'type': '[FailoverPolicy]'},
         'virtual_network_rules': {'key': 'properties.virtualNetworkRules', 'type': '[VirtualNetworkRule]'},
+        'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'},
         'enable_multiple_write_locations': {'key': 'properties.enableMultipleWriteLocations', 'type': 'bool'},
         'enable_cassandra_connector': {'key': 'properties.enableCassandraConnector', 'type': 'bool'},
         'connector_offer': {'key': 'properties.connectorOffer', 'type': 'str'},
@@ -1114,6 +1120,7 @@ def __init__(self, *, location: str=None, tags=None, kind="GlobalDocumentDB", pr
         self.locations = None
         self.failover_policies = None
         self.virtual_network_rules = virtual_network_rules
+        self.private_endpoint_connections = None
         self.enable_multiple_write_locations = enable_multiple_write_locations
         self.enable_cassandra_connector = enable_cassandra_connector
         self.connector_offer = connector_offer
@@ -3228,11 +3235,11 @@ class PrivateLinkServiceConnectionStateProperty(Model):
 
     :param status: The private link service connection status.
     :type status: str
-    :param description: The private link service connection description.
-    :type description: str
     :ivar actions_required: Any action that is required beyond basic workflow
      (approve/ reject/ disconnect)
     :vartype actions_required: str
+    :param description: The private link service connection description.
+    :type description: str
     """
 
     _validation = {
@@ -3241,15 +3248,15 @@ class PrivateLinkServiceConnectionStateProperty(Model):
 
     _attribute_map = {
         'status': {'key': 'status', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
         'actions_required': {'key': 'actionsRequired', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
     }
 
     def __init__(self, *, status: str=None, description: str=None, **kwargs) -> None:
         super(PrivateLinkServiceConnectionStateProperty, self).__init__(**kwargs)
         self.status = status
-        self.description = description
         self.actions_required = None
+        self.description = description
 
 
 class ProvisionedThroughputSettingsResource(Model):