fix(cli): proper opts override for workflows (#436)

secator/decorators.py

@@ -269,9 +269,17 @@ def func(ctx, **opts):
 		driver = opts.pop('driver', '')
 		show = opts['show']
 		context = {'workspace_name': ws}
+
+		# Remove options whose values are default values
+		for k, v in options.items():
+			opt_name = k.replace('-', '_')
+			if opt_name in opts and opts[opt_name] == v.get('default', None):
+				del opts[opt_name]
+
 		# TODO: maybe allow this in the future
 		# unknown_opts = get_unknown_opts(ctx)
 		# opts.update(unknown_opts)
+
 		targets = opts.pop(input_type)
 		targets = expand_input(targets)
 		if sync or show:

secator/utils.py

@@ -262,8 +262,8 @@ def merge_opts(*options):
 	all_opts = {}
 	for opts in options:
 		if opts:
-			opts_noemtpy = {k: v for k, v in opts.items() if v is not None}
-			all_opts.update(opts_noemtpy)
+			opts_noempty = {k: v for k, v in opts.items() if v is not None}
+			all_opts.update(opts_noempty)
 	return all_opts