From efb196c57e4e18a7a42344eb33355e0ab2cc04c5 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 10 Mar 2021 01:40:14 +0000 Subject: [PATCH] CodeGen from PR 13355 in Azure/azure-rest-api-specs Merge f5ebea6db8af96ba9a46a08b7ac7a4565e0179ad into 8d15dc681b081cca983e4d67fbf6441841d94ce4 --- .../Generated/Models/AzureEntityResource.cs | 15 ++-- .../Models/EncryptionEnforcementStatus.cs | 66 ++++++++++++++++++ .../src/Generated/Models/EncryptionWithCmk.cs | 68 +++++++++++++++++++ .../Models/NonCmkEncryptedResource.cs | 66 ++++++++++++++++++ .../Models/PrivateEndpointConnection.cs | 8 +-- .../Generated/Models/PrivateLinkResource.cs | 8 +-- .../src/Generated/Models/ProxyResource.cs | 15 ++-- .../src/Generated/Models/Resource.cs | 23 ++++--- .../src/Generated/Models/SearchService.cs | 23 +++++-- .../Generated/Models/SearchServiceUpdate.cs | 23 +++++-- .../Models/SharedPrivateLinkResource.cs | 8 +-- .../src/Generated/Models/TrackedResource.cs | 14 ++-- .../SdkInfo_SearchManagementClient.cs | 25 ++----- .../src/Generated/SearchManagementClient.cs | 2 +- 14 files changed, 298 insertions(+), 66 deletions(-) create mode 100644 sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionEnforcementStatus.cs create mode 100644 sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionWithCmk.cs create mode 100644 sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/NonCmkEncryptedResource.cs diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/AzureEntityResource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/AzureEntityResource.cs index e80cbb2d26ae2..ad0b66b66f46f 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/AzureEntityResource.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/AzureEntityResource.cs @@ -14,9 +14,12 @@ namespace Microsoft.Azure.Management.Search.Models using System.Linq; /// - /// 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. + /// public partial class AzureEntityResource : Resource { /// @@ -30,12 +33,12 @@ public AzureEntityResource() /// /// Initializes a new instance of the AzureEntityResource class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// Resource Etag. public AzureEntityResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string)) : base(id, name, type) diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionEnforcementStatus.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionEnforcementStatus.cs new file mode 100644 index 0000000000000..5e9972add2a1d --- /dev/null +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionEnforcementStatus.cs @@ -0,0 +1,66 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Search.Models +{ + using Newtonsoft.Json; + using Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for EncryptionEnforcementStatus. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum EncryptionEnforcementStatus + { + [EnumMember(Value = "unspecified")] + Unspecified, + [EnumMember(Value = "enabled")] + Enabled, + [EnumMember(Value = "disabled")] + Disabled + } + internal static class EncryptionEnforcementStatusEnumExtension + { + internal static string ToSerializedValue(this EncryptionEnforcementStatus? value) + { + return value == null ? null : ((EncryptionEnforcementStatus)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this EncryptionEnforcementStatus value) + { + switch( value ) + { + case EncryptionEnforcementStatus.Unspecified: + return "unspecified"; + case EncryptionEnforcementStatus.Enabled: + return "enabled"; + case EncryptionEnforcementStatus.Disabled: + return "disabled"; + } + return null; + } + + internal static EncryptionEnforcementStatus? ParseEncryptionEnforcementStatus(this string value) + { + switch( value ) + { + case "unspecified": + return EncryptionEnforcementStatus.Unspecified; + case "enabled": + return EncryptionEnforcementStatus.Enabled; + case "disabled": + return EncryptionEnforcementStatus.Disabled; + } + return null; + } + } +} diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionWithCmk.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionWithCmk.cs new file mode 100644 index 0000000000000..6348f9cb98bc0 --- /dev/null +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/EncryptionWithCmk.cs @@ -0,0 +1,68 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Search.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Describes properties associated with encryption of resources using + /// customer managed Keys. + /// + public partial class EncryptionWithCmk + { + /// + /// Initializes a new instance of the EncryptionWithCmk class. + /// + public EncryptionWithCmk() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the EncryptionWithCmk class. + /// + /// Enforcement state of encryption with + /// customer managed keys. Can be enabled, disabled, or unspecified. + /// Possible values include: 'unspecified', 'enabled', + /// 'disabled' + /// The list of Non Cmk + /// encrypted resource. + public EncryptionWithCmk(EncryptionEnforcementStatus? enforcement = default(EncryptionEnforcementStatus?), IList nonCmkEncryptedResources = default(IList)) + { + Enforcement = enforcement; + NonCmkEncryptedResources = nonCmkEncryptedResources; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets enforcement state of encryption with customer managed + /// keys. Can be enabled, disabled, or unspecified. Possible values + /// include: 'unspecified', 'enabled', 'disabled' + /// + [JsonProperty(PropertyName = "enforcement")] + public EncryptionEnforcementStatus? Enforcement { get; set; } + + /// + /// Gets the list of Non Cmk encrypted resource. + /// + [JsonProperty(PropertyName = "nonCmkEncryptedResources")] + public IList NonCmkEncryptedResources { get; private set; } + + } +} diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/NonCmkEncryptedResource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/NonCmkEncryptedResource.cs new file mode 100644 index 0000000000000..11aa563a2ce87 --- /dev/null +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/NonCmkEncryptedResource.cs @@ -0,0 +1,66 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Search.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Describes properties of resources not encrypted with customer managed + /// keys. + /// + public partial class NonCmkEncryptedResource + { + /// + /// Initializes a new instance of the NonCmkEncryptedResource class. + /// + public NonCmkEncryptedResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the NonCmkEncryptedResource class. + /// + /// Describes type of resource (.i.e. index, + /// indexer, skillset, synonym map and debug session) not encrypted by + /// customer managed keys. + /// Describes name of resource not encrypted by + /// customer managed keys. + public NonCmkEncryptedResource(string type = default(string), string name = default(string)) + { + Type = type; + Name = name; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets describes type of resource (.i.e. index, indexer, + /// skillset, synonym map and debug session) not encrypted by customer + /// managed keys. + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + + /// + /// Gets or sets describes name of resource not encrypted by customer + /// managed keys. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + } +} diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateEndpointConnection.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateEndpointConnection.cs index e773892026082..3dbcb1596080e 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateEndpointConnection.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateEndpointConnection.cs @@ -30,12 +30,12 @@ public PrivateEndpointConnection() /// /// Initializes a new instance of the PrivateEndpointConnection class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// Describes the properties of an existing /// Private Endpoint connection to the Azure Cognitive Search /// service. diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateLinkResource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateLinkResource.cs index 192ba3f6164ee..da8d103923bdf 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateLinkResource.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/PrivateLinkResource.cs @@ -30,12 +30,12 @@ public PrivateLinkResource() /// /// Initializes a new instance of the PrivateLinkResource class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// Describes the properties of a supported /// private link resource for the Azure Cognitive Search /// service. diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/ProxyResource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/ProxyResource.cs index d9362373ebaaa..7fc45b4cbc623 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/ProxyResource.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/ProxyResource.cs @@ -13,9 +13,12 @@ namespace Microsoft.Azure.Management.Search.Models using System.Linq; /// - /// 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 + /// public partial class ProxyResource : Resource { /// @@ -29,12 +32,12 @@ public ProxyResource() /// /// Initializes a new instance of the ProxyResource class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" public ProxyResource(string id = default(string), string name = default(string), string type = default(string)) : base(id, name, type) { diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/Resource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/Resource.cs index ee6edb10ee930..54ec0120b4ab3 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/Resource.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/Resource.cs @@ -15,6 +15,13 @@ namespace Microsoft.Azure.Management.Search.Models using Newtonsoft.Json; using System.Linq; + /// + /// Resource + /// + /// + /// Common fields that are returned in the response for all Azure Resource + /// Manager resources + /// public partial class Resource : IResource { /// @@ -28,12 +35,12 @@ public Resource() /// /// Initializes a new instance of the Resource class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" public Resource(string id = default(string), string name = default(string), string type = default(string)) { Id = id; @@ -48,7 +55,7 @@ public Resource() partial void CustomInit(); /// - /// Gets fully qualified resource Id for the resource. Ex - + /// Gets fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// [JsonProperty(PropertyName = "id")] @@ -61,9 +68,9 @@ public Resource() public string Name { get; private set; } /// - /// Gets the type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// Gets the type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// [JsonProperty(PropertyName = "type")] public string Type { get; private set; } diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchService.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchService.cs index d50e9bd07cf22..f384ce39f1ee0 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchService.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchService.cs @@ -36,12 +36,12 @@ public SearchService() /// /// The geo-location where the resource /// lives - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// Resource tags. /// The number of replicas in the search /// service. If specified, it must be a value between 1 and 12 @@ -95,6 +95,10 @@ public SearchService() /// the call to Create search service. This is because the free service /// uses capacity that is already set up. Possible values include: /// 'succeeded', 'provisioning', 'failed' + /// 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. /// Network specific rules that determine /// how the Azure Cognitive Search service may be reached. /// The list of private @@ -106,7 +110,7 @@ public SearchService() /// price tier and capacity limits. This property is required when /// creating a new Search Service. /// The identity of the resource. - public SearchService(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), int? replicaCount = default(int?), int? partitionCount = default(int?), HostingMode? hostingMode = default(HostingMode?), PublicNetworkAccess? publicNetworkAccess = default(PublicNetworkAccess?), SearchServiceStatus? status = default(SearchServiceStatus?), string statusDetails = default(string), ProvisioningState? provisioningState = default(ProvisioningState?), NetworkRuleSet networkRuleSet = default(NetworkRuleSet), IList privateEndpointConnections = default(IList), IList sharedPrivateLinkResources = default(IList), Sku sku = default(Sku), Identity identity = default(Identity)) + public SearchService(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), int? replicaCount = default(int?), int? partitionCount = default(int?), HostingMode? hostingMode = default(HostingMode?), PublicNetworkAccess? publicNetworkAccess = default(PublicNetworkAccess?), SearchServiceStatus? status = default(SearchServiceStatus?), string statusDetails = default(string), ProvisioningState? provisioningState = default(ProvisioningState?), EncryptionWithCmk encryptionWithCmk = default(EncryptionWithCmk), NetworkRuleSet networkRuleSet = default(NetworkRuleSet), IList privateEndpointConnections = default(IList), IList sharedPrivateLinkResources = default(IList), Sku sku = default(Sku), Identity identity = default(Identity)) : base(location, id, name, type, tags) { ReplicaCount = replicaCount; @@ -116,6 +120,7 @@ public SearchService() Status = status; StatusDetails = statusDetails; ProvisioningState = provisioningState; + EncryptionWithCmk = encryptionWithCmk; NetworkRuleSet = networkRuleSet; PrivateEndpointConnections = privateEndpointConnections; SharedPrivateLinkResources = sharedPrivateLinkResources; @@ -212,6 +217,14 @@ public SearchService() [JsonProperty(PropertyName = "properties.provisioningState")] public ProvisioningState? ProvisioningState { get; private set; } + /// + /// Gets or sets 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. + /// + [JsonProperty(PropertyName = "properties.encryptionWithCmk")] + public EncryptionWithCmk EncryptionWithCmk { get; set; } + /// /// Gets or sets network specific rules that determine how the Azure /// Cognitive Search service may be reached. diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchServiceUpdate.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchServiceUpdate.cs index 0c8ffa43de972..dd9069605d334 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchServiceUpdate.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SearchServiceUpdate.cs @@ -34,12 +34,12 @@ public SearchServiceUpdate() /// /// Initializes a new instance of the SearchServiceUpdate class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// The number of replicas in the search /// service. If specified, it must be a value between 1 and 12 /// inclusive for standard SKUs or between 1 and 3 inclusive for basic @@ -92,6 +92,10 @@ public SearchServiceUpdate() /// the call to Create search service. This is because the free service /// uses capacity that is already set up. Possible values include: /// 'succeeded', 'provisioning', 'failed' + /// 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. /// Network specific rules that determine /// how the Azure Cognitive Search service may be reached. /// The list of private @@ -109,7 +113,7 @@ public SearchServiceUpdate() /// Tags to help categorize the resource in the /// Azure portal. /// The identity of the resource. - public SearchServiceUpdate(string id = default(string), string name = default(string), string type = default(string), int? replicaCount = default(int?), int? partitionCount = default(int?), HostingMode? hostingMode = default(HostingMode?), PublicNetworkAccess? publicNetworkAccess = default(PublicNetworkAccess?), SearchServiceStatus? status = default(SearchServiceStatus?), string statusDetails = default(string), ProvisioningState? provisioningState = default(ProvisioningState?), NetworkRuleSet networkRuleSet = default(NetworkRuleSet), IList privateEndpointConnections = default(IList), IList sharedPrivateLinkResources = default(IList), Sku sku = default(Sku), string location = default(string), IDictionary tags = default(IDictionary), Identity identity = default(Identity)) + public SearchServiceUpdate(string id = default(string), string name = default(string), string type = default(string), int? replicaCount = default(int?), int? partitionCount = default(int?), HostingMode? hostingMode = default(HostingMode?), PublicNetworkAccess? publicNetworkAccess = default(PublicNetworkAccess?), SearchServiceStatus? status = default(SearchServiceStatus?), string statusDetails = default(string), ProvisioningState? provisioningState = default(ProvisioningState?), EncryptionWithCmk encryptionWithCmk = default(EncryptionWithCmk), NetworkRuleSet networkRuleSet = default(NetworkRuleSet), IList privateEndpointConnections = default(IList), IList sharedPrivateLinkResources = default(IList), Sku sku = default(Sku), string location = default(string), IDictionary tags = default(IDictionary), Identity identity = default(Identity)) : base(id, name, type) { ReplicaCount = replicaCount; @@ -119,6 +123,7 @@ public SearchServiceUpdate() Status = status; StatusDetails = statusDetails; ProvisioningState = provisioningState; + EncryptionWithCmk = encryptionWithCmk; NetworkRuleSet = networkRuleSet; PrivateEndpointConnections = privateEndpointConnections; SharedPrivateLinkResources = sharedPrivateLinkResources; @@ -217,6 +222,14 @@ public SearchServiceUpdate() [JsonProperty(PropertyName = "properties.provisioningState")] public ProvisioningState? ProvisioningState { get; private set; } + /// + /// Gets or sets 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. + /// + [JsonProperty(PropertyName = "properties.encryptionWithCmk")] + public EncryptionWithCmk EncryptionWithCmk { get; set; } + /// /// Gets or sets network specific rules that determine how the Azure /// Cognitive Search service may be reached. diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SharedPrivateLinkResource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SharedPrivateLinkResource.cs index d49cf11b073d7..bee784fe9d371 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SharedPrivateLinkResource.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/SharedPrivateLinkResource.cs @@ -30,12 +30,12 @@ public SharedPrivateLinkResource() /// /// Initializes a new instance of the SharedPrivateLinkResource class. /// - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// Describes the properties of a Shared /// Private Link Resource managed by the Azure Cognitive Search /// service. diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/TrackedResource.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/TrackedResource.cs index f070232efd98c..930bc794b5dcc 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/TrackedResource.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/Models/TrackedResource.cs @@ -17,8 +17,12 @@ namespace Microsoft.Azure.Management.Search.Models using System.Linq; /// - /// 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' + /// public partial class TrackedResource : Resource { /// @@ -34,12 +38,12 @@ public TrackedResource() /// /// The geo-location where the resource /// lives - /// Fully qualified resource Id for the resource. Ex - + /// Fully qualified resource ID for the resource. Ex - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} /// The name of the resource - /// The type of the resource. Ex- - /// Microsoft.Compute/virtualMachines or - /// Microsoft.Storage/storageAccounts. + /// The type of the resource. E.g. + /// "Microsoft.Compute/virtualMachines" or + /// "Microsoft.Storage/storageAccounts" /// Resource tags. public TrackedResource(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary)) : base(id, name, type) diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SdkInfo_SearchManagementClient.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SdkInfo_SearchManagementClient.cs index 13e8cca3ae5ec..23485da30e6bf 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SdkInfo_SearchManagementClient.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SdkInfo_SearchManagementClient.cs @@ -19,26 +19,15 @@ public static IEnumerable> ApiInfo_SearchManagemen { return new Tuple[] { - new Tuple("Search", "AdminKeys", "2020-08-01"), - new Tuple("Search", "Operations", "2020-08-01"), - new Tuple("Search", "PrivateEndpointConnections", "2020-08-01"), - new Tuple("Search", "PrivateLinkResources", "2020-08-01"), - new Tuple("Search", "QueryKeys", "2020-08-01"), - new Tuple("Search", "Services", "2020-08-01"), - new Tuple("Search", "SharedPrivateLinkResources", "2020-08-01"), + new Tuple("Search", "AdminKeys", "2021-01-04"), + new Tuple("Search", "Operations", "2021-01-04"), + new Tuple("Search", "PrivateEndpointConnections", "2021-01-04"), + new Tuple("Search", "PrivateLinkResources", "2021-01-04"), + new Tuple("Search", "QueryKeys", "2021-01-04"), + new Tuple("Search", "Services", "2021-01-04"), + new Tuple("Search", "SharedPrivateLinkResources", "2021-01-04"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/search/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\\src\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "8a98a5bf0f5c543cf2a340fcf77407658d59addb"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SearchManagementClient.cs b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SearchManagementClient.cs index 47107e568ac29..5dab35748ae82 100644 --- a/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SearchManagementClient.cs +++ b/sdk/search/Microsoft.Azure.Management.Search/src/Generated/SearchManagementClient.cs @@ -360,7 +360,7 @@ private void Initialize() PrivateEndpointConnections = new PrivateEndpointConnectionsOperations(this); SharedPrivateLinkResources = new SharedPrivateLinkResourcesOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2020-08-01"; + ApiVersion = "2021-01-04"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true;