u5surf · u5surf · Oct 12, 2023
diff --git a/agent/agents/mysql/perfschema/perfschema.go b/agent/agents/mysql/perfschema/perfschema.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"sync"
 	"time"
 
 	"github.com/AlekSi/pointer" // register SQL driver
@@ -55,22 +54,9 @@ type mySQLVersion struct {
 
 // versionsCache provides cached access to MySQL version.
 type versionsCache struct {
-	rw    sync.RWMutex
 	items map[string]*mySQLVersion
 }
 
-func (m *PerfSchema) mySQLVersion() *mySQLVersion {
-	m.versionsCache.rw.RLock()
-	defer m.versionsCache.rw.RUnlock()
-
-	res := m.versionsCache.items[m.agentID]
-	if res == nil {
-		return &mySQLVersion{}
-	}
-
-	return res
-}
-
 const (
 	retainHistory    = 5 * time.Minute
 	refreshHistory   = 5 * time.Second

diff --git a/agent/commands/run.go b/agent/commands/run.go
@@ -109,7 +109,7 @@ func Run() {
 func processClientUntilCancel(ctx context.Context, client *client.Client, reloadCh chan bool) {
 	for {
 		clientCtx, cancelClientCtx := context.WithCancel(ctx)
-		client.Run(clientCtx)
+		client.Run(clientCtx) //nolint:errcheck
 
 		cancelClientCtx()
 		<-client.Done()

diff --git a/managed/cmd/pmm-managed/main.go b/managed/cmd/pmm-managed/main.go
@@ -81,7 +81,7 @@ import (
 	"github.com/percona/pmm/managed/services/alertmanager"
 	"github.com/percona/pmm/managed/services/backup"
 	"github.com/percona/pmm/managed/services/checks"
-	"github.com/percona/pmm/managed/services/config"
+	"github.com/percona/pmm/managed/services/config" //nolint:staticcheck
 	"github.com/percona/pmm/managed/services/dbaas"
 	"github.com/percona/pmm/managed/services/grafana"
 	"github.com/percona/pmm/managed/services/inventory"

diff --git a/managed/services/backup/compatibility_service_test.go b/managed/services/backup/compatibility_service_test.go
@@ -208,7 +208,7 @@ func TestCheckCompatibility(t *testing.T) {
 	mock.AssertExpectationsForObjects(t, &mockVersioner)
 }
 
-func TestFindCompatibleServiceIDs(t *testing.T) {
+func TestFindCompatibleServiceIDs(t *testing.T) { //nolint:tparallel
 	t.Parallel()
 	cSvc := NewCompatibilityService(nil, nil)
 

diff --git a/managed/services/dbaas/kubernetes/client/client.go b/managed/services/dbaas/kubernetes/client/client.go
@@ -725,7 +725,7 @@ func (c Client) DoCSVWait(ctx context.Context, key types.NamespacedName) error {
 	}
 
 	csv := v1alpha1.ClusterServiceVersion{}
-	csvPhaseSucceeded := func() (bool, error) {
+	csvPhaseSucceeded := func(ctx context.Context) (bool, error) {
 		err := kubeclient.Get(ctx, key, &csv)
 		if err != nil {
 			if apierrors.IsNotFound(err) {
@@ -748,7 +748,7 @@ func (c Client) DoCSVWait(ctx context.Context, key types.NamespacedName) error {
 		}
 	}
 
-	err = wait.PollImmediateUntil(time.Second, csvPhaseSucceeded, ctx.Done())
+	err = wait.PollUntilContextCancel(ctx, time.Second, true, csvPhaseSucceeded(ctx))
 	if err != nil && errors.Is(err, context.DeadlineExceeded) {
 		depCheckErr := c.checkDeploymentErrors(ctx, key, csv)
 		if depCheckErr != nil {
@@ -767,7 +767,7 @@ func (c Client) GetSubscriptionCSV(ctx context.Context, subKey types.NamespacedN
 		return csvKey, err
 	}
 
-	subscriptionInstalledCSV := func() (bool, error) {
+	subscriptionInstalledCSV := func(ctx context.Context) (bool, error) {
 		sub := v1alpha1.Subscription{}
 		err := kubeclient.Get(ctx, subKey, &sub)
 		if err != nil {
@@ -784,7 +784,7 @@ func (c Client) GetSubscriptionCSV(ctx context.Context, subKey types.NamespacedN
 		log.Printf("  Found installed CSV %q", installedCSV)
 		return true, nil
 	}
-	return csvKey, wait.PollImmediateUntil(time.Second, subscriptionInstalledCSV, ctx.Done())
+	return csvKey, wait.PollUntilContextCancel(ctx, time.Second, true, subscriptionInstalledCSV(ctx))
 }
 
 func (c *Client) getKubeclient() (client.Client, error) { //nolint:ireturn
@@ -895,7 +895,7 @@ func (c Client) DoRolloutWait(ctx context.Context, key types.NamespacedName) err
 		return err
 	}
 
-	rolloutComplete := func() (bool, error) {
+	rolloutComplete := func(ctx context.Context) (bool, error) {
 		deployment := appsv1.Deployment{}
 		err := kubeclient.Get(ctx, key, &deployment)
 		if err != nil {
@@ -928,7 +928,7 @@ func (c Client) DoRolloutWait(ctx context.Context, key types.NamespacedName) err
 		// Waiting for Deployment to rollout: waiting for deployment spec update to be observed
 		return false, nil
 	}
-	return wait.PollImmediateUntil(time.Second, rolloutComplete, ctx.Done())
+	return wait.PollUntilContextCancel(ctx, time.Second, true, rolloutComplete(ctx))
 }
 
 // GetOperatorGroup retrieves an operator group details by namespace and name.

diff --git a/managed/services/dbaas/kubernetes/client/load_config.go b/managed/services/dbaas/kubernetes/client/load_config.go
@@ -20,12 +20,12 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
-// configGetter stores kubeconfig string to convert it to the final object
+// configGetter stores kubeconfig string to convert it to the final object.
 type configGetter struct {
 	kubeconfig string
 }
 
-// NewConfigGetter creates a new configGetter struct
+// NewConfigGetter creates a new configGetter struct.
 func NewConfigGetter(kubeconfig string) *configGetter {
 	return &configGetter{kubeconfig: kubeconfig}
 }

diff --git a/managed/services/dbaas/kubernetes/client/writer.go b/managed/services/dbaas/kubernetes/client/writer.go
@@ -30,7 +30,7 @@ type PrefixWriter interface {
 	Flush()
 }
 
-// prefixWriter implements PrefixWriter
+// prefixWriter implements PrefixWriter.
 type prefixWriter struct {
 	out io.Writer
 }

diff --git a/managed/services/dbaas/kubernetes/kubernetes.go b/managed/services/dbaas/kubernetes/kubernetes.go
@@ -826,7 +826,7 @@ func (k *Kubernetes) InstallOperator(ctx context.Context, req InstallOperatorReq
 		return errors.Wrap(err, "cannot create a susbcription to install the operator")
 	}
 
-	err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
+	err = wait.PollUntilContextTimeout(ctx, pollInterval, pollDuration, false, func() (bool, error) {
 		k.lock.Lock()
 		defer k.lock.Unlock()
 
@@ -877,7 +877,7 @@ func (k *Kubernetes) UpgradeOperator(ctx context.Context, namespace, name string
 	var subs *v1alpha1.Subscription
 
 	// If the subscription was recently created, the install plan might not be ready yet.
-	err := wait.Poll(pollInterval, pollDuration, func() (bool, error) {
+	err := wait.PollUntilContextTimeout(ctx, pollInterval, pollDuration, false, func() (bool, error) {
 		var err error
 		subs, err = k.client.GetSubscription(ctx, namespace, name)
 		if err != nil {

diff --git a/managed/services/inventory/grpc/nodes_server.go b/managed/services/inventory/grpc/nodes_server.go
@@ -111,60 +111,63 @@ func (s *nodesServer) AddNode(ctx context.Context, req *inventorypb.AddNodeReque
 }
 
 // AddGenericNode adds Generic Node.
-func (s *nodesServer) AddGenericNode(ctx context.Context, req *inventorypb.AddGenericNodeRequest) (*inventorypb.AddGenericNodeResponse, error) {
+func (s *nodesServer) AddGenericNode(ctx context.Context, req *inventorypb.AddGenericNodeRequest) (*inventorypb.AddGenericNodeResponse, error) { //nolint:staticcheck
 	node, err := s.svc.AddGenericNode(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	res := &inventorypb.AddGenericNodeResponse{Generic: node}
+	res := &inventorypb.AddGenericNodeResponse{Generic: node} //nolint:staticcheck
 	return res, nil
 }
 
 // AddContainerNode adds Container Node.
-func (s *nodesServer) AddContainerNode(ctx context.Context, req *inventorypb.AddContainerNodeRequest) (*inventorypb.AddContainerNodeResponse, error) {
+func (s *nodesServer) AddContainerNode(ctx context.Context, req *inventorypb.AddContainerNodeRequest) (*inventorypb.AddContainerNodeResponse, error) { //nolint:staticcheck
 	node, err := s.svc.AddContainerNode(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	res := &inventorypb.AddContainerNodeResponse{Container: node}
+	res := &inventorypb.AddContainerNodeResponse{Container: node} //nolint:staticcheck
 	return res, nil
 }
 
 // AddRemoteNode adds Remote Node.
-func (s *nodesServer) AddRemoteNode(ctx context.Context, req *inventorypb.AddRemoteNodeRequest) (*inventorypb.AddRemoteNodeResponse, error) {
+func (s *nodesServer) AddRemoteNode(
+	ctx context.Context,
+	req *inventorypb.AddRemoteNodeRequest,
+) (*inventorypb.AddRemoteNodeResponse, error) { //nolint:staticcheck
 	node, err := s.svc.AddRemoteNode(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	res := &inventorypb.AddRemoteNodeResponse{Remote: node}
+	res := &inventorypb.AddRemoteNodeResponse{Remote: node} //nolint:staticcheck
 	return res, nil
 }
 
 // AddRemoteRDSNode adds Remote RDS Node.
-func (s *nodesServer) AddRemoteRDSNode(ctx context.Context, req *inventorypb.AddRemoteRDSNodeRequest) (*inventorypb.AddRemoteRDSNodeResponse, error) {
+func (s *nodesServer) AddRemoteRDSNode(ctx context.Context, req *inventorypb.AddRemoteRDSNodeRequest) (*inventorypb.AddRemoteRDSNodeResponse, error) { //nolint:staticcheck
 	node, err := s.svc.AddRemoteRDSNode(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	res := &inventorypb.AddRemoteRDSNodeResponse{RemoteRds: node}
+	res := &inventorypb.AddRemoteRDSNodeResponse{RemoteRds: node} //nolint:staticcheck
 	return res, nil
 }
 
 // AddRemoteAzureDatabaseNode adds Remote Azure database Node.
 func (s *nodesServer) AddRemoteAzureDatabaseNode(
 	ctx context.Context,
 	req *inventorypb.AddRemoteAzureDatabaseNodeRequest,
-) (*inventorypb.AddRemoteAzureDatabaseNodeResponse, error) {
+) (*inventorypb.AddRemoteAzureDatabaseNodeResponse, error) { //nolint:staticcheck
 	node, err := s.svc.AddRemoteAzureDatabaseNode(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	res := &inventorypb.AddRemoteAzureDatabaseNodeResponse{RemoteAzureDatabase: node}
+	res := &inventorypb.AddRemoteAzureDatabaseNodeResponse{RemoteAzureDatabase: node} //nolint:staticcheck
 	return res, nil
 }
 

diff --git a/managed/services/inventory/nodes.go b/managed/services/inventory/nodes.go
@@ -233,7 +233,7 @@ func (s *NodesService) AddRemoteNode(ctx context.Context, req *inventorypb.AddRe
 	return invNode.(*inventorypb.RemoteNode), nil //nolint:forcetypeassert
 }
 
-// AddRemoteRDSNode adds a new RDS node
+// AddRemoteRDSNode adds a new RDS node.
 func (s *NodesService) AddRemoteRDSNode(ctx context.Context, req *inventorypb.AddRemoteRDSNodeRequest) (*inventorypb.RemoteRDSNode, error) {
 	params := &models.CreateNodeParams{
 		NodeName:     req.NodeName,

diff --git a/managed/services/management/backup/artifacts_service.go b/managed/services/management/backup/artifacts_service.go
@@ -128,7 +128,7 @@ func (s *ArtifactsService) DeleteArtifact(
 	return &backuppb.DeleteArtifactResponse{}, nil
 }
 
-// ListPitrTimeranges lists available PITR timelines/time-ranges (for MongoDB)
+// ListPitrTimeranges lists available PITR timelines/time-ranges (for MongoDB).
 func (s *ArtifactsService) ListPitrTimeranges(
 	ctx context.Context,
 	req *backuppb.ListPitrTimerangesRequest,

diff --git a/managed/services/management/backup/deps.go b/managed/services/management/backup/deps.go
@@ -60,7 +60,7 @@ type removalService interface {
 	DeleteArtifact(storage backup.Storage, artifactID string, removeFiles bool) error
 }
 
-// pbmPITRService provides methods that help us inspect PITR artifacts
+// pbmPITRService provides methods that help us inspect PITR artifacts.
 type pbmPITRService interface {
 	// ListPITRTimeranges returns the available PITR timeranges for the given artifact in the provided location.
 	ListPITRTimeranges(ctx context.Context, locationClient backup.Storage, location *models.BackupLocation, artifact *models.Artifact) ([]backup.Timeline, error)

diff --git a/managed/services/management/ia/alerts_service.go b/managed/services/management/ia/alerts_service.go
@@ -71,7 +71,7 @@ func (s *AlertsService) Enabled() bool {
 
 // ListAlerts returns list of existing alerts.
 // Deprecated. Do not use.
-func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlertsRequest) (*iav1beta1.ListAlertsResponse, error) {
+func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlertsRequest) (*iav1beta1.ListAlertsResponse, error) { //nolint:staticcheck
 	filter := &services.FilterParams{
 		IsIA: true,
 	}
@@ -80,7 +80,7 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert
 		return nil, errors.Wrap(err, "failed to get alerts from alertmanager")
 	}
 
-	var res []*iav1beta1.Alert //nolint:prealloc
+	var res []*iav1beta1.Alert //nolint:prealloc,staticcheck
 	for _, alert := range alerts {
 		updatedAt := timestamppb.New(time.Time(*alert.UpdatedAt))
 		if err := updatedAt.CheckValid(); err != nil {
@@ -101,7 +101,7 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert
 			st = iav1beta1.Status_SILENCED
 		}
 
-		var rule *iav1beta1.Rule
+		var rule *iav1beta1.Rule //nolint:staticcheck
 		// Rules files created by user in directory /srv/prometheus/rules/ doesn't have associated rules in DB.
 		// So alertname field will be empty or will keep invalid value. Don't fill rule field in that case.
 		ruleID, ok := alert.Labels["alertname"]
@@ -146,7 +146,7 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert
 			}
 		}
 
-		res = append(res, &iav1beta1.Alert{
+		res = append(res, &iav1beta1.Alert{ //nolint:staticcheck
 			AlertId:   getAlertID(alert),
 			Summary:   alert.Annotations["summary"],
 			Severity:  managementpb.Severity(common.ParseSeverity(alert.Labels["severity"])),
@@ -186,11 +186,11 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert
 	}
 	pageTotals.TotalItems = int32(len(res))
 
-	return &iav1beta1.ListAlertsResponse{Alerts: res[from:to], Totals: pageTotals}, nil
+	return &iav1beta1.ListAlertsResponse{Alerts: res[from:to], Totals: pageTotals}, nil //nolint:staticcheck
 }
 
 // satisfiesFilters checks that alert passes filters, returns true in case of success.
-func satisfiesFilters(alert *ammodels.GettableAlert, filters []*iav1beta1.Filter) (bool, error) {
+func satisfiesFilters(alert *ammodels.GettableAlert, filters []*iav1beta1.Filter) (bool, error) { //nolint:staticcheck
 	for _, filter := range filters {
 		value, ok := alert.Labels[filter.Key]
 		if !ok {
@@ -229,7 +229,7 @@ func getAlertID(alert *ammodels.GettableAlert) string {
 
 // ToggleAlerts allows to silence/unsilence specified alerts.
 // Deprecated. Do not use.
-func (s *AlertsService) ToggleAlerts(ctx context.Context, req *iav1beta1.ToggleAlertsRequest) (*iav1beta1.ToggleAlertsResponse, error) {
+func (s *AlertsService) ToggleAlerts(ctx context.Context, req *iav1beta1.ToggleAlertsRequest) (*iav1beta1.ToggleAlertsResponse, error) { //nolint:staticcheck
 	var err error
 	var alerts []*ammodels.GettableAlert
 
@@ -257,7 +257,7 @@ func (s *AlertsService) ToggleAlerts(ctx context.Context, req *iav1beta1.ToggleA
 		return nil, err
 	}
 
-	return &iav1beta1.ToggleAlertsResponse{}, nil
+	return &iav1beta1.ToggleAlertsResponse{}, nil //nolint:staticcheck
 }
 
 // Check interfaces.