diff --git a/.betterer.results b/.betterer.results index bb8da713bc1..1f6dba52b0c 100644 --- a/.betterer.results +++ b/.betterer.results @@ -2065,7 +2065,13 @@ exports[`better eslint`] = { "public/app/features/dashboard-scene/saving/SaveProvisionedDashboard.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "2"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "3"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "4"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "5"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "6"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "7"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "8"] ], "public/app/features/dashboard-scene/saving/SaveProvisionedDashboardForm.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], @@ -3682,6 +3688,9 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "2"], [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] ], + "public/app/features/provisioning/RepositoryStatusPage.tsx:5381": [ + [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] + ], "public/app/features/provisioning/api/index.ts:5381": [ [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"] ], diff --git a/pkg/registry/apis/folders/register.go b/pkg/registry/apis/folders/register.go index bd5d3456f66..d77580e398a 100644 --- a/pkg/registry/apis/folders/register.go +++ b/pkg/registry/apis/folders/register.go @@ -57,6 +57,7 @@ func RegisterAPIService(cfg *setting.Cfg, registerer prometheus.Registerer, ) *FolderAPIBuilder { if !(features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) || + features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerTestingWithExperimentalAPIs) || features.IsEnabledGlobally(featuremgmt.FlagKubernetesFolders) || features.IsEnabledGlobally(featuremgmt.FlagProvisioning)) { return nil // skip registration unless opting into experimental apis or dashboards in the k8s api diff --git a/pkg/registry/apis/provisioning/files.go b/pkg/registry/apis/provisioning/files.go index 86672a9d206..cc4f114468e 100644 --- a/pkg/registry/apis/provisioning/files.go +++ b/pkg/registry/apis/provisioning/files.go @@ -161,6 +161,7 @@ func (s *filesConnector) doRead(ctx context.Context, logger *slog.Logger, repo r // GVR will exist for anything we can actually save (dashboard/playlist for now) if parsed.gvr == nil { if parsed.gvk != nil { + //nolint:govet parsed.errors = append(parsed.errors, fmt.Errorf("unknown resource for Kind: "+parsed.gvk.Kind)) } else { parsed.errors = append(parsed.errors, fmt.Errorf("unknown resource")) diff --git a/pkg/registry/apis/provisioning/repository/github/client.go b/pkg/registry/apis/provisioning/repository/github/client.go index 0d14b9ab9a7..611b07ca77c 100644 --- a/pkg/registry/apis/provisioning/repository/github/client.go +++ b/pkg/registry/apis/provisioning/repository/github/client.go @@ -17,7 +17,7 @@ var ( ErrMismatchedHash = errors.New("the update cannot be applied because the expected and actual hashes are unequal") ErrNoSecret = errors.New("new webhooks must have a secret") //lint:ignore ST1005 this is not punctuation - ErrPathTraversalDisallowed = errors.New("the path contained ..") + ErrPathTraversalDisallowed = errors.New("the path contained ..") //nolint:stylecheck ErrServiceUnavailable = apierrors.NewServiceUnavailable("github is unavailable") )