Merge branch '2.x'

pysteel/command.py

@@ -132,6 +132,8 @@ def resolve_args(context, args, cwd):
     cmd = os.path.split(args[0])[-1]
     if cmd == 'cf':
         resolve_cf_args(context, args, cwd)
+    if cmd == 'uaac':
+        resolve_uaac_args(context, args, cwd)
     return args
 
 
@@ -150,3 +152,14 @@ def resolve_cf_args(context, args, cwd):
             if match:
                 app = match.group(1)
                 args += ['--hostname', dns.resolve_hostname(context, app)]
+
+
+def resolve_uaac_args(context, args, cwd):
+    """
+    :type context: behave.runner.Context
+    :type args: list
+    :type cwd: str
+    """
+    if '--redirect_uri' in args:
+        idx = args.index('--redirect_uri') + 1
+        args[idx] = dns.resolve_url(context, args[idx])