Skip to content

Commit 7d23b9e

Browse files
kdailykdaily
authored
Merge pull request #9547 from kdaily/configure-list-table-accessibility
[v2] Adjust format of table for accessibility
2 parents f5c09aa + 913c948 commit 7d23b9e

File tree

3 files changed

+27
-31
lines changed

3 files changed

+27
-31
lines changed

‎awscli/customizations/configure/list.py‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,23 @@ class ConfigureListCommand(BasicCommand):
4141
'To show your current configuration values::\n'
4242
'\n'
4343
' $ aws configure list\n'
44-
' Name Value Type Location\n'
45-
' ---- ----- ---- --------\n'
46-
' profile <not set> None None\n'
47-
' access_key ****************ABCD config_file ~/.aws/config\n'
48-
' secret_key ****************ABCD config_file ~/.aws/config\n'
49-
' region us-west-2 env AWS_DEFAULT_REGION\n'
44+
' NAME : VALUE : TYPE : LOCATION\n'
45+
' profile : <not set> : None : None\n'
46+
' access_key : ****************ABCD : config_file : ~/.aws/config\n'
47+
' secret_key : ****************ABCD : config_file : ~/.aws/config\n'
48+
' region : us-west-2 : env : AWS_DEFAULT_REGION\n'
5049
'\n'
5150
)
5251

5352
def __init__(self, session, stream=None):
54-
super(ConfigureListCommand, self).__init__(session)
53+
super().__init__(session)
5554
if stream is None:
5655
stream = sys.stdout
5756
self._stream = stream
5857

5958
def _run_main(self, args, parsed_globals):
6059
self._display_config_value(
61-
ConfigValue('Value', 'Type', 'Location'), 'Name'
62-
)
63-
self._display_config_value(
64-
ConfigValue('-----', '----', '--------'), '----'
60+
ConfigValue('VALUE', 'TYPE', 'LOCATION'), 'NAME'
6561
)
6662

6763
if parsed_globals and parsed_globals.profile is not None:
@@ -80,13 +76,10 @@ def _run_main(self, args, parsed_globals):
8076

8177
def _display_config_value(self, config_value, config_name):
8278
self._stream.write(
83-
'%10s %24s %16s %s\n'
84-
% (
85-
config_name,
86-
config_value.value,
87-
config_value.config_type,
88-
config_value.config_variable,
89-
)
79+
f'{config_name:<10} : '
80+
f'{config_value.value:<24} : '
81+
f'{str(config_value.config_type):<16} : '
82+
f'{str(config_value.config_variable)}\n'
9083
)
9184

9285
def _lookup_credentials(self):

‎tests/functional/configure/test_configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_list_command(self):
5757
stdout, _, _ = self.run_cmd("configure list")
5858
self.assertRegex(stdout, r"access_key.+config-file")
5959
self.assertRegex(stdout, r"secret_key.+config-file")
60-
self.assertRegex(stdout, r"region\s+us-west-2\s+config-file")
60+
self.assertRegex(stdout, r"region\s+:\sus-west-2\s+:\sconfig-file")
6161

6262
def test_get_command(self):
6363
self.set_config_file_contents(

‎tests/unit/customizations/configure/test_list.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ def test_configure_list_command_nothing_set(self):
3232
self.configure_list = ConfigureListCommand(session, stream)
3333
self.configure_list(args=[], parsed_globals=None)
3434
rendered = stream.getvalue()
35-
self.assertRegex(rendered, r'profile\s+<not set>')
36-
self.assertRegex(rendered, r'access_key\s+<not set>')
37-
self.assertRegex(rendered, r'secret_key\s+<not set>')
38-
self.assertRegex(rendered, r'region\s+<not set>')
35+
self.assertRegex(rendered, r'profile\s+: <not set>')
36+
self.assertRegex(rendered, r'access_key\s+: <not set>')
37+
self.assertRegex(rendered, r'secret_key\s+: <not set>')
38+
self.assertRegex(rendered, r'region\s+: <not set>')
3939

4040
def test_configure_from_env(self):
4141
env_vars = {'profile': 'myprofilename'}
@@ -52,7 +52,7 @@ def test_configure_from_env(self):
5252
self.configure_list(args=[], parsed_globals=None)
5353
rendered = stream.getvalue()
5454
self.assertRegex(
55-
rendered, r'profile\s+myprofilename\s+env\s+PROFILE_ENV_VAR'
55+
rendered, r'profile\s+: myprofilename\s+: env\s+: PROFILE_ENV_VAR'
5656
)
5757

5858
def test_configure_from_config_file(self):
@@ -70,7 +70,8 @@ def test_configure_from_config_file(self):
7070
self.configure_list(args=[], parsed_globals=None)
7171
rendered = stream.getvalue()
7272
self.assertRegex(
73-
rendered, r'region\s+us-west-2\s+config-file\s+/config/location'
73+
rendered,
74+
r'region\s+: us-west-2\s+: config-file\s+: /config/location',
7475
)
7576

7677
def test_configure_from_multiple_sources(self):
@@ -102,25 +103,27 @@ def test_configure_from_multiple_sources(self):
102103
rendered = stream.getvalue()
103104
# The profile came from an env var.
104105
self.assertRegex(
105-
rendered, r'profile\s+myprofilename\s+env\s+AWS_DEFAULT_PROFILE'
106+
rendered,
107+
r'profile\s+: myprofilename\s+: env\s+: AWS_DEFAULT_PROFILE',
106108
)
107109
# The region came from the config file.
108110
self.assertRegex(
109-
rendered, r'region\s+us-west-2\s+config-file\s+/config/location'
111+
rendered,
112+
r'region\s+: us-west-2\s+: config-file\s+: /config/location',
110113
)
111114
# The credentials came from an IAM role. Note how we're
112115
# also checking that the access_key/secret_key are masked
113116
# with '*' chars except for the last 4 chars.
114-
self.assertRegex(rendered, r'access_key\s+\*+_key\s+iam-role')
115-
self.assertRegex(rendered, r'secret_key\s+\*+_key\s+iam-role')
117+
self.assertRegex(rendered, r'access_key\s+: \*+_key\s+: iam-role')
118+
self.assertRegex(rendered, r'secret_key\s+: \*+_key\s+: iam-role')
116119

117120
def test_configure_region_from_imds(self):
118121
session = FakeSession(all_variables={'region': 'from-imds'})
119122
stream = StringIO()
120123
self.configure_list = ConfigureListCommand(session, stream)
121124
self.configure_list(args=[], parsed_globals=None)
122125
rendered = stream.getvalue()
123-
self.assertRegex(rendered, r'region\s+from-imds\s+imds')
126+
self.assertRegex(rendered, r'region\s+: from-imds\s+: imds')
124127

125128
def test_configure_from_args(self):
126129
parsed_globals = Namespace(profile='foo')
@@ -136,4 +139,4 @@ def test_configure_from_args(self):
136139
self.configure_list = ConfigureListCommand(session, stream)
137140
self.configure_list(args=[], parsed_globals=parsed_globals)
138141
rendered = stream.getvalue()
139-
self.assertRegex(rendered, r'profile\s+foo\s+manual\s+--profile')
142+
self.assertRegex(rendered, r'profile\s+: foo\s+: manual\s+: --profile')

0 commit comments

Comments
 (0)