fix

Author: yanzhudd

src/aaz_dev/command/model/configuration/_command.py

@@ -324,41 +324,34 @@ def _build_output_type_by_subresource_selector(subresource_selector):
 
 
 def handle_duplicated_options(arguments, has_subresource, operation_id):
-    def _replace_arg(arg1, arg2):
-        left_arg1 = True
-        # check whether you need to replace argument
-        if _can_replace_argument(arg2, arg1, has_subresource):
-            arg1.ref_schema.arg = arg2.var
-            dropped_args.add(arg1.var)
-            left_arg1 = False
-        elif _can_replace_argument(arg1, arg2, has_subresource):
-            arg2.ref_schema.arg = arg1.var
-            dropped_args.add(arg2.var)
-            left_arg1 = True
-        else:
-            # warning developer handle duplicated options
-            logger.warning(
-                f"Duplicated Option Value: {set(arg1.options).intersection(arg2.options)} : "
-                f"{arg1.var} with {arg2.var} : {operation_id}"
-            )
-
-        return left_arg1
-
     # check argument with duplicated option names
     dropped_args = set()
     used_args = set()
     for arg in arguments.values():
         used_args.add(arg.var)
         if arg.var in dropped_args or not arg.options:
             continue
-
+        r_arg = None
         for v in arguments.values():
             if v.var in used_args or v.var in dropped_args or arg.var == v.var or not v.options:
                 continue
             if not set(arg.options).isdisjoint(v.options):
-                left_arg = _replace_arg(arg, v)
-                if not left_arg:
-                    break
+                r_arg = v
+                break
+        if r_arg:
+            # check whether you need to replace argument
+            if _can_replace_argument(r_arg, arg, has_subresource):
+                arg.ref_schema.arg = r_arg.var
+                dropped_args.add(arg.var)
+            elif _can_replace_argument(arg, r_arg, has_subresource):
+                r_arg.ref_schema.arg = arg.var
+                dropped_args.add(r_arg.var)
+            else:
+                # warning developer handle duplicated options
+                logger.warning(
+                    f"Duplicated Option Value: {set(arg.options).intersection(r_arg.options)} : "
+                    f"{arg.var} with {r_arg.var} : {operation_id}"
+                )
 
     return [arg for var, arg in arguments.items() if var not in dropped_args]
 

src/aaz_dev/swagger/controller/_example_builder.py

@@ -78,9 +78,6 @@ def __init__(self, command=None, operation=None, cmd_operation=None):
         self.cmd_operation = cmd_operation
 
     def mapping(self, example_dict):
-        if not self.operation.parameters:
-            return self.example_items
-
         for param in self.operation.parameters:
             if param.name not in example_dict:
                 continue

src/aaz_dev/swagger/model/schema/cmd_builder.py

@@ -407,8 +407,12 @@ def build_cmd_string_format(schema):
         fmt = CMDStringFormat()
 
         if schema.pattern is not None:
-            fmt.pattern = schema.pattern
-            fmt_assigned = True
+            try:
+                _ = re.compile(schema.pattern)  # verify schema pattern
+                fmt.pattern = schema.pattern
+                fmt_assigned = True
+            except Exception as err:
+                logger.warning('Invalid regex expression: traces: {}, pattern: {}'.format(str([schema.traces]), schema.pattern))
         if schema.max_length is not None:
             fmt.max_length = schema.max_length
             fmt_assigned = True