Skip to content

Commit 95c1351

Browse files
irbyirby
authored
Merge 7a4b613 into 79d4741 
2 parents 79d4741 + 7a4b613 commit 95c1351

28 files changed

Lines changed: 1219 additions & 205 deletions

‎.github/workflows/build-and-test.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
run-name: Build and Test Solution - ${{ github.sha }}
2+
name: Build and Test Solution
3+
4+
on:
5+
pull_request:
6+
types: [opened, synchronize, reopened]
7+
8+
jobs:
9+
build-and-test-solution:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout Code
13+
uses: actions/checkout@v4
14+
15+
- name: Setup .NET 6
16+
uses: actions/setup-dotnet@v4
17+
with:
18+
dotnet-version: '6.0.x'
19+
20+
- name: Setup .NET 8
21+
uses: actions/setup-dotnet@v4
22+
with:
23+
dotnet-version: '8.0.x'
24+
25+
- name: Add Keyfactor NuGet Source
26+
run: dotnet nuget add source https://nuget.pkg.github.com/Keyfactor/index.json -n github -u ${{ github.actor }} -p ${{ secrets.V2BUILDTOKEN }} --store-password-in-clear-text
27+
28+
- name: Restore Dependencies
29+
run: dotnet restore
30+
31+
- name: Build solution
32+
run: dotnet build --no-restore --configuration Release
33+
34+
- name: Run Unit Tests
35+
run: dotnet test --configuration Release --no-build --logger "console;verbosity=detailed"

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Keyfactor Bootstrap Workflow
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, closed, synchronize, edited, reopened]
7+
push:
8+
create:
9+
branches:
10+
- 'release-*.*'
11+
12+
jobs:
13+
call-starter-workflow:
14+
uses: keyfactor/actions/.github/workflows/starter.yml@v4
15+
with:
16+
command_token_url: ${{ vars.DOCTOOL_COMMAND_TOKEN_URL }}
17+
command_hostname: ${{ vars.DOCTOOL_COMMAND_HOSTNAME }}
18+
command_base_api_path: ${{ vars.DOCTOOL_COMMAND_BASE_API_PATH }}
19+
secrets:
20+
token: ${{ secrets.V2BUILDTOKEN}}
21+
gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
22+
gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
23+
scan_token: ${{ secrets.SAST_TOKEN }}
24+
entra_username: ${{ secrets.DOCTOOL_ENTRA_USERNAME }}
25+
entra_password: ${{ secrets.DOCTOOL_ENTRA_PASSWD }}
26+
command_client_id: ${{ secrets.DOCTOOL_COMMAND_CLIENT_ID }}
27+
command_client_secret: ${{ secrets.DOCTOOL_COMMAND_CLIENT_SECRET }}

‎.gitignore‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# User-specific files (MonoDevelop/Xamarin Studio)
1414
*.userprefs
1515

16+
# Mono auto generated files
17+
mono_crash.*
18+
1619
# Build results
1720
[Dd]ebug/
1821
[Dd]ebugPublic/
@@ -26,6 +29,7 @@ bld/
2629
[Bb]in/
2730
[Oo]bj/
2831
[Ll]og/
32+
[Ll]ogs/
2933

3034
# Visual Studio 2015/2017 cache/options directory
3135
.vs/
@@ -39,9 +43,10 @@ Generated\ Files/
3943
[Tt]est[Rr]esult*/
4044
[Bb]uild[Ll]og.*
4145

42-
# NUNIT
46+
# NUnit
4347
*.VisualState.xml
4448
TestResult.xml
49+
nunit-*.xml
4550

4651
# Build Results of an ATL Project
4752
[Dd]ebugPS/
@@ -122,9 +127,6 @@ _ReSharper*/
122127
*.[Rr]e[Ss]harper
123128
*.DotSettings.user
124129

125-
# JustCode is a .NET coding add-in
126-
.JustCode
127-
128130
# TeamCity is a build add-in
129131
_TeamCity*
130132

@@ -182,6 +184,8 @@ PublishScripts/
182184

183185
# NuGet Packages
184186
*.nupkg
187+
# NuGet Symbol Packages
188+
*.snupkg
185189
# The packages folder can be ignored because of Package Restore
186190
**/[Pp]ackages/*
187191
# except build/, which is used as an MSBuild target.
@@ -206,6 +210,8 @@ BundleArtifacts/
206210
Package.StoreAssociation.xml
207211
_pkginfo.txt
208212
*.appx
213+
*.appxbundle
214+
*.appxupload
209215

210216
# Visual Studio cache files
211217
# files ending in .cache can be ignored
@@ -255,7 +261,9 @@ ServiceFabricBackup/
255261
*.bim.layout
256262
*.bim_*.settings
257263
*.rptproj.rsuser
258-
*- Backup*.rdl
264+
*- [Bb]ackup.rdl
265+
*- [Bb]ackup ([0-9]).rdl
266+
*- [Bb]ackup ([0-9][0-9]).rdl
259267

260268
# Microsoft Fakes
261269
FakesAssemblies/
@@ -291,10 +299,6 @@ paket-files/
291299
# FAKE - F# Make
292300
.fake/
293301

294-
# JetBrains Rider
295-
.idea/
296-
*.sln.iml
297-
298302
# CodeRush personal settings
299303
.cr/personal
300304

@@ -337,4 +341,15 @@ ASALocalRun/
337341
.localhistory/
338342

339343
# BeatPulse healthcheck temp database
340-
healthchecksdb
344+
healthchecksdb
345+
346+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
347+
MigrationBackup/
348+
349+
# Ionide (cross platform F# VS Code tools) working folder
350+
.ionide/
351+
352+
# Ignore .env files
353+
**/.env
354+
**/.env.*
355+
!**/.env.*.example

‎Cloudflare.TestConsole/Cloudflare.TestConsole.csproj‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\Cloudflare\Cloudflare.csproj" />
12+
</ItemGroup>
13+
14+
</Project>

‎Cloudflare.TestConsole/Program.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// See https://aka.ms/new-console-template for more information
2+
3+
using Keyfactor.Extensions.Orchestrator.CloudflareEdge;
4+
using Keyfactor.Orchestrators.Extensions;
5+
6+
var inventory = new Inventory();
7+
inventory.ProcessJob(new InventoryJobConfiguration(), );

‎Cloudflare.UnitTests/Cloudflare.UnitTests.csproj‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
8+
<IsPackable>false</IsPackable>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
13+
<PackageReference Include="Moq" Version="4.20.72" />
14+
<PackageReference Include="xunit" Version="2.4.1"/>
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
<PrivateAssets>all</PrivateAssets>
18+
</PackageReference>
19+
<PackageReference Include="coverlet.collector" Version="3.1.2">
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
<PrivateAssets>all</PrivateAssets>
22+
</PackageReference>
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<ProjectReference Include="..\Cloudflare\Cloudflare.csproj" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<None Update="fixtures\example_responses\example_certificate.crt">
31+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
32+
</None>
33+
</ItemGroup>
34+
35+
</Project>

0 commit comments

Comments
 (0)