Skip to content

Commit 5f4b6d7

Browse files
doebrowskdoebrowsk
authored
Merge pull request #16 from Keyfactor/release-1.1
Merge 1.1.0 to main
2 parents 255fb47 + 74d4af6 commit 5f4b6d7

12 files changed

+273
-210
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Keyfactor Bootstrap Workflow
1+
name: Keyfactor Bootstrap Workflow
22

33
on:
44
workflow_dispatch:
@@ -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+
v1.1.0
2+
- Modified build to produce .net6 and .net8 compatible versions
3+
- Updated README documentation to use doctool
4+
15
v1.0.1
26
- Bug fix: Individual site timeouts will no longer end inventory but will instead skip that site and move on. Inventory in those cases will produce a warning that certificates could not be retrieved for one or more sites, but it will still return all retrieved certificates.
37

‎Imperva/Imperva.csproj‎

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

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

910
<ItemGroup>
1011
<PackageReference Include="Keyfactor.Logging" Version="1.1.1" />
1112
<PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
1213
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
1314
<PackageReference Include="RestSharp" Version="108.0.3" />
14-
</ItemGroup>
1515

16-
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
17-
<Exec Command="echo F | xcopy &quot;$(ProjectDir)config.json&quot; &quot;$(TargetDir)\config.json&quot; /Y&#xD;&#xA;echo F | xcopy &quot;$(ProjectDir)manifest.json&quot; &quot;$(TargetDir)\manifest.json&quot; /Y" />
18-
</Target>
16+
<None Update="manifest.json">
17+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
18+
</None>
19+
<None Update="config.json">
20+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21+
</None>
22+
</ItemGroup>
1923

2024
</Project>

‎README.md‎

Lines changed: 219 additions & 111 deletions
Large diffs are not rendered by default.

‎docsource/content.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## Overview
2+
3+
The Imperva Orchestrator Extension allows for the management of SSL certificates bound to web sites managed by the Imperva cloud-based firewall.
4+
5+
## Requirements
6+
7+
The Imperva Orchestrator Extension requires the creation of an Imperva account id, API id, and API key. Please reference the [Imperva Documentation](https://docs.imperva.com/bundle/cloud-application-security/page/settings/api-keys.htm#:~:text=In%20the%20Cloud%20Security%20Console%20top%20menu%20bar%2C%20click%20Account,to%20create%20a%20new%20key) for more information on creating an API id and key for use with this integration.
8+

‎docsource/images/Imperva-advanced-store-type-dialog.png‎

40.7 KB
Loading

‎docsource/images/Imperva-basic-store-type-dialog.png‎

49.6 KB
Loading

‎docsource/images/Imperva-custom-fields-store-type-dialog.png‎

27.6 KB
Loading

‎docsource/imperva.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## Overview

‎integration-manifest.json‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"status": "production",
66
"description": "The Imperva Orchestrator Extension allows for the management of SSL certificates bound to web sites managed by the Imperva cloud-based firewall.",
77
"release_dir": "Imperva/bin/Release",
8+
"release_project": "Imperva/Imperva.csproj",
89
"support_level": "kf-supported",
910
"update_catalog": true,
1011
"link_github": true,
@@ -13,48 +14,38 @@
1314
"UOFramework": "10.1",
1415
"pam_support": true,
1516
"keyfactor_platform_version": "9.10",
16-
"win": {
17-
"supportsCreateStore": false,
18-
"supportsDiscovery": false,
19-
"supportsManagementAdd": true,
20-
"supportsManagementRemove": true,
21-
"supportsReenrollment": false,
22-
"supportsInventory": true
23-
},
24-
"linux": {
25-
"supportsCreateStore": false,
26-
"supportsDiscovery": false,
27-
"supportsManagementAdd": true,
28-
"supportsManagementRemove": true,
29-
"supportsReenrollment": false,
30-
"supportsInventory": true
31-
},
32-
"store_types": {
33-
"Imperva": {
34-
"Name": "Imperva",
35-
"ShortName": "Imperva",
36-
"Capability": "Imperva",
37-
"ServerRequired": false,
38-
"BlueprintAllowed": false,
39-
"CustomAliasAllowed": "Required",
40-
"PowerShell": false,
41-
"PrivateKeyAllowed": "Required",
42-
"SupportedOperations": {
43-
"Add": true,
44-
"Create": false,
45-
"Discovery": false,
46-
"Enrollment": false,
47-
"Remove": true
48-
},
17+
"store_types": [
18+
{
19+
"Name": "Imperva",
20+
"ShortName": "Imperva",
21+
"Capability": "Imperva",
22+
"ServerRequired": false,
23+
"BlueprintAllowed": false,
24+
"CustomAliasAllowed": "Required",
25+
"PowerShell": false,
26+
"PrivateKeyAllowed": "Required",
27+
"SupportedOperations": {
28+
"Add": true,
29+
"Create": false,
30+
"Discovery": false,
31+
"Enrollment": false,
32+
"Remove": true
33+
},
4934
"PasswordOptions": {
5035
"Style": "Default",
5136
"EntrySupported": false,
52-
"StoreRequired": true
37+
"StoreRequired": true,
38+
"StorePassword": {
39+
"Description": "Your Imperva API id and API key concatenated with a comma (,}. For example: 12345,12345678-1234-1234-1234-123456789ABC. Please refer to the [Imperva documentation](https://docs.imperva.com/bundle/cloud-application-security/page/settings/api-keys.htm#:~:text=In%20the%20Cloud%20Security%20Console%20top%20menu%20bar%2C%20click%20Account,to%20create%20a%20new%20key.) as to how to create an API id and key.",
40+
"IsPAMEligible": true
41+
}
5342
},
5443
"Properties": [],
55-
"EntryParameters": []
56-
}
57-
}
44+
"EntryParameters": [],
45+
"ClientMachineDescription": "The URL that will be used as the base URL for Imperva endpoint calls. Should be https://my.imperva.com",
46+
"StorePathDescription": "Your Imperva account id. Please refer to the [Imperva documentation](https://docs.imperva.com/howto/bd68301b) as to how to find your Imperva account id."
47+
}
48+
]
5849
}
5950
}
6051
}

0 commit comments

Comments
 (0)