diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/_search_management_client.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/_search_management_client.py index bee2c3b01771..5318b39e7992 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/_search_management_client.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/_search_management_client.py @@ -61,7 +61,7 @@ def __init__( super(SearchManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2020-08-01' + self.api_version = '2021-01-04' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py index cdf2018bcd87..b566bf8d1684 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py @@ -15,9 +15,11 @@ from ._models_py3 import AzureEntityResource from ._models_py3 import CheckNameAvailabilityInput from ._models_py3 import CheckNameAvailabilityOutput + from ._models_py3 import EncryptionWithCmk from ._models_py3 import Identity from ._models_py3 import IpRule from ._models_py3 import NetworkRuleSet + from ._models_py3 import NonCmkEncryptedResource from ._models_py3 import Operation from ._models_py3 import OperationDisplay from ._models_py3 import PrivateEndpointConnection @@ -44,9 +46,11 @@ from ._models import AzureEntityResource from ._models import CheckNameAvailabilityInput from ._models import CheckNameAvailabilityOutput + from ._models import EncryptionWithCmk from ._models import Identity from ._models import IpRule from ._models import NetworkRuleSet + from ._models import NonCmkEncryptedResource from ._models import Operation from ._models import OperationDisplay from ._models import PrivateEndpointConnection @@ -77,6 +81,7 @@ UnavailableNameReason, SkuName, PrivateLinkServiceConnectionStatus, + EncryptionEnforcementStatus, SharedPrivateLinkResourceStatus, SharedPrivateLinkResourceProvisioningState, HostingMode, @@ -94,9 +99,11 @@ 'AzureEntityResource', 'CheckNameAvailabilityInput', 'CheckNameAvailabilityOutput', + 'EncryptionWithCmk', 'Identity', 'IpRule', 'NetworkRuleSet', + 'NonCmkEncryptedResource', 'Operation', 'OperationDisplay', 'PrivateEndpointConnection', @@ -126,6 +133,7 @@ 'UnavailableNameReason', 'SkuName', 'PrivateLinkServiceConnectionStatus', + 'EncryptionEnforcementStatus', 'SharedPrivateLinkResourceStatus', 'SharedPrivateLinkResourceProvisioningState', 'HostingMode', diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models.py index 30cd5a8d1ad5..6503fe98ea99 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models.py @@ -65,16 +65,19 @@ def __init__(self, **kwargs): class Resource(Model): """Resource. + Common fields that are returned in the response for all Azure Resource + Manager resources. + Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str """ @@ -98,19 +101,21 @@ def __init__(self, **kwargs): class AzureEntityResource(Resource): - """The resource model definition for a Azure Resource Manager resource with an - etag. + """Entity Resource. + + The resource model definition for an Azure Resource Manager resource with + an etag. Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :ivar etag: Resource Etag. :vartype etag: str @@ -271,6 +276,38 @@ def __init__(self, **kwargs): self.details = kwargs.get('details', None) +class EncryptionWithCmk(Model): + """Describes properties associated with encryption of resources using customer + managed Keys. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param enforcement: Enforcement state of encryption with customer managed + keys. Can be enabled, disabled, or unspecified. Possible values include: + 'unspecified', 'enabled', 'disabled' + :type enforcement: str or + ~azure.mgmt.search.models.EncryptionEnforcementStatus + :ivar non_cmk_encrypted_resources: The list of Non Cmk encrypted resource. + :vartype non_cmk_encrypted_resources: + list[~azure.mgmt.search.models.NonCmkEncryptedResource] + """ + + _validation = { + 'non_cmk_encrypted_resources': {'readonly': True}, + } + + _attribute_map = { + 'enforcement': {'key': 'enforcement', 'type': 'EncryptionEnforcementStatus'}, + 'non_cmk_encrypted_resources': {'key': 'nonCmkEncryptedResources', 'type': '[NonCmkEncryptedResource]'}, + } + + def __init__(self, **kwargs): + super(EncryptionWithCmk, self).__init__(**kwargs) + self.enforcement = kwargs.get('enforcement', None) + self.non_cmk_encrypted_resources = None + + class Identity(Model): """Identity for the resource. @@ -348,6 +385,28 @@ def __init__(self, **kwargs): self.ip_rules = kwargs.get('ip_rules', None) +class NonCmkEncryptedResource(Model): + """Describes properties of resources not encrypted with customer managed keys. + + :param type: Describes type of resource (.i.e. index, indexer, skillset, + synonym map and debug session) not encrypted by customer managed keys. + :type type: str + :param name: Describes name of resource not encrypted by customer managed + keys. + :type name: str + """ + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(NonCmkEncryptedResource, self).__init__(**kwargs) + self.type = kwargs.get('type', None) + self.name = kwargs.get('name', None) + + class Operation(Model): """Describes a REST API operation. @@ -423,13 +482,13 @@ class PrivateEndpointConnection(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param properties: Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service. @@ -535,13 +594,13 @@ class PrivateLinkResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :ivar properties: Describes the properties of a supported private link resource for the Azure Cognitive Search service. @@ -614,19 +673,21 @@ def __init__(self, **kwargs): class ProxyResource(Resource): - """The resource model definition for a ARM proxy resource. It will have - everything other than required location and tags. + """Proxy Resource. + + The resource model definition for a Azure Resource Manager proxy resource. + It will not have tags and a location. Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str """ @@ -694,20 +755,23 @@ def __init__(self, **kwargs): class TrackedResource(Resource): - """The resource model definition for a ARM tracked top level resource. + """Tracked Resource. + + The resource model definition for an Azure Resource Manager tracked top + level resource which has 'tags' and a 'location'. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] @@ -744,13 +808,13 @@ class SearchService(TrackedResource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] @@ -810,6 +874,10 @@ class SearchService(TrackedResource): 'provisioning', 'failed' :vartype provisioning_state: str or ~azure.mgmt.search.models.ProvisioningState + :param encryption_with_cmk: Details related to encrypting resources (.i.e. + index, indexer, skillset, synonym map and debug session) with customer + managed keys by the Azure Cognitive Search service. + :type encryption_with_cmk: ~azure.mgmt.search.models.EncryptionWithCmk :param network_rule_set: Network specific rules that determine how the Azure Cognitive Search service may be reached. :type network_rule_set: ~azure.mgmt.search.models.NetworkRuleSet @@ -856,6 +924,7 @@ class SearchService(TrackedResource): 'status': {'key': 'properties.status', 'type': 'SearchServiceStatus'}, 'status_details': {'key': 'properties.statusDetails', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'encryption_with_cmk': {'key': 'properties.encryptionWithCmk', 'type': 'EncryptionWithCmk'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'shared_private_link_resources': {'key': 'properties.sharedPrivateLinkResources', 'type': '[SharedPrivateLinkResource]'}, @@ -872,6 +941,7 @@ def __init__(self, **kwargs): self.status = None self.status_details = None self.provisioning_state = None + self.encryption_with_cmk = kwargs.get('encryption_with_cmk', None) self.network_rule_set = kwargs.get('network_rule_set', None) self.private_endpoint_connections = None self.shared_private_link_resources = None @@ -885,13 +955,13 @@ class SearchServiceUpdate(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param replica_count: The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs @@ -947,6 +1017,10 @@ class SearchServiceUpdate(Resource): 'provisioning', 'failed' :vartype provisioning_state: str or ~azure.mgmt.search.models.ProvisioningState + :param encryption_with_cmk: Details related to encrypting resources (.i.e. + index, indexer, skillset, synonym map and debug session) with customer + managed keys by the Azure Cognitive Search service. + :type encryption_with_cmk: ~azure.mgmt.search.models.EncryptionWithCmk :param network_rule_set: Network specific rules that determine how the Azure Cognitive Search service may be reached. :type network_rule_set: ~azure.mgmt.search.models.NetworkRuleSet @@ -997,6 +1071,7 @@ class SearchServiceUpdate(Resource): 'status': {'key': 'properties.status', 'type': 'SearchServiceStatus'}, 'status_details': {'key': 'properties.statusDetails', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'encryption_with_cmk': {'key': 'properties.encryptionWithCmk', 'type': 'EncryptionWithCmk'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'shared_private_link_resources': {'key': 'properties.sharedPrivateLinkResources', 'type': '[SharedPrivateLinkResource]'}, @@ -1015,6 +1090,7 @@ def __init__(self, **kwargs): self.status = None self.status_details = None self.provisioning_state = None + self.encryption_with_cmk = kwargs.get('encryption_with_cmk', None) self.network_rule_set = kwargs.get('network_rule_set', None) self.private_endpoint_connections = None self.shared_private_link_resources = None @@ -1102,13 +1178,13 @@ class SharedPrivateLinkResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param properties: Describes the properties of a Shared Private Link Resource managed by the Azure Cognitive Search service. diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models_py3.py index 415d191c832b..ba40803607f2 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models_py3.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_models_py3.py @@ -65,16 +65,19 @@ def __init__(self, *, status=None, **kwargs) -> None: class Resource(Model): """Resource. + Common fields that are returned in the response for all Azure Resource + Manager resources. + Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str """ @@ -98,19 +101,21 @@ def __init__(self, **kwargs) -> None: class AzureEntityResource(Resource): - """The resource model definition for a Azure Resource Manager resource with an - etag. + """Entity Resource. + + The resource model definition for an Azure Resource Manager resource with + an etag. Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :ivar etag: Resource Etag. :vartype etag: str @@ -271,6 +276,38 @@ def __init__(self, *, code: str=None, message: str=None, target: str=None, detai self.details = details +class EncryptionWithCmk(Model): + """Describes properties associated with encryption of resources using customer + managed Keys. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param enforcement: Enforcement state of encryption with customer managed + keys. Can be enabled, disabled, or unspecified. Possible values include: + 'unspecified', 'enabled', 'disabled' + :type enforcement: str or + ~azure.mgmt.search.models.EncryptionEnforcementStatus + :ivar non_cmk_encrypted_resources: The list of Non Cmk encrypted resource. + :vartype non_cmk_encrypted_resources: + list[~azure.mgmt.search.models.NonCmkEncryptedResource] + """ + + _validation = { + 'non_cmk_encrypted_resources': {'readonly': True}, + } + + _attribute_map = { + 'enforcement': {'key': 'enforcement', 'type': 'EncryptionEnforcementStatus'}, + 'non_cmk_encrypted_resources': {'key': 'nonCmkEncryptedResources', 'type': '[NonCmkEncryptedResource]'}, + } + + def __init__(self, *, enforcement=None, **kwargs) -> None: + super(EncryptionWithCmk, self).__init__(**kwargs) + self.enforcement = enforcement + self.non_cmk_encrypted_resources = None + + class Identity(Model): """Identity for the resource. @@ -348,6 +385,28 @@ def __init__(self, *, ip_rules=None, **kwargs) -> None: self.ip_rules = ip_rules +class NonCmkEncryptedResource(Model): + """Describes properties of resources not encrypted with customer managed keys. + + :param type: Describes type of resource (.i.e. index, indexer, skillset, + synonym map and debug session) not encrypted by customer managed keys. + :type type: str + :param name: Describes name of resource not encrypted by customer managed + keys. + :type name: str + """ + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + } + + def __init__(self, *, type: str=None, name: str=None, **kwargs) -> None: + super(NonCmkEncryptedResource, self).__init__(**kwargs) + self.type = type + self.name = name + + class Operation(Model): """Describes a REST API operation. @@ -423,13 +482,13 @@ class PrivateEndpointConnection(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param properties: Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service. @@ -535,13 +594,13 @@ class PrivateLinkResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :ivar properties: Describes the properties of a supported private link resource for the Azure Cognitive Search service. @@ -614,19 +673,21 @@ def __init__(self, **kwargs) -> None: class ProxyResource(Resource): - """The resource model definition for a ARM proxy resource. It will have - everything other than required location and tags. + """Proxy Resource. + + The resource model definition for a Azure Resource Manager proxy resource. + It will not have tags and a location. Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str """ @@ -694,20 +755,23 @@ def __init__(self, *, client_request_id: str=None, **kwargs) -> None: class TrackedResource(Resource): - """The resource model definition for a ARM tracked top level resource. + """Tracked Resource. + + The resource model definition for an Azure Resource Manager tracked top + level resource which has 'tags' and a 'location'. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] @@ -744,13 +808,13 @@ class SearchService(TrackedResource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] @@ -810,6 +874,10 @@ class SearchService(TrackedResource): 'provisioning', 'failed' :vartype provisioning_state: str or ~azure.mgmt.search.models.ProvisioningState + :param encryption_with_cmk: Details related to encrypting resources (.i.e. + index, indexer, skillset, synonym map and debug session) with customer + managed keys by the Azure Cognitive Search service. + :type encryption_with_cmk: ~azure.mgmt.search.models.EncryptionWithCmk :param network_rule_set: Network specific rules that determine how the Azure Cognitive Search service may be reached. :type network_rule_set: ~azure.mgmt.search.models.NetworkRuleSet @@ -856,6 +924,7 @@ class SearchService(TrackedResource): 'status': {'key': 'properties.status', 'type': 'SearchServiceStatus'}, 'status_details': {'key': 'properties.statusDetails', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'encryption_with_cmk': {'key': 'properties.encryptionWithCmk', 'type': 'EncryptionWithCmk'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'shared_private_link_resources': {'key': 'properties.sharedPrivateLinkResources', 'type': '[SharedPrivateLinkResource]'}, @@ -863,7 +932,7 @@ class SearchService(TrackedResource): 'identity': {'key': 'identity', 'type': 'Identity'}, } - def __init__(self, *, location: str, tags=None, replica_count: int=1, partition_count: int=1, hosting_mode="default", public_network_access="enabled", network_rule_set=None, sku=None, identity=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, replica_count: int=1, partition_count: int=1, hosting_mode="default", public_network_access="enabled", encryption_with_cmk=None, network_rule_set=None, sku=None, identity=None, **kwargs) -> None: super(SearchService, self).__init__(tags=tags, location=location, **kwargs) self.replica_count = replica_count self.partition_count = partition_count @@ -872,6 +941,7 @@ def __init__(self, *, location: str, tags=None, replica_count: int=1, partition_ self.status = None self.status_details = None self.provisioning_state = None + self.encryption_with_cmk = encryption_with_cmk self.network_rule_set = network_rule_set self.private_endpoint_connections = None self.shared_private_link_resources = None @@ -885,13 +955,13 @@ class SearchServiceUpdate(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param replica_count: The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs @@ -947,6 +1017,10 @@ class SearchServiceUpdate(Resource): 'provisioning', 'failed' :vartype provisioning_state: str or ~azure.mgmt.search.models.ProvisioningState + :param encryption_with_cmk: Details related to encrypting resources (.i.e. + index, indexer, skillset, synonym map and debug session) with customer + managed keys by the Azure Cognitive Search service. + :type encryption_with_cmk: ~azure.mgmt.search.models.EncryptionWithCmk :param network_rule_set: Network specific rules that determine how the Azure Cognitive Search service may be reached. :type network_rule_set: ~azure.mgmt.search.models.NetworkRuleSet @@ -997,6 +1071,7 @@ class SearchServiceUpdate(Resource): 'status': {'key': 'properties.status', 'type': 'SearchServiceStatus'}, 'status_details': {'key': 'properties.statusDetails', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'encryption_with_cmk': {'key': 'properties.encryptionWithCmk', 'type': 'EncryptionWithCmk'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'shared_private_link_resources': {'key': 'properties.sharedPrivateLinkResources', 'type': '[SharedPrivateLinkResource]'}, @@ -1006,7 +1081,7 @@ class SearchServiceUpdate(Resource): 'identity': {'key': 'identity', 'type': 'Identity'}, } - def __init__(self, *, replica_count: int=1, partition_count: int=1, hosting_mode="default", public_network_access="enabled", network_rule_set=None, sku=None, location: str=None, tags=None, identity=None, **kwargs) -> None: + def __init__(self, *, replica_count: int=1, partition_count: int=1, hosting_mode="default", public_network_access="enabled", encryption_with_cmk=None, network_rule_set=None, sku=None, location: str=None, tags=None, identity=None, **kwargs) -> None: super(SearchServiceUpdate, self).__init__(**kwargs) self.replica_count = replica_count self.partition_count = partition_count @@ -1015,6 +1090,7 @@ def __init__(self, *, replica_count: int=1, partition_count: int=1, hosting_mode self.status = None self.status_details = None self.provisioning_state = None + self.encryption_with_cmk = encryption_with_cmk self.network_rule_set = network_rule_set self.private_endpoint_connections = None self.shared_private_link_resources = None @@ -1102,13 +1178,13 @@ class SharedPrivateLinkResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource Id for the resource. Ex - + :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} :vartype id: str :ivar name: The name of the resource :vartype name: str - :ivar type: The type of the resource. Ex- - Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + :ivar type: The type of the resource. E.g. + "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" :vartype type: str :param properties: Describes the properties of a Shared Private Link Resource managed by the Azure Cognitive Search service. diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_search_management_client_enums.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_search_management_client_enums.py index 18b26a59613e..3597040af361 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_search_management_client_enums.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/_search_management_client_enums.py @@ -37,6 +37,13 @@ class PrivateLinkServiceConnectionStatus(str, Enum): disconnected = "Disconnected" +class EncryptionEnforcementStatus(str, Enum): + + unspecified = "unspecified" + enabled = "enabled" + disabled = "disabled" + + class SharedPrivateLinkResourceStatus(str, Enum): pending = "Pending" diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_admin_keys_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_admin_keys_operations.py index c1c06571498d..c7f2743a500b 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_admin_keys_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_admin_keys_operations.py @@ -25,7 +25,7 @@ class AdminKeysOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_operations.py index 0039448d7c60..56f736904e6c 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_operations.py @@ -25,7 +25,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_endpoint_connections_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_endpoint_connections_operations.py index 746543c3405f..1d89bbf07285 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_endpoint_connections_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_endpoint_connections_operations.py @@ -25,7 +25,7 @@ class PrivateEndpointConnectionsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_link_resources_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_link_resources_operations.py index bc37b3bab670..5174a41831e6 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_link_resources_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_private_link_resources_operations.py @@ -25,7 +25,7 @@ class PrivateLinkResourcesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_query_keys_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_query_keys_operations.py index 1fa02c10cef7..7bc7d701284f 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_query_keys_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_query_keys_operations.py @@ -25,7 +25,7 @@ class QueryKeysOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_services_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_services_operations.py index 32cdb81e1e25..1802d66aca02 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_services_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_services_operations.py @@ -27,7 +27,7 @@ class ServicesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_shared_private_link_resources_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_shared_private_link_resources_operations.py index 3c8edd84f11f..b303489cd9d4 100644 --- a/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_shared_private_link_resources_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/_shared_private_link_resources_operations.py @@ -27,7 +27,7 @@ class SharedPrivateLinkResourcesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version to use for each request. Constant value: "2020-08-01". + :ivar api_version: The API version to use for each request. Constant value: "2021-01-04". """ models = models @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2020-08-01" + self.api_version = "2021-01-04" self.config = config