Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getopt deprecation warnings (part 2) #4909

Merged
merged 7 commits into from
Dec 16, 2024
Merged

Fix getopt deprecation warnings (part 2) #4909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5bf0c3
Update pki.server.cli.config to use argparse
edewata Dec 13, 2024
b741185
Update pki.server.cli.id to use argparse
edewata Dec 13, 2024
88dc18b
Update pki.server.cli.nuxwdog to use argparse
edewata Dec 13, 2024
c7170e8
Update pki.server.cli.range to use argparse
edewata Dec 13, 2024
f9177c6
Update pki.server.cli.selftest to use argparse
edewata Dec 13, 2024
c946b82
Update pki.server.cli.upgrade to use argparse
edewata Dec 13, 2024
84e5cb7
Update pki.server.cli.webapp to use argparse
edewata Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
251 changes: 117 additions & 134 deletions base/server/python/pki/server/cli/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
# All rights reserved.
#

from __future__ import absolute_import, print_function

import getopt
import argparse
import logging
import sys

Expand All @@ -45,8 +43,27 @@ class SubsystemConfigFindCLI(pki.cli.CLI):

def __init__(self, parent):
super().__init__('find', 'Find %s configuration parameters' % parent.parent.name.upper())

self.parent = parent

self.parser = argparse.ArgumentParser(
prog=self.name,
add_help=False)
self.parser.add_argument(
'-i',
'--instance',
default='pki-tomcat')
self.parser.add_argument(
'-v',
'--verbose',
action='store_true')
self.parser.add_argument(
'--debug',
action='store_true')
self.parser.add_argument(
'--help',
action='store_true')

def print_help(self):
print('Usage: pki-server %s-config-find [OPTIONS]' % self.parent.parent.name)
print()
Expand All @@ -58,36 +75,19 @@ def print_help(self):

def execute(self, argv):

try:
opts, _ = getopt.gnu_getopt(argv, 'i:v', [
'instance=',
'verbose', 'debug', 'help'])
args = self.parser.parse_args(args=argv)

except getopt.GetoptError as e:
logger.error(e)
if args.help:
self.print_help()
sys.exit(1)

instance_name = 'pki-tomcat'
return

for o, a in opts:
if o in ('-i', '--instance'):
instance_name = a
if args.debug:
logging.getLogger().setLevel(logging.DEBUG)

elif o in ('-v', '--verbose'):
logging.getLogger().setLevel(logging.INFO)
elif args.verbose:
logging.getLogger().setLevel(logging.INFO)

elif o == '--debug':
logging.getLogger().setLevel(logging.DEBUG)

elif o == '--help':
self.print_help()
sys.exit()

else:
logger.error('Unknown option: %s', o)
self.print_help()
sys.exit(1)
instance_name = args.instance

instance = pki.server.PKIServerFactory.create(instance_name)
if not instance.exists():
Expand All @@ -113,8 +113,28 @@ def __init__(self, parent):
super().__init__(
'show',
'Show %s configuration parameter value' % parent.parent.name.upper())

self.parent = parent

self.parser = argparse.ArgumentParser(
prog=self.name,
add_help=False)
self.parser.add_argument(
'-i',
'--instance',
default='pki-tomcat')
self.parser.add_argument(
'-v',
'--verbose',
action='store_true')
self.parser.add_argument(
'--debug',
action='store_true')
self.parser.add_argument(
'--help',
action='store_true')
self.parser.add_argument('name')

def print_help(self):
print('Usage: pki-server %s-config-show [OPTIONS] <name>' % self.parent.parent.name)
print()
Expand All @@ -126,44 +146,20 @@ def print_help(self):

def execute(self, argv):

try:
opts, args = getopt.gnu_getopt(argv, 'i:v', [
'instance=',
'verbose', 'debug', 'help'])
args = self.parser.parse_args(args=argv)

except getopt.GetoptError as e:
logger.error(e)
if args.help:
self.print_help()
sys.exit(1)
return

instance_name = 'pki-tomcat'
if args.debug:
logging.getLogger().setLevel(logging.DEBUG)

for o, a in opts:
if o in ('-i', '--instance'):
instance_name = a
elif args.verbose:
logging.getLogger().setLevel(logging.INFO)

elif o in ('-v', '--verbose'):
logging.getLogger().setLevel(logging.INFO)

elif o == '--debug':
logging.getLogger().setLevel(logging.DEBUG)

elif o == '--help':
self.print_help()
sys.exit()

else:
logger.error('Unknown option: %s', o)
self.print_help()
sys.exit(1)

if len(args) < 1:
logger.error('Missing %s configuration parameter name',
self.parent.parent.name.upper())
self.print_help()
sys.exit(1)

name = args[0]
instance_name = args.instance
name = args.name

instance = pki.server.PKIServerFactory.create(instance_name)
if not instance.exists():
Expand Down Expand Up @@ -194,8 +190,29 @@ def __init__(self, parent):
super().__init__(
'set',
'Set %s configuration parameter value' % parent.parent.name.upper())

self.parent = parent

self.parser = argparse.ArgumentParser(
prog=self.name,
add_help=False)
self.parser.add_argument(
'-i',
'--instance',
default='pki-tomcat')
self.parser.add_argument(
'-v',
'--verbose',
action='store_true')
self.parser.add_argument(
'--debug',
action='store_true')
self.parser.add_argument(
'--help',
action='store_true')
self.parser.add_argument('name')
self.parser.add_argument('value')

def print_help(self):
print('Usage: pki-server %s-config-set [OPTIONS] <name> <value>'
% self.parent.parent.name)
Expand All @@ -208,51 +225,21 @@ def print_help(self):

def execute(self, argv):

try:
opts, args = getopt.gnu_getopt(argv, 'i:v', [
'instance=',
'verbose', 'debug', 'help'])
args = self.parser.parse_args(args=argv)

except getopt.GetoptError as e:
logger.error(e)
if args.help:
self.print_help()
sys.exit(1)
return

instance_name = 'pki-tomcat'
if args.debug:
logging.getLogger().setLevel(logging.DEBUG)

for o, a in opts:
if o in ('-i', '--instance'):
instance_name = a
elif args.verbose:
logging.getLogger().setLevel(logging.INFO)

elif o in ('-v', '--verbose'):
logging.getLogger().setLevel(logging.INFO)

elif o == '--debug':
logging.getLogger().setLevel(logging.DEBUG)

elif o == '--help':
self.print_help()
sys.exit()

else:
logger.error('Unknown option: %s', o)
self.print_help()
sys.exit(1)

if len(args) < 1:
logger.error('Missing %s configuration parameter name',
self.parent.parent.name.upper())
self.print_help()
sys.exit(1)

if len(args) < 2:
logger.error('Missing %s configuration parameter value',
self.parent.parent.name.upper())
self.print_help()
sys.exit(1)

name = args[0]
value = args[1]
instance_name = args.instance
name = args.name
value = args.value

instance = pki.server.PKIServerFactory.create(instance_name)
if not instance.exists():
Expand All @@ -276,8 +263,28 @@ class SubsystemConfigUnsetCLI(pki.cli.CLI):

def __init__(self, parent):
super().__init__('unset', 'Unset %s configuration parameter' % parent.parent.name.upper())

self.parent = parent

self.parser = argparse.ArgumentParser(
prog=self.name,
add_help=False)
self.parser.add_argument(
'-i',
'--instance',
default='pki-tomcat')
self.parser.add_argument(
'-v',
'--verbose',
action='store_true')
self.parser.add_argument(
'--debug',
action='store_true')
self.parser.add_argument(
'--help',
action='store_true')
self.parser.add_argument('name')

def print_help(self):
print('Usage: pki-server %s-config-unset [OPTIONS] <name>'
% self.parent.parent.name)
Expand All @@ -290,44 +297,20 @@ def print_help(self):

def execute(self, argv):

try:
opts, args = getopt.gnu_getopt(argv, 'i:v', [
'instance=',
'verbose', 'debug', 'help'])
args = self.parser.parse_args(args=argv)

except getopt.GetoptError as e:
logger.error(e)
if args.help:
self.print_help()
sys.exit(1)

instance_name = 'pki-tomcat'

for o, a in opts:
if o in ('-i', '--instance'):
instance_name = a
return

elif o in ('-v', '--verbose'):
logging.getLogger().setLevel(logging.INFO)
if args.debug:
logging.getLogger().setLevel(logging.DEBUG)

elif o == '--debug':
logging.getLogger().setLevel(logging.DEBUG)

elif o == '--help':
self.print_help()
sys.exit()

else:
logger.error('Unknown option: %s', o)
self.print_help()
sys.exit(1)

if len(args) < 1:
logger.error('Missing %s configuration parameter name',
self.parent.parent.name.upper())
self.print_help()
sys.exit(1)
elif args.verbose:
logging.getLogger().setLevel(logging.INFO)

name = args[0]
instance_name = args.instance
name = args.name

instance = pki.server.PKIServerFactory.create(instance_name)
if not instance.exists():
Expand Down
Loading
Loading