use lazy init for data-plane keyvault client (#1219)

Azure · Mar 12, 2021 · dbdccff · dbdccff
1 parent 2c1a3e3
commit dbdccff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
     <PackageReference Include="CoreFTP" Version="1.2.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="0.0.2-preview" />

diff --git a/Tests/AzSdk.test.reference.props b/Tests/AzSdk.test.reference.props
@@ -6,7 +6,7 @@
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.3.0" />
     <PackageReference Include="SSH.NET" Version="2016.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
-    <PackageReference Include="System.Net.Http" Version="4.3.2" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
 
     <!-- This is needed for discovering tests in test explorer -->
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />	

diff --git a/src/AzSdk.reference.props b/src/AzSdk.reference.props
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">    
-    <PackageReference Include="System.Net.Http" Version="4.3.0"/>
+    <PackageReference Include="System.Net.Http" Version="4.3.4"/>
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

diff --git a/src/ResourceManagement/KeyVault/Microsoft.Azure.Management.KeyVault.Fluent.csproj b/src/ResourceManagement/KeyVault/Microsoft.Azure.Management.KeyVault.Fluent.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="$(FluentVersion)" />
-    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
   </ItemGroup>
 
 

diff --git a/src/ResourceManagement/KeyVault/VaultImpl.cs b/src/ResourceManagement/KeyVault/VaultImpl.cs
@@ -31,7 +31,7 @@ internal partial class VaultImpl :
         IDefinition,
         IUpdate
     {
-        private IKeyVaultClient client;
+        private Lazy<IKeyVaultClient> client;
         private IKeys keys;
         private ISecrets secrets;
         private IGraphRbacManager graphRbacManager;
@@ -49,7 +49,7 @@ internal VaultImpl(string name, VaultInner innerObject, IKeyVaultManager manager
                     this.accessPolicies.Add(new AccessPolicyImpl(entry, this));
                 }
             }
-            this.client = new KeyVaultClientInternal(Manager.RestClient.Credentials, Manager.RestClient.RootHttpHandler, Manager.RestClient.Handlers.ToArray());
+            this.client = new Lazy<IKeyVaultClient>(() => new KeyVaultClientInternal(Manager.RestClient.Credentials, Manager.RestClient.RootHttpHandler, Manager.RestClient.Handlers.ToArray()));
         }
 
         ///GENMHASH:FAAD3C3E07174E29B21DE058D968BBF7:A534A23FE2D228AC3080C1CF07E66439
@@ -149,7 +149,7 @@ public IKeys Keys
             {
                 if (keys == null)
                 {
-                    keys = new KeysImpl(client, this);
+                    keys = new KeysImpl(client.Value, this);
                 }
                 return keys;
             }
@@ -161,13 +161,13 @@ public ISecrets Secrets
             {
                 if (secrets == null)
                 {
-                    secrets = new SecretsImpl(client, this);
+                    secrets = new SecretsImpl(client.Value, this);
                 }
                 return secrets;
             }
         }
 
-        IKeyVaultClient IVaultBeta.Client => client;
+        IKeyVaultClient IVaultBeta.Client => client.Value;
 
         ///GENMHASH:577E5E9CE0B513EB5189E6F44BB732C7:3949CE4CBC4994E8C88DF2E4815A8696
         public VaultImpl WithEmptyAccessPolicy()