[v9.4.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891)

pkg/api/quota_test.go

@@ -25,14 +25,6 @@ var (
 	testUpdateOrgQuotaCmd = `{ "limit": 20 }`
 )
 
-var testOrgQuota = setting.OrgQuota{
-	User:       10,
-	DataSource: 10,
-	Dashboard:  10,
-	ApiKey:     10,
-	AlertRule:  10,
-}
-
 func TestAPIEndpoint_GetCurrentOrgQuotas_LegacyAccessControl(t *testing.T) {
 	cfg := setting.NewCfg()
 	cfg.Quota.Enabled = true

pkg/build/cmd/flags.go

@@ -41,11 +41,6 @@ var (
 		Name:  "dry-run",
 		Usage: "Only simulate actions",
 	}
-	gcpKeyFlag = cli.StringFlag{
-		Name:     "gcp-key",
-		Usage:    "Google Cloud Platform key file",
-		Required: true,
-	}
 	gitHubTokenFlag = cli.StringFlag{
 		Name:    "github-token",
 		Value:   "",

pkg/build/docker/build.go

@@ -70,7 +70,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
 	}
 
 	libc := "-musl"
-	baseImage := fmt.Sprintf("%salpine:3.15", baseArch)
+	baseImage := fmt.Sprintf("%salpine:3.17", baseArch)
 	tagSuffix := ""
 	if useUbuntu {
 		libc = ""

pkg/services/ngalert/provisioning/notification_policies.go

@@ -74,6 +74,10 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 	}
 
 	receivers, err := nps.receiversToMap(revision.cfg.AlertmanagerConfig.Receivers)
+	if err != nil {
+		return err
+	}
+
 	err = tree.ValidateReceivers(receivers)
 	if err != nil {
 		return fmt.Errorf("%w: %s", ErrValidation, err.Error())

pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go

@@ -150,9 +150,7 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashes []dashboard, acl
 		return fmt.Errorf("failed to bulk-create roles: %w", err)
 	}
 
-	for i := range createdRoles {
-		allRoles = append(allRoles, createdRoles[i])
-	}
+	allRoles = append(allRoles, createdRoles...)
 
 	if err := m.bulkAssignRoles(createdRoles); err != nil {
 		return fmt.Errorf("failed to bulk-assign roles: %w", err)

pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go

@@ -173,7 +173,7 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
 	tracer.Inject(ctx, req.Header, span)
 
 	logger.Debug("AzureLogAnalytics", "Request ApiURL", req.URL.String())
-	res, err := client.Do(req)
+	res, err := client.Do(req) //nolint:bodyclose // fixed in main
 	if err != nil {
 		return dataResponseErrorWithExecuted(err)
 	}

pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go

@@ -178,7 +178,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, logger
 	tracer.Inject(ctx, req.Header, span)
 
 	logger.Debug("AzureResourceGraph", "Request ApiURL", req.URL.String())
-	res, err := client.Do(req)
+	res, err := client.Do(req) //nolint:bodyclose // fixed in main
 	if err != nil {
 		return dataResponseErrorWithExecuted(err)
 	}

pkg/tsdb/cloudmonitoring/utils.go

@@ -15,10 +15,11 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"go.opentelemetry.io/otel/attribute"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
-	"go.opentelemetry.io/otel/attribute"
 )
 
 func addInterval(period string, field *data.Field) error {
@@ -81,7 +82,7 @@ func doRequestPage(ctx context.Context, logger log.Logger, r *http.Request, dsIn
 		r.Body = io.NopCloser(bytes.NewBuffer(buf))
 		r.Method = http.MethodPost
 	}
-	res, err := dsInfo.services[cloudMonitor].client.Do(r)
+	res, err := dsInfo.services[cloudMonitor].client.Do(r) //nolint:bodyclose // fixed in main
 	if err != nil {
 		return cloudMonitoringResponse{}, err
 	}

pkg/tsdb/graphite/graphite.go

@@ -151,7 +151,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 
 	s.tracer.Inject(ctx, graphiteReq.Header, span)
 
-	res, err := dsInfo.HTTPClient.Do(graphiteReq)
+	res, err := dsInfo.HTTPClient.Do(graphiteReq) //nolint:bodyclose // fixed in main
 	if res != nil {
 		span.SetAttributes("graphite.response.code", res.StatusCode, attribute.Key("graphite.response.code").Int(res.StatusCode))
 	}

pkg/tsdb/opentsdb/opentsdb.go

@@ -93,7 +93,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		return &backend.QueryDataResponse{}, err
 	}
 
-	res, err := dsInfo.HTTPClient.Do(request)
+	res, err := dsInfo.HTTPClient.Do(request) //nolint:bodyclose // fixed in main
 	if err != nil {
 		return &backend.QueryDataResponse{}, err
 	}

pkg/tsdb/prometheus/querydata/request.go

@@ -155,6 +155,7 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
 }
 
 func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (backend.DataResponse, error) {
+	//nolint:bodyclose // fixed in main
 	res, err := c.QueryRange(ctx, q)
 	if err != nil {
 		return backend.DataResponse{}, err
@@ -163,6 +164,7 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.
 }
 
 func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (backend.DataResponse, error) {
+	//nolint:bodyclose // fixed in main
 	res, err := c.QueryInstant(ctx, q)
 	if err != nil {
 		return backend.DataResponse{}, err
@@ -171,6 +173,7 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model
 }
 
 func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (backend.DataResponse, error) {
+	//nolint:bodyclose // fixed in main
 	res, err := c.QueryExemplars(ctx, q)
 	if err != nil {
 		return backend.DataResponse{}, err

pkg/tsdb/prometheus/querydata/request_test.go

@@ -353,7 +353,7 @@ func executeWithHeaders(tctx *testContext, query backend.DataQuery, qr interface
 		Headers: headers,
 	}
 
-	promRes, err := toAPIResponse(qr)
+	promRes, err := toAPIResponse(qr) //nolint:bodyclose // fixed in main
 	if err != nil {
 		return nil, err
 	}

pkg/util/errutil/log.go

@@ -31,7 +31,7 @@ func (l LogLevel) LogFunc(logger LogInterface) func(msg string, ctx ...interface
 		return logger.Info
 	case LevelWarn:
 		return logger.Warn
-	default: // LevelUnknown and LevelError
+	default: // LevelUnknown and LevelError.
 		return logger.Error
 	}
 }