Fix output awscli on Windows

mozilla_aws_cli/cache.py

@@ -22,6 +22,11 @@
 else:
     import ConfigParser as configparser
 
+try:
+    from shlex import quote
+except ImportError:
+    from pipes import quote
+
 ZERO = datetime.timedelta(0)
 
 
@@ -147,12 +152,14 @@ def write_aws_cli_credentials(profile, credentials):
     for cred_key, aws_key in viewitems(CREDENTIALS_TO_AWS_MAP):
         if cred_key in credentials:
             process = ["aws", "configure", "set",
-                       aws_key, credentials[cred_key]]
+                       quote(aws_key), quote(credentials[cred_key])]
 
             if profile != "default":
-                process += ["--profile", profile]
+                process += ["--profile", quote(profile)]
 
-            _retval = subprocess.call(process)
+            # We have to use shell=True to function on Windows, as `aws` is
+            # aws.CMD there
+            _retval = subprocess.call(" ".join(process), shell=True)
             retval = retval | _retval
 
             logger.debug("`{}` executed with return code: {}".format(

mozilla_aws_cli/cli.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import, print_function
-from distutils.spawn import find_executable
+from shutil import which
 import os
 import logging
 
@@ -56,7 +56,7 @@ def validate_output(ctx, param, value):
     del ctx, param  # we don't use these arguments
     if value is None:
         pass
-    elif value.lower() == "awscli" and not find_executable("aws"):
+    elif value.lower() == "awscli" and which("aws") is None:
         raise click.BadParameter("AWS CLI is not detected on local system.")
 
     return value