From 4f86fe96981efcb843d13c53c75cf8341577030b Mon Sep 17 00:00:00 2001
From: kadraman <kevin.lee@microfocus.com>
Date: Fri, 19 Apr 2024 08:44:56 +0100
Subject: [PATCH 1/3] Added HTTP Header to support ValueEdge/Octane integration

---
 .../OctaneAuthenticatingRestConnection.java   |  6 ++-
 bugtracker/config/FoDToOctane.xml             | 38 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/bugtracker-target-octane/src/main/java/com/fortify/bugtracker/tgt/octane/connection/OctaneAuthenticatingRestConnection.java b/bugtracker-target-octane/src/main/java/com/fortify/bugtracker/tgt/octane/connection/OctaneAuthenticatingRestConnection.java
index 68ad1ee..cb12b84 100644
--- a/bugtracker-target-octane/src/main/java/com/fortify/bugtracker/tgt/octane/connection/OctaneAuthenticatingRestConnection.java
+++ b/bugtracker-target-octane/src/main/java/com/fortify/bugtracker/tgt/octane/connection/OctaneAuthenticatingRestConnection.java
@@ -147,7 +147,8 @@ public void addComment(TargetIssueLocator targetIssueLocator, String comment) {
 				.path(octaneIssueId.getSharedSpaceAndWorkspaceId().getSharedSpaceUid())
 				.path("/workspaces/")
 				.path(octaneIssueId.getSharedSpaceAndWorkspaceId().getWorkspaceId())
-				.path("/comments"),
+				.path("/comments")
+				.request().header("HPECLIENTTYPE", "OCTANE_MIGRATION"),
 				Entity.entity(request, "application/json"), JSONMap.class);
 	}
 	
@@ -213,7 +214,8 @@ private JSONMap submitOrUpdateIssue(OctaneSharedSpaceAndWorkspaceId sharedSpaceA
 				.path(sharedSpaceAndWorkspaceId.getSharedSpaceUid())
 				.path("/workspaces/")
 				.path(sharedSpaceAndWorkspaceId.getWorkspaceId())
-				.path("/defects"),
+				.path("/defects")
+				.request().header("HPECLIENTTYPE", "OCTANE_MIGRATION"),
 				Entity.entity(data, "application/json"), JSONMap.class);
 	}
 	
diff --git a/bugtracker/config/FoDToOctane.xml b/bugtracker/config/FoDToOctane.xml
index 9f1d011..07ff882 100644
--- a/bugtracker/config/FoDToOctane.xml
+++ b/bugtracker/config/FoDToOctane.xml
@@ -40,6 +40,31 @@
 		configuration components and properties. 
 	 -->
 	
+	<!-- 
+		The following map lists all of the options that can be set for the integration, uncomment any
+		which you want to default, e.g. "FoDBaseUrl", "OctaneBaseUrl". You can also set/override any of the below 
+		on the command line, e.g.
+
+		>FortifyBugTrackerUtility.bat -configFile .\FoDToOctane.xml -FoDClientId YOUR_CLIENT_ID \
+			-FoDClientSecret YOUR_CLIENT_SECRET -FoDReleaseId 1159568 \
+			-OctaneSharedSpaceUid 416002 -OctaneWorkspaceId 79003 \
+			-OctaneClientId YOUR_CLIENT_ID -OctaneClientSecret YOUR_CLIENT_SECRET
+	
+	-->
+	<util:map id="cliOptionsDefaultValues">
+		<!--entry key="FoDBaseUrl" value="https://ams.fortify.com" /-->
+		<!--entry key="FoDTenant" value="YOUR_TENANT_ID" /-->
+		<!--entry key="FoDClientId" value="YOUR_CLIENT_ID" /-->
+		<!--entry key="FoDClientSecret" value="YOUR_CLIENT_SECRET" /-->
+		<!--entry key="FoDReleaseId" value="YOUR_RELEASE_ID" /-->
+		<!--entry key="FoDReleaseName" value="YOUR_APPLICATION_NAME:YOUR_RELEASE_NAME" /-->
+		<!--entry key="OctaneBaseUrl" value="https://almoctane-ams.saas.microfocus.com/" /-->
+		<!--entry key="OctaneSharedSpaceUid" value="YOUR_SHARED_SPACE_ID" /-->
+		<!--entry key="OctaneWorkspaceId" value="YOUR_WORKSPACE_ID" /-->	
+		<!--entry key="OctaneClientId" value="YOUR_CLIENT_ID" /-->
+		<!--entry key="OctaneClientSecret" value="YOUR_CLIENT_SECRET" /-->
+	</util:map>
+
 	<context:component-scan base-package="com.fortify.bugtracker.src.fod, com.fortify.bugtracker.tgt.octane"/>
 	
 	<bean class="com.fortify.bugtracker.src.fod.config.FoDSourceVulnerabilitiesConfiguration">	
@@ -73,6 +98,19 @@
 			<entry key="phase.name" value="New"/>
 			<entry key="parent.type" value="work_item"/>
 			<entry key="parent.name" value="Backlog"/>
+			<entry key="severity.type" value='list_node'/>
+			<entry key="severity.name" value="${{'Critical':'Critical','High':'High','Medium':'Medium','Low':'Low'}.get(severityString)}"/>
+			<!-- 
+				The following fields have beend added to Octane/ValueEdge to support integration.
+				They might not exist in your instance. If they do, add them to the default Defect
+				form for better visibility. 
+			-->
+			<entry key="category.type" value="list_node"/>
+			<entry key="category.name" value="Security"/>
+			<entry key="item_origin.type" value="list_node"/>
+			<entry key="item_origin.name" value="Fortify"/>
+			<!--entry key="detected_in_release.type" value="release"/-->
+			<!--entry key="detected_in_release.name" value="YOUR_OCTANE_RELEASE"/--> 
 		</map></property>
 		
 		<property name="appendedFields"><map>

From 5e468d03da4223137ceff5e9059f34549bcdc701 Mon Sep 17 00:00:00 2001
From: kadraman <kevin.lee@microfocus.com>
Date: Mon, 22 Apr 2024 11:01:55 +0100
Subject: [PATCH 2/3] Minor change to FoDOctane.xml

---
 bugtracker/config/FoDToOctane.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bugtracker/config/FoDToOctane.xml b/bugtracker/config/FoDToOctane.xml
index 07ff882..62af3a5 100644
--- a/bugtracker/config/FoDToOctane.xml
+++ b/bugtracker/config/FoDToOctane.xml
@@ -99,7 +99,7 @@
 			<entry key="parent.type" value="work_item"/>
 			<entry key="parent.name" value="Backlog"/>
 			<entry key="severity.type" value='list_node'/>
-			<entry key="severity.name" value="${{'Critical':'Critical','High':'High','Medium':'Medium','Low':'Low'}.get(severityString)}"/>
+			<entry key="severity.name" value="${severityString)}"/>
 			<!-- 
 				The following fields have beend added to Octane/ValueEdge to support integration.
 				They might not exist in your instance. If they do, add them to the default Defect

From cbc7a01883635a06d52eba5434eb3bd98aff62f8 Mon Sep 17 00:00:00 2001
From: kadraman <kevin.lee@microfocus.com>
Date: Fri, 26 Apr 2024 09:28:24 +0100
Subject: [PATCH 3/3] Commented out Fortify integration fields in case they are
 not present in old instances.

---
 bugtracker/config/FoDToOctane.xml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/bugtracker/config/FoDToOctane.xml b/bugtracker/config/FoDToOctane.xml
index 62af3a5..785011b 100644
--- a/bugtracker/config/FoDToOctane.xml
+++ b/bugtracker/config/FoDToOctane.xml
@@ -45,9 +45,9 @@
 		which you want to default, e.g. "FoDBaseUrl", "OctaneBaseUrl". You can also set/override any of the below 
 		on the command line, e.g.
 
-		>FortifyBugTrackerUtility.bat -configFile .\FoDToOctane.xml -FoDClientId YOUR_CLIENT_ID \
-			-FoDClientSecret YOUR_CLIENT_SECRET -FoDReleaseId 1159568 \
-			-OctaneSharedSpaceUid 416002 -OctaneWorkspaceId 79003 \
+		>FortifyBugTrackerUtility.bat -configFile .\FoDToOctane.xml -FoDBaseUrl YOUR_FOD_URL -FoDClientId YOUR_CLIENT_ID \
+			-FoDClientSecret YOUR_CLIENT_SECRET -FoDReleaseId YOUR_FOD_RELEASE_ID \
+			-OctaneBaseUrl YOUR_OCTANE_URL -OctaneSharedSpaceUid YOUR_SHARED_SPACE_ID -OctaneWorkspaceId YOUR_WORKSPACE_ID \
 			-OctaneClientId YOUR_CLIENT_ID -OctaneClientSecret YOUR_CLIENT_SECRET
 	
 	-->
@@ -99,18 +99,26 @@
 			<entry key="parent.type" value="work_item"/>
 			<entry key="parent.name" value="Backlog"/>
 			<entry key="severity.type" value='list_node'/>
-			<entry key="severity.name" value="${severityString)}"/>
+        	<entry key="severity.name" value="${severityString}"/>
 			<!-- 
-				The following fields have beend added to Octane/ValueEdge to support integration.
-				They might not exist in your instance. If they do, add them to the default Defect
-				form for better visibility. 
+				The following fields have been added to ALM Octane/ValueEdge to support integration.
+				However, they might not exist in old instances, please check and uncomment to
+				support better mapping/traceability between ALM Octane/ValueEdge and Fortify.
 			-->
+			<!--
 			<entry key="category.type" value="list_node"/>
 			<entry key="category.name" value="Security"/>
 			<entry key="item_origin.type" value="list_node"/>
 			<entry key="item_origin.name" value="Fortify"/>
-			<!--entry key="detected_in_release.type" value="release"/-->
-			<!--entry key="detected_in_release.name" value="YOUR_OCTANE_RELEASE"/--> 
+			-->
+			<!--
+				It is recommended to map your FoD Release to a Release in ALM Octane/ValueEdge
+				by uncommenting the below and setting an appropriate name
+			-->
+			<!--
+			<entry key="detected_in_release.type" value="release"/>
+			<entry key="detected_in_release.name" value="YOUR_OCTANE_RELEASE"/>
+			-->
 		</map></property>
 		
 		<property name="appendedFields"><map>