diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperations.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperations.cs index facaa50c26fdf..4c1ad03ca942c 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperations.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperations.cs @@ -473,9 +473,7 @@ internal CertificatesOperations(IotHubClient client) /// ETag of the Certificate. Do not specify for creating a brand new /// certificate. Required to update an existing certificate. /// - /// - /// base-64 representation of the X509 leaf certificate .cer file or just .pem - /// file content. + /// /// /// /// Headers that will be added to request. @@ -498,7 +496,7 @@ internal CertificatesOperations(IotHubClient client) /// /// A response object containing the response body and response headers. /// - public async Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), string certificate = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), CertificateProperties properties = default(CertificateProperties), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.ApiVersion == null) { @@ -527,10 +525,10 @@ internal CertificatesOperations(IotHubClient client) throw new ValidationException(ValidationRules.Pattern, "certificateName", "^[A-Za-z0-9-._]{1,64}$"); } } - CertificateBodyDescription certificateDescription = new CertificateBodyDescription(); - if (certificate != null) + CertificateDescription certificateDescription = new CertificateDescription(); + if (properties != null) { - certificateDescription.Certificate = certificate; + certificateDescription.Properties = properties; } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperationsExtensions.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperationsExtensions.cs index 7711af9c9919a..74ac5afad1f05 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperationsExtensions.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/CertificatesOperationsExtensions.cs @@ -141,13 +141,11 @@ public static CertificateDescription Get(this ICertificatesOperations operations /// ETag of the Certificate. Do not specify for creating a brand new /// certificate. Required to update an existing certificate. /// - /// - /// base-64 representation of the X509 leaf certificate .cer file or just .pem - /// file content. + /// /// - public static CertificateDescription CreateOrUpdate(this ICertificatesOperations operations, string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), string certificate = default(string)) + public static CertificateDescription CreateOrUpdate(this ICertificatesOperations operations, string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), CertificateProperties properties = default(CertificateProperties)) { - return operations.CreateOrUpdateAsync(resourceGroupName, resourceName, certificateName, ifMatch, certificate).GetAwaiter().GetResult(); + return operations.CreateOrUpdateAsync(resourceGroupName, resourceName, certificateName, ifMatch, properties).GetAwaiter().GetResult(); } /// @@ -172,16 +170,14 @@ public static CertificateDescription Get(this ICertificatesOperations operations /// ETag of the Certificate. Do not specify for creating a brand new /// certificate. Required to update an existing certificate. /// - /// - /// base-64 representation of the X509 leaf certificate .cer file or just .pem - /// file content. + /// /// /// /// The cancellation token. /// - public static async Task CreateOrUpdateAsync(this ICertificatesOperations operations, string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), string certificate = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateOrUpdateAsync(this ICertificatesOperations operations, string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), CertificateProperties properties = default(CertificateProperties), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, resourceName, certificateName, ifMatch, certificate, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, resourceName, certificateName, ifMatch, properties, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/ICertificatesOperations.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/ICertificatesOperations.cs index d6ba4d3719d85..d2f47b57ce3d3 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/ICertificatesOperations.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/ICertificatesOperations.cs @@ -101,9 +101,7 @@ public partial interface ICertificatesOperations /// ETag of the Certificate. Do not specify for creating a brand new /// certificate. Required to update an existing certificate. /// - /// - /// base-64 representation of the X509 leaf certificate .cer file or - /// just .pem file content. + /// /// /// /// The headers that will be added to request. @@ -120,7 +118,7 @@ public partial interface ICertificatesOperations /// /// Thrown when a required parameter is null /// - Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), string certificate = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string resourceName, string certificateName, string ifMatch = default(string), CertificateProperties properties = default(CertificateProperties), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Delete an X509 certificate. /// diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IIotHubResourceOperations.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IIotHubResourceOperations.cs index c3c39852fe787..fa02cd608d676 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IIotHubResourceOperations.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IIotHubResourceOperations.cs @@ -58,7 +58,9 @@ public partial interface IIotHubResourceOperations /// Create or update the metadata of an Iot hub. The usual pattern to /// modify a property is to retrieve the IoT hub metadata and security /// metadata, and then combine them with the modified values in a new - /// body to update the IoT hub. + /// body to update the IoT hub. If certain properties are missing in + /// the JSON, updating IoT Hub may cause these values to fallback to + /// default, which may lead to unexpected behavior. /// /// /// The name of the resource group that contains the IoT hub. @@ -341,6 +343,8 @@ public partial interface IIotHubResourceOperations /// /// The name of the consumer group to add. /// + /// + /// /// /// The headers that will be added to request. /// @@ -356,7 +360,7 @@ public partial interface IIotHubResourceOperations /// /// Thrown when a required parameter is null /// - Task> CreateEventHubConsumerGroupWithHttpMessagesAsync(string resourceGroupName, string resourceName, string eventHubEndpointName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> CreateEventHubConsumerGroupWithHttpMessagesAsync(string resourceGroupName, string resourceName, string eventHubEndpointName, string name, EventHubConsumerGroupName properties, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Delete a consumer group from an Event Hub-compatible endpoint in an /// IoT hub @@ -742,7 +746,9 @@ public partial interface IIotHubResourceOperations /// Create or update the metadata of an Iot hub. The usual pattern to /// modify a property is to retrieve the IoT hub metadata and security /// metadata, and then combine them with the modified values in a new - /// body to update the IoT hub. + /// body to update the IoT hub. If certain properties are missing in + /// the JSON, updating IoT Hub may cause these values to fallback to + /// default, which may lead to unexpected behavior. /// /// /// The name of the resource group that contains the IoT hub. diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubClient.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubClient.cs index 0c874eebed0a3..08defd8c022bc 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubClient.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubClient.cs @@ -358,7 +358,7 @@ private void Initialize() PrivateLinkResources = new PrivateLinkResourcesOperations(this); PrivateEndpointConnections = new PrivateEndpointConnectionsOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2020-03-01"; + ApiVersion = "2021-03-31"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperations.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperations.cs index a97deac297eec..2924eafd45748 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperations.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperations.cs @@ -251,7 +251,9 @@ internal IotHubResourceOperations(IotHubClient client) /// Create or update the metadata of an Iot hub. The usual pattern to modify a /// property is to retrieve the IoT hub metadata and security metadata, and /// then combine them with the modified values in a new body to update the IoT - /// hub. + /// hub. If certain properties are missing in the JSON, updating IoT Hub may + /// cause these values to fallback to default, which may lead to unexpected + /// behavior. /// /// /// The name of the resource group that contains the IoT hub. @@ -1519,6 +1521,8 @@ internal IotHubResourceOperations(IotHubClient client) /// /// The name of the consumer group to add. /// + /// + /// /// /// Headers that will be added to request. /// @@ -1540,7 +1544,7 @@ internal IotHubResourceOperations(IotHubClient client) /// /// A response object containing the response body and response headers. /// - public async Task> CreateEventHubConsumerGroupWithHttpMessagesAsync(string resourceGroupName, string resourceName, string eventHubEndpointName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateEventHubConsumerGroupWithHttpMessagesAsync(string resourceGroupName, string resourceName, string eventHubEndpointName, string name, EventHubConsumerGroupName properties, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.ApiVersion == null) { @@ -1566,6 +1570,19 @@ internal IotHubResourceOperations(IotHubClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "name"); } + if (properties == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "properties"); + } + if (properties != null) + { + properties.Validate(); + } + EventHubConsumerGroupBodyDescription consumerGroupBody = new EventHubConsumerGroupBodyDescription(); + if (properties != null) + { + consumerGroupBody.Properties = properties; + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1577,6 +1594,7 @@ internal IotHubResourceOperations(IotHubClient client) tracingParameters.Add("resourceName", resourceName); tracingParameters.Add("eventHubEndpointName", eventHubEndpointName); tracingParameters.Add("name", name); + tracingParameters.Add("consumerGroupBody", consumerGroupBody); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "CreateEventHubConsumerGroup", tracingParameters); } @@ -1631,6 +1649,12 @@ internal IotHubResourceOperations(IotHubClient client) // Serialize Request string _requestContent = null; + if(consumerGroupBody != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(consumerGroupBody, Client.SerializationSettings); + _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); + } // Set Credentials if (Client.Credentials != null) { @@ -4147,7 +4171,9 @@ internal IotHubResourceOperations(IotHubClient client) /// Create or update the metadata of an Iot hub. The usual pattern to modify a /// property is to retrieve the IoT hub metadata and security metadata, and /// then combine them with the modified values in a new body to update the IoT - /// hub. + /// hub. If certain properties are missing in the JSON, updating IoT Hub may + /// cause these values to fallback to default, which may lead to unexpected + /// behavior. /// /// /// The name of the resource group that contains the IoT hub. diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperationsExtensions.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperationsExtensions.cs index 6b8d1af18367e..ae2585f9e3c9d 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperationsExtensions.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/IotHubResourceOperationsExtensions.cs @@ -76,7 +76,9 @@ public static IotHubDescription Get(this IIotHubResourceOperations operations, s /// Create or update the metadata of an Iot hub. The usual pattern to modify a /// property is to retrieve the IoT hub metadata and security metadata, and /// then combine them with the modified values in a new body to update the IoT - /// hub. + /// hub. If certain properties are missing in the JSON, updating IoT Hub may + /// cause these values to fallback to default, which may lead to unexpected + /// behavior. /// /// /// The operations group for this extension method. @@ -106,7 +108,9 @@ public static IotHubDescription Get(this IIotHubResourceOperations operations, s /// Create or update the metadata of an Iot hub. The usual pattern to modify a /// property is to retrieve the IoT hub metadata and security metadata, and /// then combine them with the modified values in a new body to update the IoT - /// hub. + /// hub. If certain properties are missing in the JSON, updating IoT Hub may + /// cause these values to fallback to default, which may lead to unexpected + /// behavior. /// /// /// The operations group for this extension method. @@ -540,9 +544,11 @@ public static EventHubConsumerGroupInfo GetEventHubConsumerGroup(this IIotHubRes /// /// The name of the consumer group to add. /// - public static EventHubConsumerGroupInfo CreateEventHubConsumerGroup(this IIotHubResourceOperations operations, string resourceGroupName, string resourceName, string eventHubEndpointName, string name) + /// + /// + public static EventHubConsumerGroupInfo CreateEventHubConsumerGroup(this IIotHubResourceOperations operations, string resourceGroupName, string resourceName, string eventHubEndpointName, string name, EventHubConsumerGroupName properties) { - return operations.CreateEventHubConsumerGroupAsync(resourceGroupName, resourceName, eventHubEndpointName, name).GetAwaiter().GetResult(); + return operations.CreateEventHubConsumerGroupAsync(resourceGroupName, resourceName, eventHubEndpointName, name, properties).GetAwaiter().GetResult(); } /// @@ -566,12 +572,14 @@ public static EventHubConsumerGroupInfo CreateEventHubConsumerGroup(this IIotHub /// /// The name of the consumer group to add. /// + /// + /// /// /// The cancellation token. /// - public static async Task CreateEventHubConsumerGroupAsync(this IIotHubResourceOperations operations, string resourceGroupName, string resourceName, string eventHubEndpointName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateEventHubConsumerGroupAsync(this IIotHubResourceOperations operations, string resourceGroupName, string resourceName, string eventHubEndpointName, string name, EventHubConsumerGroupName properties, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.CreateEventHubConsumerGroupWithHttpMessagesAsync(resourceGroupName, resourceName, eventHubEndpointName, name, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.CreateEventHubConsumerGroupWithHttpMessagesAsync(resourceGroupName, resourceName, eventHubEndpointName, name, properties, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -1205,7 +1213,9 @@ public static JobResponse ImportDevices(this IIotHubResourceOperations operation /// Create or update the metadata of an Iot hub. The usual pattern to modify a /// property is to retrieve the IoT hub metadata and security metadata, and /// then combine them with the modified values in a new body to update the IoT - /// hub. + /// hub. If certain properties are missing in the JSON, updating IoT Hub may + /// cause these values to fallback to default, which may lead to unexpected + /// behavior. /// /// /// The operations group for this extension method. @@ -1235,7 +1245,9 @@ public static JobResponse ImportDevices(this IIotHubResourceOperations operation /// Create or update the metadata of an Iot hub. The usual pattern to modify a /// property is to retrieve the IoT hub metadata and security metadata, and /// then combine them with the modified values in a new body to update the IoT - /// hub. + /// hub. If certain properties are missing in the JSON, updating IoT Hub may + /// cause these values to fallback to default, which may lead to unexpected + /// behavior. /// /// /// The operations group for this extension method. diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ArmIdentity.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ArmIdentity.cs new file mode 100644 index 0000000000000..4c259b0dc14b5 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ArmIdentity.cs @@ -0,0 +1,82 @@ +// +// 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.IotHub.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + public partial class ArmIdentity + { + /// + /// Initializes a new instance of the ArmIdentity class. + /// + public ArmIdentity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ArmIdentity class. + /// + /// Principal Id + /// Tenant Id + /// The type of identity used for the resource. The + /// type 'SystemAssigned, UserAssigned' includes both an implicitly + /// created identity and a set of user assigned identities. The type + /// 'None' will remove any identities from the service. Possible values + /// include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, + /// UserAssigned', 'None' + public ArmIdentity(string principalId = default(string), string tenantId = default(string), ResourceIdentityType? type = default(ResourceIdentityType?), IDictionary userAssignedIdentities = default(IDictionary)) + { + PrincipalId = principalId; + TenantId = tenantId; + Type = type; + UserAssignedIdentities = userAssignedIdentities; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets principal Id + /// + [JsonProperty(PropertyName = "principalId")] + public string PrincipalId { get; private set; } + + /// + /// Gets tenant Id + /// + [JsonProperty(PropertyName = "tenantId")] + public string TenantId { get; private set; } + + /// + /// Gets or sets the type of identity used for the resource. The type + /// 'SystemAssigned, UserAssigned' includes both an implicitly created + /// identity and a set of user assigned identities. The type 'None' + /// will remove any identities from the service. Possible values + /// include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, + /// UserAssigned', 'None' + /// + [JsonProperty(PropertyName = "type")] + public ResourceIdentityType? Type { get; set; } + + /// + /// + [JsonProperty(PropertyName = "userAssignedIdentities")] + public IDictionary UserAssignedIdentities { get; set; } + + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ArmUserIdentity.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ArmUserIdentity.cs new file mode 100644 index 0000000000000..755de23f8a3c6 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ArmUserIdentity.cs @@ -0,0 +1,52 @@ +// +// 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.IotHub.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class ArmUserIdentity + { + /// + /// Initializes a new instance of the ArmUserIdentity class. + /// + public ArmUserIdentity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ArmUserIdentity class. + /// + public ArmUserIdentity(string principalId = default(string), string clientId = default(string)) + { + PrincipalId = principalId; + ClientId = clientId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// + [JsonProperty(PropertyName = "principalId")] + public string PrincipalId { get; private set; } + + /// + /// + [JsonProperty(PropertyName = "clientId")] + public string ClientId { get; private set; } + + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/DefaultAction.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/DefaultAction.cs new file mode 100644 index 0000000000000..3266ced524ae6 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/DefaultAction.cs @@ -0,0 +1,22 @@ +// +// 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.IotHub.Models +{ + + /// + /// Defines values for DefaultAction. + /// + public static class DefaultAction + { + public const string Deny = "Deny"; + public const string Allow = "Allow"; + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthData.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthData.cs index 7e81c9abf2e42..495dc1ed57ca8 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthData.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthData.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.IotHub.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -43,11 +45,23 @@ public EndpointHealthData() /// shows that the IoT Hub has not established a connection with the /// endpoint. No messages have been delivered to or rejected from this /// endpoint. Possible values include: 'unknown', 'healthy', - /// 'unhealthy', 'dead' - public EndpointHealthData(string endpointId = default(string), string healthStatus = default(string)) + /// 'degraded', 'unhealthy', 'dead' + /// Last error obtained when a message + /// failed to be delivered to iot hub + /// Time at which the last known error + /// occurred + /// Last time iot hub + /// successfully sent a message to the endpoint + /// Last time iot hub tried to send a + /// message to the endpoint + public EndpointHealthData(string endpointId = default(string), string healthStatus = default(string), string lastKnownError = default(string), System.DateTime? lastKnownErrorTime = default(System.DateTime?), System.DateTime? lastSuccessfulSendAttemptTime = default(System.DateTime?), System.DateTime? lastSendAttemptTime = default(System.DateTime?)) { EndpointId = endpointId; HealthStatus = healthStatus; + LastKnownError = lastKnownError; + LastKnownErrorTime = lastKnownErrorTime; + LastSuccessfulSendAttemptTime = lastSuccessfulSendAttemptTime; + LastSendAttemptTime = lastSendAttemptTime; CustomInit(); } @@ -75,10 +89,41 @@ public EndpointHealthData() /// issues with endpoints. The 'unknown' status shows that the IoT Hub /// has not established a connection with the endpoint. No messages /// have been delivered to or rejected from this endpoint. Possible - /// values include: 'unknown', 'healthy', 'unhealthy', 'dead' + /// values include: 'unknown', 'healthy', 'degraded', 'unhealthy', + /// 'dead' /// [JsonProperty(PropertyName = "healthStatus")] public string HealthStatus { get; set; } + /// + /// Gets or sets last error obtained when a message failed to be + /// delivered to iot hub + /// + [JsonProperty(PropertyName = "lastKnownError")] + public string LastKnownError { get; set; } + + /// + /// Gets or sets time at which the last known error occurred + /// + [JsonConverter(typeof(DateTimeRfc1123JsonConverter))] + [JsonProperty(PropertyName = "lastKnownErrorTime")] + public System.DateTime? LastKnownErrorTime { get; set; } + + /// + /// Gets or sets last time iot hub successfully sent a message to the + /// endpoint + /// + [JsonConverter(typeof(DateTimeRfc1123JsonConverter))] + [JsonProperty(PropertyName = "lastSuccessfulSendAttemptTime")] + public System.DateTime? LastSuccessfulSendAttemptTime { get; set; } + + /// + /// Gets or sets last time iot hub tried to send a message to the + /// endpoint + /// + [JsonConverter(typeof(DateTimeRfc1123JsonConverter))] + [JsonProperty(PropertyName = "lastSendAttemptTime")] + public System.DateTime? LastSendAttemptTime { get; set; } + } } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthStatus.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthStatus.cs index 82fd7f09e03a0..b5de1f7c9d01d 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthStatus.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EndpointHealthStatus.cs @@ -18,6 +18,7 @@ public static class EndpointHealthStatus { public const string Unknown = "unknown"; public const string Healthy = "healthy"; + public const string Degraded = "degraded"; public const string Unhealthy = "unhealthy"; public const string Dead = "dead"; } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupBodyDescription.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupBodyDescription.cs new file mode 100644 index 0000000000000..cbf1c2a6a40e7 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupBodyDescription.cs @@ -0,0 +1,69 @@ +// +// 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.IotHub.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// The EventHub consumer group. + /// + public partial class EventHubConsumerGroupBodyDescription + { + /// + /// Initializes a new instance of the + /// EventHubConsumerGroupBodyDescription class. + /// + public EventHubConsumerGroupBodyDescription() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// EventHubConsumerGroupBodyDescription class. + /// + public EventHubConsumerGroupBodyDescription(EventHubConsumerGroupName properties) + { + Properties = properties; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// + [JsonProperty(PropertyName = "properties")] + public EventHubConsumerGroupName Properties { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Properties == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); + } + if (Properties != null) + { + Properties.Validate(); + } + } + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupInfo.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupInfo.cs index 24a35cf2999de..6c74fb7205a24 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupInfo.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupInfo.cs @@ -40,7 +40,7 @@ public EventHubConsumerGroupInfo() /// name. /// the resource type. /// The etag. - public EventHubConsumerGroupInfo(IDictionary properties = default(IDictionary), string id = default(string), string name = default(string), string type = default(string), string etag = default(string)) + public EventHubConsumerGroupInfo(IDictionary properties = default(IDictionary), string id = default(string), string name = default(string), string type = default(string), string etag = default(string)) { Properties = properties; Id = id; @@ -59,7 +59,7 @@ public EventHubConsumerGroupInfo() /// Gets or sets the tags. /// [JsonProperty(PropertyName = "properties")] - public IDictionary Properties { get; set; } + public IDictionary Properties { get; set; } /// /// Gets the Event Hub-compatible consumer group identifier. diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupName.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupName.cs new file mode 100644 index 0000000000000..10135436da872 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/EventHubConsumerGroupName.cs @@ -0,0 +1,65 @@ +// +// 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.IotHub.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// The EventHub consumer group name. + /// + public partial class EventHubConsumerGroupName + { + /// + /// Initializes a new instance of the EventHubConsumerGroupName class. + /// + public EventHubConsumerGroupName() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the EventHubConsumerGroupName class. + /// + /// EventHub consumer group name + public EventHubConsumerGroupName(string name) + { + Name = name; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets eventHub consumer group name + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Name == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Name"); + } + } + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ExportDevicesRequest.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ExportDevicesRequest.cs index a64f84afee181..3f6b30f698e18 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ExportDevicesRequest.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ExportDevicesRequest.cs @@ -42,12 +42,22 @@ public ExportDevicesRequest() /// Specifies authentication type /// being used for connecting to the storage account. Possible values /// include: 'keyBased', 'identityBased' - public ExportDevicesRequest(string exportBlobContainerUri, bool excludeKeys, string exportBlobName = default(string), string authenticationType = default(string)) + /// Managed identity properties of storage + /// endpoint for export devices. + /// The value indicating whether + /// configurations should be exported. + /// The name of the blob that will + /// be created in the provided output blob container. This blob will + /// contain the exported configurations for the Iot Hub. + public ExportDevicesRequest(string exportBlobContainerUri, bool excludeKeys, string exportBlobName = default(string), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity), bool? includeConfigurations = default(bool?), string configurationsBlobName = default(string)) { ExportBlobContainerUri = exportBlobContainerUri; ExcludeKeys = excludeKeys; ExportBlobName = exportBlobName; AuthenticationType = authenticationType; + Identity = identity; + IncludeConfigurations = includeConfigurations; + ConfigurationsBlobName = configurationsBlobName; CustomInit(); } @@ -85,6 +95,28 @@ public ExportDevicesRequest() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of storage endpoint for + /// export devices. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + + /// + /// Gets or sets the value indicating whether configurations should be + /// exported. + /// + [JsonProperty(PropertyName = "includeConfigurations")] + public bool? IncludeConfigurations { get; set; } + + /// + /// Gets or sets the name of the blob that will be created in the + /// provided output blob container. This blob will contain the exported + /// configurations for the Iot Hub. + /// + [JsonProperty(PropertyName = "configurationsBlobName")] + public string ConfigurationsBlobName { get; set; } + /// /// Validate the object. /// diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/GroupIdInformation.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/GroupIdInformation.cs index a646ed0f9a277..ae44b57e636fe 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/GroupIdInformation.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/GroupIdInformation.cs @@ -82,13 +82,6 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); } - if (Name != null) - { - if (!System.Text.RegularExpressions.Regex.IsMatch(Name, "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$")) - { - throw new ValidationException(ValidationRules.Pattern, "Name", "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$"); - } - } } } } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ImportDevicesRequest.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ImportDevicesRequest.cs index e0211f0fb392e..9d30004b11277 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ImportDevicesRequest.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ImportDevicesRequest.cs @@ -42,13 +42,23 @@ public ImportDevicesRequest() /// Specifies authentication type /// being used for connecting to the storage account. Possible values /// include: 'keyBased', 'identityBased' - public ImportDevicesRequest(string inputBlobContainerUri, string outputBlobContainerUri, string inputBlobName = default(string), string outputBlobName = default(string), string authenticationType = default(string)) + /// Managed identity properties of storage + /// endpoint for import devices. + /// The value indicating whether + /// configurations should be imported. + /// The blob name to be used when + /// importing configurations from the provided input blob + /// container. + public ImportDevicesRequest(string inputBlobContainerUri, string outputBlobContainerUri, string inputBlobName = default(string), string outputBlobName = default(string), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity), bool? includeConfigurations = default(bool?), string configurationsBlobName = default(string)) { InputBlobContainerUri = inputBlobContainerUri; OutputBlobContainerUri = outputBlobContainerUri; InputBlobName = inputBlobName; OutputBlobName = outputBlobName; AuthenticationType = authenticationType; + Identity = identity; + IncludeConfigurations = includeConfigurations; + ConfigurationsBlobName = configurationsBlobName; CustomInit(); } @@ -91,6 +101,27 @@ public ImportDevicesRequest() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of storage endpoint for + /// import devices. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + + /// + /// Gets or sets the value indicating whether configurations should be + /// imported. + /// + [JsonProperty(PropertyName = "includeConfigurations")] + public bool? IncludeConfigurations { get; set; } + + /// + /// Gets or sets the blob name to be used when importing configurations + /// from the provided input blob container. + /// + [JsonProperty(PropertyName = "configurationsBlobName")] + public string ConfigurationsBlobName { get; set; } + /// /// Validate the object. /// diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubDescription.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubDescription.cs index f0b46cebcc677..ba50bfaa6b97d 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubDescription.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubDescription.cs @@ -42,12 +42,15 @@ public IotHubDescription() /// provided in the response body, it must also be provided as a header /// per the normal ETag convention. /// IotHub properties - public IotHubDescription(string location, IotHubSkuInfo sku, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string etag = default(string), IotHubProperties properties = default(IotHubProperties)) + /// The managed identities for the + /// IotHub. + public IotHubDescription(string location, IotHubSkuInfo sku, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string etag = default(string), IotHubProperties properties = default(IotHubProperties), ArmIdentity identity = default(ArmIdentity)) : base(location, id, name, type, tags) { Etag = etag; Properties = properties; Sku = sku; + Identity = identity; CustomInit(); } @@ -76,6 +79,12 @@ public IotHubDescription() [JsonProperty(PropertyName = "sku")] public IotHubSkuInfo Sku { get; set; } + /// + /// Gets or sets the managed identities for the IotHub. + /// + [JsonProperty(PropertyName = "identity")] + public ArmIdentity Identity { get; set; } + /// /// Validate the object. /// diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubProperties.cs index 529baa2ca1e5e..2b73c00c41e4a 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/IotHubProperties.cs @@ -66,11 +66,12 @@ public IotHubProperties() /// 'DeviceManagement' /// Primary and secondary location for iot /// hub - public IotHubProperties(IList authorizationPolicies = default(IList), string publicNetworkAccess = default(string), IList ipFilterRules = default(IList), string minTlsVersion = default(string), IList privateEndpointConnections = default(IList), string provisioningState = default(string), string state = default(string), string hostName = default(string), IDictionary eventHubEndpoints = default(IDictionary), RoutingProperties routing = default(RoutingProperties), IDictionary storageEndpoints = default(IDictionary), IDictionary messagingEndpoints = default(IDictionary), bool? enableFileUploadNotifications = default(bool?), CloudToDeviceProperties cloudToDevice = default(CloudToDeviceProperties), string comments = default(string), string features = default(string), IList locations = default(IList)) + public IotHubProperties(IList authorizationPolicies = default(IList), string publicNetworkAccess = default(string), IList ipFilterRules = default(IList), NetworkRuleSetProperties networkRuleSets = default(NetworkRuleSetProperties), string minTlsVersion = default(string), IList privateEndpointConnections = default(IList), string provisioningState = default(string), string state = default(string), string hostName = default(string), IDictionary eventHubEndpoints = default(IDictionary), RoutingProperties routing = default(RoutingProperties), IDictionary storageEndpoints = default(IDictionary), IDictionary messagingEndpoints = default(IDictionary), bool? enableFileUploadNotifications = default(bool?), CloudToDeviceProperties cloudToDevice = default(CloudToDeviceProperties), string comments = default(string), string features = default(string), IList locations = default(IList)) { AuthorizationPolicies = authorizationPolicies; PublicNetworkAccess = publicNetworkAccess; IpFilterRules = ipFilterRules; + NetworkRuleSets = networkRuleSets; MinTlsVersion = minTlsVersion; PrivateEndpointConnections = privateEndpointConnections; ProvisioningState = provisioningState; @@ -113,6 +114,11 @@ public IotHubProperties() [JsonProperty(PropertyName = "ipFilterRules")] public IList IpFilterRules { get; set; } + /// + /// + [JsonProperty(PropertyName = "networkRuleSets")] + public NetworkRuleSetProperties NetworkRuleSets { get; set; } + /// /// Gets or sets specifies the minimum TLS version to support for this /// hub. Can be set to "1.2" to have clients that use a TLS version @@ -236,6 +242,10 @@ public virtual void Validate() } } } + if (NetworkRuleSets != null) + { + NetworkRuleSets.Validate(); + } if (PrivateEndpointConnections != null) { foreach (var element2 in PrivateEndpointConnections) diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ManagedIdentity.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ManagedIdentity.cs new file mode 100644 index 0000000000000..c8986b474d36d --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ManagedIdentity.cs @@ -0,0 +1,52 @@ +// +// 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.IotHub.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The properties of the Managed identity. + /// + public partial class ManagedIdentity + { + /// + /// Initializes a new instance of the ManagedIdentity class. + /// + public ManagedIdentity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ManagedIdentity class. + /// + /// The user assigned + /// identity. + public ManagedIdentity(string userAssignedIdentity = default(string)) + { + UserAssignedIdentity = userAssignedIdentity; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the user assigned identity. + /// + [JsonProperty(PropertyName = "userAssignedIdentity")] + public string UserAssignedIdentity { get; set; } + + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleIPAction.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleIPAction.cs new file mode 100644 index 0000000000000..2edfdf6a270a9 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleIPAction.cs @@ -0,0 +1,21 @@ +// +// 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.IotHub.Models +{ + + /// + /// Defines values for NetworkRuleIPAction. + /// + public static class NetworkRuleIPAction + { + public const string Allow = "Allow"; + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleSetIpRule.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleSetIpRule.cs new file mode 100644 index 0000000000000..2050551fe9816 --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleSetIpRule.cs @@ -0,0 +1,88 @@ +// +// 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.IotHub.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// IP Rule to be applied as part of Network Rule Set + /// + public partial class NetworkRuleSetIpRule + { + /// + /// Initializes a new instance of the NetworkRuleSetIpRule class. + /// + public NetworkRuleSetIpRule() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the NetworkRuleSetIpRule class. + /// + /// Name of the IP filter rule. + /// A string that contains the IP address range in + /// CIDR notation for the rule. + /// IP Filter Action. Possible values include: + /// 'Allow' + public NetworkRuleSetIpRule(string filterName, string ipMask, string action = default(string)) + { + FilterName = filterName; + Action = action; + IpMask = ipMask; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets name of the IP filter rule. + /// + [JsonProperty(PropertyName = "filterName")] + public string FilterName { get; set; } + + /// + /// Gets or sets IP Filter Action. Possible values include: 'Allow' + /// + [JsonProperty(PropertyName = "action")] + public string Action { get; set; } + + /// + /// Gets or sets a string that contains the IP address range in CIDR + /// notation for the rule. + /// + [JsonProperty(PropertyName = "ipMask")] + public string IpMask { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (FilterName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "FilterName"); + } + if (IpMask == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "IpMask"); + } + } + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleSetProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleSetProperties.cs new file mode 100644 index 0000000000000..1d473711e4dfa --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/NetworkRuleSetProperties.cs @@ -0,0 +1,98 @@ +// +// 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.IotHub.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Network Rule Set Properties of IotHub + /// + public partial class NetworkRuleSetProperties + { + /// + /// Initializes a new instance of the NetworkRuleSetProperties class. + /// + public NetworkRuleSetProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the NetworkRuleSetProperties class. + /// + /// If True, then Network + /// Rule Set is also applied to BuiltIn EventHub EndPoint of + /// IotHub + /// List of IP Rules + /// Default Action for Network Rule Set. + /// Possible values include: 'Deny', 'Allow' + public NetworkRuleSetProperties(bool applyToBuiltInEventHubEndpoint, IList ipRules, string defaultAction = default(string)) + { + DefaultAction = defaultAction; + ApplyToBuiltInEventHubEndpoint = applyToBuiltInEventHubEndpoint; + IpRules = ipRules; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets default Action for Network Rule Set. Possible values + /// include: 'Deny', 'Allow' + /// + [JsonProperty(PropertyName = "defaultAction")] + public string DefaultAction { get; set; } + + /// + /// Gets or sets if True, then Network Rule Set is also applied to + /// BuiltIn EventHub EndPoint of IotHub + /// + [JsonProperty(PropertyName = "applyToBuiltInEventHubEndpoint")] + public bool ApplyToBuiltInEventHubEndpoint { get; set; } + + /// + /// Gets or sets list of IP Rules + /// + [JsonProperty(PropertyName = "ipRules")] + public IList IpRules { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (IpRules == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "IpRules"); + } + if (IpRules != null) + { + foreach (var element in IpRules) + { + if (element != null) + { + element.Validate(); + } + } + } + } + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/PrivateEndpointConnection.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/PrivateEndpointConnection.cs index be46ac71b2f93..c71e2a8372a4a 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/PrivateEndpointConnection.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/PrivateEndpointConnection.cs @@ -83,13 +83,6 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); } - if (Name != null) - { - if (!System.Text.RegularExpressions.Regex.IsMatch(Name, "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$")) - { - throw new ValidationException(ValidationRules.Pattern, "Name", "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$"); - } - } if (Properties != null) { Properties.Validate(); diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ResourceIdentityType.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ResourceIdentityType.cs new file mode 100644 index 0000000000000..560d44d8d9faa --- /dev/null +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/ResourceIdentityType.cs @@ -0,0 +1,72 @@ +// +// 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.IotHub.Models +{ + using Newtonsoft.Json; + using Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for ResourceIdentityType. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum ResourceIdentityType + { + [EnumMember(Value = "SystemAssigned")] + SystemAssigned, + [EnumMember(Value = "UserAssigned")] + UserAssigned, + [EnumMember(Value = "SystemAssigned, UserAssigned")] + SystemAssignedUserAssigned, + [EnumMember(Value = "None")] + None + } + internal static class ResourceIdentityTypeEnumExtension + { + internal static string ToSerializedValue(this ResourceIdentityType? value) + { + return value == null ? null : ((ResourceIdentityType)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this ResourceIdentityType value) + { + switch( value ) + { + case ResourceIdentityType.SystemAssigned: + return "SystemAssigned"; + case ResourceIdentityType.UserAssigned: + return "UserAssigned"; + case ResourceIdentityType.SystemAssignedUserAssigned: + return "SystemAssigned, UserAssigned"; + case ResourceIdentityType.None: + return "None"; + } + return null; + } + + internal static ResourceIdentityType? ParseResourceIdentityType(this string value) + { + switch( value ) + { + case "SystemAssigned": + return ResourceIdentityType.SystemAssigned; + case "UserAssigned": + return ResourceIdentityType.UserAssigned; + case "SystemAssigned, UserAssigned": + return ResourceIdentityType.SystemAssignedUserAssigned; + case "None": + return ResourceIdentityType.None; + } + return null; + } + } +} diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RouteProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RouteProperties.cs index 0bca2ab9baf46..f898488b9c19d 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RouteProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RouteProperties.cs @@ -39,7 +39,8 @@ public RouteProperties() /// The source that the routing rule is to be /// applied to, such as DeviceMessages. Possible values include: /// 'Invalid', 'DeviceMessages', 'TwinChangeEvents', - /// 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents' + /// 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents', + /// 'DeviceConnectionStateEvents' /// The list of endpoints to which messages /// that satisfy the condition are routed. Currently only one endpoint /// is allowed. @@ -76,7 +77,7 @@ public RouteProperties() /// Gets or sets the source that the routing rule is to be applied to, /// such as DeviceMessages. Possible values include: 'Invalid', /// 'DeviceMessages', 'TwinChangeEvents', 'DeviceLifecycleEvents', - /// 'DeviceJobLifecycleEvents' + /// 'DeviceJobLifecycleEvents', 'DeviceConnectionStateEvents' /// [JsonProperty(PropertyName = "source")] public string Source { get; set; } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingEventHubProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingEventHubProperties.cs index f5c4b14f197a0..500d72d32f498 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingEventHubProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingEventHubProperties.cs @@ -45,17 +45,20 @@ public RoutingEventHubProperties() /// Method used to authenticate /// against the event hub endpoint. Possible values include: /// 'keyBased', 'identityBased' + /// Managed identity properties of routing event + /// hub endpoint. /// The subscription identifier of the /// event hub endpoint. /// The name of the resource group of the /// event hub endpoint. - public RoutingEventHubProperties(string name, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string entityPath = default(string), string authenticationType = default(string), string subscriptionId = default(string), string resourceGroup = default(string)) + public RoutingEventHubProperties(string name, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string entityPath = default(string), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity), string subscriptionId = default(string), string resourceGroup = default(string)) { Id = id; ConnectionString = connectionString; EndpointUri = endpointUri; EntityPath = entityPath; AuthenticationType = authenticationType; + Identity = identity; Name = name; SubscriptionId = subscriptionId; ResourceGroup = resourceGroup; @@ -99,6 +102,13 @@ public RoutingEventHubProperties() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of routing event hub + /// endpoint. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + /// /// Gets or sets the name that identifies this endpoint. The name can /// only include alphanumeric characters, periods, underscores, hyphens diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusQueueEndpointProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusQueueEndpointProperties.cs index 66202dd4a90dc..47f46aac2a11e 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusQueueEndpointProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusQueueEndpointProperties.cs @@ -48,17 +48,20 @@ public RoutingServiceBusQueueEndpointProperties() /// Method used to authenticate /// against the service bus queue endpoint. Possible values include: /// 'keyBased', 'identityBased' + /// Managed identity properties of routing + /// service bus queue endpoint. /// The subscription identifier of the /// service bus queue endpoint. /// The name of the resource group of the /// service bus queue endpoint. - public RoutingServiceBusQueueEndpointProperties(string name, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string entityPath = default(string), string authenticationType = default(string), string subscriptionId = default(string), string resourceGroup = default(string)) + public RoutingServiceBusQueueEndpointProperties(string name, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string entityPath = default(string), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity), string subscriptionId = default(string), string resourceGroup = default(string)) { Id = id; ConnectionString = connectionString; EndpointUri = endpointUri; EntityPath = entityPath; AuthenticationType = authenticationType; + Identity = identity; Name = name; SubscriptionId = subscriptionId; ResourceGroup = resourceGroup; @@ -104,6 +107,13 @@ public RoutingServiceBusQueueEndpointProperties() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of routing service bus + /// queue endpoint. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + /// /// Gets or sets the name that identifies this endpoint. The name can /// only include alphanumeric characters, periods, underscores, hyphens diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusTopicEndpointProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusTopicEndpointProperties.cs index 2c9627da6f751..a9683395661ad 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusTopicEndpointProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingServiceBusTopicEndpointProperties.cs @@ -48,17 +48,20 @@ public RoutingServiceBusTopicEndpointProperties() /// Method used to authenticate /// against the service bus topic endpoint. Possible values include: /// 'keyBased', 'identityBased' + /// Managed identity properties of routing + /// service bus topic endpoint. /// The subscription identifier of the /// service bus topic endpoint. /// The name of the resource group of the /// service bus topic endpoint. - public RoutingServiceBusTopicEndpointProperties(string name, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string entityPath = default(string), string authenticationType = default(string), string subscriptionId = default(string), string resourceGroup = default(string)) + public RoutingServiceBusTopicEndpointProperties(string name, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string entityPath = default(string), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity), string subscriptionId = default(string), string resourceGroup = default(string)) { Id = id; ConnectionString = connectionString; EndpointUri = endpointUri; EntityPath = entityPath; AuthenticationType = authenticationType; + Identity = identity; Name = name; SubscriptionId = subscriptionId; ResourceGroup = resourceGroup; @@ -104,6 +107,13 @@ public RoutingServiceBusTopicEndpointProperties() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of routing service bus + /// topic endpoint. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + /// /// Gets or sets the name that identifies this endpoint. The name can /// only include alphanumeric characters, periods, underscores, hyphens diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingSource.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingSource.cs index e1caf2ad9a7f4..58161448faef4 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingSource.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingSource.cs @@ -21,5 +21,6 @@ public static class RoutingSource public const string TwinChangeEvents = "TwinChangeEvents"; public const string DeviceLifecycleEvents = "DeviceLifecycleEvents"; public const string DeviceJobLifecycleEvents = "DeviceJobLifecycleEvents"; + public const string DeviceConnectionStateEvents = "DeviceConnectionStateEvents"; } } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingStorageContainerProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingStorageContainerProperties.cs index 31fb6a8c21d79..39131a2c06a21 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingStorageContainerProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/RoutingStorageContainerProperties.cs @@ -47,6 +47,8 @@ public RoutingStorageContainerProperties() /// Method used to authenticate /// against the storage endpoint. Possible values include: 'keyBased', /// 'identityBased' + /// Managed identity properties of routing + /// storage endpoint. /// The subscription identifier of the /// storage account. /// The name of the resource group of the @@ -64,12 +66,13 @@ public RoutingStorageContainerProperties() /// to blobs. Supported values are 'avro', 'avrodeflate', and 'JSON'. /// Default value is 'avro'. Possible values include: 'Avro', /// 'AvroDeflate', 'JSON' - public RoutingStorageContainerProperties(string name, string containerName, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string authenticationType = default(string), string subscriptionId = default(string), string resourceGroup = default(string), string fileNameFormat = default(string), int? batchFrequencyInSeconds = default(int?), int? maxChunkSizeInBytes = default(int?), string encoding = default(string)) + public RoutingStorageContainerProperties(string name, string containerName, string id = default(string), string connectionString = default(string), string endpointUri = default(string), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity), string subscriptionId = default(string), string resourceGroup = default(string), string fileNameFormat = default(string), int? batchFrequencyInSeconds = default(int?), int? maxChunkSizeInBytes = default(int?), string encoding = default(string)) { Id = id; ConnectionString = connectionString; EndpointUri = endpointUri; AuthenticationType = authenticationType; + Identity = identity; Name = name; SubscriptionId = subscriptionId; ResourceGroup = resourceGroup; @@ -112,6 +115,13 @@ public RoutingStorageContainerProperties() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of routing storage + /// endpoint. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + /// /// Gets or sets the name that identifies this endpoint. The name can /// only include alphanumeric characters, periods, underscores, hyphens diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/StorageEndpointProperties.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/StorageEndpointProperties.cs index b7d2f3400fddc..e6e2efa06946a 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/StorageEndpointProperties.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/StorageEndpointProperties.cs @@ -41,12 +41,15 @@ public StorageEndpointProperties() /// Specifies authentication type /// being used for connecting to the storage account. Possible values /// include: 'keyBased', 'identityBased' - public StorageEndpointProperties(string connectionString, string containerName, System.TimeSpan? sasTtlAsIso8601 = default(System.TimeSpan?), string authenticationType = default(string)) + /// Managed identity properties of storage + /// endpoint for file upload. + public StorageEndpointProperties(string connectionString, string containerName, System.TimeSpan? sasTtlAsIso8601 = default(System.TimeSpan?), string authenticationType = default(string), ManagedIdentity identity = default(ManagedIdentity)) { SasTtlAsIso8601 = sasTtlAsIso8601; ConnectionString = connectionString; ContainerName = containerName; AuthenticationType = authenticationType; + Identity = identity; CustomInit(); } @@ -86,6 +89,13 @@ public StorageEndpointProperties() [JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType { get; set; } + /// + /// Gets or sets managed identity properties of storage endpoint for + /// file upload. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedIdentity Identity { get; set; } + /// /// Validate the object. /// diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/TestAllRoutesInput.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/TestAllRoutesInput.cs index 84ad4754dafa0..979db5f1440b4 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/TestAllRoutesInput.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/Models/TestAllRoutesInput.cs @@ -31,7 +31,8 @@ public TestAllRoutesInput() /// /// Routing source. Possible values /// include: 'Invalid', 'DeviceMessages', 'TwinChangeEvents', - /// 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents' + /// 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents', + /// 'DeviceConnectionStateEvents' /// Routing message /// Routing Twin Reference public TestAllRoutesInput(string routingSource = default(string), RoutingMessage message = default(RoutingMessage), RoutingTwin twin = default(RoutingTwin)) @@ -50,7 +51,7 @@ public TestAllRoutesInput() /// /// Gets or sets routing source. Possible values include: 'Invalid', /// 'DeviceMessages', 'TwinChangeEvents', 'DeviceLifecycleEvents', - /// 'DeviceJobLifecycleEvents' + /// 'DeviceJobLifecycleEvents', 'DeviceConnectionStateEvents' /// [JsonProperty(PropertyName = "routingSource")] public string RoutingSource { get; set; } diff --git a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/SdkInfo_iotHubClient.cs b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/SdkInfo_iotHubClient.cs index 4a58d6c7b187d..719f6be9895f4 100644 --- a/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/SdkInfo_iotHubClient.cs +++ b/sdk/iothub/Microsoft.Azure.Management.IotHub/src/Generated/SdkInfo_iotHubClient.cs @@ -19,26 +19,15 @@ public static IEnumerable> ApiInfo_iotHubClient { return new Tuple[] { - new Tuple("Devices", "Certificates", "2020-03-01"), - new Tuple("Devices", "IotHub", "2020-03-01"), - new Tuple("Devices", "IotHubResource", "2020-03-01"), - new Tuple("Devices", "Operations", "2020-03-01"), - new Tuple("Devices", "PrivateEndpointConnections", "2020-03-01"), - new Tuple("Devices", "PrivateLinkResources", "2020-03-01"), - new Tuple("Devices", "ResourceProviderCommon", "2020-03-01"), + new Tuple("Devices", "Certificates", "2021-03-31"), + new Tuple("Devices", "IotHub", "2021-03-31"), + new Tuple("Devices", "IotHubResource", "2021-03-31"), + new Tuple("Devices", "Operations", "2021-03-31"), + new Tuple("Devices", "PrivateEndpointConnections", "2021-03-31"), + new Tuple("Devices", "PrivateLinkResources", "2021-03-31"), + new Tuple("Devices", "ResourceProviderCommon", "2021-03-31"), }.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/iothub/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2020-03 --csharp-sdks-folder=C:\\code\\Azure\\asfn1\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "55131eaf8fb4722171769ba175791ad45ae3d969"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -