diff --git a/README.md b/README.md index b0f0296208ba..8211b5758ec6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Microsoft Azure SDK for .NET +## All PRs should be opened against master branch. This branch is being retired and will be deleted. + +### Microsoft Azure SDK for .NET ---------- The Microsoft Azure SDK for .NET allows you to build applications that take advantage of scalable cloud computing resources. diff --git a/src/SDKs/ManagedServiceIdentity/AzSdk.RP.props b/src/SDKs/ManagedServiceIdentity/AzSdk.RP.props index 39645fa6dc05..b7ba063327e3 100644 --- a/src/SDKs/ManagedServiceIdentity/AzSdk.RP.props +++ b/src/SDKs/ManagedServiceIdentity/AzSdk.RP.props @@ -1,7 +1,7 @@ - + ManagedIdentity_2018-11-30; $(PackageTags);$(CommonTags);$(AzureApiTag); \ No newline at end of file diff --git a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/IManagedServiceIdentityClient.cs b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/IManagedServiceIdentityClient.cs index f1da7e87a08d..c09a0c99ccdb 100644 --- a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/IManagedServiceIdentityClient.cs +++ b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/IManagedServiceIdentityClient.cs @@ -51,19 +51,20 @@ public partial interface IManagedServiceIdentityClient : System.IDisposable string ApiVersion { get; } /// - /// Gets or sets the preferred language for the response. + /// The preferred language for the response. /// string AcceptLanguage { get; set; } /// - /// Gets or sets the retry timeout in seconds for Long Running - /// Operations. Default value is 30. + /// The retry timeout in seconds for Long Running Operations. Default + /// value is 30. /// int? LongRunningOperationRetryTimeout { get; set; } /// - /// When set to true a unique x-ms-client-request-id value is generated - /// and included in each request. Default is true. + /// Whether a unique x-ms-client-request-id should be generated. When + /// set to true a unique x-ms-client-request-id value is generated and + /// included in each request. Default is true. /// bool? GenerateClientRequestId { get; set; } diff --git a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/ManagedServiceIdentityClient.cs b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/ManagedServiceIdentityClient.cs index cc0b2a520b21..3ac00601114f 100644 --- a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/ManagedServiceIdentityClient.cs +++ b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/ManagedServiceIdentityClient.cs @@ -57,19 +57,20 @@ public partial class ManagedServiceIdentityClient : ServiceClient - /// Gets or sets the preferred language for the response. + /// The preferred language for the response. /// public string AcceptLanguage { get; set; } /// - /// Gets or sets the retry timeout in seconds for Long Running Operations. - /// Default value is 30. + /// The retry timeout in seconds for Long Running Operations. Default value is + /// 30. /// public int? LongRunningOperationRetryTimeout { get; set; } /// - /// When set to true a unique x-ms-client-request-id value is generated and - /// included in each request. Default is true. + /// Whether a unique x-ms-client-request-id should be generated. When set to + /// true a unique x-ms-client-request-id value is generated and included in + /// each request. Default is true. /// public bool? GenerateClientRequestId { get; set; } @@ -83,6 +84,19 @@ public partial class ManagedServiceIdentityClient : ServiceClient public virtual IUserAssignedIdentitiesOperations UserAssignedIdentities { get; private set; } + /// + /// Initializes a new instance of the ManagedServiceIdentityClient class. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling ManagedServiceIdentityClient.Dispose(). False: will not dispose provided httpClient + protected ManagedServiceIdentityClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient) + { + Initialize(); + } + /// /// Initializes a new instance of the ManagedServiceIdentityClient class. /// @@ -178,6 +192,33 @@ public ManagedServiceIdentityClient(ServiceClientCredentials credentials, params } } + /// + /// Initializes a new instance of the ManagedServiceIdentityClient class. + /// + /// + /// Required. Credentials needed for the client to connect to Azure. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling ManagedServiceIdentityClient.Dispose(). False: will not dispose provided httpClient + /// + /// Thrown when a required parameter is null + /// + public ManagedServiceIdentityClient(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient) : this(httpClient, disposeHttpClient) + { + if (credentials == null) + { + throw new System.ArgumentNullException("credentials"); + } + Credentials = credentials; + if (Credentials != null) + { + Credentials.InitializeServiceClient(this); + } + } + /// /// Initializes a new instance of the ManagedServiceIdentityClient class. /// @@ -287,7 +328,7 @@ private void Initialize() Operations = new Operations(this); UserAssignedIdentities = new UserAssignedIdentitiesOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2015-08-31-preview"; + ApiVersion = "2018-11-30"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/Models/Identity.cs b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/Models/Identity.cs index ee98bb507d26..13aef9f36ada 100644 --- a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/Models/Identity.cs +++ b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/Models/Identity.cs @@ -47,7 +47,9 @@ public Identity() /// The id of the app associated with the /// identity. This is a random generated UUID by MSI. /// The ManagedServiceIdentity DataPlane - /// URL that can be queried to obtain the identity credentials. + /// URL that can be queried to obtain the identity credentials. If + /// identity is user assigned, then the clientSecretUrl will not be + /// present in the response, otherwise it will be present. /// The type of resource i.e. /// Microsoft.ManagedIdentity/userAssignedIdentities. Possible values /// include: 'Microsoft.ManagedIdentity/userAssignedIdentities' @@ -116,7 +118,9 @@ public Identity() /// /// Gets The ManagedServiceIdentity DataPlane URL that can be queried - /// to obtain the identity credentials. + /// to obtain the identity credentials. If identity is user assigned, + /// then the clientSecretUrl will not be present in the response, + /// otherwise it will be present. /// [JsonProperty(PropertyName = "properties.clientSecretUrl")] public string ClientSecretUrl { get; private set; } diff --git a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/SdkInfo_ManagedServiceIdentityClient.cs b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/SdkInfo_ManagedServiceIdentityClient.cs new file mode 100644 index 000000000000..4922a9912f28 --- /dev/null +++ b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Generated/SdkInfo_ManagedServiceIdentityClient.cs @@ -0,0 +1,39 @@ + +// +// 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.ManagedServiceIdentity +{ + using System; + using System.Collections.Generic; + using System.Linq; + + internal static partial class SdkInfo + { + public static IEnumerable> ApiInfo_ManagedServiceIdentityClient + { + get + { + return new Tuple[] + { + new Tuple("ManagedIdentity", "Operations", "2018-11-30"), + new Tuple("ManagedIdentity", "UserAssignedIdentities", "2018-11-30"), + }.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/msi/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\\azure-sdk-for-net\\src\\SDKs"; + public static readonly String GithubForkName = "Azure"; + public static readonly String GithubBranchName = "master"; + public static readonly String GithubCommidId = "14f4c33c0a6cc17d0b3577fbddfaacd38a235b57"; + public static readonly String CodeGenerationErrors = ""; + public static readonly String GithubRepoName = "azure-rest-api-specs"; + // END: Code Generation Metadata Section + } +} + diff --git a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Microsoft.Azure.Management.ManagedServiceIdentity.csproj b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Microsoft.Azure.Management.ManagedServiceIdentity.csproj index 751f3b982199..07b1020edad2 100644 --- a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Microsoft.Azure.Management.ManagedServiceIdentity.csproj +++ b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/Microsoft.Azure.Management.ManagedServiceIdentity.csproj @@ -5,8 +5,8 @@ Microsoft.Azure.Management.ManagedServiceIdentity - Provides developers with libraries for ManagedSericeIdentity under Azure Resource manager to perform CRUD operations on identities. - 0.10.0-preview + Provides developers with libraries for ManagedServiceIdentity under Azure Resource manager to perform CRUD operations on identities. + 0.11.0 Microsoft.Azure.Management.ManagedServiceIdentity Microsoft Azure resource management;msi;managedserviceidentity; Taking dependency on 10.0.3 version of Newtonsoft nuget package. diff --git a/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/generate.ps1 b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/generate.ps1 new file mode 100644 index 000000000000..94d4d36ba349 --- /dev/null +++ b/src/SDKs/ManagedServiceIdentity/Management.ManagedServiceIdentity/generate.ps1 @@ -0,0 +1 @@ +Start-AutoRestCodeGeneration -ResourceProvider "msi/resource-manager" -AutoRestVersion "latest" \ No newline at end of file diff --git a/src/SDKs/_metadata/managedserviceidentity_resource-manager.txt b/src/SDKs/_metadata/managedserviceidentity_resource-manager.txt index 1a8990017323..784de2b64f9d 100644 --- a/src/SDKs/_metadata/managedserviceidentity_resource-manager.txt +++ b/src/SDKs/_metadata/managedserviceidentity_resource-manager.txt @@ -1,11 +1,14 @@ -2017-12-15 22:38:47 UTC - -1) azure-rest-api-specs repository information -GitHub user: Azure -Branch: current -Commit: ca7dadf950700baa6a9fde9e78bd80d4498213f4 - -2) AutoRest information +Installing AutoRest version: latest +AutoRest installed successfully. +Commencing code generation +Generating CSharp code +Executing AutoRest command +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/managedserviceidentity/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\azure-sdk-for-net\src\SDKs +2019-01-23 21:27:23 UTC +Azure-rest-api-specs repository information +GitHub fork: Azure +Branch: master +Commit: 14f4c33c0a6cc17d0b3577fbddfaacd38a235b57 +AutoRest information Requested version: latest -Bootstrapper version: C:\Users\vakuma\AppData\Roaming\npm `-- autorest@2.0.4215 -Latest installed version: +Bootstrapper version: autorest@2.0.4283 diff --git a/src/SDKs/_metadata/msi_resource-manager.txt b/src/SDKs/_metadata/msi_resource-manager.txt new file mode 100644 index 000000000000..ebe699c64527 --- /dev/null +++ b/src/SDKs/_metadata/msi_resource-manager.txt @@ -0,0 +1,14 @@ +Installing AutoRest version: latest +AutoRest installed successfully. +Commencing code generation +Generating CSharp code +Executing AutoRest command +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/msi/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\azure-sdk-for-net\src\SDKs +2019-01-23 22:21:24 UTC +Azure-rest-api-specs repository information +GitHub fork: Azure +Branch: master +Commit: 14f4c33c0a6cc17d0b3577fbddfaacd38a235b57 +AutoRest information +Requested version: latest +Bootstrapper version: autorest@2.0.4283