Skip to content

Commit d65ed2e

Browse files
doebrowskdoebrowsk
authored
Merge 2.4.0 to main
2 parents b266e28 + 086fbd8 commit d65ed2e

File tree

11 files changed

+502
-175
lines changed

11 files changed

+502
-175
lines changed

‎.github/workflows/keyfactor-bootstrap-workflow.yml‎ renamed to ‎.github/workflows/keyfactor-starter-workflow.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ on:
1111

1212
jobs:
1313
call-starter-workflow:
14-
uses: keyfactor/actions/.github/workflows/starter.yml@v2
14+
uses: keyfactor/actions/.github/workflows/starter.yml@3.1.2
1515
secrets:
1616
token: ${{ secrets.V2BUILDTOKEN}}
1717
APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
1818
gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
1919
gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
20+
scan_token: ${{ secrets.SAST_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.4.0
2+
* .Net 6 and .Net 8 Build Support
3+
* Documentation Updates
4+
15
2.3.1
26
* Fixed issue where trace logs had extra info in them
37
* Fixed issue with chain support when pushing certs to palo

‎PaloAlto/PaloAlto.csproj‎

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

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

910
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1011
<DebugType>none</DebugType>
1112
<DebugSymbols>false</DebugSymbols>
1213
</PropertyGroup>
1314

14-
<ItemGroup>
15-
<Compile Remove="Interfaces\**" />
16-
<EmbeddedResource Remove="Interfaces\**" />
17-
<None Remove="Interfaces\**" />
15+
<ItemGroup>
16+
<Compile Remove="Interfaces\**" />
17+
<EmbeddedResource Remove="Interfaces\**" />
18+
<None Remove="Interfaces\**" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

‎PaloAlto/Validators.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public static (bool valid, JobResult result) ValidateStoreProperties(JobProperti
118118
if (!templateStacks.Any())
119119
{
120120
errors +=
121-
$"Could not find your Template Stacks In Panorama. Valid Device Groups are {string.Join(",", templateStackList.Result.Result.Entry.Select(d => d.Name))}";
121+
$"Could not find your Template Stacks In Panorama. Valid Template Stacks are {string.Join(",", templateStackList.Result.Result.Entry.Select(d => d.Name))}";
122122
}
123123
}
124124

‎PaloAltoTestConsole/PaloAltoTestConsole.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
6+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
7+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
8+
<ImplicitUsings>disable</ImplicitUsings>
69
</PropertyGroup>
710

811
<ItemGroup>

‎PaloAltoTestConsole/RunTest.bat‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@echo off
22

3-
cd C:\Users\asdf\source\repos\paloalto-firewall-orchestrator\PaloAltoTestConsole\bin\Debug\netcoreapp3.1
4-
set FWMachine=asfd
5-
set FWApiUser=asfd
6-
set FWApiPassword=asfdsdfa
7-
set PAMachine=afsd
8-
set PAApiUser=bhisadfll
9-
set PAApiPassword=adfssadf
3+
cd C:\bin\Debug\netcoreapp3.1
4+
set FWMachine=fwMachine
5+
set FWApiUser=bhill
6+
set FWApiPassword=asfda!
7+
set PAMachine=paMachine
8+
set PAApiUser=bhill
9+
set PAApiPassword=asdfas
1010

1111

1212
echo ***********************************
@@ -31,7 +31,7 @@ set overwrite=false
3131
set inventorytrusted=false
3232
set templatestackname=""
3333

34-
REM goto :PANTemplates
34+
goto :PANInventory
3535

3636
echo ************************************************************************************************************************
3737
echo TC1 %mgt%. Should do the %mgt% and add anything in the chain
@@ -483,7 +483,7 @@ set overwrite=false
483483

484484
echo:
485485
echo ************************************************************************************
486-
echo TC16 %mgt% certificate no overwrite, should %mgt% to Panorama and push to firewalls
486+
echo TC12 %mgt% certificate no overwrite, should %mgt% to Panorama and push to firewalls
487487
echo ************************************************************************************
488488
echo overwrite: %overwrite%
489489
echo store path: %storepath%
@@ -496,7 +496,7 @@ set mgt=add
496496
set overwrite=true
497497
echo:
498498
echo ***************************************************
499-
echo TC17 %mgt%, Overwrite should overwrite unbound cert
499+
echo TC23 %mgt%, Overwrite should overwrite unbound cert
500500
echo ****************************************************
501501
echo overwrite: %overwrite%
502502
echo store path: %storepath%
@@ -509,7 +509,7 @@ set mgt=remove
509509
set overwrite=false
510510
echo:
511511
echo ***********************************************************************************************
512-
echo TC18 %mgt% no bindings, should allow this
512+
echo TC24 %mgt% no bindings, should allow this
513513
echo ***********************************************************************************************
514514
echo overwrite: %overwrite%
515515
echo store path: %storepath%
@@ -523,7 +523,7 @@ set mgt=add
523523
set overwrite=true
524524
echo:
525525
echo ***********************************************************************************************
526-
echo TC19 %mgt% add with overwrite bound cert
526+
echo TC25 %mgt% add with overwrite bound cert
527527
echo ***********************************************************************************************
528528
echo overwrite: %overwrite%
529529
echo store path: %storepath%
@@ -537,7 +537,7 @@ set mgt=remove
537537
set overwrite=false
538538
echo:
539539
echo ***********************************************************************************************
540-
echo TC20 %mgt% with Bindings not allow should error out, can't delete cert without deleting binding
540+
echo TC26 %mgt% with Bindings not allow should error out, can't delete cert without deleting binding
541541
echo ***********************************************************************************************
542542
echo overwrite: %overwrite%
543543
echo store path: %storepath%
@@ -556,7 +556,7 @@ echo ***********************************
556556
set casename=Inventory
557557
echo:
558558
echo *************************************************************************
559-
echo TC21 Inventory Panorama Certificates from Trusted Root and Cert Locations
559+
echo TC27 Inventory Panorama Certificates from Trusted Root and Cert Locations
560560
echo *************************************************************************
561561
echo overwrite: %overwrite%
562562
echo trusted: %trusted%
@@ -599,7 +599,7 @@ PaloAltoTestConsole.exe -clientmachine=%clientmachine% -casename=%casename% -use
599599

600600
echo:
601601
echo *************************************************************
602-
echo TC23 Duplicate Certificate No overwrite flag should warn user
602+
echo TC28 Duplicate Certificate No overwrite flag should warn user
603603
echo *************************************************************
604604
echo overwrite: %overwrite%
605605
echo store path: %storepath%
@@ -611,7 +611,7 @@ set overwrite=true
611611

612612
echo:
613613
echo *************************************************************
614-
echo TC24 Duplicate Certificate overwrite flag replaces certificate
614+
echo TC29 Duplicate Certificate overwrite flag replaces certificate
615615
echo *************************************************************
616616
echo overwrite: %overwrite%
617617
echo store path: %storepath%
@@ -624,7 +624,7 @@ set mgt=remove
624624

625625
echo:
626626
echo *************************************************************
627-
echo TC25 Delete unbound certificate should delete this.
627+
echo TC30 Delete unbound certificate should delete this.
628628
echo *************************************************************
629629
echo overwrite: %overwrite%
630630
echo store path: %storepath%
@@ -638,7 +638,7 @@ set mgt=add
638638
set overwrite=true
639639
echo:
640640
echo ****************************************************
641-
echo TC26 Add Bound Certifcate with Overwrite
641+
echo TC31 Add Bound Certifcate with Overwrite
642642
echo ****************************************************
643643
set /p cert=Please enter bound cert name:
644644
echo overwrite: %overwrite%
@@ -651,7 +651,7 @@ PaloAltoTestConsole.exe -clientmachine=%clientmachine% -casename=%casename% -use
651651
set mgt=remove
652652
echo:
653653
echo *************************************************************
654-
echo TC27 Delete bound certificate should warn user can't do this
654+
echo TC32 Delete bound certificate should warn user can't do this
655655
echo *************************************************************
656656
echo overwrite: %overwrite%
657657
echo store path: %storepath%

0 commit comments

Comments
 (0)