This commit is contained in:
Ryan McKinley committed 2024-11-27 09:57:33 +03:00
1 parent 7a7d6d0c2d
commit 552a13f0ec
4 files changed
+13 -2

No files matched your search

+10 -1
View File
@@ -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 <Trans />", "0"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "1"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"]
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "3"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "4"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "5"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "6"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "7"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "8"]
],
"public/app/features/dashboard-scene/saving/SaveProvisionedDashboardForm.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
@@ -3682,6 +3688,9 @@ exports[`better eslint`] = {
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "3"]
],
"public/app/features/provisioning/RepositoryStatusPage.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"]
],
"public/app/features/provisioning/api/index.ts:5381": [
[0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"]
],
+1
View File
@@ -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
+1
View File
@@ -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"))
@@ -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")
)