tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement validator support for function objects

Browse Source 
fixes #8291
This commit is contained in:
Gunnar Beutner 2015-01-27 10:55:14 +01:00
parent a11cdbdc39
commit 13917e07b0
5 changed files with 93 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/config/config_lexer.ll
View File

@ -174,6 +174,7 @@ do { \
%string { yylval->type = TypeString; return T_TYPE_STRING; } %string { yylval->type = TypeString; return T_TYPE_STRING; }
%scalar { yylval->type = TypeScalar; return T_TYPE_SCALAR; } %scalar { yylval->type = TypeScalar; return T_TYPE_SCALAR; }
%any { yylval->type = TypeAny; return T_TYPE_ANY; } %any { yylval->type = TypeAny; return T_TYPE_ANY; }
%function { yylval->type = TypeFunction; return T_TYPE_FUNCTION; }
%name { yylval->type = TypeName; return T_TYPE_NAME; } %name { yylval->type = TypeName; return T_TYPE_NAME; }
%validator { return T_VALIDATOR; } %validator { return T_VALIDATOR; }
%require { return T_REQUIRE; } %require { return T_REQUIRE; }

2
lib/config/config_parser.yy
View File

@ -152,6 +152,7 @@ static void MakeRBinaryOp(Expression** result, Expression *left, Expression *rig
%token <type> T_TYPE_STRING "string (T_TYPE_STRING)" %token <type> T_TYPE_STRING "string (T_TYPE_STRING)"
%token <type> T_TYPE_SCALAR "scalar (T_TYPE_SCALAR)" %token <type> T_TYPE_SCALAR "scalar (T_TYPE_SCALAR)"
%token <type> T_TYPE_ANY "any (T_TYPE_ANY)" %token <type> T_TYPE_ANY "any (T_TYPE_ANY)"
%token <type> T_TYPE_FUNCTION "function (T_TYPE_FUNCTION)"
%token <type> T_TYPE_NAME "name (T_TYPE_NAME)" %token <type> T_TYPE_NAME "name (T_TYPE_NAME)"
%token T_VALIDATOR "%validator (T_VALIDATOR)" %token T_VALIDATOR "%validator (T_VALIDATOR)"
%token T_REQUIRE "%require (T_REQUIRE)" %token T_REQUIRE "%require (T_REQUIRE)"
@ -435,6 +436,7 @@ type: T_TYPE_DICTIONARY
| T_TYPE_STRING | T_TYPE_STRING
| T_TYPE_SCALAR | T_TYPE_SCALAR
| T_TYPE_ANY | T_TYPE_ANY
| T_TYPE_FUNCTION
| T_TYPE_NAME | T_TYPE_NAME
; ;

3
lib/config/typerule.cpp
View File

@ -73,6 +73,9 @@ bool TypeRule::MatchValue(const Value& value, String *hint, const TypeRuleUtilit
case TypeArray: case TypeArray:
return value.IsObjectType<Array>(); return value.IsObjectType<Array>();
case TypeFunction:
return value.IsObjectType<Function>();
case TypeName: case TypeName:
if (!value.IsScalar()) if (!value.IsScalar())
return false; return false;

1
lib/config/typerule.hpp
View File

@ -51,6 +51,7 @@ enum TypeSpecifier
TypeString, TypeString,
TypeDictionary, TypeDictionary,
TypeArray, TypeArray,
TypeFunction,
TypeName TypeName
}; };

4
lib/icinga/icinga-type.conf
View File

@ -174,7 +174,7 @@
%attribute %string "display_name", %attribute %string "display_name",
%require "update", %require "update",
%attribute %any "update", %attribute %function "update",
/* %if (methods.update == "LegacyTimePeriod") { */ /* %if (methods.update == "LegacyTimePeriod") { */
// %require "ranges", // %require "ranges",
@ -188,7 +188,7 @@
%validator "ValidateCommandAttributes", %validator "ValidateCommandAttributes",
%require "execute", %require "execute",
%attribute %any "execute", %attribute %function "execute",
/* %if (methods.execute == "PluginNotification" || methods.execute == "PluginCheck" || methods.execute == "PluginEvent") { */ /* %if (methods.execute == "PluginNotification" || methods.execute == "PluginCheck" || methods.execute == "PluginEvent") { */
// %require "command", // %require "command",