Skip to content

Commit c11047e

Browse files
BethanyZhouBethanyZhou
committed
Upgrade Azure.ResourceManager to 1.0.0
1 parent 9105155 commit c11047e

File tree

8 files changed

+33
-31
lines changed

8 files changed

+33
-31
lines changed

‎src/Accounts/Authentication/Factories/ClientFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public virtual ArmClient CreateCustomArmClient(IAzureContext context,
142142
}
143143

144144
var creds = AzureSession.Instance.AuthenticationFactory.GetTokenCredential(context, endpoint);
145-
return new ArmClient(context.Subscription.Id.ToString(), creds, option);
145+
return new ArmClient(creds, context.Subscription.Id.ToString(), option);
146146
}
147147

148148
public virtual TClient CreateCustomArmClient<TClient>(params object[] parameters) where TClient : Microsoft.Rest.ServiceClient<TClient>

‎src/KeyVault/KeyVault/KeyVault.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
1818
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1919
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
20-
<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.0.0-beta.5" />
20+
<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.0.0-beta.8" />
2121
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
2222
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.5.0" />
2323
</ItemGroup>

‎src/KeyVault/KeyVault/Models/PSKeyVault.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public PSKeyVault()
2929
{
3030
}
3131

32-
public PSKeyVault(Track2ManagementSdk.Vault vault, IMicrosoftGraphClient graphClient)
32+
public PSKeyVault(Track2ManagementSdk.VaultResource vault, IMicrosoftGraphClient graphClient)
3333
{
3434
if (!vault.HasData)
3535
{
@@ -45,7 +45,7 @@ public PSKeyVault(Track2ManagementSdk.Vault vault, IMicrosoftGraphClient graphCl
4545
TenantId = vault.Data.Properties.TenantId;
4646
var vaultTenantDisplayName = ModelExtensions.GetDisplayNameForTenant(vault.Data.Properties.TenantId, graphClient);
4747
TenantName = vaultTenantDisplayName;
48-
VaultUri = vault.Data.Properties.VaultUri;
48+
VaultUri = vault.Data.Properties.VaultUri.ToString();
4949
EnabledForDeployment = vault.Data.Properties.EnabledForDeployment ?? false;
5050
EnabledForTemplateDeployment = vault.Data.Properties.EnabledForTemplateDeployment;
5151
EnabledForDiskEncryption = vault.Data.Properties.EnabledForDiskEncryption;

‎src/KeyVault/KeyVault/Models/VaultCreationOrUpdateParameters.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public Track1ManagementSdk.VaultCreateOrUpdateParameters ToTrack1VaultCreateOrUp
107107
};
108108
}
109109

110-
public Track2ManagementSdk.VaultCreateOrUpdateParameters ToTrack2VaultCreateOrUpdateParameters()
110+
public Track2ManagementSdk.VaultCreateOrUpdateContent ToTrack2VaultCreateOrUpdateContent()
111111
{
112112
if (this == null)
113113
throw new ArgumentNullException("parameters");
@@ -118,7 +118,7 @@ public Track2ManagementSdk.VaultCreateOrUpdateParameters ToTrack2VaultCreateOrUp
118118
if (string.IsNullOrWhiteSpace(Location))
119119
throw new ArgumentNullException("parameters.Location");
120120

121-
Track2ManagementSdk.Sku sku = null;
121+
Track2ManagementSdk.KeyVaultSku sku = null;
122122
Track2ManagementSdk.VaultProperties properties = null;
123123

124124
if (CreateMode != Track1ManagementSdk.CreateMode.Recover)
@@ -130,10 +130,10 @@ public Track2ManagementSdk.VaultCreateOrUpdateParameters ToTrack2VaultCreateOrUp
130130

131131
if (!string.IsNullOrWhiteSpace(SkuName) && !string.IsNullOrWhiteSpace(SkuFamilyName))
132132
{
133-
if (Enum.TryParse(SkuName, true, out Track2ManagementSdk.SkuName skuName) &&
134-
Enum.TryParse(SkuFamilyName, true, out Track2ManagementSdk.SkuFamily skuFamily))
133+
if (Enum.TryParse(SkuName, true, out Track2ManagementSdk.KeyVaultSkuName skuName) &&
134+
Enum.TryParse(SkuFamilyName, true, out Track2ManagementSdk.KeyVaultSkuFamily skuFamily))
135135
{
136-
sku = new Track2ManagementSdk.Sku(skuFamily, skuName);
136+
sku = new Track2ManagementSdk.KeyVaultSku(skuFamily, skuName);
137137
}
138138
else
139139
{
@@ -151,7 +151,7 @@ public Track2ManagementSdk.VaultCreateOrUpdateParameters ToTrack2VaultCreateOrUp
151151
EnableRbacAuthorization = EnableRbacAuthorization,
152152
SoftDeleteRetentionInDays = SoftDeleteRetentionInDays,
153153
TenantId = TenantId,
154-
VaultUri = ""
154+
VaultUri = new Uri("")
155155
};
156156
/*properties.AccessPolicies = (parameters.AccessPolicy != null) ? new[] { parameters.AccessPolicy } :
157157
new Track1ManagementSdk.AccessPolicyEntry[] { };
@@ -167,7 +167,7 @@ public Track2ManagementSdk.VaultCreateOrUpdateParameters ToTrack2VaultCreateOrUp
167167
properties.CreateMode = Track2ManagementSdk.CreateMode.Recover;
168168
}
169169

170-
return new Track2ManagementSdk.VaultCreateOrUpdateParameters(Location, properties);
170+
return new Track2ManagementSdk.VaultCreateOrUpdateContent(Location, properties);
171171
}
172172

173173
private void UpdateVaultNetworkRuleSetProperties(Track1ManagementSdk.VaultProperties vaultProperties, PSKeyVaultNetworkRuleSet psRuleSet)

‎src/KeyVault/KeyVault/Track2Models/Track2KeyVaultManagementClient.cs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using Azure.ResourceManager;
1+
using Azure;
2+
using Azure.Core;
3+
using Azure.ResourceManager;
24
using Azure.ResourceManager.KeyVault;
35
using Azure.ResourceManager.KeyVault.Models;
46
using Azure.ResourceManager.Resources;
@@ -23,18 +25,18 @@ public Track2KeyVaultManagementClient(IClientFactory clientFactory, IAzureContex
2325
_subscription = context.Subscription.Id;
2426
}
2527

26-
private ResourceGroup GetResourceGroup(string resourcegroup) =>
27-
_armClient.GetResourceGroup(new ResourceIdentifier(
28-
string.Format("/subscriptions/{0}/resourceGroups/{1}", _subscription, resourcegroup)));
28+
private ResourceGroupResource GetResourceGroup(string resourceGroupName) =>
29+
_armClient.GetResourceGroupResource(ResourceGroupResource.CreateResourceIdentifier(_subscription, resourceGroupName));
2930

30-
public IEnumerable<Vault> ListVaults(string resourcegroup) =>
31-
GetResourceGroup(resourcegroup).GetVaults().GetAll();
3231

33-
public Vault GetVault(string resourcegroup, string vaultName) =>
34-
_armClient.GetVault(Vault.CreateResourceIdentifier(_subscription, resourcegroup, vaultName));
32+
public IEnumerable<VaultResource> ListVaults(string resourceGroupName) =>
33+
GetResourceGroup(resourceGroupName).GetVaults().GetAll();
34+
35+
public VaultResource GetVault(string resourcegroup, string vaultName) =>
36+
_armClient.GetVaultResource(VaultResource.CreateResourceIdentifier(_subscription, resourcegroup, vaultName));
37+
38+
public VaultResource CreateVault(string resourceGroupName, string vaultName, VaultCreateOrUpdateContent parameters) =>
39+
GetResourceGroup(resourceGroupName).GetVaults().CreateOrUpdate(WaitUntil.Completed, vaultName, parameters).WaitForCompletion();
3540

36-
public Vault CreateVault(string resourcegroup, string vaultName, VaultCreateOrUpdateParameters parameters) =>
37-
GetResourceGroup(resourcegroup).GetVaults().CreateOrUpdate(vaultName, parameters).Value;
38-
3941
}
4042
}

‎src/KeyVault/KeyVault/Track2Models/Track2ModelConvertionExtensions.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static Track1ManagementSdk.Models.NetworkRuleSet ToTrack1NetworkRuleSet(t
6464
{
6565
Bypass = track2NetworkRuleSet.Bypass.ToString(),
6666
DefaultAction = track2NetworkRuleSet.DefaultAction.ToString(),
67-
IpRules = track2NetworkRuleSet.IpRules.Select(ipRule => new Track1ManagementSdk.Models.IPRule(ipRule.Value)).ToList(),
67+
IpRules = track2NetworkRuleSet.IPRules.Select(ipRule => new Track1ManagementSdk.Models.IPRule(ipRule.Value)).ToList(),
6868
VirtualNetworkRules = track2NetworkRuleSet.VirtualNetworkRules.Select(vnRule => new Track1ManagementSdk.Models.VirtualNetworkRule(vnRule.Id)).ToList()
6969
};
7070

@@ -77,7 +77,7 @@ public static Track1ManagementSdk.Models.NetworkRuleSet ToTrack1NetworkRuleSet(t
7777
return track1CreateMode;
7878
}
7979

80-
public static Track1ManagementSdk.Models.Permissions ToTrack1Permissions(this Track2ManagementSdk.Models.Permissions track2Permissions) =>
80+
public static Track1ManagementSdk.Models.Permissions ToTrack1Permissions(this Track2ManagementSdk.Models.AccessPermissions track2Permissions) =>
8181
new Track1ManagementSdk.Models.Permissions(track2Permissions.Keys.Select(key => key.ToString()).ToList(),
8282
track2Permissions.Secrets.Select(key => key.ToString()).ToList(),
8383
track2Permissions.Certificates.Select(key => key.ToString()).ToList(),
@@ -92,7 +92,7 @@ public static Track1ManagementSdk.Models.AccessPolicyEntry ToTrack1AccessPolicyE
9292
TenantId = track2AccessPolicyEntry.TenantId
9393
};
9494

95-
public static Track1ManagementSdk.Models.Sku ToTrack1Sku(this Track2ManagementSdk.Models.Sku track2Sku)
95+
public static Track1ManagementSdk.Models.Sku ToTrack1Sku(this Track2ManagementSdk.Models.KeyVaultSku track2Sku)
9696
{
9797
Track1ManagementSdk.Models.Sku track1Sku = new Track1ManagementSdk.Models.Sku();
9898

@@ -107,7 +107,7 @@ public static Track1ManagementSdk.Models.Sku ToTrack1Sku(this Track2ManagementSd
107107
public static Track1ManagementSdk.Models.PrivateEndpointConnectionItem ToTrack1PrivateEndpointConnectionItem(this Track2ManagementSdk.Models.PrivateEndpointConnectionItem track2PrivateEndpointConnectionItem) =>
108108
new Track1ManagementSdk.Models.PrivateEndpointConnectionItem()
109109
{
110-
PrivateEndpoint = new Track1ManagementSdk.Models.PrivateEndpoint(track2PrivateEndpointConnectionItem.PrivateEndpoint.Id),
110+
PrivateEndpoint = new Track1ManagementSdk.Models.PrivateEndpoint(track2PrivateEndpointConnectionItem.Id),
111111
PrivateLinkServiceConnectionState = new Track1ManagementSdk.Models.PrivateLinkServiceConnectionState(
112112
track2PrivateEndpointConnectionItem.PrivateLinkServiceConnectionState.Status?.ToString(),
113113
track2PrivateEndpointConnectionItem.PrivateLinkServiceConnectionState.Description,
@@ -120,7 +120,7 @@ public static Track1ManagementSdk.Models.VaultProperties ToTrack1VaultProperties
120120
TenantId = track2VaultProperties.TenantId,
121121
Sku = track2VaultProperties.Sku?.ToTrack1Sku(),
122122
AccessPolicies = track2VaultProperties.AccessPolicies.Select(ap => ap?.ToTrack1AccessPolicyEntry()).ToList(),
123-
VaultUri = track2VaultProperties.VaultUri,
123+
VaultUri = track2VaultProperties.VaultUri.ToString(),
124124
EnabledForDeployment = track2VaultProperties.EnabledForDeployment,
125125
EnabledForDiskEncryption = track2VaultProperties.EnabledForDiskEncryption,
126126
EnabledForTemplateDeployment = track2VaultProperties.EnabledForTemplateDeployment,
@@ -133,9 +133,9 @@ public static Track1ManagementSdk.Models.VaultProperties ToTrack1VaultProperties
133133
// PrivateEndpointConnections = track2VaultProperties.PrivateEndpointConnections.Select(peCon => peCon?.ToTrack1PrivateEndpointConnectionItem()).ToList()
134134
};
135135

136-
public static Track1ManagementSdk.Models.Vault ToTrack1Vault(this Track2ManagementSdk.Vault track2Vault) =>
136+
public static Track1ManagementSdk.Models.Vault ToTrack1Vault(this Track2ManagementSdk.VaultResource track2Vault) =>
137137
new Track1ManagementSdk.Models.Vault(
138138
track2Vault.Data.Properties?.ToTrack1VaultProperties(),
139-
track2Vault.Data.Id, track2Vault.Data.Name, track2Vault.Data.Type, track2Vault.Data.Location, track2Vault.Data.Tags.ToDictionary(pair => pair.Key, pair => pair.Value));
139+
track2Vault.Data.Id, track2Vault.Data.Name, track2Vault.Data.ResourceType, track2Vault.Data.Location, track2Vault.Data.Tags.ToDictionary(pair => pair.Key, pair => pair.Value));
140140
}
141141
}

‎src/KeyVault/KeyVault/Track2Models/Track2VaultManagementClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Track2VaultManagementClient(IClientFactory clientFactory , IAzureContext
3838

3939
#region Vault-related METHODS
4040
public PSKeyVault CreateVault(string resourcegroup, string vaultName, VaultCreationOrUpdateParameters parameters, IMicrosoftGraphClient msGraphClient = null) =>
41-
new PSKeyVault(Track2KeyVaultManagementClient.CreateVault(resourcegroup, vaultName, parameters.ToTrack2VaultCreateOrUpdateParameters()), msGraphClient);
41+
new PSKeyVault(Track2KeyVaultManagementClient.CreateVault(resourcegroup, vaultName, parameters.ToTrack2VaultCreateOrUpdateContent()), msGraphClient);
4242

4343
public IList<PSKeyVault> ListVaults(string resourcegroup, IMicrosoftGraphClient msGraphClient = null)
4444
{

‎tools/Common.Netcore.Dependencies.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<PackageReference Include="Azure.ResourceManager" Version="1.0.0-beta.7" />
4+
<PackageReference Include="Azure.ResourceManager" Version="1.0.0" />
55
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.0.0-preview"/>
66
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.0.0-preview"/>
77
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.0.0-preview"/>

0 commit comments

Comments
 (0)