#2529 remove deprecated --ca option
Merged a year ago by tkopecek. Opened 2 years ago by tkopecek.
tkopecek/koji issue2192  into  master

file modified
-1
@@ -6495,7 +6495,6 @@ 

                  'xz_options': '-z6T0',

                  'task_avail_delay': 300,

                  'cert': None,

-                 'ca': '',  # FIXME: Unused, remove in next major release

                  'serverca': None}

      if config.has_section('kojid'):

          for name, value in config.items('kojid'):

file modified
-4
@@ -120,7 +120,6 @@ 

      parser.add_option("--keytab", help=_("specify a Kerberos keytab to use"), metavar="FILE")

      parser.add_option("--principal", help=_("specify a Kerberos principal to use"))

      parser.add_option("--cert", help=_("specify a SSL cert to use"), metavar="FILE")

-     parser.add_option("--ca", help=SUPPRESS_HELP, metavar="FILE")  # FIXME: remove in 1.24

      parser.add_option("--runas", help=_("run as the specified user (requires special privileges)"))

      parser.add_option("--user", help=_("specify user"))

      parser.add_option("--password", help=_("specify password"))
@@ -149,9 +148,6 @@ 

                        help=_("list commands"))

      (options, args) = parser.parse_args()

  

-     if options.ca:

-         koji.util.deprecated("--ca option is deprecated and will be removed in 1.24")

- 

      # load local config

      try:

          result = koji.read_config(options.profile, user_config=options.configFile)

file modified
-4
@@ -1912,7 +1912,6 @@ 

          'principal': None,

          'keytab': None,

          'cert': None,

-         'ca': '',  # FIXME: remove in next major release

          'serverca': None,

          'no_ssl_verify': False,

          'authtype': None,
@@ -1990,9 +1989,6 @@ 

          else:

              result[name] = os.path.expanduser(result[name])

  

-     if result.get('ca'):

-         util.deprecated("ca option in config file is deprecated and will be removed in 1.24")

- 

      return result

  

  

@@ -74,7 +74,6 @@ 

              'method': 'ssl_login',

              'parameters': {

                  'cert': '/etc/pki/cert',

-                 'ca': ['/etc/pki/clientca', '/etc/pki/serverca'],

              },

              'result': 'success'

          }

file modified
+1 -6
@@ -27,7 +27,7 @@ 

  

  import koji

  import koji.policy

- from koji.util import LazyDict, LazyValue, to_list, deprecated

+ from koji.util import LazyDict, LazyValue, to_list

  

  

  def _(args):
@@ -54,7 +54,6 @@ 

      parser.add_option("--network-hack", action="store_true", default=False,

                        help=optparse.SUPPRESS_HELP)  # no longer used

      parser.add_option("--cert", help=_("Client SSL certificate file for authentication"))

-     parser.add_option("--ca", help=optparse.SUPPRESS_HELP)  # FIXME: remove in 1.24

      parser.add_option("--serverca", help=_("CA cert file that issued the hub certificate"))

      parser.add_option("-n", "--test", action="store_true", default=False,

                        help=_("test mode"))
@@ -131,7 +130,6 @@ 

          ['password', None, 'string'],

          ['noauth', None, 'boolean'],

          ['cert', None, 'string'],

-         ['ca', None, 'string'],  # FIXME: remove in next major release

          ['serverca', None, 'string'],

          ['server', None, 'string'],

          ['weburl', None, 'string'],
@@ -173,9 +171,6 @@ 

      (options, args) = parser.parse_args(values=defaults)

      options.config = config

  

-     if options.ca:

-         deprecated("--ca option is deprecated and will be removed in 1.24")

- 

      # figure out actions

      actions = ('prune', 'trash', 'delete', 'salvage')

      if options.action:

file modified
+2 -3
@@ -1124,7 +1124,6 @@ 

                  'recent_tasks_lifetime': 600,

                  'sleeptime': 15,

                  'cert': None,

-                 'ca': '',  # FIXME: unused, remove in next major release

                  'serverca': None,

                  'queue_file': None,

                  }
@@ -1134,8 +1133,8 @@ 

                      'max_delete_processes', 'max_repo_tasks_maven', 'dist_repo_lifetime',

                      'sleeptime', 'recent_tasks_lifetime')

          str_opts = ('topdir', 'server', 'user', 'password', 'logfile', 'principal', 'keytab',

-                     'cert', 'ca', 'serverca', 'debuginfo_tags', 'queue_file',

-                     'source_tags', 'separate_source_tags', 'ignore_tags')  # FIXME: remove ca here

+                     'cert', 'serverca', 'debuginfo_tags', 'queue_file',

+                     'source_tags', 'separate_source_tags', 'ignore_tags')

          bool_opts = ('verbose', 'debug', 'ignore_stray_repos', 'offline_retry',

                       'no_ssl_verify', 'check_external_repos')

          legacy_opts = ('with_src', 'delete_batch_size')

file modified
-1
@@ -140,7 +140,6 @@ 

                  'offline_retry_interval': 120,

                  'allowed_scms': '',

                  'cert': None,

-                 'ca': '',  # FIXME: Remove in next major release

                  'serverca': None}

      if config.has_section('kojivmd'):

          for name, value in config.items('kojivmd'):

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

2 years ago

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

2 years ago

The testing ready tag was removed temporarily because of conflict with other PR.

Metadata Update from @mfilip:
- Pull-request untagged with: testing-ready

2 years ago

Metadata Update from @mfilip:
- Pull-request tagged with: testing-ready

2 years ago

Commit 1a964a7 fixes this pull-request

Pull-Request has been merged by tkopecek

a year ago

Metadata Update from @mfilip:
- Pull-request untagged with: testing-ready

a year ago

The testing ready tag was removed temporarily because of conflict with other PR.

Metadata Update from @mfilip:
- Pull-request tagged with: testing-ready

a year ago