xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 11:01:09 +00:00
Code Issues Projects Releases Wiki Activity

Warn user of unworkable syntax

Browse Source 
When used in {} expressions, attributes must obey python syntax rules,
try out the attribute name and report the issue when it would be a problem.
This commit is contained in:
Jarrod Johnson 2022-02-11 14:32:52 -05:00
parent 522d7e2b59
commit f547071d38
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
confluent_server/confluent/plugins/configuration/attributes.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import ast
import confluent.exceptions as exc
import confluent.messages as msg
import confluent.config.attributes as allattributes
@ -188,6 +189,12 @@ def update_nodegroup(group, element, configmanager, inputdata):
for attrib in inputdata.attribs:
if inputdata.attribs[attrib] is None:
clearattribs.append(attrib)
else:
try:
ast.parse(attrib)
except SyntaxError as e:
markup = (e.text[:e.offset-1] + '-->' + e.text[e.offset-1] + '<--' + e.text[e.offset:]).strip()
raise exc.InvalidArgumentException('Syntax error in attribute name: "{0}"'.format(markup))
for attrib in clearattribs:
del inputdata.attribs[attrib]
if clearattribs:
@ -280,6 +287,12 @@ def update_nodes(nodes, element, configmanager, inputdata):
for matchattrib in currnodeattrs.get(node, {}):
updatenode[matchattrib] = updatenode[attrib]
del updatenode[attrib]
else:
try:
ast.parse(attrib)
except SyntaxError as e:
markup = (e.text[:e.offset-1] + '-->' + e.text[e.offset-1] + '<--' + e.text[e.offset:]).strip()
raise exc.InvalidArgumentException('Syntax error in attribute name: "{0}"'.format(markup))
if len(clearattribs) > 0:
configmanager.clear_node_attributes([node], clearattribs)
updatedict[node] = updatenode