PMM-7 Merge PMM 2 changes into v3 branch.

percona · Nov 20, 2023 · 3fad605 · 3fad605
1 parent 6236724
commit 3fad605
Show file tree

Hide file tree

Showing 6 changed files with 696 additions and 117 deletions.
diff --git a/api/serverpb/json/serverpb.json b/api/serverpb/json/serverpb.json
diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
diff --git a/descriptor.bin b/descriptor.bin
diff --git a/managed/services/management/deps.go b/managed/services/management/deps.go
@@ -17,6 +17,7 @@ package management
 
 import (
 	"context"
+	"net/http"
 	"time"
 
 	"github.com/percona-platform/saas/pkg/check"
@@ -100,4 +101,5 @@ type victoriaMetricsClient interface {
 
 type apiKeyProvider interface {
 	CreateAdminAPIKey(ctx context.Context, name string) (int64, string, error)
+	IsAPIKeyAuth(headers http.Header) bool
 }
diff --git a/managed/services/management/node.go b/managed/services/management/node.go
@@ -34,11 +34,6 @@ import (
 	"github.com/percona/pmm/managed/services"
 )
 
-type apiKeyProvider interface {
-	CreateAdminAPIKey(ctx context.Context, name string) (int64, string, error)
-	IsAPIKeyAuth(headers http.Header) bool
-}
-
 // NodeService represents service for working with nodes.
 type NodeService struct {
 	db  *reform.DB