From 10af2857c3e994861e696de4c773e1eaec217533 Mon Sep 17 00:00:00 2001
From: maxhotta <nobuto.hotta@broadcom.com>
Date: Thu, 16 Nov 2023 00:18:50 +0000
Subject: [PATCH 1/3] Deprecating the proxy (endpoint) object in order to keep
 the network proxy related fields together in the profile.  A new field
 (proxy_endpoint) has been added to replace it.

---
 dictionary.json             | 8 ++++----
 events/network/network.json | 4 ++++
 profiles/network_proxy.json | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dictionary.json b/dictionary.json
index 310b1ac2c..da8b2664a 100644
--- a/dictionary.json
+++ b/dictionary.json
@@ -2528,10 +2528,10 @@
       "description": "The proxy (server) in a network connection.",
       "type": "network_proxy"
     },
-    "purl":{
-      "caption": "Package URL",
-      "description": "A purl is a URL string used to identify and locate a software package in a mostly universal and uniform way across programing languages, package managers, packaging conventions, tools, APIs and databases.",
-      "type": "string_t"
+    "proxy_endpoint": {
+      "caption": "Proxy Endpoint",
+      "description": "The proxy (server) in a network connection.",
+      "type": "network_proxy"
     },
     "proxy_connection_info": {
       "caption": "Proxy Connection Info",
diff --git a/events/network/network.json b/events/network/network.json
index 567a0b794..83e26c6d9 100644
--- a/events/network/network.json
+++ b/events/network/network.json
@@ -60,6 +60,10 @@
       "requirement": "required"
     },
     "proxy": {
+      "@deprecated": {
+        "message": "Proxy has been decoupled from this object, instead use <code> proxy_endpoint </code> in the <code> Network Proxy </code> profile.",
+        "since": "v1.1.0"
+      },
       "group": "primary",
       "requirement": "optional"
     },
diff --git a/profiles/network_proxy.json b/profiles/network_proxy.json
index 0ee8760c2..6793c8357 100644
--- a/profiles/network_proxy.json
+++ b/profiles/network_proxy.json
@@ -7,6 +7,10 @@
     "group": "context"
   },
   "attributes": {
+    "proxy_endpoint": {
+      "description": "The proxy (server) in a network connection.",
+      "requirement": "optional"
+    },
     "proxy_connection_info": {
       "description": "The connection information from the proxy server to the remote server.",
       "requirement": "recommended"

From 96ff01fd3afaf85065ac07b6973a6622fc2d945a Mon Sep 17 00:00:00 2001
From: maxhotta <nobuto.hotta@broadcom.com>
Date: Thu, 16 Nov 2023 00:27:37 +0000
Subject: [PATCH 2/3] Adding back purl

---
 dictionary.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dictionary.json b/dictionary.json
index da8b2664a..98ca17856 100644
--- a/dictionary.json
+++ b/dictionary.json
@@ -2533,6 +2533,11 @@
       "description": "The proxy (server) in a network connection.",
       "type": "network_proxy"
     },
+    "purl":{
+      "caption": "Package URL",
+      "description": "A purl is a URL string used to identify and locate a software package in a mostly universal and uniform way across programing languages, package managers, packaging conventions, tools, APIs and databases.",
+      "type": "string_t"
+    },
     "proxy_connection_info": {
       "caption": "Proxy Connection Info",
       "description": "The connection information from the proxy server to the remote server.",

From 453dc1b1377d1f9e1e974547f2f555673338b86d Mon Sep 17 00:00:00 2001
From: maxhotta <nobuto.hotta@broadcom.com>
Date: Thu, 16 Nov 2023 17:28:22 +0000
Subject: [PATCH 3/3] Updated with suggestions on deprecating the proxy
 attribute.  Fixed the version to 1.0.0

---
 dictionary.json             | 4 ++++
 events/network/network.json | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dictionary.json b/dictionary.json
index 98ca17856..3661b3764 100644
--- a/dictionary.json
+++ b/dictionary.json
@@ -2524,6 +2524,10 @@
       "type": "string_t"
     },
     "proxy": {
+      "@deprecated": {
+        "message": "Use the <code> proxy_endpoint </code> attribute instead.",
+        "since": "v1.0.0"
+      },
       "caption": "Proxy",
       "description": "The proxy (server) in a network connection.",
       "type": "network_proxy"
diff --git a/events/network/network.json b/events/network/network.json
index 83e26c6d9..567a0b794 100644
--- a/events/network/network.json
+++ b/events/network/network.json
@@ -60,10 +60,6 @@
       "requirement": "required"
     },
     "proxy": {
-      "@deprecated": {
-        "message": "Proxy has been decoupled from this object, instead use <code> proxy_endpoint </code> in the <code> Network Proxy </code> profile.",
-        "since": "v1.1.0"
-      },
       "group": "primary",
       "requirement": "optional"
     },