diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerGroupsOperations.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerGroupsOperations.cs index c13aba718d109..6f4ccce1dbebc 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerGroupsOperations.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerGroupsOperations.cs @@ -1874,7 +1874,7 @@ internal ContainerGroupsOperations(ContainerInstanceManagementClient client) HttpStatusCode _statusCode = _httpResponse.StatusCode; cancellationToken.ThrowIfCancellationRequested(); string _responseContent = null; - if ((int)_statusCode != 204) + if ((int)_statusCode != 202) { var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerInstanceManagementClient.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerInstanceManagementClient.cs index a4998cdbb712f..fe10d22514613 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerInstanceManagementClient.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainerInstanceManagementClient.cs @@ -339,7 +339,7 @@ private void Initialize() Location = new LocationOperations(this); Containers = new ContainersOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2019-12-01"; + ApiVersion = "2021-03-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperations.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperations.cs index 4182cae399c8a..e757fce4974b1 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperations.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperations.cs @@ -70,6 +70,10 @@ internal ContainersOperations(ContainerInstanceManagementClient client) /// The number of lines to show from the tail of the container instance log. If /// not provided, all available logs are shown up to 4mb. /// + /// + /// If true, adds a timestamp at the beginning of every line of log output. If + /// not provided, defaults to false. + /// /// /// Headers that will be added to request. /// @@ -91,7 +95,7 @@ internal ContainersOperations(ContainerInstanceManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> ListLogsWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> ListLogsWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), bool? timestamps = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -124,6 +128,7 @@ internal ContainersOperations(ContainerInstanceManagementClient client) tracingParameters.Add("containerGroupName", containerGroupName); tracingParameters.Add("containerName", containerName); tracingParameters.Add("tail", tail); + tracingParameters.Add("timestamps", timestamps); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListLogs", tracingParameters); } @@ -143,6 +148,10 @@ internal ContainersOperations(ContainerInstanceManagementClient client) { _queryParameters.Add(string.Format("tail={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(tail, Client.SerializationSettings).Trim('"')))); } + if (timestamps != null) + { + _queryParameters.Add(string.Format("timestamps={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(timestamps, Client.SerializationSettings).Trim('"')))); + } if (_queryParameters.Count > 0) { _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); @@ -491,5 +500,214 @@ internal ContainersOperations(ContainerInstanceManagementClient client) return _result; } + /// + /// Attach to the output of a specific container instance. + /// + /// + /// Attach to the output stream of a specific container instance in a specified + /// resource group and container group. + /// + /// + /// The name of the resource group. + /// + /// + /// The name of the container group. + /// + /// + /// The name of the container instance. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> AttachWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (containerGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "containerGroupName"); + } + if (containerName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "containerName"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("containerGroupName", containerGroupName); + tracingParameters.Add("containerName", containerName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Attach", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{containerGroupName}", System.Uri.EscapeDataString(containerGroupName)); + _url = _url.Replace("{containerName}", System.Uri.EscapeDataString(containerName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("POST"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + } } diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperationsExtensions.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperationsExtensions.cs index 4ddbfe9182060..2f6d6af09170f 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperationsExtensions.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/ContainersOperationsExtensions.cs @@ -44,9 +44,13 @@ public static partial class ContainersOperationsExtensions /// The number of lines to show from the tail of the container instance log. If /// not provided, all available logs are shown up to 4mb. /// - public static Logs ListLogs(this IContainersOperations operations, string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?)) + /// + /// If true, adds a timestamp at the beginning of every line of log output. If + /// not provided, defaults to false. + /// + public static Logs ListLogs(this IContainersOperations operations, string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), bool? timestamps = default(bool?)) { - return operations.ListLogsAsync(resourceGroupName, containerGroupName, containerName, tail).GetAwaiter().GetResult(); + return operations.ListLogsAsync(resourceGroupName, containerGroupName, containerName, tail, timestamps).GetAwaiter().GetResult(); } /// @@ -72,12 +76,16 @@ public static partial class ContainersOperationsExtensions /// The number of lines to show from the tail of the container instance log. If /// not provided, all available logs are shown up to 4mb. /// + /// + /// If true, adds a timestamp at the beginning of every line of log output. If + /// not provided, defaults to false. + /// /// /// The cancellation token. /// - public static async Task ListLogsAsync(this IContainersOperations operations, string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ListLogsAsync(this IContainersOperations operations, string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), bool? timestamps = default(bool?), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListLogsWithHttpMessagesAsync(resourceGroupName, containerGroupName, containerName, tail, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListLogsWithHttpMessagesAsync(resourceGroupName, containerGroupName, containerName, tail, timestamps, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -143,5 +151,59 @@ public static ContainerExecResponse ExecuteCommand(this IContainersOperations op } } + /// + /// Attach to the output of a specific container instance. + /// + /// + /// Attach to the output stream of a specific container instance in a specified + /// resource group and container group. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group. + /// + /// + /// The name of the container group. + /// + /// + /// The name of the container instance. + /// + public static ContainerAttachResponse Attach(this IContainersOperations operations, string resourceGroupName, string containerGroupName, string containerName) + { + return operations.AttachAsync(resourceGroupName, containerGroupName, containerName).GetAwaiter().GetResult(); + } + + /// + /// Attach to the output of a specific container instance. + /// + /// + /// Attach to the output stream of a specific container instance in a specified + /// resource group and container group. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group. + /// + /// + /// The name of the container group. + /// + /// + /// The name of the container instance. + /// + /// + /// The cancellation token. + /// + public static async Task AttachAsync(this IContainersOperations operations, string resourceGroupName, string containerGroupName, string containerName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.AttachWithHttpMessagesAsync(resourceGroupName, containerGroupName, containerName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + } } diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/IContainersOperations.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/IContainersOperations.cs index 76d95fc1ef957..3b44e84e303dc 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/IContainersOperations.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/IContainersOperations.cs @@ -43,6 +43,10 @@ public partial interface IContainersOperations /// The number of lines to show from the tail of the container instance /// log. If not provided, all available logs are shown up to 4mb. /// + /// + /// If true, adds a timestamp at the beginning of every line of log + /// output. If not provided, defaults to false. + /// /// /// The headers that will be added to request. /// @@ -58,7 +62,7 @@ public partial interface IContainersOperations /// /// Thrown when a required parameter is null /// - Task> ListLogsWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> ListLogsWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, int? tail = default(int?), bool? timestamps = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Executes a command in a specific container instance. /// @@ -94,5 +98,37 @@ public partial interface IContainersOperations /// Thrown when a required parameter is null /// Task> ExecuteCommandWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, ContainerExecRequest containerExecRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Attach to the output of a specific container instance. + /// + /// + /// Attach to the output stream of a specific container instance in a + /// specified resource group and container group. + /// + /// + /// The name of the resource group. + /// + /// + /// The name of the container group. + /// + /// + /// The name of the container instance. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> AttachWithHttpMessagesAsync(string resourceGroupName, string containerGroupName, string containerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerAttachResponse.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerAttachResponse.cs new file mode 100644 index 0000000000000..8487a49174d52 --- /dev/null +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerAttachResponse.cs @@ -0,0 +1,64 @@ +// +// 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.ContainerInstance.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The information for the output stream from container attach. + /// + public partial class ContainerAttachResponse + { + /// + /// Initializes a new instance of the ContainerAttachResponse class. + /// + public ContainerAttachResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ContainerAttachResponse class. + /// + /// The uri for the output stream from the + /// attach. + /// The password to the output stream from the + /// attach. Send as an Authorization header value when connecting to + /// the websocketUri. + public ContainerAttachResponse(string webSocketUri = default(string), string password = default(string)) + { + WebSocketUri = webSocketUri; + Password = password; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the uri for the output stream from the attach. + /// + [JsonProperty(PropertyName = "webSocketUri")] + public string WebSocketUri { get; set; } + + /// + /// Gets or sets the password to the output stream from the attach. + /// Send as an Authorization header value when connecting to the + /// websocketUri. + /// + [JsonProperty(PropertyName = "password")] + public string Password { get; set; } + + } +} diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerHttpGet.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerHttpGet.cs index cc292679fff56..2c79a6825f254 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerHttpGet.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/ContainerHttpGet.cs @@ -33,11 +33,13 @@ public ContainerHttpGet() /// The path to probe. /// The scheme. Possible values include: 'http', /// 'https' - public ContainerHttpGet(int port, string path = default(string), string scheme = default(string)) + /// The HTTP headers. + public ContainerHttpGet(int port, string path = default(string), string scheme = default(string), HttpHeaders httpHeaders = default(HttpHeaders)) { Path = path; Port = port; Scheme = scheme; + HttpHeaders = httpHeaders; CustomInit(); } @@ -64,6 +66,12 @@ public ContainerHttpGet() [JsonProperty(PropertyName = "scheme")] public string Scheme { get; set; } + /// + /// Gets or sets the HTTP headers. + /// + [JsonProperty(PropertyName = "httpHeaders")] + public HttpHeaders HttpHeaders { get; set; } + /// /// Validate the object. /// diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/HttpHeaders.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/HttpHeaders.cs new file mode 100644 index 0000000000000..1e1fe60953557 --- /dev/null +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/HttpHeaders.cs @@ -0,0 +1,59 @@ +// +// 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.ContainerInstance.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The HTTP headers. + /// + public partial class HttpHeaders + { + /// + /// Initializes a new instance of the HttpHeaders class. + /// + public HttpHeaders() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the HttpHeaders class. + /// + /// The header name. + /// The header value. + public HttpHeaders(string name = default(string), string value = default(string)) + { + Name = name; + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the header name. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets the header value. + /// + [JsonProperty(PropertyName = "value")] + public string Value { get; set; } + + } +} diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/LogAnalytics.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/LogAnalytics.cs index 34ed73b3c474b..2b45c69579949 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/LogAnalytics.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/Models/LogAnalytics.cs @@ -39,12 +39,15 @@ public LogAnalytics() /// The log type to be used. Possible values /// include: 'ContainerInsights', 'ContainerInstanceLogs' /// Metadata for log analytics. - public LogAnalytics(string workspaceId, string workspaceKey, string logType = default(string), IDictionary metadata = default(IDictionary)) + /// The workspace resource id for log + /// analytics + public LogAnalytics(string workspaceId, string workspaceKey, string logType = default(string), IDictionary metadata = default(IDictionary), IDictionary workspaceResourceId = default(IDictionary)) { WorkspaceId = workspaceId; WorkspaceKey = workspaceKey; LogType = logType; Metadata = metadata; + WorkspaceResourceId = workspaceResourceId; CustomInit(); } @@ -78,6 +81,12 @@ public LogAnalytics() [JsonProperty(PropertyName = "metadata")] public IDictionary Metadata { get; set; } + /// + /// Gets or sets the workspace resource id for log analytics + /// + [JsonProperty(PropertyName = "workspaceResourceId")] + public IDictionary WorkspaceResourceId { get; set; } + /// /// Validate the object. /// diff --git a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/SdkInfo_ContainerInstanceManagementClient.cs b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/SdkInfo_ContainerInstanceManagementClient.cs index 647c214046bc3..9031cde0211ef 100644 --- a/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/SdkInfo_ContainerInstanceManagementClient.cs +++ b/sdk/containerinstance/Microsoft.Azure.Management.ContainerInstance/src/Generated/SdkInfo_ContainerInstanceManagementClient.cs @@ -19,23 +19,12 @@ public static IEnumerable> ApiInfo_ContainerInstan { return new Tuple[] { - new Tuple("ContainerInstance", "ContainerGroups", "2019-12-01"), - new Tuple("ContainerInstance", "Containers", "2019-12-01"), - new Tuple("ContainerInstance", "Location", "2019-12-01"), - new Tuple("ContainerInstance", "Operations", "2019-12-01"), + new Tuple("ContainerInstance", "ContainerGroups", "2021-03-01"), + new Tuple("ContainerInstance", "Containers", "2021-03-01"), + new Tuple("ContainerInstance", "Location", "2021-03-01"), + new Tuple("ContainerInstance", "Operations", "2021-03-01"), }.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/containerinstance/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\Users\\nochangi\\DEV\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "ae8d69cc6c78331c24b13951979bf171bf132d26"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -