Merge ed1720c into 2521feb

.github/workflows/keyfactor-bootstrap-workflow.yml → .github/workflows/keyfactor-starter-workflow.yml

@@ -1,4 +1,4 @@
-name: Keyfactor Bootstrap Workflow
+name: Keyfactor Bootstrap Workflow 
 
 on:
   workflow_dispatch:
@@ -11,9 +11,10 @@ on:
 
 jobs:
   call-starter-workflow:
-    uses: keyfactor/actions/.github/workflows/starter.yml@v2
+    uses: keyfactor/actions/.github/workflows/starter.yml@3.1.2
     secrets:
       token: ${{ secrets.V2BUILDTOKEN}}
       APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
       gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
       gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
+      scan_token: ${{ secrets.SAST_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.1
+- Modified build to produce .net6 and .net8 compatible versions
+- Updated README documentation to use doctool
+
 v1.0.1
 - 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.
 

Imperva/Imperva.csproj

@@ -1,20 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Keyfactor.Logging" Version="1.1.1" />
     <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="RestSharp" Version="108.0.3" />
-  </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <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" />
-  </Target>
+    <None Update="manifest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="config.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>

docsource/content.md

@@ -0,0 +1,7 @@
+## Overview
+
+
+## Requirements
+
+The Imperva Orchestrator Extension requires the creation of an Imperva account id, API id, and API key.  Please reference the [Imperva Documentation](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. 
+

docsource/imperva.md

@@ -0,0 +1 @@
+## Overview

integration-manifest.json

@@ -5,6 +5,7 @@
   "status": "production",
   "description": "The Imperva Orchestrator Extension allows for the management of SSL certificates bound to web sites managed by the Imperva cloud-based firewall.",
   "release_dir": "Imperva/bin/Release",
+  "release_project": "Imperva/Imperva.csproj",
   "support_level": "kf-supported",
   "update_catalog": true,
   "link_github": true,
@@ -13,48 +14,40 @@
       "UOFramework": "10.1",
       "pam_support": true,
       "keyfactor_platform_version": "9.10",
-      "win": {
-        "supportsCreateStore": false,
-        "supportsDiscovery": false,
-        "supportsManagementAdd": true,
-        "supportsManagementRemove": true,
-        "supportsReenrollment": false,
-        "supportsInventory": true
-      },
-      "linux": {
-        "supportsCreateStore": false,
-        "supportsDiscovery": false,
-        "supportsManagementAdd": true,
-        "supportsManagementRemove": true,
-        "supportsReenrollment": false,
-        "supportsInventory": true
-      },
-      "store_types": {
-        "Imperva": {
-          "Name": "Imperva",
-          "ShortName": "Imperva",
-          "Capability": "Imperva",
-          "ServerRequired": false,
-          "BlueprintAllowed": false,
-          "CustomAliasAllowed": "Required",
-          "PowerShell": false,
-          "PrivateKeyAllowed": "Required",
-          "SupportedOperations": {
-            "Add": true,
-            "Create": false,
-            "Discovery": false,
-            "Enrollment": false,
-            "Remove": true
-          },
-          "PasswordOptions": {
-            "Style": "Default",
-            "EntrySupported": false,
-            "StoreRequired": true
-          },
-          "Properties": [],
-          "EntryParameters": []
+      "store_types": [
+        {
+          "Imperva": {
+            "Name": "Imperva",
+            "ShortName": "Imperva",
+            "Capability": "Imperva",
+            "ServerRequired": false,
+            "BlueprintAllowed": false,
+            "CustomAliasAllowed": "Required",
+            "PowerShell": false,
+            "PrivateKeyAllowed": "Required",
+            "SupportedOperations": {
+              "Add": true,
+              "Create": false,
+              "Discovery": false,
+              "Enrollment": false,
+              "Remove": true
+            },
+            "PasswordOptions": {
+              "Style": "Default",
+              "EntrySupported": false,
+              "StoreRequired": true,
+              "StorePassword": {
+                "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.",
+                "IsPAMEligible": true
+              },
+              "Properties": [],
+              "EntryParameters": [],
+              "ClientMachineDescription": "The URL that will be used as the base URL for Imperva endpoint calls.  Should be https://my.imperva.com",
+              "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."
+            }
+          }
         }
-      }
+      ]
     }
   }
 }