From e8e2b79be3abe9831c2f4276e8a31d0cfe522a60 Mon Sep 17 00:00:00 2001 From: Kjell Hedstrom Date: Wed, 27 May 2015 21:22:12 -0600 Subject: [PATCH 1/2] The UI code should add the UUID if it is missing. Therefore there should never be a protomsg without it (thus it is required) --- protofiles/LuaDefinedRule.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protofiles/LuaDefinedRule.proto b/protofiles/LuaDefinedRule.proto index 4fe0bb54af99a..1a1778fac21f5 100644 --- a/protofiles/LuaDefinedRule.proto +++ b/protofiles/LuaDefinedRule.proto @@ -22,7 +22,7 @@ message LuaDefinedRule { optional bool enabled = 4; optional string description = 5; optional string author = 6; - optional string uuid = 7; + required string uuid = 7; optional uint64 last_modified_date =8; } @@ -34,4 +34,4 @@ message LuaRules { required string rule = 2; } repeated LuaSerializedRule rules =1; -} \ No newline at end of file +} From d9e363b90351a84f814808621f5008e46df37ef9 Mon Sep 17 00:00:00 2001 From: Kjell Hedstrom Date: Tue, 2 Jun 2015 11:25:21 -0600 Subject: [PATCH 2/2] merge fix --- protofiles/LuaDefinedRule.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protofiles/LuaDefinedRule.proto b/protofiles/LuaDefinedRule.proto index e6cd133e16efc..8cc454888a5b7 100644 --- a/protofiles/LuaDefinedRule.proto +++ b/protofiles/LuaDefinedRule.proto @@ -2,7 +2,7 @@ package protoMsg; option java_package = "com.logrhythm.nm.message"; option java_outer_classname = "LuaRulesMsg"; - +import "Rule.proto"; message LuaDefinedRule { enum LuaType { @@ -25,4 +25,4 @@ message LuaDefinedRule { message LuaRules { repeated LuaDefinedRule rules = 1; -} \ No newline at end of file +}