diff --git a/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClient.cs b/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClient.cs index bbbfecf6b26a6..e8d2c843ad2ae 100644 --- a/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClient.cs +++ b/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClient.cs @@ -20,6 +20,8 @@ namespace Microsoft.Azure.Management.Blueprint using System.Linq; using System.Net; using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; /// /// Blueprint Client @@ -383,5 +385,164 @@ private void Initialize() DeserializationSettings.Converters.Add(new TransformationJsonConverter()); DeserializationSettings.Converters.Add(new CloudErrorJsonConverter()); } + /// + /// Get Blueprints service SPN objectId + /// + /// + /// 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 + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> WhoIsBlueprintWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "WhoIsBlueprint", tracingParameters); + } + // Construct URL + var _baseUrl = BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{scope}/providers/Microsoft.Blueprint/blueprintAssignments/{assignmentName}").ToString(); + List _queryParameters = new List(); + 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 (GenerateClientRequestId != null && GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", 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 (Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await 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 = SafeJsonConvert.DeserializeObject(_responseContent, 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 = SafeJsonConvert.DeserializeObject(_responseContent, 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/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClientExtensions.cs b/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClientExtensions.cs new file mode 100644 index 0000000000000..9227fdaa3c852 --- /dev/null +++ b/src/SDKs/Blueprint/Management.Blueprint/Generated/BlueprintManagementClientExtensions.cs @@ -0,0 +1,53 @@ +// +// 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.Blueprint +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for BlueprintManagementClient. + /// + public static partial class BlueprintManagementClientExtensions + { + /// + /// Get Blueprints service SPN objectId + /// + /// + /// The operations group for this extension method. + /// + public static WhoIsBlueprintContract WhoIsBlueprint(this IBlueprintManagementClient operations) + { + return operations.WhoIsBlueprintAsync().GetAwaiter().GetResult(); + } + + /// + /// Get Blueprints service SPN objectId + /// + /// + /// The operations group for this extension method. + /// + /// + /// The cancellation token. + /// + public static async Task WhoIsBlueprintAsync(this IBlueprintManagementClient operations, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.WhoIsBlueprintWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/src/SDKs/Blueprint/Management.Blueprint/Generated/IBlueprintManagementClient.cs b/src/SDKs/Blueprint/Management.Blueprint/Generated/IBlueprintManagementClient.cs index b14e9d68abb53..b76afbf3793dc 100644 --- a/src/SDKs/Blueprint/Management.Blueprint/Generated/IBlueprintManagementClient.cs +++ b/src/SDKs/Blueprint/Management.Blueprint/Generated/IBlueprintManagementClient.cs @@ -14,6 +14,10 @@ namespace Microsoft.Azure.Management.Blueprint using Microsoft.Rest.Azure; using Models; using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; /// /// Blueprint Client @@ -94,5 +98,16 @@ public partial interface IBlueprintManagementClient : System.IDisposable /// IAssignmentOperations AssignmentOperations { get; } + /// + /// Get Blueprints service SPN objectId + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + Task> WhoIsBlueprintWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } } diff --git a/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/AssignmentLockSettings.cs b/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/AssignmentLockSettings.cs index 8271cff9becdf..d3609571aa7c1 100644 --- a/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/AssignmentLockSettings.cs +++ b/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/AssignmentLockSettings.cs @@ -11,6 +11,8 @@ namespace Microsoft.Azure.Management.Blueprint.Models { using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; /// @@ -31,9 +33,12 @@ public AssignmentLockSettings() /// /// Lock mode. Possible values include: 'None', /// 'AllResourcesReadOnly', 'AllResourcesDoNotDelete' - public AssignmentLockSettings(string mode = default(string)) + /// List of AAD principals excluded + /// from blueprint locks. Up to 5 principals permitted. + public AssignmentLockSettings(string mode = default(string), IList excludedPrincipals = default(IList)) { Mode = mode; + ExcludedPrincipals = excludedPrincipals; CustomInit(); } @@ -49,5 +54,12 @@ public AssignmentLockSettings() [JsonProperty(PropertyName = "mode")] public string Mode { get; set; } + /// + /// Gets or sets list of AAD principals excluded from blueprint locks. + /// Up to 5 principals permitted. + /// + [JsonProperty(PropertyName = "excludedPrincipals")] + public IList ExcludedPrincipals { get; set; } + } } diff --git a/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/WhoIsBlueprintContract.cs b/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/WhoIsBlueprintContract.cs new file mode 100644 index 0000000000000..0bdb5362d1224 --- /dev/null +++ b/src/SDKs/Blueprint/Management.Blueprint/Generated/Models/WhoIsBlueprintContract.cs @@ -0,0 +1,51 @@ +// +// 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.Blueprint.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// AAD object Id of the Azure Blueprints service principal in the tenant. + /// + public partial class WhoIsBlueprintContract + { + /// + /// Initializes a new instance of the WhoIsBlueprintContract class. + /// + public WhoIsBlueprintContract() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the WhoIsBlueprintContract class. + /// + /// Identifier. + public WhoIsBlueprintContract(string objectId = default(string)) + { + ObjectId = objectId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets identifier. + /// + [JsonProperty(PropertyName = "objectId")] + public string ObjectId { get; set; } + + } +} diff --git a/src/SDKs/Blueprint/Management.Blueprint/Generated/SdkInfo_BlueprintManagementClient.cs b/src/SDKs/Blueprint/Management.Blueprint/Generated/SdkInfo_BlueprintManagementClient.cs index 7d7b12de0bbfb..8f75313f11114 100644 --- a/src/SDKs/Blueprint/Management.Blueprint/Generated/SdkInfo_BlueprintManagementClient.cs +++ b/src/SDKs/Blueprint/Management.Blueprint/Generated/SdkInfo_BlueprintManagementClient.cs @@ -25,19 +25,9 @@ public static IEnumerable> ApiInfo_BlueprintManage new Tuple("Blueprint", "Blueprints", "2018-11-01-preview"), new Tuple("Blueprint", "PublishedArtifacts", "2018-11-01-preview"), new Tuple("Blueprint", "PublishedBlueprints", "2018-11-01-preview"), + new Tuple("Blueprint", "WhoIsBlueprint", "2018-11-01-preview"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "latest"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/blueprint/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\\Repos\\azure-sdk-for-net\\src\\SDKs"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "8aa15b5d44d5487f810a4b992d2e7569abd84341"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -