PMM-13633 Improve API Key migration to service accounts #796
Conversation
…ounts' into PMM-13633-migrate-to-service-accounts
matejkubinec
changed the title
|
Changes on BE:
|
| return response.Error(http.StatusBadRequest, "Auth method is not service account token", errors.New("failed to get service account info")) | ||
| return response.JSON(http.StatusOK, nil) |
There was a problem hiding this comment.
Any suggestions? Like reserve -1 ID for SA? In case it is not service account? Because in case of returning error it is logged in Grafana log.
There was a problem hiding this comment.
I think it's ok to log it in grafana log as API key is deprecated.
There was a problem hiding this comment.
Reverted and right now it will be error in logs again. Changes related to this change in PMM PR: percona/pmm@e519d45. Ticket also adjusted.
pkg/services/user/userimpl/user.go
Outdated
| @@ -23,6 +20,8 @@ import ( | |||
| "github.com/grafana/grafana/pkg/services/user" | |||
| "github.com/grafana/grafana/pkg/setting" | |||
| "github.com/grafana/grafana/pkg/util" | |||
| "go.opentelemetry.io/otel/attribute" | |||
| "go.opentelemetry.io/otel/trace" | |||
There was a problem hiding this comment.
When I ran "go fmt ./..." even on v3 branch this change appear. It is moved from top to here. Same if I save in my IDE.
There was a problem hiding this comment.
I dont see make format in Makefile. Only something called format-drone. Not related.
There was a problem hiding this comment.
please revert manually if there is no command for that.
| "github.com/grafana/grafana/pkg/infra/localcache" | ||
| "github.com/grafana/grafana/pkg/infra/tracing" | ||
| "github.com/grafana/grafana/pkg/services/org" | ||
| "github.com/grafana/grafana/pkg/services/org/orgtest" | ||
| "github.com/grafana/grafana/pkg/services/team/teamtest" | ||
| "github.com/grafana/grafana/pkg/services/user" | ||
| "github.com/grafana/grafana/pkg/setting" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" |
There was a problem hiding this comment.
Same here like above. If needed I can do it manually.
…ounts' into PMM-13633-migrate-to-service-accounts
PMM-13633
PMM PR: percona/pmm#3420
FB: Percona-Lab/pmm-submodules#3808