From f6f67f4b60acdaceed2977d0a29fb8e5e8edc0c4 Mon Sep 17 00:00:00 2001 From: Anthony Chan Date: Fri, 6 Dec 2024 14:34:39 -0700 Subject: [PATCH 1/3] Simplify environment variable object for more compact data representation Signed-off-by: Anthony Chan --- dictionary.json | 10 ---------- objects/environment_variable.json | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dictionary.json b/dictionary.json index b74b01da2..c877d4e65 100644 --- a/dictionary.json +++ b/dictionary.json @@ -5152,16 +5152,6 @@ "type": "string_t", "is_array": true }, - "variable_name": { - "caption": "Variable Name", - "description": "The name of a variable. See specific usage.", - "type": "long_string" - }, - "variable_value": { - "caption": "Variable Value", - "description": "The value of a variable. See specific usage.", - "type": "long_string" - }, "vector_string": { "caption": "Vector String", "description": "The CVSS vector string is a text representation of a set of CVSS metrics. It is commonly used to record or transfer CVSS metric information in a concise form. For example: 3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:N/A:H.", diff --git a/objects/environment_variable.json b/objects/environment_variable.json index 805febab9..c6eed4802 100644 --- a/objects/environment_variable.json +++ b/objects/environment_variable.json @@ -4,13 +4,22 @@ "extends": "object", "name": "environment_variable", "attributes": { - "variable_name": { - "description": "The name of the environment variable. Note that some operating systems permit environment variables to have very long names.", + "name": { + "caption": "Name", + "description": "The name of the environment variable. For very long names, a name_truncated label indicates truncation.", + "type": "string_t", "requirement": "required" }, - "variable_value": { - "description": "The value of the environment variable. Note that some operating systems permit environment variables to have very long values.", + "value": { + "caption": "Value", + "description": "The value of the environment variable. For very long values, a value_truncated label indicates truncation.", + "type": "string_t", "requirement": "required" + + }, + "labels": { + "description": "Annotation. Defined values are: name_truncated and value_truncated.", + "requirement": "optional" } } } \ No newline at end of file From fc8e84625fe53942201ef216266fcaf715209fc0 Mon Sep 17 00:00:00 2001 From: Anthony Chan Date: Wed, 11 Dec 2024 16:10:13 -0700 Subject: [PATCH 2/3] Reuse existing name and value attributes in dictionary Signed-off-by: Anthony Chan --- objects/environment_variable.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/objects/environment_variable.json b/objects/environment_variable.json index c6eed4802..b09ba6650 100644 --- a/objects/environment_variable.json +++ b/objects/environment_variable.json @@ -5,15 +5,11 @@ "name": "environment_variable", "attributes": { "name": { - "caption": "Name", "description": "The name of the environment variable. For very long names, a name_truncated label indicates truncation.", - "type": "string_t", "requirement": "required" }, "value": { - "caption": "Value", "description": "The value of the environment variable. For very long values, a value_truncated label indicates truncation.", - "type": "string_t", "requirement": "required" }, From bf78380e9b1ca2e6d934aa69235e4238e340bb1d Mon Sep 17 00:00:00 2001 From: Anthony Chan Date: Fri, 13 Dec 2024 08:16:07 -0700 Subject: [PATCH 3/3] Remove environment_variable.labels truncation indicator for concern it may set an undesired precedent Signed-off-by: Anthony Chan --- objects/environment_variable.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/objects/environment_variable.json b/objects/environment_variable.json index b09ba6650..c3d0f469a 100644 --- a/objects/environment_variable.json +++ b/objects/environment_variable.json @@ -5,17 +5,13 @@ "name": "environment_variable", "attributes": { "name": { - "description": "The name of the environment variable. For very long names, a name_truncated label indicates truncation.", + "description": "The name of the environment variable.", "requirement": "required" }, "value": { - "description": "The value of the environment variable. For very long values, a value_truncated label indicates truncation.", + "description": "The value of the environment variable.", "requirement": "required" - }, - "labels": { - "description": "Annotation. Defined values are: name_truncated and value_truncated.", - "requirement": "optional" } } } \ No newline at end of file