Skip to content

Commit 5bf5382

Browse files
ABZhang0Alan Zhang
andauthored
[AMG]: Deprecate api-key command group (#8881)
* Deprecate api-key command group * Update version * Use new minor version --------- Co-authored-by: Alan Zhang <[email protected]>
1 parent fa8face commit 5bf5382

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/amg/HISTORY.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ Release History
138138
* `az grafana integrations monitor delete`: support optional subscription id argument for multi-subscription scenarios
139139
* `az grafana notification-channel`: deprecate command group as part of Grafana legacy alerting deprecation
140140

141-
142141
2.6.1
143142
++++++
144-
* Remove msrestazure dependency
143+
* Remove msrestazure dependency
144+
145+
2.7.0
146+
++++++
147+
* `az grafana api-key`: deprecate command group as Grafana Labs is sunsetting API keys

src/amg/azext_amg/_help.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@
368368

369369
helps['grafana api-key'] = """
370370
type: group
371-
short-summary: Commands to manage api keys.
371+
short-summary: Commands to manage API keys.
372+
long-summary: API keys are deprecated by Grafana Labs and will not be supported in Grafana 12 and above. Please use service accounts instead.
372373
"""
373374

374375
helps['grafana api-key create'] = """

src/amg/azext_amg/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def load_command_table(self, _):
5454
g.custom_show_command('show', 'show_user')
5555
g.custom_command('actual-user', 'get_actual_user')
5656

57-
with self.command_group('grafana api-key') as g:
57+
with self.command_group('grafana api-key', deprecate_info=self.deprecate()) as g:
5858
g.custom_command('create', 'create_api_key')
5959
g.custom_command('list', 'list_api_keys')
6060
g.custom_command('delete', 'delete_api_key')

src/amg/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# TODO: Confirm this is the right version number you want and it matches your
1818
# HISTORY.rst entry.
19-
VERSION = '2.6.1'
19+
VERSION = '2.7.0'
2020

2121
# The full list of classifiers is available at
2222
# https://pypi.python.org/pypi?%3Aaction=list_classifiers

0 commit comments

Comments
 (0)