Merge pull request #15

AE-1678: enable absolute paths for asset descriptors

Author: jonasfuegen

processors/report/report_create-document.md

@@ -38,8 +38,7 @@ of this repository.
 | param.property.selector.classification | no               | Templates may introduce a set of custom properties. These properties are loaded via a dedicated set of property files qualified by this selector.                                                                              |                                                                   |
 | param.property.selector.control        | no               | Templates may introduce a set of custom properties. These properties are loaded via a dedicated set of property files qualified by this selector.                                                                              |                                                                   |
 | param.security.policy.file             | no (VR/CR only)  | The file containing the security policy configurations for the workbench.                                                                                                                                                      | <env.workbench.dir>/policies/security-policy/security-policy.json |
-| param.asset.descriptor.dir             | no               | The directory where the asset descriptors are located .                                                                                                                                                                        | <env.workbench.dir>/descriptors                                   |
-| param.asset.descriptor.path            | yes              | The path of the asset descriptor used for the document.                                                                                                                                                                        |                                                                   | 
+| param.asset.descriptor.file            | yes              | The file of the asset descriptor used for the document.                                                                                                                                                                        |                                                                   | 
 | param.reference.inventory.dir          | no (VR only)     | The directory of the reference inventory for the document.                                                                                                                                                                     |                                                                   |
 | param.reference.license.dir            | no               | The path to the reference license directory.                                                                                                                                                                                   | <param.reference.inventory.dir>/../licenses                       |
 | param.reference.component.dir          | no               | The path to the reference component directory.                                                                                                                                                                                 | <param.reference.inventory.dir>/../components                     |

processors/report/report_create-document.xml

@@ -36,7 +36,6 @@
 
         <!-- default values for report parameters -->
         <param.document.language>en</param.document.language>
-        <param.asset.descriptor.dir>${env.workbench.dir}/descriptors</param.asset.descriptor.dir>
 
         <!-- FIXME: Check whether this is required -->
         <param.reference.license.dir>${param.reference.inventory.dir}/../licenses</param.reference.license.dir>
@@ -85,8 +84,7 @@
                                 <argument>-Dreference.license.path=${param.reference.license.dir}</argument>
                                 <argument>-Dreference.component.path=${param.reference.component.dir}</argument>
                                 <argument>-Dparam.computed.inventory.dir=${param.computed.inventory.dir}</argument>
-                                <argument>-Dasset.descriptor.basedir=${param.asset.descriptor.dir}</argument>
-                                <argument>-Dasset.descriptor.path=${param.asset.descriptor.path}</argument>
+                                <argument>-Dasset.descriptor.file=${param.asset.descriptor.file}</argument>
 
                                 <argument>-Dsecurity.policy.file=${param.security.policy.file}</argument>
                                 <argument>-Denv.vulnerability.mirror.dir=${env.vulnerability.mirror.dir}</argument>
@@ -123,7 +121,7 @@
                         <configuration>
                             <rules>
                                 <requireProperty>
-                                    <property>param.asset.descriptor.path</property>
+                                    <property>param.asset.descriptor.file</property>
                                 </requireProperty>
                                 <requireProperty>
                                     <property>input.inventory.file</property>

tests/scripts/cases/report/report_create-document-01.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-export INPUT_ASSET_DESCRIPTOR_PATH="asset-descriptor_GENERIC-vulnerability-report.yaml"
 export INPUT_INVENTORY_FILE="$AGGREGATED_DIR_001/sample-asset-1.0/sample-asset-1.0-inventory.xls"
 export OUTPUT_DOCUMENT_FILE="$REPORTED_DIR_001/asset-vulnerability-report.pdf"
 export OUTPUT_COMPUTED_INVENTORY_DIR="$REPORTED_DIR_001/computed"
+export PARAM_ASSET_DESCRIPTOR_FILE="$EXTERNAL_WORKBENCH_DIR/descriptors/asset-descriptor_GENERIC-vulnerability-report.yaml"
 export PARAM_REFERENCE_INVENTORY_DIR="$EXTERNAL_WORKBENCH_DIR/inventories/example-reference-inventory/inventory"
 export PARAM_SECURITY_POLICY_FILE="$EXTERNAL_WORKBENCH_DIR/policies/security-policy/security-policy.json"
 export PARAM_DOCUMENT_TYPE="VR"

tests/scripts/cases/report/report_create-document-02.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-export INPUT_ASSET_DESCRIPTOR_PATH="asset-descriptor_GENERIC-vulnerability-report.yaml"
 export INPUT_INVENTORY_FILE="$ADVISED_DIR_002/busybox-1.35.0-enriched.xlsx"
 export OUTPUT_DOCUMENT_FILE="$REPORTED_DIR_002/busybox-1.35.0-vulnerability-report.pdf"
 export OUTPUT_COMPUTED_INVENTORY_DIR="$REPORTED_DIR_002/computed"
+export PARAM_ASSET_DESCRIPTOR_FILE="$EXTERNAL_WORKBENCH_DIR/descriptors/asset-descriptor_GENERIC-vulnerability-report.yaml"
 export PARAM_REFERENCE_INVENTORY_DIR="$EXTERNAL_WORKBENCH_DIR/inventories/example-reference-inventory/inventory"
 export PARAM_SECURITY_POLICY_FILE="$EXTERNAL_WORKBENCH_DIR/policies/security-policy/security-policy.json"
 export PARAM_DOCUMENT_TYPE="VR"

tests/scripts/processors/report/report_create-document.sh

@@ -44,9 +44,9 @@ run_maven_command() {
   [ "${DEBUG:-}" = "true" ] && CMD+=("-X")
   [ -n "${AE_CORE_VERSION:-}" ] && CMD+=("-Dae.core.version=$AE_CORE_VERSION")
   [ -n "${AE_ARTIFACT_ANALYSIS_VERSION:-}" ] && CMD+=("-Dae.artifact.analysis.version=$AE_ARTIFACT_ANALYSIS_VERSION")
-  CMD+=("-Dparam.asset.descriptor.path=$INPUT_ASSET_DESCRIPTOR_PATH")
   CMD+=("-Dinput.inventory.file=$INPUT_INVENTORY_FILE")
   CMD+=("-Doutput.document.file=$OUTPUT_DOCUMENT_FILE")
+  CMD+=("-Dparam.asset.descriptor.file=$PARAM_ASSET_DESCRIPTOR_FILE")
   CMD+=("-Dparam.computed.inventory.dir=$OUTPUT_COMPUTED_INVENTORY_DIR")
   CMD+=("-Dparam.reference.inventory.dir=$PARAM_REFERENCE_INVENTORY_DIR")
   CMD+=("-Dparam.security.policy.file=$PARAM_SECURITY_POLICY_FILE")