Make sure str representation is used for click options (patroni#3352)

The previous version only worked before the click-8.2
token-normalization changes

Author: hughcapet

patroni/ctl.py

@@ -1053,7 +1053,7 @@ def parse_scheduled(scheduled: Optional[str]) -> Optional[datetime.datetime]:
 @click.argument('member_names', nargs=-1)
 @option_citus_group
 @click.option('--role', '-r', help='Reload only members with this role',
-              type=role_choice, default=CtlPostgresqlRole.ANY)
+              type=role_choice, default=repr(CtlPostgresqlRole.ANY))
 @option_force
 def reload(cluster_name: str, member_names: List[str], group: Optional[int],
            force: bool, role: CtlPostgresqlRole) -> None:
@@ -1092,7 +1092,7 @@ def reload(cluster_name: str, member_names: List[str], group: Optional[int],
 @click.argument('member_names', nargs=-1)
 @option_citus_group
 @click.option('--role', '-r', help='Restart only members with this role', type=role_choice,
-              default=CtlPostgresqlRole.ANY)
+              default=repr(CtlPostgresqlRole.ANY))
 @click.option('--any', 'p_any', help='Restart a single member only', is_flag=True)
 @click.option('--scheduled', help='Timestamp of a scheduled restart in unambiguous format (e.g. ISO 8601)',
               default=None)
@@ -1924,7 +1924,8 @@ def timestamp(precision: int = 6) -> str:
 @option_citus_group
 @click.argument('member_names', nargs=-1)
 @click.argument('target', type=click.Choice(['restart', 'switchover']))
-@click.option('--role', '-r', help='Flush only members with this role', type=role_choice, default=CtlPostgresqlRole.ANY)
+@click.option('--role', '-r', help='Flush only members with this role',
+              type=role_choice, default=repr(CtlPostgresqlRole.ANY))
 @option_force
 def flush(cluster_name: str, group: Optional[int],
           member_names: List[str], force: bool, role: CtlPostgresqlRole, target: str) -> None:

tests/test_ctl.py

@@ -270,7 +270,7 @@ def test_get_dcs(self):
     def test_query(self):
         # Mutually exclusive
         for role in self.TEST_ROLES:
-            result = self.runner.invoke(ctl, ['query', 'alpha', '--member', 'abc', '--role', role])
+            result = self.runner.invoke(ctl, ['query', 'alpha', '--member', 'abc', '--role', repr(role)])
             assert result.exit_code == 1
 
         with self.runner.isolated_filesystem():
@@ -331,7 +331,7 @@ def test_dsn(self):
 
         # Mutually exclusive options
         for role in self.TEST_ROLES:
-            result = self.runner.invoke(ctl, ['dsn', 'alpha', '--role', role, '--member', 'dummy'])
+            result = self.runner.invoke(ctl, ['dsn', 'alpha', '--role', repr(role), '--member', 'dummy'])
             assert result.exit_code == 1
 
         # Non-existing member
@@ -555,7 +555,7 @@ def test_topology(self):
     @patch('patroni.dcs.AbstractDCS.get_cluster', Mock(return_value=get_cluster_initialized_with_leader()))
     def test_flush_restart(self):
         for role in self.TEST_ROLES:
-            result = self.runner.invoke(ctl, ['flush', 'dummy', 'restart', '-r', role], input='y')
+            result = self.runner.invoke(ctl, ['flush', 'dummy', 'restart', '-r', repr(role)], input='y')
             assert 'No scheduled restart' in result.output
 
         result = self.runner.invoke(ctl, ['flush', 'dummy', 'restart', '--force'])