Proto updates (#68)

* Proto updates for future workflows Co-authored-by: o.omahony <[email protected]>
nginx · Oct 11, 2022 · 24aa7dc · 24aa7dc
1 parent caa7a71
commit 24aa7dc
Show file tree

Hide file tree

Showing 15 changed files with 2,325 additions and 345 deletions.
diff --git a/sdk/proto/agent.proto b/sdk/proto/agent.proto
@@ -14,7 +14,7 @@ message AgentConnectRequest {
     reserved 1;
     reserved "identity";
     AgentMeta meta = 2  [(gogoproto.jsontag) = "meta"];
-    repeated NginxDetails details = 3 [(gogoproto.jsontag) = "details"];
+    repeated NginxDetails details = 3 [(gogoproto.jsontag) = "details"]; // moving to dataplane_software_details
     HostInfo host = 4 [(gogoproto.jsontag) = "host"];
     repeated DataplaneSoftwareDetails dataplane_software_details = 5 [(gogoproto.jsontag) = "dataplane_software_details"];
 }

diff --git a/sdk/proto/command.pb.go b/sdk/proto/command.pb.go
diff --git a/sdk/proto/command.proto b/sdk/proto/command.proto
@@ -10,7 +10,7 @@ import "nginx.proto";
 import "config.proto";
 import "events/event.proto";
 import "dp_software_details.proto";
-
+import "nap.proto";
 
 // Command is the envelope sent between the management plane and the data plane, requesting some action or reporting a response
 message Command {
@@ -82,10 +82,23 @@ message CommandStatusResponse {
 // DataplaneStatus reports Dataplane metrics the Agent is aware of
 message DataplaneStatus {
   string system_id = 1 [(gogoproto.jsontag) = "system_id" ];
-  repeated NginxDetails details = 2 [(gogoproto.jsontag) = "details" ];
+  repeated NginxDetails details = 2 [(gogoproto.jsontag) = "details" ]; // moving to dataplane_software_details
   HostInfo host = 3 [(gogoproto.jsontag) = "host" ];
-  repeated NginxHealth healths = 5 [(gogoproto.jsontag) = "healths" ];
+  repeated NginxHealth healths = 5 [(gogoproto.jsontag) = "healths" ]; // moving to DataplaneSoftwareHealth
   repeated DataplaneSoftwareDetails dataplane_software_details = 6 [(gogoproto.jsontag) = "dataplane_software_details"];
+  repeated DataplaneSoftwareHealth dataplane_software_healths = 7 [(gogoproto.jsontag) = "dataplane_software_healths"];
+}
+
+message DataplaneSoftwareHealth {
+    oneof health {
+        NginxHealth nginx_health = 1 [(gogoproto.jsontag) = "nginx_health"];
+        AppProtectWAFHealth app_protect_waf_health = 2 [(gogoproto.jsontag) = "app_protect_waf_health"];
+    }
+}
+
+message DataplaneUpdate {
+    HostInfo host = 1 [(gogoproto.jsontag) = "host"];
+    repeated DataplaneSoftwareDetails dataplane_software_details = 2 [(gogoproto.jsontag) = "dataplane_software_details"];
 }
 
 message DownloadRequest {

diff --git a/sdk/proto/dp_software_details.proto b/sdk/proto/dp_software_details.proto
@@ -11,5 +11,4 @@ message DataplaneSoftwareDetails {
     oneof data {
         AppProtectWAFDetails app_protect_waf_details = 1 [(gogoproto.jsontag) = "app_protect_waf_details"];
     }
-
 }
diff --git a/sdk/proto/nap.proto b/sdk/proto/nap.proto
@@ -7,9 +7,9 @@ import "gogo.proto";
 // AppProtectWAFDetails reports the details of Nginx App Protect
 message AppProtectWAFDetails {
     string waf_version = 1 [(gogoproto.jsontag) = "waf_version"];
-    string attack_signatures_version = 2 [(gogoproto.jsontag) = "attack_signatures_version"];
-    string threat_campaigns_version = 3 [(gogoproto.jsontag) = "threat_campaigns_version"];
-    AppProtectWAFHealth health = 4 [(gogoproto.jsontag) = "health"];
+    string attack_signatures_version = 2 [(gogoproto.jsontag) = "attack_signatures_version"]; // deprecating
+    string threat_campaigns_version = 3 [(gogoproto.jsontag) = "threat_campaigns_version"]; // deprecating
+    AppProtectWAFHealth health = 4 [(gogoproto.jsontag) = "health"]; // deprecating
 }
 
 // AppProtectWAFHealth reports the health details of Nginx App Protect
@@ -22,4 +22,4 @@ message AppProtectWAFHealth {
     string system_id = 1 [(gogoproto.jsontag) = "system_id"];
     AppProtectWAFStatus app_protect_waf_status = 2 [(gogoproto.jsontag) = "app_protect_waf_status"];
     string degraded_reason = 3 [(gogoproto.jsontag) = "degraded_reason"];
-}
+}
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/command.pb.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/command.pb.go
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/command.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/command.proto
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/dp_software_details.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/dp_software_details.proto
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nap.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nap.proto
diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,4 @@ message DataplaneSoftwareDetails { @@
         oneof data {
             AppProtectWAFDetails app_protect_waf_details = 1 [(gogoproto.jsontag) = "app_protect_waf_details"];
         }
     }