From 8a3d3113423ba3f4147e0035f83c9fd74e36cbb9 Mon Sep 17 00:00:00 2001 From: u5surf Date: Fri, 13 Oct 2023 08:58:04 +0900 Subject: [PATCH] Fix linter issue #2538 --- agent/agents/mysql/perfschema/perfschema.go | 14 ------- agent/commands/run.go | 2 +- managed/cmd/pmm-managed/main.go | 2 +- .../backup/compatibility_service_test.go | 2 +- .../dbaas/kubernetes/client/client.go | 12 +++--- .../dbaas/kubernetes/client/load_config.go | 4 +- .../dbaas/kubernetes/client/writer.go | 2 +- .../services/dbaas/kubernetes/kubernetes.go | 4 +- .../services/inventory/grpc/nodes_server.go | 23 ++++++----- managed/services/inventory/nodes.go | 2 +- .../management/backup/artifacts_service.go | 2 +- managed/services/management/backup/deps.go | 2 +- .../services/management/ia/alerts_service.go | 16 ++++---- .../management/ia/channels_service.go | 40 +++++++++---------- managed/services/management/ia/common.go | 8 ++-- .../services/management/ia/rules_service.go | 12 +++--- managed/utils/envvars/parser.go | 2 +- 17 files changed, 69 insertions(+), 80 deletions(-) diff --git a/agent/agents/mysql/perfschema/perfschema.go b/agent/agents/mysql/perfschema/perfschema.go index 04312fcf8ac..1b4b3924a35 100644 --- 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 index 43111807b17..15509ab56fd 100644 --- 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 index ab347034f86..01022e10cd7 100644 --- 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 index 4859073fd8c..efc56a78f15 100644 --- 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 index f29787d7dfa..f27144f4afb 100644 --- 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 index ec8cffa41cb..c8fd78cc7db 100644 --- 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 index 2c5839504c8..1e22e2f8e45 100644 --- 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 index 207bff645ae..9b8c6cffabc 100644 --- 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 index 18b57b1d4db..d67743fe306 100644 --- a/managed/services/inventory/grpc/nodes_server.go +++ b/managed/services/inventory/grpc/nodes_server.go @@ -111,46 +111,49 @@ 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 } @@ -158,13 +161,13 @@ func (s *nodesServer) AddRemoteRDSNode(ctx context.Context, req *inventorypb.Add 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 index 31a4f304d48..547df77d0d2 100644 --- 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 index 3f4d212dfcb..c478591a3b8 100644 --- 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 index a8493dbe7ad..0938e3aa5cb 100644 --- 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 index d1809ab0cb2..3cefdc9b258 100644 --- 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. diff --git a/managed/services/management/ia/channels_service.go b/managed/services/management/ia/channels_service.go index 96990bc337c..6d7caac1165 100644 --- a/managed/services/management/ia/channels_service.go +++ b/managed/services/management/ia/channels_service.go @@ -60,7 +60,7 @@ func (s *ChannelsService) Enabled() bool { // ListChannels returns list of available channels. // Deprecated. Do not use. -func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListChannelsRequest) (*iav1beta1.ListChannelsResponse, error) { +func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListChannelsRequest) (*iav1beta1.ListChannelsResponse, error) { //nolint:staticcheck var pageIndex int var pageSize int if req.PageParams != nil { @@ -68,7 +68,7 @@ func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListC pageSize = int(req.PageParams.PageSize) } - var channels []*iav1beta1.Channel + var channels []*iav1beta1.Channel //nolint:staticcheck pageTotals := &managementpb.PageTotals{ TotalPages: 1, } @@ -85,10 +85,10 @@ func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListC return nil, err } - return &iav1beta1.ListChannelsResponse{Channels: channels, Totals: pageTotals}, nil + return &iav1beta1.ListChannelsResponse{Channels: channels, Totals: pageTotals}, nil //nolint:staticcheck } -func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error) { +func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error) { //nolint:staticcheck var channels []*models.Channel errTx := s.db.InTransaction(func(tx *reform.TX) error { var err error @@ -103,7 +103,7 @@ func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error return nil, errors.WithStack(errTx) } - res := make([]*iav1beta1.Channel, len(channels)) + res := make([]*iav1beta1.Channel, len(channels)) //nolint:staticcheck for i, channel := range channels { c, err := convertChannel(channel) if err != nil { @@ -161,7 +161,7 @@ func (s *ChannelsService) getNotificationChannelsPage(pageIndex, pageSize int) ( // AddChannel adds new notification channel. // Deprecated. Do not use. -func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChannelRequest) (*iav1beta1.AddChannelResponse, error) { +func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChannelRequest) (*iav1beta1.AddChannelResponse, error) { //nolint:staticcheck params := &models.CreateChannelParams{ Summary: req.Summary, Disabled: req.Disabled, @@ -207,12 +207,12 @@ func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChan s.alertManager.RequestConfigurationUpdate() - return &iav1beta1.AddChannelResponse{ChannelId: channel.ID}, nil + return &iav1beta1.AddChannelResponse{ChannelId: channel.ID}, nil //nolint:staticcheck } // ChangeChannel changes existing notification channel. // Deprecated. Do not use. -func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.ChangeChannelRequest) (*iav1beta1.ChangeChannelResponse, error) { +func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.ChangeChannelRequest) (*iav1beta1.ChangeChannelResponse, error) { //nolint:staticcheck params := &models.ChangeChannelParams{ Summary: req.Summary, Disabled: req.Disabled, @@ -256,12 +256,12 @@ func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.Chan s.alertManager.RequestConfigurationUpdate() - return &iav1beta1.ChangeChannelResponse{}, nil + return &iav1beta1.ChangeChannelResponse{}, nil //nolint:staticcheck } // RemoveChannel removes notification channel. // Deprecated. Do not use. -func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.RemoveChannelRequest) (*iav1beta1.RemoveChannelResponse, error) { +func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.RemoveChannelRequest) (*iav1beta1.RemoveChannelResponse, error) { //nolint:staticcheck e := s.db.InTransaction(func(tx *reform.TX) error { return models.RemoveChannel(tx.Querier, req.ChannelId) }) @@ -271,7 +271,7 @@ func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.Remo s.alertManager.RequestConfigurationUpdate() - return &iav1beta1.RemoveChannelResponse{}, nil + return &iav1beta1.RemoveChannelResponse{}, nil //nolint:staticcheck } // convertChannel converts a channel model to its protobuf representation. @@ -286,7 +286,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { switch channel.Type { case models.Email: config := channel.EmailConfig - c.Channel = &iav1beta1.Channel_EmailConfig{ + c.Channel = &iav1beta1.Channel_EmailConfig{ //nolint:staticcheck EmailConfig: &iav1beta1.EmailConfig{ SendResolved: config.SendResolved, To: config.To, @@ -295,7 +295,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.PagerDuty: config := channel.PagerDutyConfig c.Channel = &iav1beta1.Channel_PagerdutyConfig{ - PagerdutyConfig: &iav1beta1.PagerDutyConfig{ + PagerdutyConfig: &iav1beta1.PagerDutyConfig{ //nolint:staticcheck SendResolved: config.SendResolved, RoutingKey: config.RoutingKey, ServiceKey: config.ServiceKey, @@ -304,7 +304,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.Slack: config := channel.SlackConfig c.Channel = &iav1beta1.Channel_SlackConfig{ - SlackConfig: &iav1beta1.SlackConfig{ + SlackConfig: &iav1beta1.SlackConfig{ //nolint:staticcheck SendResolved: config.SendResolved, Channel: config.Channel, }, @@ -312,7 +312,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.WebHook: config := channel.WebHookConfig c.Channel = &iav1beta1.Channel_WebhookConfig{ - WebhookConfig: &iav1beta1.WebhookConfig{ + WebhookConfig: &iav1beta1.WebhookConfig{ //nolint:staticcheck SendResolved: config.SendResolved, Url: config.URL, HttpConfig: convertModelToHTTPConfig(config.HTTPConfig), @@ -328,7 +328,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { // convertHTTPConfigToModel converts a protobuf HTTPConfig to its model representation. // Deprecated. Do not use. -func convertHTTPConfigToModel(config *iav1beta1.HTTPConfig) *models.HTTPConfig { +func convertHTTPConfigToModel(config *iav1beta1.HTTPConfig) *models.HTTPConfig { //nolint:staticcheck if config == nil { return nil } @@ -365,19 +365,19 @@ func convertHTTPConfigToModel(config *iav1beta1.HTTPConfig) *models.HTTPConfig { // convertModelToHTTPConfig converts a HTTPConfig model to its protobuf representation. // Deprecated. Do not use. -func convertModelToHTTPConfig(config *models.HTTPConfig) *iav1beta1.HTTPConfig { +func convertModelToHTTPConfig(config *models.HTTPConfig) *iav1beta1.HTTPConfig { //nolint:staticcheck if config == nil { return nil } - res := &iav1beta1.HTTPConfig{ + res := &iav1beta1.HTTPConfig{ //nolint:staticcheck BearerToken: config.BearerToken, BearerTokenFile: config.BearerTokenFile, ProxyUrl: config.ProxyURL, } if basicAuthConf := config.BasicAuth; basicAuthConf != nil { - res.BasicAuth = &iav1beta1.BasicAuth{ + res.BasicAuth = &iav1beta1.BasicAuth{ //nolint:staticcheck Username: basicAuthConf.Username, Password: basicAuthConf.Password, PasswordFile: basicAuthConf.PasswordFile, @@ -385,7 +385,7 @@ func convertModelToHTTPConfig(config *models.HTTPConfig) *iav1beta1.HTTPConfig { } if tlsConfig := config.TLSConfig; tlsConfig != nil { - res.TlsConfig = &iav1beta1.TLSConfig{ + res.TlsConfig = &iav1beta1.TLSConfig{ //nolint:staticcheck CaFile: tlsConfig.CAFile, CertFile: tlsConfig.CertFile, KeyFile: tlsConfig.KeyFile, diff --git a/managed/services/management/ia/common.go b/managed/services/management/ia/common.go index 73af3400e0b..c4f7e8717a9 100644 --- a/managed/services/management/ia/common.go +++ b/managed/services/management/ia/common.go @@ -52,8 +52,8 @@ func convertParamUnit(u alert.Unit) alerting.ParamUnit { return alerting.ParamUnit_PARAM_UNIT_INVALID } -func convertRule(l *logrus.Entry, rule *models.Rule, channels []*models.Channel) (*iav1beta1.Rule, error) { - r := &iav1beta1.Rule{ +func convertRule(l *logrus.Entry, rule *models.Rule, channels []*models.Channel) (*iav1beta1.Rule, error) { //nolint:staticcheck + r := &iav1beta1.Rule{ //nolint:staticcheck RuleId: rule.ID, TemplateName: rule.TemplateName, Disabled: rule.Disabled, @@ -102,9 +102,9 @@ func convertRule(l *logrus.Entry, rule *models.Rule, channels []*models.Channel) return nil, errors.Wrap(err, "failed to load rule annotations") } - r.Filters = make([]*iav1beta1.Filter, len(rule.Filters)) + r.Filters = make([]*iav1beta1.Filter, len(rule.Filters)) //nolint:staticcheck for i, filter := range rule.Filters { - r.Filters[i] = &iav1beta1.Filter{ + r.Filters[i] = &iav1beta1.Filter{ //nolint:staticcheck Type: convertModelToFilterType(filter.Type), Key: filter.Key, Value: filter.Val, diff --git a/managed/services/management/ia/rules_service.go b/managed/services/management/ia/rules_service.go index 9b196d21e0a..1cbfd2ed6fd 100644 --- a/managed/services/management/ia/rules_service.go +++ b/managed/services/management/ia/rules_service.go @@ -272,7 +272,7 @@ func (s *RulesService) writeRuleFile(rule *ruleFile) error { // ListAlertRules returns a list of all Integrated Alerting rules. // Deprecated. Do not use. -func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAlertRulesRequest) (*iav1beta1.ListAlertRulesResponse, error) { +func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAlertRulesRequest) (*iav1beta1.ListAlertRulesResponse, error) { //nolint:staticcheck var pageIndex int pageSize := math.MaxInt32 if req.PageParams != nil { @@ -328,7 +328,7 @@ func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAl TotalPages: int32(totalPages), } - return &iav1beta1.ListAlertRulesResponse{Rules: res, Totals: totals}, nil + return &iav1beta1.ListAlertRulesResponse{Rules: res, Totals: totals}, nil //nolint:staticcheck } func (s *RulesService) convertAlertRules(rules []*models.Rule, channels []*models.Channel) ([]*iav1beta1.Rule, error) { @@ -346,7 +346,7 @@ func (s *RulesService) convertAlertRules(rules []*models.Rule, channels []*model // CreateAlertRule creates Integrated Alerting rule. // Deprecated. Do not use. -func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.CreateAlertRuleRequest) (*iav1beta1.CreateAlertRuleResponse, error) { +func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.CreateAlertRuleRequest) (*iav1beta1.CreateAlertRuleResponse, error) { //nolint:staticcheck if req.TemplateName != "" && req.SourceRuleId != "" { return nil, status.Errorf(codes.InvalidArgument, "Both template name and source rule id are specified.") } @@ -442,12 +442,12 @@ func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.Creat s.updateConfigurations() - return &iav1beta1.CreateAlertRuleResponse{RuleId: rule.ID}, nil + return &iav1beta1.CreateAlertRuleResponse{RuleId: rule.ID}, nil //nolint:staticcheck } // UpdateAlertRule updates Integrated Alerting rule. // Deprecated. Do not use. -func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.UpdateAlertRuleRequest) (*iav1beta1.UpdateAlertRuleResponse, error) { +func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.UpdateAlertRuleRequest) (*iav1beta1.UpdateAlertRuleResponse, error) { //nolint:staticcheck params := &models.ChangeRuleParams{ Name: req.Name, Disabled: req.Disabled, @@ -491,7 +491,7 @@ func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.Updat s.updateConfigurations() - return &iav1beta1.UpdateAlertRuleResponse{}, nil + return &iav1beta1.UpdateAlertRuleResponse{}, nil //nolint:staticcheck } // ToggleAlertRule allows switching between disabled and enabled states of an Alert Rule. diff --git a/managed/utils/envvars/parser.go b/managed/utils/envvars/parser.go index 3412e95f23e..afc2aee8d06 100644 --- a/managed/utils/envvars/parser.go +++ b/managed/utils/envvars/parser.go @@ -69,7 +69,7 @@ func (e InvalidDurationError) Error() string { return string(e) } // - the environment variables prefixed with GF_ passed as related to Grafana. // - the environment variables relating to proxies // - the environment variable set by podman -func ParseEnvVars(envs []string) (envSettings *models.ChangeSettingsParams, errs []error, warns []string) { //nolint:cyclop,nonamedreturns +func ParseEnvVars(envs []string) (envSettings *models.ChangeSettingsParams, errs []error, warns []string) { //nolint:cyclop,nonamedreturns,maintidx envSettings = &models.ChangeSettingsParams{} for _, env := range envs {