Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Compute] Changing ResourceIdentity to EncryptionSetIdentity #8370

Merged
merged 1 commit into from
Oct 24, 2019
Merged

[Compute] Changing ResourceIdentity to EncryptionSetIdentity #8370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/compute_resource-manager.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ 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/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\hylee-sdk\october\sdk
2019-10-21 18:53:15 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\hylee-sdk\master\sdk
2019-10-24 04:36:05 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 9fcf995a147b389702f020d0d3c153cba0fdc0c2
Commit: 49ff81e824bd69605e033b28c14f8e8cc85e5924
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
4 changes: 2 additions & 2 deletions sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DiskEncryptionSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public DiskEncryptionSet()
/// rotation.</param>
/// <param name="provisioningState">The disk encryption set
/// provisioning state.</param>
public DiskEncryptionSet(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), ResourceIdentity identity = default(ResourceIdentity), KeyVaultAndKeyReference activeKey = default(KeyVaultAndKeyReference), IList<KeyVaultAndKeyReference> previousKeys = default(IList<KeyVaultAndKeyReference>), string provisioningState = default(string))
public DiskEncryptionSet(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), EncryptionSetIdentity identity = default(EncryptionSetIdentity), KeyVaultAndKeyReference activeKey = default(KeyVaultAndKeyReference), IList<KeyVaultAndKeyReference> previousKeys = default(IList<KeyVaultAndKeyReference>), string provisioningState = default(string))
: base(location, id, name, type, tags)
{
Identity = identity;
Expand All @@ -65,7 +65,7 @@ public DiskEncryptionSet()
/// <summary>
/// </summary>
[JsonProperty(PropertyName = "identity")]
public ResourceIdentity Identity { get; set; }
public EncryptionSetIdentity Identity { get; set; }

/// <summary>
/// Gets or sets the key vault key which is currently used by this disk
Expand Down
10 changes: 5 additions & 5 deletions .../src/Generated/Models/ResourceIdentity.cs → ...Generated/Models/EncryptionSetIdentity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ namespace Microsoft.Azure.Management.Compute.Models
/// The managed identity for the disk encryption set. It should be given
/// permission on the key vault before it can be used to encrypt disks.
/// </summary>
public partial class ResourceIdentity
public partial class EncryptionSetIdentity
{
/// <summary>
/// Initializes a new instance of the ResourceIdentity class.
/// Initializes a new instance of the EncryptionSetIdentity class.
/// </summary>
public ResourceIdentity()
public EncryptionSetIdentity()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the ResourceIdentity class.
/// Initializes a new instance of the EncryptionSetIdentity class.
/// </summary>
/// <param name="type">The type of Managed Identity used by the
/// DiskEncryptionSet. Only SystemAssigned is supported. Possible
Expand All @@ -41,7 +41,7 @@ public ResourceIdentity()
/// Resource. This will be sent to the RP from ARM via the
/// x-ms-client-tenant-id header in the PUT request if the resource has
/// a systemAssigned(implicit) identity</param>
public ResourceIdentity(string type = default(string), string principalId = default(string), string tenantId = default(string))
public EncryptionSetIdentity(string type = default(string), string principalId = default(string), string tenantId = default(string))
{
Type = type;
PrincipalId = principalId;
Expand Down
4 changes: 2 additions & 2 deletions ...mpute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_ComputeManageme
// 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/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\\hylee-sdk\\october\\sdk";
public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\\hylee-sdk\\master\\sdk";
public static readonly String GithubForkName = "Azure";
public static readonly String GithubBranchName = "master";
public static readonly String GithubCommidId = "9fcf995a147b389702f020d0d3c153cba0fdc0c2";
public static readonly String GithubCommidId = "49ff81e824bd69605e033b28c14f8e8cc85e5924";
public static readonly String CodeGenerationErrors = "";
public static readonly String GithubRepoName = "azure-rest-api-specs";
// END: Code Generation Metadata Section
Expand Down
11 changes: 2 additions & 9 deletions sdk/compute/Microsoft.Azure.Management.Compute/src/Microsoft.Azure.Management.Compute.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,12 @@
<PropertyGroup>
<PackageId>Microsoft.Azure.Management.Compute</PackageId>
<Description>Provides developers with libraries for the updated compute platform under Azure Resource manager to deploy virtual machine, virtual machine extensions and availability set management capabilities. Launch, restart, scale, capture and manage VMs, VM Extensions and more. Note: This client library is for Virtual Machines under Azure Resource Manager.</Description>
<Version>30.0.0</Version>
<Version>30.1.0</Version>
<AssemblyName>Microsoft.Azure.Management.Compute</AssemblyName>
<PackageTags>management;virtual machine;compute;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
This is a public release of the Azure Compute SDK. Included with this release are the following changes:
1) 2019-07-01 API version for VM, VMSS, and Disk APIs
2) VMSS VM extension APIs
3) Disk encryption set APIs
4) Disk encryption set property for managed disk
5) Virtual machine reapply
6) diskIOPSReadWrite and diskMBpsReadWrite properties for data disk
7) publicIPAddressVersion propery for VMSS IP address config
This is a public release of the Azure Compute SDK. Included with this release is changing ResourceIdentity object to EncryptionSetIdentity object to avoid duplicates.
]]>
</PackageReleaseNotes>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/compute/Microsoft.Azure.Management.Compute/src/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Compute Resources.")]

[assembly: AssemblyVersion("30.0.0.0")]
[assembly: AssemblyFileVersion("30.0.0.0")]
[assembly: AssemblyFileVersion("30.1.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
2 changes: 1 addition & 1 deletion sdk/compute/Microsoft.Azure.Management.Compute/tests/DiskRPTests/DiskRPTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ protected DiskEncryptionSet GenerateDefaultDiskEncryptionSet(string location)

var des = new DiskEncryptionSet
{
Identity = new ResourceIdentity
Identity = new EncryptionSetIdentity
{
Type = ResourceIdentityType.SystemAssigned.ToString()
},
Expand Down