Merge branch 'v3' into PMM-11180-upgrade-matrix

percona · Oct 17, 2024 · b58702d · b58702d
2 parents 7829bc3 + ab83e33
commit b58702d
Show file tree

Hide file tree

Showing 150 changed files with 30,571 additions and 67,733 deletions.
diff --git a/agent/cmd/pmm-agent-entrypoint/main.go b/agent/cmd/pmm-agent-entrypoint/main.go
@@ -23,11 +23,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/pkg/errors"
 	reaper "github.com/ramr/go-reaper"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
-	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/percona/pmm/utils/logger"
 )

diff --git a/agent/config/config.go b/agent/config/config.go
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
-	"gopkg.in/alecthomas/kingpin.v2"
 	"gopkg.in/yaml.v3"
 
 	"github.com/percona/pmm/utils/nodeinfo"

diff --git a/agent/main.go b/agent/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"gopkg.in/alecthomas/kingpin.v2"
+	"github.com/alecthomas/kingpin/v2"
 
 	"github.com/percona/pmm/agent/commands"
 	"github.com/percona/pmm/agent/config"

diff --git a/...accesscontrol/v1beta1/json/client/access_control_service/access_control_service_client.go b/...accesscontrol/v1beta1/json/client/access_control_service/access_control_service_client.go
diff --git a/api/accesscontrol/v1beta1/json/client/access_control_service/assign_roles_responses.go b/api/accesscontrol/v1beta1/json/client/access_control_service/assign_roles_responses.go