Skip to content

Commit c59f079

Browse files
doebrowskdoebrowsk
authored
Merge release 1.1.1 to main
2 parents f3a5048 + 640bb00 commit c59f079

File tree

12 files changed

+459
-166
lines changed

12 files changed

+459
-166
lines changed

‎.github/workflows/keyfactor-starter-workflow.yml

Lines changed: 17 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
1-
name: Starter Workflow
2-
on: [workflow_dispatch, push, pull_request]
1+
name: Keyfactor Bootstrap Workflow
32

4-
jobs:
5-
call-create-github-release-workflow:
6-
uses: Keyfactor/actions/.github/workflows/github-release.yml@main
7-
8-
get-manifest-properties:
9-
runs-on: windows-latest
10-
outputs:
11-
update_catalog: ${{ steps.read-json.outputs.prop }}
12-
steps:
13-
- uses: actions/checkout@v3
14-
- name: Read json
15-
id: read-json
16-
shell: pwsh
17-
run: |
18-
$json = Get-Content integration-manifest.json | ConvertFrom-Json
19-
echo "::set-output name=prop::$(echo $json.update_catalog)"
20-
21-
call-dotnet-build-and-release-workflow:
22-
needs: [call-create-github-release-workflow]
23-
uses: Keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@main
24-
with:
25-
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
26-
release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
27-
release_dir: DataPower/bin/Debug # TODO: set build output directory to upload as a release, relative to checkout workspace
28-
secrets:
29-
token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, closed, synchronize, edited, reopened]
7+
push:
8+
create:
9+
branches:
10+
- 'release-*.*'
3011

31-
call-generate-readme-workflow:
32-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
33-
uses: Keyfactor/actions/.github/workflows/generate-readme.yml@main
12+
jobs:
13+
call-starter-workflow:
14+
uses: keyfactor/actions/.github/workflows/starter.yml@3.1.2
3415
secrets:
35-
token: ${{ secrets.APPROVE_README_PUSH }}
36-
37-
call-update-catalog-workflow:
38-
needs: get-manifest-properties
39-
if: needs.get-manifest-properties.outputs.update_catalog == 'True' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
40-
uses: Keyfactor/actions/.github/workflows/update-catalog.yml@main
41-
secrets:
42-
token: ${{ secrets.SDK_SYNC_PAT }}
16+
token: ${{ secrets.V2BUILDTOKEN}}
17+
APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
18+
gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
19+
gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
20+
scan_token: ${{ secrets.SAST_TOKEN }}

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.1.1
2+
* Dual Build .Net 6 and .Net 8 support
3+
* Test Tool Modifications
4+
* Readme Updates
5+
16
1.1.0
27
* Convert to Universal Orchestrator Framework
38
* Added Support for .cer files during inventory

‎DataPower.sln

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30717.126
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.11.35222.181
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataPower", "DataPower\DataPower.csproj", "{33FBC5A1-3466-4F10-B9A6-7186F804A65A}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A6C93E7-24FD-47FD-883D-EDABF5CEE4C6}"
99
ProjectSection(SolutionItems) = preProject
1010
CHANGELOG.md = CHANGELOG.md
1111
integration-manifest.json = integration-manifest.json
12+
.github\workflows\keyfactor-extension-release.yml = .github\workflows\keyfactor-extension-release.yml
1213
README.md = README.md
14+
README.md.tpl = README.md.tpl
1315
EndProjectSection
1416
EndProject
1517
Global
@@ -20,8 +22,12 @@ Global
2022
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2123
{33FBC5A1-3466-4F10-B9A6-7186F804A65A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2224
{33FBC5A1-3466-4F10-B9A6-7186F804A65A}.Debug|Any CPU.Build.0 = Debug|Any CPU
23-
{33FBC5A1-3466-4F10-B9A6-7186F804A65A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
24-
{33FBC5A1-3466-4F10-B9A6-7186F804A65A}.Release|Any CPU.Build.0 = Debug|Any CPU
25+
{33FBC5A1-3466-4F10-B9A6-7186F804A65A}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{33FBC5A1-3466-4F10-B9A6-7186F804A65A}.Release|Any CPU.Build.0 = Release|Any CPU
27+
{FFF21E91-1820-4090-922B-A78D5CC38D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{FFF21E91-1820-4090-922B-A78D5CC38D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{FFF21E91-1820-4090-922B-A78D5CC38D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{FFF21E91-1820-4090-922B-A78D5CC38D7B}.Release|Any CPU.Build.0 = Release|Any CPU
2531
EndGlobalSection
2632
GlobalSection(SolutionProperties) = preSolution
2733
HideSolutionNode = FALSE

‎DataPower/DataPower.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<RootNamespace>Keyfactor.Extensions.Orchestrator.DataPower</RootNamespace>
4+
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
5+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
7+
<ImplicitUsings>disable</ImplicitUsings>
78
</PropertyGroup>
89

9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
10-
<DebugType>none</DebugType>
11-
<DebugSymbols>false</DebugSymbols>
12-
</PropertyGroup>
1310

1411
<ItemGroup>
1512
<PackageReference Include="Keyfactor.Logging" Version="1.1.1" />

‎DataPower/Jobs/Inventory.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInven
7474
_protocol = ci.Protocol;
7575
_logger.LogTrace(
7676
$"Certificate Config Domain: {ci.Domain} and Certificate Store: {ci.CertificateStore}");
77-
_logger.LogTrace($"Any Job Config {JsonConvert.SerializeObject(config)}");
7877
_logger.LogTrace("Entering IBM DataPower: Certificate Inventory");
7978
_logger.LogTrace(
8079
$"Entering processJob for Domain: {ci.Domain} and Certificate Store: {ci.CertificateStore}");

‎DataPower/Jobs/Management.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
4343
try
4444
{
4545
_logger.MethodEntry(LogLevel.Debug);
46-
_logger.LogTrace($"Any Job Config {JsonConvert.SerializeObject(config)}");
4746

4847
var ci = Utility.ParseCertificateConfig(config);
4948
var np = Utility.ParseStoreProperties(config);

‎DataPower/RequestManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ public JobResult AddPubCert(ManagementJobConfiguration addPubConfig, CertStoreIn
535535
//If you have a password then you will get a PFX in return instead of the base64 encoded string
536536
if (!string.IsNullOrEmpty(addPubConfig.JobCertificate?.PrivateKeyPassword))
537537
{
538-
_logger.LogTrace($"Has PFX Password {addPubConfig.JobCertificate?.PrivateKeyPassword}");
538+
_logger.LogTrace($"Has PFX Password");
539539
using var ms = new MemoryStream(certData);
540540
store = new Pkcs12Store(ms, addPubConfig.JobCertificate?.PrivateKeyPassword.ToCharArray());
541541
var storeAlias = store.Aliases.Cast<string>().SingleOrDefault(a => store.IsKeyEntry(a));
@@ -600,7 +600,7 @@ private JobResult RemoveCertFromDomain(ManagementJobConfiguration removeConfig,
600600
_logger.LogTrace(
601601
$"Entering RemoveCertStore for Domain: {ci.Domain} and Certificate Store: {ci.CertificateStore}");
602602
_logger.LogTrace(
603-
$"Creating API Client Created with user: {ServerUserName} password: {ServerPassword} protocol: {_protocol} ClientMachine: {removeConfig.CertificateStoreDetails.ClientMachine.Trim()} Domain: {ci.Domain}");
603+
$"Creating API Client Created with user: {ServerUserName} protocol: {_protocol} ClientMachine: {removeConfig.CertificateStoreDetails.ClientMachine.Trim()} Domain: {ci.Domain}");
604604
var apiClient = new DataPowerClient(ServerUserName, ServerPassword,
605605
$"{_protocol}://" + removeConfig.CertificateStoreDetails.ClientMachine.Trim(), ci.Domain);
606606
_logger.LogTrace("API Client Created!");
@@ -792,7 +792,7 @@ private JobResult AddCertStore(ManagementJobConfiguration addConfig, CertStoreIn
792792
_logger.LogTrace(
793793
$"Entering AddCertStore for Domain: {ci.Domain} and Certificate Store: {ci.CertificateStore}");
794794
_logger.LogTrace(
795-
$"Creating API Client Created with user: {ServerUserName} password: {ServerPassword} protocol: {_protocol} ClientMachine: {addConfig.CertificateStoreDetails.ClientMachine.Trim()} Domain: {ci.Domain}");
795+
$"Creating API Client Created with user: {ServerUserName} protocol: {_protocol} ClientMachine: {addConfig.CertificateStoreDetails.ClientMachine.Trim()} Domain: {ci.Domain}");
796796
var apiClient = new DataPowerClient(ServerUserName, ServerPassword,
797797
$"{_protocol}://" + addConfig.CertificateStoreDetails.ClientMachine.Trim(),
798798
ci.Domain);
@@ -808,7 +808,7 @@ private JobResult AddCertStore(ManagementJobConfiguration addConfig, CertStoreIn
808808
{
809809
if (!string.IsNullOrEmpty(addConfig.JobCertificate.PrivateKeyPassword))
810810
{
811-
_logger.LogTrace($"Has Password: {addConfig.JobCertificate.PrivateKeyPassword}");
811+
_logger.LogTrace($"Has Password");
812812
var certPem = GetCertPem(addConfig, alias, ref privateKeyString);
813813
_logger.LogTrace($"certPem: {certPem}");
814814
var baseAlias = alias.ToLower();

0 commit comments

Comments
 (0)