CI: Bump golangci-lint to 2.0.2 (#103572)
This commit is contained in:
@@ -87,9 +87,10 @@ func (s *Service) ReportSummary(ctx context.Context) (*ReportInfo, error) {
|
||||
reportInfo := &ReportInfo{}
|
||||
if latestPluginCheck != nil {
|
||||
for _, failure := range latestPluginCheck.CheckStatus.Report.Failures {
|
||||
if failure.StepID == plugincheck.UpdateStepID {
|
||||
switch failure.StepID {
|
||||
case plugincheck.UpdateStepID:
|
||||
reportInfo.PluginsOutdated++
|
||||
} else if failure.StepID == plugincheck.DeprecationStepID {
|
||||
case plugincheck.DeprecationStepID:
|
||||
reportInfo.PluginsDeprecated++
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ func (m *ForwardIDMiddleware) applyToken(ctx context.Context, pCtx backend.Plugi
|
||||
return nil
|
||||
}
|
||||
|
||||
if token := reqCtx.SignedInUser.GetIDToken(); token != "" {
|
||||
if token := reqCtx.GetIDToken(); token != "" {
|
||||
req.SetHTTPHeader(forwardIDHeaderName, token)
|
||||
}
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@ func TestInstrumentationMiddleware(t *testing.T) {
|
||||
require.Equal(t, 1, testutil.CollectAndCount(promRegistry, metricRequestDurationMs))
|
||||
require.Equal(t, 1, testutil.CollectAndCount(promRegistry, metricRequestDurationS))
|
||||
|
||||
counter := mw.pluginMetrics.pluginRequestCounter.WithLabelValues(pluginID, string(tc.expEndpoint), instrumentationutils.RequestStatusOK.String(), string(backendplugin.TargetUnknown), string(backend.DefaultErrorSource))
|
||||
counter := mw.pluginRequestCounter.WithLabelValues(pluginID, string(tc.expEndpoint), instrumentationutils.RequestStatusOK.String(), string(backendplugin.TargetUnknown), string(backend.DefaultErrorSource))
|
||||
require.Equal(t, 1.0, testutil.ToFloat64(counter))
|
||||
for _, m := range []string{metricRequestDurationMs, metricRequestDurationS} {
|
||||
require.NoError(t, checkHistogram(promRegistry, m, map[string]string{
|
||||
@@ -162,14 +162,14 @@ func TestInstrumentationMiddlewareStatusSource(t *testing.T) {
|
||||
))
|
||||
|
||||
t.Run("Metrics", func(t *testing.T) {
|
||||
metricsMw.pluginMetrics.pluginRequestCounter.Reset()
|
||||
metricsMw.pluginRequestCounter.Reset()
|
||||
|
||||
cdt.TestHandler.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
|
||||
return &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{"A": downstreamErrorResponse}}, nil
|
||||
}
|
||||
_, err := cdt.MiddlewareHandler.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
|
||||
require.NoError(t, err)
|
||||
counter, err := metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(
|
||||
counter, err := metricsMw.pluginRequestCounter.GetMetricWith(newLabels(
|
||||
queryDataErrorCounterLabels,
|
||||
prometheus.Labels{
|
||||
labelStatusSource: string(backend.ErrorSourceDownstream),
|
||||
|
||||
@@ -32,8 +32,8 @@ func (m *UserHeaderMiddleware) applyUserHeader(ctx context.Context, h backend.Fo
|
||||
}
|
||||
|
||||
h.DeleteHTTPHeader(proxyutil.UserHeaderName)
|
||||
if !reqCtx.SignedInUser.IsIdentityType(claims.TypeAnonymous) {
|
||||
h.SetHTTPHeader(proxyutil.UserHeaderName, reqCtx.SignedInUser.GetLogin())
|
||||
if !reqCtx.IsIdentityType(claims.TypeAnonymous) {
|
||||
h.SetHTTPHeader(proxyutil.UserHeaderName, reqCtx.GetLogin())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ func (p *Plugin) Start(ctx context.Context) error {
|
||||
}
|
||||
|
||||
func (p *Plugin) Version() string {
|
||||
return p.plugin.JSONData.Info.Version
|
||||
return p.plugin.Info.Version
|
||||
}
|
||||
|
||||
func (m *Manager) Renderer(ctx context.Context) (rendering.Plugin, bool) {
|
||||
|
||||
Reference in New Issue
Block a user