From ae181b7753db552342c5d540e0f4359c9c3dbe50 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 26 Jun 2019 13:24:24 -0400 Subject: [PATCH] Improve nodelicense error messages Check and exit should the file or directory not exist. --- confluent_client/bin/nodelicense | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/confluent_client/bin/nodelicense b/confluent_client/bin/nodelicense index 0a49c9ed..96af0d52 100755 --- a/confluent_client/bin/nodelicense +++ b/confluent_client/bin/nodelicense @@ -60,6 +60,10 @@ client.check_globbing(noderange) def install_license(session, filename): global exitcode + if not os.path.exists(filename): + sys.stderr.write('Unable to locate requested file {0}\n'.format( + filename)) + sys.exit(404) resource = '/noderange/{0}/configuration/' \ 'management_controller/licenses/'.format(noderange) filename = os.path.abspath(filename) @@ -74,6 +78,10 @@ def save_licenses(session, dirname): resource = '/noderange/{0}/configuration/' \ 'management_controller/save_licenses'.format(noderange) filename = os.path.abspath(dirname) + if not os.path.exists(filename): + sys.stderr.write('Unable to locate specified directory {0}\n'.format( + filename)) + sys.exit(404) instargs = {'dirname': filename} for res in session.create(resource, instargs): for node in res.get('databynode', {}): @@ -130,4 +138,4 @@ try: show_licenses(session) except KeyboardInterrupt: print('') -sys.exit(exitcode) \ No newline at end of file +sys.exit(exitcode)