Skip to content

Commit f4fc68c

Browse files
authored
Merge pull request #69 from Keyfactor/release-3.1
Merge 3.1.10 to main
2 parents 89b7265 + acf5ea6 commit f4fc68c

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

AzureKeyVault/AzureKeyVault.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
3030
<PackageReference Include="Keyfactor.Logging" Version="1.1.2" />
3131
<PackageReference Include="Keyfactor.Orchestrators.Common" Version="3.2.0" />
32-
<PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
32+
<PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="1.0.0" />
3333
<PackageReference Include="Keyfactor.Platform.IPAMProvider" Version="1.0.0" />
3434
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
3535
<PackageReference Include="Microsoft.Identity.Client" Version="4.68.0" />

AzureKeyVault/Jobs/Management.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Keyfactor.Orchestrators.Extensions.Interfaces;
1818
using System.Collections.Generic;
1919
using Newtonsoft.Json;
20+
using System.Security.AccessControl;
2021

2122
namespace Keyfactor.Extensions.Orchestrator.AzureKeyVault
2223
{
@@ -35,23 +36,21 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
3536

3637
InitializeStore(config);
3738

39+
logger.LogTrace($"raw entry parameters from command: {JsonConvert.SerializeObject(config.JobProperties)}");
40+
3841
JobResult complete = new JobResult()
3942
{
4043
Result = OrchestratorJobStatusJobResult.Failure,
4144
FailureMessage = "Invalid Management Operation"
4245
};
43-
object tagsObj;
44-
object preserveTagsObj;
46+
4547
string tagsJSON;
4648
bool preserveTags;
4749

48-
config.JobProperties.TryGetValue("CertificateTags", out tagsObj);
49-
50-
config.JobProperties.TryGetValue(EntryParameters.PRESERVE_TAGS, out preserveTagsObj);
51-
52-
preserveTags = (bool)preserveTagsObj;
50+
logger.LogTrace("parsing entry parameters.. ");
5351

54-
tagsJSON = tagsObj as string;
52+
tagsJSON = config.JobProperties[EntryParameters.TAGS] as string ?? string.Empty;
53+
preserveTags = config.JobProperties[EntryParameters.PRESERVE_TAGS] as bool? ?? false;
5554

5655
switch (config.OperationType)
5756
{

0 commit comments

Comments
 (0)