Service accounts: Remove Add API keys buttons and remove one state of migrating for API keys tab #63411
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eleijonmarck
requested review from
linoman and
alexanderzobnin
and removed request for
a team
eleijonmarck
changed the title
alexanderzobnin
requested changes
Feb 20, 2023
eleijonmarck
requested review from
zserge,
mildwonkey,
yangkb09 and
alexanderzobnin
and removed request for
a team
alexanderzobnin
requested changes
Feb 21, 2023
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
|
Could we please hold on with the merge until we align on the release milestone and understand how this should be communicated. As this is a breaking change, I am hesitant about letting it out with 9.5. |
kalleep
reviewed
Feb 21, 2023
|
|
||
| // hideApiKeysTabIfNoAPIKeysPresent is used to remove the apikeys tab from the admin tabs | ||
| // if there are no apikeys, this makes it so that we only issue service account tokens instead | ||
| func hideApiKeysTabIfNoAPIKeysPresent(l *log.ConcreteLogger, store *sqlstore.SQLStore, serviceAccountsStore *database.ServiceAccountsStoreImpl) { |
There was a problem hiding this comment.
NIT: This should be part of the store
There was a problem hiding this comment.
Also I think the correct place would be in the api key package
kalleep
reviewed
Feb 21, 2023
eleijonmarck
changed the title
eleijonmarck
requested review from
ashharrison90
and removed request for
a team
kalleep
reviewed
Feb 24, 2023
This removes the migrationstatus state from the UI in favor of only looking at the number of API keys to determine what to show to the user. This simplifies the logic and makes less calls to the backend with each page load. This was called both on the API keys page and the Service accounts page. - removes the state of migrationstatus from the UI - removes the backend call - removes the backend endpoint for migrationstatus
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
eleijonmarck
commented
Feb 24, 2023
eleijonmarck
commented
Feb 24, 2023
eleijonmarck
commented
Feb 24, 2023
9 tasks
eleijonmarck
changed the title
eleijonmarck
commented
Mar 1, 2023
eleijonmarck
deleted the
eleijonmarck/serviceaccounts/hide-apikeys-tab-on-start
branch
ryantxu
pushed a commit
that referenced
this pull request
Mar 2, 2023
… migrating for API keys tab (#63411) * add: hide apikeys tab on start * make use of store method * added hiding of apikeys tab for new org creation * missing err check * removed unused files * implemennted fake to make tests run * move check for globalHideApikeys from org to admin * refactor to remove the fake * removed unused method calls for interface * Update pkg/services/serviceaccounts/manager/service.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * Update pkg/services/serviceaccounts/manager/service.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * remove the checkglobal method * removed duplicate global set const * add count of apikeys for performance * remove apikeys adding in UI * added back deleted file * added comment on component * changed wording and copy for hiding and migrating service accounts * refactor: remove migrationstatus in front/backend This removes the migrationstatus state from the UI in favor of only looking at the number of API keys to determine what to show to the user. This simplifies the logic and makes less calls to the backend with each page load. This was called both on the API keys page and the Service accounts page. - removes the state of migrationstatus from the UI - removes the backend call - removes the backend endpoint for migrationstatus * Update pkg/services/apikey/apikeyimpl/xorm_store.go Co-authored-by: Karl Persson <kalle.persson@grafana.com> * changes the contet to also be primary * change id of version for footer component --------- Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
This is part of our deprecation strategy for API keys. This does the following:
Why do we need this feature?
This feature is an improvement of our communication and functionality of deprecating API keys from Grafana. We were showing a bit too much about migration status which gave impression of migrating would be a big issue. This improves not only the performance by reducing a number of calls to the backend but also creates a better experience for the user flow (tested and approved by UX)
*Which issue(s) does this PR fix?**:
#58091
Fixes #
Special notes for your reviewer: