ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Use sys.exit(msg) i/o print() and sys.exit() (#15465)

Browse source 
Any non-0 exits should be showing an error message
to stderr instead of to stdout.
This commit is contained in:
Adrian Likins 2016-08-23 11:09:23 -04:00 committed by Brian Coca
parent 76f9935634
commit 57a911e098
10 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/inventory/consul_io.py
View file

@ -126,6 +126,7 @@ be used to access the machine.
import os
import re
import argparse
import sys
from time import time
import sys
import ConfigParser
@ -191,9 +192,8 @@ except ImportError:
try:
import consul
except ImportError as e:
print("""failed=True msg='python-consul required for this module. see
http://python-consul.readthedocs.org/en/latest/#installation'""")
sys.exit(1)
sys.exit("""failed=True msg='python-consul required for this module.
See http://python-consul.readthedocs.org/en/latest/#installation'""")
from six import iteritems

9
contrib/inventory/digital_ocean.py
View file

@ -147,8 +147,7 @@ except ImportError:
try:
from dopy.manager import DoManager
except ImportError as e:
print("failed=True msg='`dopy` library required for this script'")
sys.exit(1)
sys.exit("failed=True msg='`dopy` library required for this script'")
@ -178,9 +177,9 @@ class DigitalOceanInventory(object):
# Verify credentials were set
if not hasattr(self, 'api_token'):
print('''Could not find values for DigitalOcean api_token.
sys.stderr.write('''Could not find values for DigitalOcean api_token.
They must be specified via either ini file, command line argument (--api-token),
or environment variables (DO_API_TOKEN)''')
or environment variables (DO_API_TOKEN)\n''')
sys.exit(-1)
# env command, show DigitalOcean credentials
@ -196,7 +195,7 @@ or environment variables (DO_API_TOKEN)''')
self.load_from_cache()
if len(self.data) == 0:
if self.args.force_cache:
print('''Cache is empty and --force-cache was specified''')
sys.stderr.write('''Cache is empty and --force-cache was specified\n''')
sys.exit(-1)
self.manager = DoManager(None, self.api_token, api_version=2)

6
contrib/inventory/gce.py
View file

@ -104,8 +104,7 @@ try:
from libcloud.compute.providers import get_driver
_ = Provider.GCE
except:
print("GCE inventory script requires libcloud >= 0.13")
sys.exit(1)
sys.exit("GCE inventory script requires libcloud >= 0.13")
class GceInventory(object):
@ -205,8 +204,7 @@ class GceInventory(object):
if not secrets_path.endswith('secrets.py'):
err = "Must specify libcloud secrets file as "
err += "/absolute/path/to/secrets.py"
print(err)
sys.exit(1)
sys.exit(err)
sys.path.append(os.path.dirname(secrets_path))
try:
import secrets

2
contrib/inventory/jail.py
View file

@ -34,4 +34,4 @@ if len(sys.argv) == 2 and sys.argv[1] == '--list':
elif len(sys.argv) == 3 and sys.argv[1] == '--host':
print(json.dumps({'ansible_connection': 'jail'}))
else:
print("Need an argument, either --list or --host <host>")
sys.stderr.write("Need an argument, either --list or --host <host>\n")

2
contrib/inventory/libvirt_lxc.py
View file

@ -34,4 +34,4 @@ if len(sys.argv) == 2 and sys.argv[1] == '--list':
elif len(sys.argv) == 3 and sys.argv[1] == '--host':
print(json.dumps({'ansible_connection': 'libvirt_lxc'}))
else:
print("Need an argument, either --list or --host <host>")
sys.stderr.write("Need an argument, either --list or --host <host>\n")

10
contrib/inventory/linode.py
View file

@ -185,20 +185,14 @@ class LinodeInventory(object):
for node in Linode.search(status=Linode.STATUS_RUNNING):
self.add_node(node)
except chube_api.linode_api.ApiError as e:
print("Looks like Linode's API is down:")
print("")
print(e)
sys.exit(1)
sys.exit("Looks like Linode's API is down:\n %s" % e)
def get_node(self, linode_id):
"""Gets details about a specific node."""
try:
return Linode.find(api_id=linode_id)
except chube_api.linode_api.ApiError as e:
print("Looks like Linode's API is down:")
print("")
print(e)
sys.exit(1)
sys.exit("Looks like Linode's API is down:\n%" % e)
def populate_datacenter_cache(self):
"""Creates self._datacenter_cache, containing all Datacenters indexed by ID."""

3
contrib/inventory/nova.py
View file

@ -226,5 +226,4 @@ elif len(sys.argv) == 3 and (sys.argv[1] == '--host'):
sys.exit(0)
else:
print("usage: --list ..OR.. --host <hostname>")
sys.exit(1)
sys.exit("usage: --list ..OR.. --host <hostname>")

3
contrib/inventory/openshift.py
View file

@ -62,8 +62,7 @@ def get_config(env_var, config_var):
if not result:
result = get_from_rhc_config(config_var)
if not result:
print("failed=True msg='missing %s'" % env_var)
sys.exit(1)
sys.exit("failed=True msg='missing %s'" % env_var)
return result

16
contrib/inventory/rax.py
View file

@ -166,8 +166,7 @@ try:
import pyrax
from pyrax.utils import slugify
except ImportError:
print('pyrax is required for this module')
sys.exit(1)
sys.exit('pyrax is required for this module')
from time import time
@ -402,10 +401,9 @@ def setup():
if os.path.isfile(default_creds_file):
creds_file = default_creds_file
elif not keyring_username:
sys.stderr.write('No value in environment variable %s and/or no '
'credentials file at %s\n'
% ('RAX_CREDS_FILE', default_creds_file))
sys.exit(1)
sys.exit('No value in environment variable %s and/or no '
'credentials file at %s'
% ('RAX_CREDS_FILE', default_creds_file))
identity_type = pyrax.get_setting('identity_type')
pyrax.set_setting('identity_type', identity_type or 'rackspace')
@ -418,8 +416,7 @@ def setup():
else:
pyrax.set_credential_file(creds_file, region=region)
except Exception as e:
sys.stderr.write("%s: %s\n" % (e, e.message))
sys.exit(1)
sys.exit("%s: %s" % (e, e.message))
regions = []
if region:
@ -433,8 +430,7 @@ def setup():
regions = pyrax.regions
break
elif region not in pyrax.regions:
sys.stderr.write('Unsupported region %s' % region)
sys.exit(1)
sys.exit('Unsupported region %s' % region)
elif region not in regions:
regions.append(region)

2
contrib/inventory/zone.py
View file

@ -40,4 +40,4 @@ if len(sys.argv) == 2 and sys.argv[1] == '--list':
elif len(sys.argv) == 3 and sys.argv[1] == '--host':
print(json.dumps({'ansible_connection': 'zone'}))
else:
print("Need an argument, either --list or --host <host>")
sys.stderr.write("Need an argument, either --list or --host <host>\n")