Merge pull request #45 from Keyfactor/release-3.1

Sdk update (#44)
Keyfactor · Jun 19, 2024 · e49f12a · e49f12a
2 parents 51a8e53 + 5cc874b
commit e49f12a
Show file tree

Hide file tree

Showing 9 changed files with 532 additions and 66 deletions.
diff --git a/.github/workflows/keyfactor-starter-workflow.yml b/.github/workflows/keyfactor-starter-workflow.yml
diff --git a/.gitignore b/.gitignore
@@ -346,3 +346,4 @@ healthchecksdb
 /key.pem
 /cert.pem
 /cert.csr
+.config/dotnet-tools.json
diff --git a/AzureKeyVault/AzureClient.cs b/AzureKeyVault/AzureClient.cs
@@ -18,7 +18,6 @@
 using Azure.ResourceManager.KeyVault.Models;
 using Azure.ResourceManager.Resources;
 using Azure.Security.KeyVault.Certificates;
-using Azure.Security.KeyVault.Secrets;
 using Keyfactor.Logging;
 using Keyfactor.Orchestrators.Common.Enums;
 using Keyfactor.Orchestrators.Extensions;
@@ -29,7 +28,6 @@ namespace Keyfactor.Extensions.Orchestrator.AzureKeyVault
     public class AzureClient
     {
         internal protected virtual AkvProperties VaultProperties { get; set; }
-        private SecretClient _secretClient;
         private Uri AzureCloudEndpoint
         {
             get
@@ -82,8 +80,7 @@ private protected virtual CertificateClient CertClient
                     logger.LogTrace("Using a service principal to authenticate, generating the credentials");
                     cred = new ClientSecretCredential(VaultProperties.TenantId, VaultProperties.ClientId, VaultProperties.ClientSecret, new ClientSecretCredentialOptions() { AuthorityHost = AzureCloudEndpoint, AdditionallyAllowedTenants = { "*" } });
                     logger.LogTrace("generated credentials", cred);
-                }
-                _secretClient = new SecretClient(new Uri(VaultProperties.VaultURL), credential: cred);
+                }                
                 _certClient = new CertificateClient(new Uri(VaultProperties.VaultURL), credential: cred);
 
                 return _certClient;

diff --git a/AzureKeyVault/AzureKeyVault.csproj b/AzureKeyVault/AzureKeyVault.csproj
@@ -23,24 +23,22 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Azure.Identity" Version="1.8.2" />
-		<PackageReference Include="Azure.ResourceManager" Version="1.5.0" />
-		<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.1.0" />
-		<PackageReference Include="Azure.ResourceManager.Resources" Version="1.4.0" />
-		<PackageReference Include="Azure.Security.KeyVault.Administration" Version="4.3.0" />
-		<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.5.1" />
-		<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
-		<PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
+		<PackageReference Include="Azure.Identity" Version="1.11.3" />
+		<PackageReference Include="Azure.ResourceManager" Version="1.12.0" />
+		<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.2.3" />
+		<PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.3" />
+		<PackageReference Include="Azure.Security.KeyVault.Administration" Version="4.4.0" />
+		<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.6.0" />
+		<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
 		<PackageReference Include="CSS.Common" Version="1.7.0" />
 		<PackageReference Include="Keyfactor.Common" Version="2.3.7" />
 		<PackageReference Include="Keyfactor.Extensions.Pam.Utilities" Version="1.0.2" />
 		<PackageReference Include="Keyfactor.Logging" Version="1.1.1" />
 		<PackageReference Include="Keyfactor.Orchestrators.Common" Version="3.2.0" />
 		<PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
 		<PackageReference Include="Keyfactor.Platform.IPAMProvider" Version="1.0.0" />
-		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-		<PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.38.1" />
-		<PackageReference Include="Microsoft.WindowsAzure.Common" Version="1.4.1" />
+		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/AzureKeyVault/Jobs/Discovery.cs b/AzureKeyVault/Jobs/Discovery.cs
@@ -32,7 +32,6 @@ public JobResult ProcessJob(DiscoveryJobConfiguration config, SubmitDiscoveryUpd
             InitializeStore(config);
 
             var complete = new JobResult() { JobHistoryId = config.JobHistoryId, Result = OrchestratorJobStatusJobResult.Failure };
-            var failureMessage = string.Empty;
             List<string> keyVaults, warnings;
 
             try
@@ -45,7 +44,6 @@ public JobResult ProcessJob(DiscoveryJobConfiguration config, SubmitDiscoveryUpd
             {
                 complete.FailureMessage = ex.Message;
                 return complete;
-                throw;
             }
 
             // if there are no warnings return vaults and status of success

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-- 3.1.3
+- - 3.1.4
+  - Update nuget dependencies (Azure Identity Packages)
+
+- - 3.1.3
   - Discovery now continues the search if an error is encountered during the process. 
   - Fixed issue with overwrite box check being ignored when replacing cert in Keyvault
   -	Now getting properties of certs as pageable during inventory to fix a timeout issue when querying for thousands of certs.