Merge branch 'v3' into PMM-13315-service-account-max-length

percona · Oct 11, 2024 · d0eb182 · d0eb182
2 parents af2bc91 + 9f00573
commit d0eb182
Show file tree

Hide file tree

Showing 82 changed files with 3,155 additions and 9,235 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,6 +16,9 @@ jobs:
     name: Checks
     runs-on: ubuntu-22.04
 
+    env:
+      PMM_ENCRYPTION_KEY_PATH: pmm-encryption.key
+
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/admin/commands/inventory/list_agents.go b/admin/commands/inventory/list_agents.go
@@ -90,6 +90,7 @@ func getAgentStatus(status *string) string {
 	if res == "" {
 		res = "UNKNOWN"
 	}
+	res, _ = strings.CutPrefix(res, "AGENT_STATUS_")
 	return res
 }
 

diff --git a/admin/commands/pmm/server/docker/deps.go b/admin/commands/pmm/server/docker/deps.go
@@ -21,6 +21,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
 
@@ -47,7 +48,7 @@ type Functions interface { //nolint:interfacebloat
 // Imager holds methods to interact with Docker images.
 type Imager interface {
 	ParsePullImageProgress(r io.Reader, p *tea.Program) (<-chan struct{}, <-chan error)
-	PullImage(ctx context.Context, dockerImage string, opts types.ImagePullOptions) (io.Reader, error)
+	PullImage(ctx context.Context, dockerImage string, opts image.PullOptions) (io.Reader, error)
 }
 
 // Installer holds methods related to Docker installation.

diff --git a/admin/commands/pmm/server/docker/install.go b/admin/commands/pmm/server/docker/install.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/go-connections/nat"
 	"github.com/pkg/errors"
@@ -145,7 +145,7 @@ func (c *InstallCommand) runContainer(ctx context.Context, volume *volume.Volume
 
 // pullImage pulls a docker image and displays progress.
 func (c *InstallCommand) pullImage(ctx context.Context, globals *flags.GlobalFlags) (commands.Result, error) {
-	reader, err := c.dockerFn.PullImage(ctx, c.DockerImage, types.ImagePullOptions{})
+	reader, err := c.dockerFn.PullImage(ctx, c.DockerImage, image.PullOptions{})
 	if err != nil {
 		return nil, err
 	}

diff --git a/admin/commands/pmm/server/docker/mock_functions_test.go b/admin/commands/pmm/server/docker/mock_functions_test.go
diff --git a/admin/commands/pmm/server/docker/upgrade.go b/admin/commands/pmm/server/docker/upgrade.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/strslice"
 	"github.com/pkg/errors"
@@ -204,7 +205,7 @@ func (c *UpgradeCommand) backupVolumes(ctx context.Context, container *types.Con
 }
 
 func (c *UpgradeCommand) pullImage(ctx context.Context, imageName string) error {
-	reader, err := c.dockerFn.PullImage(ctx, imageName, types.ImagePullOptions{})
+	reader, err := c.dockerFn.PullImage(ctx, imageName, image.PullOptions{})
 	if err != nil {
 		return err
 	}

diff --git a/admin/commands/status.go b/admin/commands/status.go
@@ -60,7 +60,8 @@ func (res *statusResult) HumanReadableAgentType(agentType string) string {
 }
 
 func (res *statusResult) NiceAgentStatus(status string) string {
-	return cases.Title(language.English).String(strings.ToLower(status))
+	s, _ := strings.CutPrefix(status, "AGENT_STATUS_")
+	return cases.Title(language.English).String(strings.ToLower(s))
 }
 
 func (res *statusResult) Result() {}

diff --git a/admin/pkg/docker/docker.go b/admin/pkg/docker/docker.go
@@ -149,7 +149,7 @@ func (b *Base) GetDockerClient() *client.Client {
 
 // FindServerContainers finds all containers running PMM Server.
 func (b *Base) FindServerContainers(ctx context.Context) ([]types.Container, error) {
-	return b.Cli.ContainerList(ctx, types.ContainerListOptions{ //nolint:exhaustruct
+	return b.Cli.ContainerList(ctx, container.ListOptions{ //nolint:exhaustruct
 		All: true,
 		Filters: filters.NewArgs(filters.KeyValuePair{
 			Key:   "label",
@@ -221,7 +221,7 @@ func (b *Base) RunContainer(ctx context.Context, config *container.Config, hostC
 		return "", err
 	}
 
-	if err := b.Cli.ContainerStart(ctx, res.ID, types.ContainerStartOptions{}); err != nil { //nolint:exhaustruct
+	if err := b.Cli.ContainerStart(ctx, res.ID, container.StartOptions{}); err != nil { //nolint:exhaustruct
 		return "", err
 	}
 

diff --git a/admin/pkg/docker/pull_image.go b/admin/pkg/docker/pull_image.go
@@ -21,13 +21,13 @@ import (
 	"io"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/image"
 
 	"github.com/percona/pmm/admin/pkg/bubbles/progress"
 )
 
 // PullImage pulls image from Docker registry.
-func (b *Base) PullImage(ctx context.Context, dockerImage string, opts types.ImagePullOptions) (io.Reader, error) {
+func (b *Base) PullImage(ctx context.Context, dockerImage string, opts image.PullOptions) (io.Reader, error) {
 	return b.Cli.ImagePull(ctx, dockerImage, opts)
 }