diff --git a/.betterer.results b/.betterer.results index c35064cb70b..adbcfdd1d1e 100644 --- a/.betterer.results +++ b/.betterer.results @@ -208,7 +208,8 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"] + [0, 0, 0, "Do not use any type assertions.", "3"], + [0, 0, 0, "Do not use any type assertions.", "4"] ], "packages/grafana-data/src/types/config.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] @@ -542,9 +543,11 @@ exports[`better eslint`] = { "packages/grafana-runtime/src/services/pluginExtensions/usePluginComponent.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], + "packages/grafana-runtime/src/services/pluginExtensions/usePluginComponents.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "packages/grafana-runtime/src/services/pluginExtensions/usePluginExtensions.ts:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"] + [0, 0, 0, "Do not use any type assertions.", "0"] ], "packages/grafana-runtime/src/utils/DataSourceWithBackend.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] @@ -2481,9 +2484,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "6"], [0, 0, 0, "Do not use any type assertions.", "7"] ], - "public/app/features/alerting/unified/utils/rulerClient.ts:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"] - ], "public/app/features/alerting/unified/utils/rules.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], @@ -4991,6 +4991,9 @@ exports[`better eslint`] = { "public/app/features/plugins/extensions/getPluginExtensions.test.tsx:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], + "public/app/features/plugins/extensions/usePluginComponents.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/features/plugins/loader/sharedDependencies.ts:5381": [ [0, 0, 0, "* import is invalid because \'Layout,HorizontalGroup,VerticalGroup\' from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], @@ -7810,7 +7813,6 @@ exports[`no gf-form usage`] = { [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"], [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"], [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"], - [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"], [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"] ], "public/app/features/variables/adhoc/picker/AdHocFilter.tsx:5381": [ diff --git a/.betterer.ts b/.betterer.ts index 269ef0d4dd0..6b92c439de6 100644 --- a/.betterer.ts +++ b/.betterer.ts @@ -10,6 +10,7 @@ const eslintPathsToIgnore = [ 'public/app/angular', // will be removed in Grafana 11 'public/app/plugins/panel/graph', // will be removed alongside angular 'public/app/plugins/panel/table-old', // will be removed alongside angular + 'e2e/test-plugins', ]; // Avoid using functions that report the position of the issues, as this causes a lot of merge conflicts diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index cfcedc5a4b9..21d5bcb5c62 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -35,11 +35,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod @echo "(re)installing $(GOBIN)/drone-v1.5.0" @cd $(BINGO_DIR) && GOWORK=off CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone" -GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.59.1 +GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.60.1 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/golangci-lint-v1.59.1" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.59.1 "github.com/golangci/golangci-lint/cmd/golangci-lint" + @echo "(re)installing $(GOBIN)/golangci-lint-v1.60.1" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.60.1 "github.com/golangci/golangci-lint/cmd/golangci-lint" JB := $(GOBIN)/jb-v0.5.1 $(JB): $(BINGO_DIR)/jb.mod diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index d92f68a1602..6f043fadfa9 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -1,7 +1,7 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.22 +go 1.22.1 -toolchain go1.22.4 +toolchain go1.23.0 -require github.com/golangci/golangci-lint v1.59.1 // cmd/golangci-lint +require github.com/golangci/golangci-lint v1.60.1 // cmd/golangci-lint diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum index abbf63506dd..60995023a48 100644 --- a/.bingo/golangci-lint.sum +++ b/.bingo/golangci-lint.sum @@ -55,18 +55,26 @@ github.com/Antonboom/testifylint v1.3.0 h1:UiqrddKs1W3YK8R0TUuWwrVKlVAnS07DTUVWW github.com/Antonboom/testifylint v1.3.0/go.mod h1:NV0hTlteCkViPW9mSR4wEMfwp+Hs1T3dY60bkvSfhpM= github.com/Antonboom/testifylint v1.3.1 h1:Uam4q1Q+2b6H7gvk9RQFw6jyVDdpzIirFOOrbs14eG4= github.com/Antonboom/testifylint v1.3.1/go.mod h1:NV0hTlteCkViPW9mSR4wEMfwp+Hs1T3dY60bkvSfhpM= +github.com/Antonboom/testifylint v1.4.3 h1:ohMt6AHuHgttaQ1xb6SSnxCeK4/rnK7KKzbvs7DmEck= +github.com/Antonboom/testifylint v1.4.3/go.mod h1:+8Q9+AOLsz5ZiQiiYujJKs9mNz398+M6UgslP4qgJLA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Crocmagnon/fatcontext v0.2.2 h1:OrFlsDdOj9hW/oBEJBNSuH7QWf+E9WPVHw+x52bXVbk= github.com/Crocmagnon/fatcontext v0.2.2/go.mod h1:WSn/c/+MMNiD8Pri0ahRj0o9jVpeowzavOQplBJw6u0= +github.com/Crocmagnon/fatcontext v0.4.0 h1:4ykozu23YHA0JB6+thiuEv7iT6xq995qS1vcuWZq0tg= +github.com/Crocmagnon/fatcontext v0.4.0/go.mod h1:ZtWrXkgyfsYPzS6K3O88va6t2GEglG93vnII/F94WC0= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 h1:sATXp1x6/axKxz2Gjxv8MALP0bXaNRfQinEwyfMcx8c= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0/go.mod h1:Nl76DrGNJTA1KJ0LePKBw/vznBX1EHbAZX8mwjR82nI= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0/go.mod h1:ONJg5sxcbsdQQ4pOW8TGdTidT2TMAUy/2Xhr8mrYaao= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= @@ -100,6 +108,8 @@ github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= github.com/bombsimon/wsl/v4 v4.2.1 h1:Cxg6u+XDWff75SIFFmNsqnIOgob+Q9hG6y/ioKbRFiM= github.com/bombsimon/wsl/v4 v4.2.1/go.mod h1:Xu/kDxGZTofQcDGCtQe9KCzhHphIe0fDuyWTxER9Feo= +github.com/bombsimon/wsl/v4 v4.4.1 h1:jfUaCkN+aUpobrMO24zwyAMwMAV5eSziCkOKEauOLdw= +github.com/bombsimon/wsl/v4 v4.4.1/go.mod h1:Xu/kDxGZTofQcDGCtQe9KCzhHphIe0fDuyWTxER9Feo= github.com/breml/bidichk v0.2.7 h1:dAkKQPLl/Qrk7hnP6P+E0xOodrq8Us7+U0o4UBOAlQY= github.com/breml/bidichk v0.2.7/go.mod h1:YodjipAGI9fGcYM7II6wFvGhdMYsC5pHDlGzqvEW3tQ= github.com/breml/errchkjson v0.3.6 h1:VLhVkqSBH96AvXEyclMR37rZslRrY2kcyq+31HCsVrA= @@ -132,6 +142,7 @@ github.com/ckaznocha/intrange v0.1.2/go.mod h1:RWffCw/vKBwHeOEwWdCikAtY0q4gGt8Vh github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/daixiang0/gci v0.12.3 h1:yOZI7VAxAGPQmkb1eqt5g/11SUlwoat1fSblGLmdiQc= @@ -208,6 +219,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= +github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -248,6 +261,8 @@ github.com/golangci/golangci-lint v1.59.0 h1:st69YDnAH/v2QXDcgUaZ0seQajHScPALBVk github.com/golangci/golangci-lint v1.59.0/go.mod h1:QNA32UWdUdHXnu+Ap5/ZU4WVwyp2tL94UxEXrSErjg0= github.com/golangci/golangci-lint v1.59.1 h1:CRRLu1JbhK5avLABFJ/OHVSQ0Ie5c4ulsOId1h3TTks= github.com/golangci/golangci-lint v1.59.1/go.mod h1:jX5Oif4C7P0j9++YB2MMJmoNrb01NJ8ITqKWNLewThg= +github.com/golangci/golangci-lint v1.60.1 h1:DRKNqNTQRLBJZ1il5u4fvgLQCjQc7QFs0DbhksJtVJE= +github.com/golangci/golangci-lint v1.60.1/go.mod h1:jDIPN1rYaIA+ijp9OZcUmUCoQOtZ76pOlFbi15FlLJY= github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g= github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI= github.com/golangci/misspell v0.5.1 h1:/SjR1clj5uDjNLwYzCahHwIOPmQgoH04AyQIiWGbhCM= @@ -331,6 +346,8 @@ github.com/jjti/go-spancheck v0.5.3 h1:vfq4s2IB8T3HvbpiwDTYgVPj1Ze/ZSXrTtaZRTc7C github.com/jjti/go-spancheck v0.5.3/go.mod h1:eQdOX1k3T+nAKvZDyLC3Eby0La4dZ+I19iOl5NzSPFE= github.com/jjti/go-spancheck v0.6.1 h1:ZK/wE5Kyi1VX3PJpUO2oEgeoI4FWOUm7Shb2Gbv5obI= github.com/jjti/go-spancheck v0.6.1/go.mod h1:vF1QkOO159prdo6mHRxak2CpzDpHAfKiPUDP/NeRnX8= +github.com/jjti/go-spancheck v0.6.2 h1:iYtoxqPMzHUPp7St+5yA8+cONdyXD3ug6KK15n7Pklk= +github.com/jjti/go-spancheck v0.6.2/go.mod h1:+X7lvIrR5ZdUTkxFYqzJ0abr8Sb5LOo80uOhWNqIrYA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -401,6 +418,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE= github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA= +github.com/mgechev/revive v1.3.9 h1:18Y3R4a2USSBF+QZKFQwVkBROUda7uoBlkEuBD+YD1A= +github.com/mgechev/revive v1.3.9/go.mod h1:+uxEIr5UH0TjXWHTno3xh4u7eg6jDpXKzQccA9UGhHU= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -412,6 +431,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/moricho/tparallel v0.3.1 h1:fQKD4U1wRMAYNngDonW5XupoB/ZGJHdpzrWqgyg9krA= github.com/moricho/tparallel v0.3.1/go.mod h1:leENX2cUv7Sv2qDgdi0D0fCftN8fRC67Bcn8pqzeYNI= +github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI= +github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= @@ -448,6 +469,8 @@ github.com/polyfloyd/go-errorlint v1.5.1 h1:5gHxDjLyyWij7fhfrjYNNlHsUNQeyx0LFQKU github.com/polyfloyd/go-errorlint v1.5.1/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= github.com/polyfloyd/go-errorlint v1.5.2 h1:SJhVik3Umsjh7mte1vE0fVZ5T1gznasQG3PV7U5xFdA= github.com/polyfloyd/go-errorlint v1.5.2/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= +github.com/polyfloyd/go-errorlint v1.6.0 h1:tftWV9DE7txiFzPpztTAwyoRLKNj9gpVm2cg8/OwcYY= +github.com/polyfloyd/go-errorlint v1.6.0/go.mod h1:HR7u8wuP1kb1NeN1zqTd1ZMlqUKPPHF+Id4vIPvDqVw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -486,6 +509,8 @@ github.com/ryancurrah/gomodguard v1.3.1 h1:fH+fUg+ngsQO0ruZXXHnA/2aNllWA1whly4a6 github.com/ryancurrah/gomodguard v1.3.1/go.mod h1:DGFHzEhi6iJ0oIDfMuo3TgrS+L9gZvrEfmjjuelnRU0= github.com/ryancurrah/gomodguard v1.3.2 h1:CuG27ulzEB1Gu5Dk5gP8PFxSOZ3ptSdP5iI/3IXxM18= github.com/ryancurrah/gomodguard v1.3.2/go.mod h1:LqdemiFomEjcxOqirbQCb3JFvSxH2JUYMerTFd3sF2o= +github.com/ryancurrah/gomodguard v1.3.3 h1:eiSQdJVNr9KTNxY2Niij8UReSwR8Xrte3exBrAZfqpg= +github.com/ryancurrah/gomodguard v1.3.3/go.mod h1:rsKQjj4l3LXe8N344Ow7agAy5p9yjsWOtRzUMYmA0QY= github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc= @@ -498,6 +523,8 @@ github.com/sashamelentyev/usestdlibvars v1.25.0 h1:IK8SI2QyFzy/2OD2PYnhy84dpfNo9 github.com/sashamelentyev/usestdlibvars v1.25.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= github.com/sashamelentyev/usestdlibvars v1.26.0 h1:LONR2hNVKxRmzIrZR0PhSF3mhCAzvnr+DcUiHgREfXE= github.com/sashamelentyev/usestdlibvars v1.26.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= +github.com/sashamelentyev/usestdlibvars v1.27.0 h1:t/3jZpSXtRPRf2xr0m63i32ZrusyurIGT9E5wAvXQnI= +github.com/sashamelentyev/usestdlibvars v1.27.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= github.com/securego/gosec/v2 v2.19.0 h1:gl5xMkOI0/E6Hxx0XCY2XujA3V7SNSefA8sC+3f1gnk= github.com/securego/gosec/v2 v2.19.0/go.mod h1:hOkDcHz9J/XIgIlPDXalxjeVYsHxoWUc5zJSHxcB8YM= github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 h1:rnO6Zp1YMQwv8AyxzuwsVohljJgp4L0ZqiCgtACsPsc= @@ -515,6 +542,8 @@ github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+W github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= +github.com/sivchari/tenv v1.10.0 h1:g/hzMA+dBCKqGXgW8AV/1xIWhAvDrx0zFKNR48NFMg0= +github.com/sivchari/tenv v1.10.0/go.mod h1:tdY24masnVoZFxYrHv/nD6Tc8FbkEtAQEEziXpyMgqY= github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= github.com/sonatard/noctx v0.0.2/go.mod h1:kzFz+CzWSjQ2OzIm46uJZoXuBpa2+0y3T36U18dWqIo= github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0= @@ -525,6 +554,8 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -577,6 +608,8 @@ github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/ github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k= +github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZyM= +github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U= github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg= github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= @@ -608,6 +641,8 @@ go-simpler.org/sloglint v0.7.0 h1:rMZRxD9MbaGoRFobIOicMxZzum7AXNFDlez6xxJs5V4= go-simpler.org/sloglint v0.7.0/go.mod h1:g9SXiSWY0JJh4LS39/Q0GxzP/QX2cVcbTOYhDpXrJEs= go-simpler.org/sloglint v0.7.1 h1:qlGLiqHbN5islOxjeLXoPtUdZXb669RW+BDQ+xOSNoU= go-simpler.org/sloglint v0.7.1/go.mod h1:OlaVDRh/FKKd4X4sIMbsz8st97vomydceL146Fthh/c= +go-simpler.org/sloglint v0.7.2 h1:Wc9Em/Zeuu7JYpl+oKoYOsQSy2X560aVueCW/m6IijY= +go-simpler.org/sloglint v0.7.2/go.mod h1:US+9C80ppl7VsThQclkM7BkCHQAzuz8kHLsW3ppuluo= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -679,6 +714,8 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -740,6 +777,8 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -800,6 +839,8 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -890,6 +931,8 @@ golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -997,6 +1040,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +honnef.co/go/tools v0.5.0 h1:29uoiIormS3Z6R+t56STz/oI4v+mB51TSmEOdJPgRnE= +honnef.co/go/tools v0.5.0/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs= mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14 h1:zCr3iRRgdk5eIikZNDphGcM6KGVTx3Yu+/Uu9Es254w= diff --git a/.bingo/variables.env b/.bingo/variables.env index 2df4e49c0ba..2f31fa8a2e7 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -14,7 +14,7 @@ CUE="${GOBIN}/cue-v0.5.0" DRONE="${GOBIN}/drone-v1.5.0" -GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.59.1" +GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.1" JB="${GOBIN}/jb-v0.5.1" diff --git a/.drone.yml b/.drone.yml index 22b31b9b296..57e6b2857d8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -76,14 +76,14 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: - compile-build-cmd - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: lint-starlark trigger: event: @@ -377,7 +377,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -386,21 +386,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend - commands: - apk add --update build-base @@ -409,7 +409,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend-integration trigger: event: @@ -461,7 +461,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - apk add --update curl jq bash @@ -488,16 +488,16 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: validate-openapi-spec trigger: event: @@ -556,7 +556,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -566,7 +566,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -575,14 +575,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -615,7 +615,7 @@ steps: from_secret: drone_token - commands: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.22.4 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.23.0 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -628,6 +628,14 @@ steps: volumes: - name: docker path: /var/run/docker.sock +- commands: + - yarn e2e:plugin:build + depends_on: + - yarn-install + environment: + NODE_OPTIONS: --max_old_space_size=8192 + image: node:20.9.0-alpine + name: build-test-plugins - commands: - apk add --update tar bash - mkdir grafana @@ -646,6 +654,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite dashboards-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -654,6 +663,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/dashboards-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -662,6 +672,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -670,6 +681,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/smoke-tests-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -678,6 +690,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite panels-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -686,6 +699,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/panels-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -694,6 +708,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite various-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -702,6 +717,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/various-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -738,6 +754,7 @@ steps: - yarn e2e:playwright depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server PORT: "3001" @@ -851,7 +868,7 @@ steps: - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.22.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.23.0 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -954,7 +971,7 @@ services: - commands: - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: grafana/mimir-alpine:r295-a23e559 + image: grafana/mimir-alpine:r304-3872ccb name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -995,7 +1012,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1009,7 +1026,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1018,14 +1035,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1046,7 +1063,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1067,7 +1084,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1088,7 +1105,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1104,7 +1121,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1120,7 +1137,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1137,7 +1154,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1225,7 +1242,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue trigger: event: @@ -1266,7 +1283,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - apt-get update -yq && apt-get install shellcheck @@ -1338,7 +1355,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: swagger-gen trigger: event: @@ -1402,7 +1419,7 @@ services: - commands: - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: grafana/mimir-alpine:r295-a23e559 + image: grafana/mimir-alpine:r304-3872ccb name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -1434,7 +1451,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1445,7 +1462,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1455,14 +1472,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - apk add --update build-base @@ -1470,7 +1487,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1482,7 +1499,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1493,7 +1510,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1504,7 +1521,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1582,7 +1599,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue trigger: branch: main @@ -1755,7 +1772,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1764,21 +1781,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend - commands: - apk add --update build-base @@ -1787,7 +1804,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend-integration trigger: branch: main @@ -1832,22 +1849,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -1964,7 +1981,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1974,7 +1991,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1983,14 +2000,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -2022,7 +2039,7 @@ steps: name: build-frontend-packages - commands: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.22.4 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.23.0 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2035,6 +2052,14 @@ steps: volumes: - name: docker path: /var/run/docker.sock +- commands: + - yarn e2e:plugin:build + depends_on: + - yarn-install + environment: + NODE_OPTIONS: --max_old_space_size=8192 + image: node:20.9.0-alpine + name: build-test-plugins - commands: - apk add --update tar bash - mkdir grafana @@ -2053,6 +2078,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite dashboards-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2061,6 +2087,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/dashboards-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2069,6 +2096,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2077,6 +2105,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/smoke-tests-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2085,6 +2114,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite panels-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2093,6 +2123,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/panels-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2101,6 +2132,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite various-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2109,6 +2141,7 @@ steps: - ./bin/build e2e-tests --port 3001 --suite scenes/various-suite depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server image: cypress/included:13.10.0 @@ -2145,6 +2178,7 @@ steps: - yarn e2e:playwright depends_on: - grafana-server + - build-test-plugins environment: HOST: grafana-server PORT: "3001" @@ -2294,7 +2328,7 @@ steps: - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.22.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.23.0 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -2480,7 +2514,7 @@ services: - commands: - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: grafana/mimir-alpine:r295-a23e559 + image: grafana/mimir-alpine:r304-3872ccb name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -2500,7 +2534,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2514,7 +2548,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2523,14 +2557,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2551,7 +2585,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2572,7 +2606,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2593,7 +2627,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2609,7 +2643,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2625,7 +2659,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2642,7 +2676,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2952,7 +2986,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2961,21 +2995,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend - commands: - apk add --update build-base @@ -2984,7 +3018,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend-integration trigger: branch: @@ -3027,22 +3061,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: validate-openapi-spec trigger: branch: @@ -3112,7 +3146,7 @@ services: - commands: - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: grafana/mimir-alpine:r295-a23e559 + image: grafana/mimir-alpine:r304-3872ccb name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -3132,7 +3166,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3146,7 +3180,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3155,14 +3189,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3183,7 +3217,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3204,7 +3238,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3225,7 +3259,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3241,7 +3275,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3257,7 +3291,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3274,7 +3308,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3377,7 +3411,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3508,7 +3542,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3644,7 +3678,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -3729,7 +3763,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3953,7 +3987,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4171,7 +4205,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.23.0 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4229,13 +4263,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: whats-new-checker trigger: event: @@ -4337,7 +4371,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4346,21 +4380,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend - commands: - apk add --update build-base @@ -4369,7 +4403,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend-integration trigger: event: @@ -4426,7 +4460,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.23.0 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4609,7 +4643,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.23.0 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4758,7 +4792,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4767,21 +4801,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend - commands: - apk add --update build-base @@ -4790,7 +4824,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: test-backend-integration trigger: cron: @@ -4845,7 +4879,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.23.0 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4992,7 +5026,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.23.0 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -5081,7 +5115,7 @@ steps: - commands: - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF} --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} ' - - --go-version=1.22.4 + - --go-version=1.23.0 environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token @@ -5102,7 +5136,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.23.0 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -5192,20 +5226,20 @@ steps: - commands: [] depends_on: - clone - image: golang:1.22.4-windowsservercore-1809 + image: golang:1.23.0-windowsservercore-1809 name: windows-init - commands: - go install github.com/google/wire/cmd/wire@v0.5.0 - wire gen -tags oss ./pkg/server depends_on: - windows-init - image: golang:1.22.4-windowsservercore-1809 + image: golang:1.23.0-windowsservercore-1809 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.22.4-windowsservercore-1809 + image: golang:1.23.0-windowsservercore-1809 name: test-backend trigger: event: @@ -5271,7 +5305,7 @@ services: - commands: - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled environment: {} - image: grafana/mimir-alpine:r295-a23e559 + image: grafana/mimir-alpine:r304-3872ccb name: mimir_backend - environment: {} image: redis:6.2.11-alpine @@ -5298,7 +5332,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5307,14 +5341,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -5335,7 +5369,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -5356,7 +5390,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -5377,7 +5411,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -5393,7 +5427,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5409,7 +5443,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -5426,7 +5460,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.23.0-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5781,7 +5815,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.4-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -5792,7 +5826,7 @@ steps: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir-alpine:r295-a23e559 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir-alpine:r304-3872ccb - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM redis:6.2.11-alpine @@ -5818,7 +5852,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.4-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -5829,7 +5863,7 @@ steps: - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack - trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8 - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine - - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir-alpine:r295-a23e559 + - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir-alpine:r304-3872ccb - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39 - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32 - trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine @@ -6074,6 +6108,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: d35eadf9a166f68973ffd6df85f165bbda468d422d5debe416ec6a5af6ead84a +hmac: 7c752913b444e0efe410d5a8a0d300e1b4d48d2cac8df602c35314bc62b7ac3c ... diff --git a/.eslintignore b/.eslintignore index 95ace0ec535..1b83fc33e02 100644 --- a/.eslintignore +++ b/.eslintignore @@ -13,7 +13,7 @@ node_modules /public/lib/monaco /scripts/grafana-server/tmp vendor -e2e/custom-plugins +e2e/test-plugins playwright-report # TS generate from cue by cuetsy diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c92f3f3d701..8c656594ef8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -209,6 +209,7 @@ /devenv/docker/blocks/postgres_tests/ @grafana/oss-big-tent /devenv/docker/blocks/prometheus/ @grafana/observability-metrics /devenv/docker/blocks/prometheus_random_data/ @grafana/observability-metrics +/devenv/docker/blocks/prometheus_high_card/ @grafana/observability-metrics /devenv/docker/blocks/pyroscope/ @grafana/observability-traces-and-profiling /devenv/docker/blocks/redis/ @bergquist /devenv/docker/blocks/sensugo/ @grafana/grafana-backend-group @@ -319,6 +320,7 @@ /e2e/ @grafana/grafana-frontend-platform /e2e/cloud-plugins-suite/ @grafana/partner-datasources /e2e/plugin-e2e/plugin-e2e-api-tests/ @grafana/plugins-platform-frontend +/e2e/test-plugins/grafana-extensionstest-app/ @grafana/plugins-platform-frontend # Packages /packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend diff --git a/.github/workflows/detect-breaking-changes-levitate.yml b/.github/workflows/detect-breaking-changes-levitate.yml index 0cca7c5e785..ad0fcdbcdcf 100644 --- a/.github/workflows/detect-breaking-changes-levitate.yml +++ b/.github/workflows/detect-breaking-changes-levitate.yml @@ -141,6 +141,7 @@ jobs: with: workload_identity_provider: ${{ secrets.WIF_PROVIDER }} service_account: ${{ secrets.LEVITATE_SA }} + project_id: 'grafanalabs-global' - name: 'Set up Cloud SDK' uses: 'google-github-actions/setup-gcloud@v2' @@ -149,16 +150,6 @@ jobs: project_id: 'grafanalabs-global' install_components: 'bq' - # This step is needed to generate a detailed levitate report - - name: Set up gcloud project - run: | - unset CLOUDSDK_CORE_PROJECT - unset GCLOUD_PROJECT - unset GCP_PROJECT - unset GOOGLE_CLOUD_PROJECT - - gcloud config set project grafanalabs-global - - name: Get link for the Github Action job id: job uses: actions/github-script@v6 diff --git a/.github/workflows/go_lint.yml b/.github/workflows/go_lint.yml index 4cdbabf22b3..d4ac5e49346 100644 --- a/.github/workflows/go_lint.yml +++ b/.github/workflows/go_lint.yml @@ -25,8 +25,8 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.59.1 + version: v1.60.1 args: | - --config .golangci.toml --max-same-issues=0 --max-issues-per-linter=0 --verbose $(./scripts/go-workspace/golangci-lint-includes.sh) + --config .golangci.toml --max-same-issues=0 --max-issues-per-linter=0 --verbose $(./scripts/go-workspace/golangci-lint-includes.sh) skip-cache: true install-mode: binary diff --git a/.github/workflows/pr-go-workspace-check.yml b/.github/workflows/pr-go-workspace-check.yml index 699f211e1e9..bc5385ef0e0 100644 --- a/.github/workflows/pr-go-workspace-check.yml +++ b/.github/workflows/pr-go-workspace-check.yml @@ -30,4 +30,6 @@ jobs: echo "Please run 'make update-workspace' and commit the changes." echo "If there is a change in enterprise dependencies, please update pkg/extensions/main.go." exit 1 - fi \ No newline at end of file + fi + - name: Ensure Dockerfile contains submodule COPY commands + run: ./scripts/go-workspace/validate-dockerfile.sh \ No newline at end of file diff --git a/.golangci.toml b/.golangci.toml index f45ec1af4b7..e021433a9a6 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -125,6 +125,34 @@ files = [ "**/pkg/promlib/**/*" ] +[linters-settings.depguard.rules.storage-unified-resource] +list-mode = "lax" +allow = [ + "github.com/grafana/grafana/pkg/apimachinery", +] +deny = [ + { pkg = "github.com/grafana/grafana/pkg", desc = "pkg/storage/unified/resource is not allowed to import grafana core" } +] +files = [ + "./pkg/storage/unified/resource/*", + "./pkg/storage/unified/resource/**/*" +] + +[linters-settings.depguard.rules.storage-unified-apistore] +list-mode = "lax" +allow = [ + "github.com/grafana/grafana/pkg/apimachinery", + "github.com/grafana/grafana/pkg/apiserver", + "github.com/grafana/grafana/pkg/unified/resource", +] +deny = [ + { pkg = "github.com/grafana/grafana/pkg", desc = "pkg/storage/unified/apistore is not allowed to import grafana core" } +] +files = [ + "./pkg/storage/unified/apistore/*", + "./pkg/storage/unified/apistore/**/*" +] + [linters-settings.gocritic] enabled-checks = ["ruleguard"] [linters-settings.gocritic.settings.ruleguard] diff --git a/Dockerfile b/Dockerfile index 5fe3fc478aa..ddc1398f7f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.19.1 ARG JS_IMAGE=node:20-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.22.4-alpine +ARG GO_IMAGE=golang:1.23.0-alpine ARG GO_SRC=go-builder ARG JS_SRC=js-builder @@ -63,6 +63,7 @@ COPY pkg/build/go.* pkg/build/ COPY pkg/build/wire/go.* pkg/build/wire/ COPY pkg/promlib/go.* pkg/promlib/ COPY pkg/storage/unified/resource/go.* pkg/storage/unified/resource/ +COPY pkg/storage/unified/apistore/go.* pkg/storage/unified/apistore/ COPY pkg/semconv/go.* pkg/semconv/ COPY pkg/aggregator/go.* pkg/aggregator/ diff --git a/Makefile b/Makefile index 1424ea96ce0..1f45d7385aa 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.22.4 +GO_VERSION = 1.23.0 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) SH_FILES ?= $(shell find ./scripts -name *.sh) @@ -239,6 +239,14 @@ test-go-unit: ## Run unit tests for backend with flags. printf '$(GO_TEST_FILES)' | xargs \ $(GO) test $(GO_RACE_FLAG) -short -covermode=atomic -timeout=30m +.PHONY: test-go-unit-pretty +test-go-unit-pretty: check-tparse + @if [ -z "$(FILES)" ]; then \ + echo "Notice: FILES variable is not set. Try \"make test-go-unit-pretty FILES=./pkg/services/mysvc\""; \ + exit 1; \ + fi + $(GO) test $(GO_RACE_FLAG) -timeout=10s $(FILES) -json | tparse -all + .PHONY: test-go-integration test-go-integration: ## Run integration tests for backend with flags. @echo "test backend integration tests" @@ -431,6 +439,12 @@ go-race-is-enabled: enable-go-race: @touch .go-race-enabled-locally +check-tparse: + @command -v tparse >/dev/null 2>&1 || { \ + echo >&2 "Error: tparse is not installed. Refer to https://github.com/mfridman/tparse"; \ + exit 1; \ + } + .PHONY: help help: ## Display this help. @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) diff --git a/conf/defaults.ini b/conf/defaults.ini index b14e1d5ea49..e164bf0fbd2 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1729,6 +1729,12 @@ install_token = hide_angular_deprecation = # Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled. forward_host_env_vars = +# Comma separated list of plugin ids to install as part of the startup process. Used only when feature flag backgroundPluginInstaller is enabled. +preinstall = +# Controls whether preinstall plugins asynchronously (in the background) or synchronously (blocking). Useful when preinstalled plugins are used with provisioning. +preinstall_async = true +# Disables preinstall feature. It has the same effect as setting preinstall to an empty list. +preinstall_disabled = false #################################### Grafana Live ########################################## [live] diff --git a/contribute/engineering/terminology.md b/contribute/engineering/terminology.md index 5b28cb7f4b1..5392f9050e4 100644 --- a/contribute/engineering/terminology.md +++ b/contribute/engineering/terminology.md @@ -2,16 +2,14 @@ -This document defines technical terms used in Grafana. +This glossary defines technical terms used in Grafana. ## TLS/SSL The acronyms [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security) (Transport Layer Security) and -[SSL](https://en.wikipedia.org/wiki/SSL) (Secure Socket Layer) are both used to describe the HTTPS security layer, -and are in practice synonymous. However, TLS is considered the current name for the technology, and SSL is considered +[SSL](https://en.wikipedia.org/wiki/SSL) (Secure Socket Layer) are both used to describe the HTTPS security layer. +In practice, they are synonymous. However, TLS is considered the current name for the technology, and SSL is considered [deprecated](https://tools.ietf.org/html/rfc7568). -As such, while both terms are in use (also in our codebase) and are indeed interchangeable, TLS is the preferred term. -That said however, we have at Grafana Labs decided to use both acronyms in combination when referring to this type of -technology, i.e. _TLS/SSL_. This is in order to not confuse those who may not be aware of them being synonymous, -and SSL still being so prevalent in common discourse. +As such, while we use both terms in our codebase and documentation, we generally prefer TLS. +However, we use both acronyms in combination when referring to this type of technology, that is, _TLS/SSL_. We do this because we don't want to confuse readers who may not be aware of them being synonymous, and SSL is still prevalent in common discourse. diff --git a/contribute/style-guides/e2e-plugins.md b/contribute/style-guides/e2e-plugins.md index 6324204c4f6..e708281d675 100644 --- a/contribute/style-guides/e2e-plugins.md +++ b/contribute/style-guides/e2e-plugins.md @@ -1,16 +1,18 @@ -# end-to-end tests for plugins +# End-to-end tests for plugins -When end-to-end testing Grafana plugins, it's recommended to use the [`@grafana/plugin-e2e`](https://www.npmjs.com/package/@grafana/plugin-e2e?activeTab=readme) testing tool. `@grafana/plugin-e2e` extends [`@playwright/test`](https://playwright.dev/) capabilities with relevant fixtures, models, and expect matchers; enabling comprehensive end-to-end testing of Grafana plugins across multiple versions of Grafana. For information on how to get started with Plugin end-to-end testing and Playwright, checkout the [Get started](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/get-started) guide. +When end-to-end testing Grafana plugins, a best practice is to use the [`@grafana/plugin-e2e`](https://www.npmjs.com/package/@grafana/plugin-e2e?activeTab=readme) testing tool. The `@grafana/plugin-e2e` tool extends [`@playwright/test`](https://playwright.dev/) capabilities with relevant fixtures, models, and expect matchers. Use it to enable comprehensive end-to-end testing of Grafana plugins across multiple versions of Grafana. -## Adding end-to-end tests for a core plugin +> **Note:** To learn more, refer to our documentation on [plugin development](https://grafana.com/developers/plugin-tools/) and [end-to-end plugin testing](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/get-started). -Playwright end-to-end tests for plugins should be added to the [`e2e/plugin-e2e`](https://github.com/grafana/grafana/tree/main/e2e/plugin-e2e) directory. +## Add end-to-end tests for a core plugin -1. Add a new directory that has the name as your plugin [`here`](https://github.com/grafana/grafana/tree/main/e2e/plugin-e2e). This is where your plugin tests will be kept. +You can add Playwright end-to-end tests for plugins to the [`e2e/plugin-e2e`](https://github.com/grafana/grafana/tree/main/e2e/plugin-e2e) directory. -2. Playwright uses [projects](https://playwright.dev/docs/test-projects) to logically group tests together. All tests in a project share the same configuration. - In the [Playwright config file](https://github.com/grafana/grafana/blob/main/playwright.config.ts), add a new project item. Make sure the `name` and the `testDir` sub directory matches the name of the directory that contains your plugin tests. - Adding `'authenticate'` to the list of dependencies and specifying `'playwright/.auth/admin.json'` as storage state will ensure all tests in your project will start already authenticated as an admin user. If you wish to use a different role for and perhaps test RBAC for some of your tests, please refer to the plugin-e2e [documentation](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/use-authentication). +1. Add a new directory that has the name as your plugin [`here`](https://github.com/grafana/grafana/tree/main/e2e/plugin-e2e). This is the directory where your plugin tests will be kept. + +1. Playwright uses [projects](https://playwright.dev/docs/test-projects) to logically group tests together. All tests in a project share the same configuration. + In the [Playwright config file](https://github.com/grafana/grafana/blob/main/playwright.config.ts), add a new project item. Make sure the `name` and the `testDir` subdirectory match the name of the directory that contains your plugin tests. + Add `'authenticate'` to the list of dependencies and specify `'playwright/.auth/admin.json'` as the storage state to ensure that all tests in your project will start already authenticated as an admin user. If you want to use a different role for and perhaps test RBAC for some of your tests, refer to our [documentation](https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/use-authentication). ```ts { @@ -24,14 +26,16 @@ Playwright end-to-end tests for plugins should be added to the [`e2e/plugin-e2e` }, ``` -3. Update the [CODEOWNERS](https://github.com/grafana/grafana/blob/main/.github/CODEOWNERS/#L315) file so that your team is owner of the tests in the directory you added in step 1. +1. Update the [CODEOWNERS](https://github.com/grafana/grafana/blob/main/.github/CODEOWNERS/#L315) file so that your team is owner of the tests in the directory you added in step 1. ## Commands -- `yarn e2e:playwright` will run all Playwright tests. Optionally, you can provide the `--project mysql` argument to run tests in a certain project. +- `yarn e2e:playwright` runs all Playwright tests. Optionally, you can provide the `--project mysql` argument to run tests in a specific project. -The script above assumes you have Grafana running on `localhost:3000`. You may change this by providing environment variables. + The `yarn e2e:playwright` script assumes you have Grafana running on `localhost:3000`. You may change this with an environment variable: -`HOST=127.0.0.1 PORT=3001 yarn e2e:playwright` + `HOST=127.0.0.1 PORT=3001 yarn e2e:playwright` -- `yarn e2e:playwright:server` will start a Grafana [development server](https://github.com/grafana/grafana/blob/main/scripts/grafana-server/start-server) on port 3001 and run the Playwright tests. The development server is provisioned with the [devenv](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md#add-data-sources) dashboards, data sources and apps. + The `yarn e2e:playwright:server` starts a Grafana [development server](https://github.com/grafana/grafana/blob/main/scripts/grafana-server/start-server) on port 3001 and runs the Playwright tests. + +- You can provision the development server with the [devenv](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md#add-data-sources) dashboards, data sources, and apps. diff --git a/contribute/style-guides/e2e.md b/contribute/style-guides/e2e.md index 285936f2c5b..89424bafd9e 100644 --- a/contribute/style-guides/e2e.md +++ b/contribute/style-guides/e2e.md @@ -1,4 +1,4 @@ -# End-to-End tests +# End-to-end tests Grafana Labs uses a minimal [homegrown solution](../../e2e/utils/index.ts) built on top of [Cypress](https://cypress.io) for its end-to-end (E2E) tests. @@ -6,17 +6,17 @@ Important notes: - We generally store all element identifiers ([CSS selectors](https://mdn.io/docs/Web/CSS/CSS_Selectors)) within the framework for reuse and maintainability. - We generally do not use stubs or mocks as to fully simulate a real user. -- Cypress' promises [do not behave as you'd expect](https://docs.cypress.io/guides/core-concepts/introduction-to-cypress.html#Mixing-Async-and-Sync-code). -- [Testing core Grafana](e2e-core.md) is different than [testing plugins](e2e-plugins.md) - core Grafana uses Cypress whereas plugins use [Playwright test](https://playwright.dev/). +- Cypress' promises [don't behave as you might expect](https://docs.cypress.io/guides/core-concepts/introduction-to-cypress.html#Mixing-Async-and-Sync-code). +- [Testing core Grafana](e2e-core.md) is different than [testing plugins](e2e-plugins.md)—core Grafana uses Cypress whereas plugins use [Playwright test](https://playwright.dev/). ## Framework structure -Inspired by https://martinfowler.com/bliki/PageObject.html +Our framework structure is inspired by [Martin Fowler's Page Object](https://martinfowler.com/bliki/PageObject.html). -- `Selector`: A unique identifier that is used from the E2E framework to retrieve an element from the Browser -- `Page`: An abstraction for an object that contains one or more `Selectors` with `visit` function to navigate to the page. -- `Component`: An abstraction for an object that contains one or more `Selectors` but without `visit` function -- `Flow`: An abstraction that contains a sequence of actions on one or more `Pages` that can be reused and shared between tests +- **`Selector`**: A unique identifier that is used from the E2E framework to retrieve an element from the browser +- **`Page`**: An abstraction for an object that contains one or more `Selector` identifiers with the `visit` function to go to the page. +- **`Component`**: An abstraction for an object that contains one or more `Selector` identifiers but without the `visit` function +- **`Flow`**: An abstraction that contains a sequence of actions on one or more `Page` abstractions that can be reused and shared between tests ## Basic example @@ -26,13 +26,15 @@ Let's start with a simple [JSX](https://reactjs.org/docs/introducing-jsx.html) e ``` -We _could_ target the field with a CSS selector like `.gf-form-input.login-form-input` but that would be brittle as style changes occur frequently. Furthermore there is nothing that signals to future developers that this input is part of an E2E test. At Grafana, we use `data-testid` attributes as our preferred way of defining selectors. See [Aria-Labels vs data-testid](#aria-labels-vs-data-testid) for more details. +It is possible to target the field with a CSS selector like `.gf-form-input.login-form-input`. However, doing so is a brittle solution because style changes occur frequently. + +Furthermore, there is nothing that signals to future developers that this input is part of an E2E test. At Grafana, we use `data-testid` attributes as our preferred way of defining selectors. See [Aria-Labels vs data-testid](#aria-labels-vs-data-testid) for more details. ```jsx ``` -The next step is to create a `Page` representation in our E2E framework to glue the test with the real implementation using the `pageFactory` function. For that function we can supply a `url` and `selectors` like in the example below: +The next step is to create a `Page` representation in our E2E framework. Doing so glues the test with the real implementation using the `pageFactory` function. For that function we can supply a `url` and selector like in the following example: ```typescript export const Login = { @@ -43,9 +45,9 @@ export const Login = { }; ``` -Note that the selector is prefixed with `data-testid` - this is a signal to the framework to look for the selector in the `data-testid` attribute. +In this example, the selector is prefixed with `data-testid`. The prefix is a signal to the framework to look for the selector in the `data-testid` attribute. -The next step is to add the `Login` page to the `Pages` export within [_\/packages/grafana-e2e-selectors/src/selectors/pages.ts_](../../packages/grafana-e2e-selectors/src/selectors/pages.ts) so that it appears when we type `e2e.pages` in our IDE. +The next step is to add the `Login` page to the `Pages` export within [_\/packages/grafana-e2e-selectors/src/selectors/pages.ts_](../../packages/grafana-e2e-selectors/src/selectors/pages.ts) so that it appears when we type `e2e.pages` in your IDE. ```typescript export const Pages = { @@ -56,7 +58,9 @@ export const Pages = { }; ``` -Now that we have a `Page` called `Login` in our `Pages` const we can use that to add a selector in our html like shown below and now this really signals to future developers that it is part of an E2E test. +Now that we have a page called `Login` in our `Pages` const, use it to add a selector in our HTML as shown in the following example. This page really signals to future developers that it is part of an E2E test. + +Example: ```jsx import { selectors } from '@grafana/e2e-selectors'; @@ -66,9 +70,8 @@ import { selectors } from '@grafana/e2e-selectors'; The last step in our example is to use our `Login` page as part of a test. -- The `url` property is used whenever we call the `visit` function and is equivalent to the Cypress' [`cy.visit()`](https://docs.cypress.io/api/commands/visit.html#Syntax). - -- Any defined selector can be accessed from the `Login` page by invoking it. This is equivalent to the result of the Cypress function [`cy.get(…)`](https://docs.cypress.io/api/commands/get.html#Syntax). +- Use the `url` property whenever you call the `visit` function. It is equivalent to the [`cy.visit()`](https://docs.cypress.io/api/commands/visit.html#Syntax) in Cypress. +- Access any defined selector from the `Login` page by invoking it. This is equivalent to the result of the Cypress function [`cy.get(…)`](https://docs.cypress.io/api/commands/get.html#Syntax). ```typescript describe('Login test', () => { @@ -83,7 +86,7 @@ describe('Login test', () => { ## Advanced example -Let's take a look at an example that uses the same `selector` for multiple items in a list for instance. In this example app we have a list of data sources that we want to click on during an E2E test. +Let's take a look at an example that uses the same selector for multiple items in a list for instance. In this example app, there's a list of data sources that we want to click on during an E2E test. ```jsx
    @@ -97,7 +100,7 @@ Let's take a look at an example that uses the same `selector` for multiple items
``` -Just as before in the basic example we'll start by creating a page abstraction using the `pageFactory` function: +Like in the basic example, start by creating a page abstraction using the `pageFactory` function: ```typescript export const DataSources = { @@ -106,11 +109,11 @@ export const DataSources = { }; ``` -You might have noticed that instead of a simple `string` as the `selector`, we're using a `function` that takes a string parameter as an argument and returns a formatted string using the argument. +You might have noticed that instead of a simple string as the selector, there's a function that takes a string parameter as an argument and returns a formatted string using the argument. -Just as before we need to add the `DataSources` page to the exported const `Pages` in `packages/grafana-e2e-selectors/src/selectors/pages.ts`. +Just as before, you need to add the `DataSources` page to the exported const `Pages` in `packages/grafana-e2e-selectors/src/selectors/pages.ts`. -The next step is to use the `dataSources` selector function as in our example below: +The next step is to use the `dataSources` selector function as in the following example: ```jsx
    @@ -126,7 +129,7 @@ The next step is to use the `dataSources` selector function as in our example be
``` -When this list is rendered with the data sources with names `A`, `B` and `C` ,the resulting HTML would look like: +When this list is rendered with the data sources with names `A`, `B` and `C` ,the resulting HTML looks like this: ```html
A
@@ -134,7 +137,7 @@ When this list is rendered with the data sources with names `A`, `B` and `C` ,th
C
``` -Now we can write our test. The one thing that differs from the [basic example](#basic-example) above is that we pass in which data source we want to click on as an argument to the selector function: +Now we can write our test. The one thing that differs from the previous [basic example](#basic-example) is that we pass in which data source we want to click as an argument to the selector function: ```typescript describe('List test', () => { @@ -147,17 +150,17 @@ describe('List test', () => { }); ``` -## Aria-Labels vs data-testid +## aria-label versus data-testid -Our selectors are set up to work with both aria-labels and data-testid attributes. Aria-labels help assistive technologies such as screenreaders identify interactive elements of a page for our users. +Our selectors are set up to work with both `aria-label` attributes and `data-testid` attributes. The `aria-label` attributes help assistive technologies such as screen readers identify interactive elements of a page for our users. -A good example of a time to use an aria-label might be if you have a button with an X to close: +A good example of a time to use an aria-label might be if you have a button with an **X** to close: ``` ; + } + + return ( + <> + + alert('You triggered the default action')}> + Run default action + + { + const extension = option.value; + + if (isPluginExtensionLink(extension)) { + if (extension.path) { + return setExtension(extension); + } + if (extension.onClick) { + return extension.onClick(); + } + } + }} + /> + + {extension && extension?.path && ( + setExtension(undefined)} /> + )} + + ); +} + +function useExtensionsAsOptions(extensions: PluginExtension[]): Array> { + return useMemo(() => { + return extensions.reduce((options: Array>, extension) => { + if (isPluginExtensionLink(extension)) { + options.push({ + label: extension.title, + title: extension.title, + value: extension, + }); + } + return options; + }, []); + }, [extensions]); +} + +type LinkModelProps = { + onDismiss: () => void; + title: string; + path: string; +}; + +export function LinkModal(props: LinkModelProps): ReactElement { + const { onDismiss, title, path } = props; + const openInNewTab = () => { + global.open(locationUtil.assureBaseUrl(path), '_blank'); + onDismiss(); + }; + + const openInCurrentTab = () => locationService.push(path); + + return ( + + +

Do you want to proceed in the current tab or open a new tab?

+ + + + + + + + ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/components/ActionButton/index.ts b/e2e/test-plugins/grafana-extensionstest-app/components/ActionButton/index.ts new file mode 100644 index 00000000000..ee0c64cd96c --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/components/ActionButton/index.ts @@ -0,0 +1 @@ +export { ActionButton } from './ActionButton'; diff --git a/e2e/test-plugins/grafana-extensionstest-app/components/App/App.tsx b/e2e/test-plugins/grafana-extensionstest-app/components/App/App.tsx new file mode 100644 index 00000000000..2a413c665a6 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/components/App/App.tsx @@ -0,0 +1,23 @@ +import { Route, Routes } from 'react-router-dom'; + +import { AppRootProps } from '@grafana/data'; + +import { ROUTES } from '../../constants'; +import { AddedComponents, AddedLinks, ExposedComponents, LegacyGetters, LegacyHooks } from '../../pages'; +import { testIds } from '../../testIds'; + +export function App(props: AppRootProps) { + return ( +
+ + } /> + } /> + } /> + } /> + } /> + + } /> + +
+ ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/components/App/index.tsx b/e2e/test-plugins/grafana-extensionstest-app/components/App/index.tsx new file mode 100644 index 00000000000..ac7ba3b3a24 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/components/App/index.tsx @@ -0,0 +1 @@ +export * from './App'; diff --git a/e2e/test-plugins/grafana-extensionstest-app/components/QueryModal/QueryModal.tsx b/e2e/test-plugins/grafana-extensionstest-app/components/QueryModal/QueryModal.tsx new file mode 100644 index 00000000000..bf6d8f43015 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/components/QueryModal/QueryModal.tsx @@ -0,0 +1,45 @@ +import { DataQuery } from '@grafana/data'; +import { Button, FilterPill, Modal, Stack } from '@grafana/ui'; +import { testIds } from '../../testIds'; +import { ReactElement, useState } from 'react'; +import { selectQuery } from '../../utils/utils'; + +type Props = { + targets: DataQuery[] | undefined; + onDismiss?: () => void; +}; + +export function QueryModal(props: Props): ReactElement { + const { targets = [], onDismiss } = props; + const [selected, setSelected] = useState(targets[0]); + + return ( +
+

Please select the query you would like to use to create "something" in the plugin.

+ + {targets.map((query) => ( + setSelected(query)} + /> + ))} + + + + + +
+ ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/components/QueryModal/index.ts b/e2e/test-plugins/grafana-extensionstest-app/components/QueryModal/index.ts new file mode 100644 index 00000000000..d0f61309a21 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/components/QueryModal/index.ts @@ -0,0 +1 @@ +export { QueryModal } from './QueryModal'; diff --git a/e2e/test-plugins/grafana-extensionstest-app/constants.ts b/e2e/test-plugins/grafana-extensionstest-app/constants.ts new file mode 100644 index 00000000000..120eb5d8191 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/constants.ts @@ -0,0 +1,11 @@ +import pluginJson from './plugin.json'; + +export const PLUGIN_BASE_URL = `/a/${pluginJson.id}`; + +export enum ROUTES { + LegacyGetters = 'legacy-getters', + LegacyHooks = 'legacy-hooks', + ExposedComponents = 'exposed-components', + AddedComponents = 'added-components', + AddedLinks = 'added-links', +} diff --git a/e2e/custom-plugins/app-with-exposed-components/img/logo.svg b/e2e/test-plugins/grafana-extensionstest-app/img/logo.svg similarity index 100% rename from e2e/custom-plugins/app-with-exposed-components/img/logo.svg rename to e2e/test-plugins/grafana-extensionstest-app/img/logo.svg diff --git a/e2e/test-plugins/grafana-extensionstest-app/module.tsx b/e2e/test-plugins/grafana-extensionstest-app/module.tsx new file mode 100644 index 00000000000..f98d6629e48 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/module.tsx @@ -0,0 +1,86 @@ +import { AppPlugin, PluginExtensionPanelContext, PluginExtensionPoints } from '@grafana/data'; +import { App } from './components/App'; +import { QueryModal } from './components/QueryModal'; +import { selectQuery } from './utils/utils'; +import pluginJson from './plugin.json'; + +export const plugin = new AppPlugin<{}>() + .setRootPage(App) + .configureExtensionLink({ + title: 'Open from time series or pie charts (path)', + description: 'This link will only be visible on time series and pie charts', + extensionPointId: PluginExtensionPoints.DashboardPanelMenu, + path: `/a/${pluginJson.id}/`, + configure: (context) => { + // Will only be visible for the Link Extensions dashboard + if (context?.dashboard?.title !== 'Link Extensions (path)') { + return undefined; + } + + switch (context?.pluginId) { + case 'timeseries': + return {}; // Does not apply any overrides + case 'piechart': + return { + title: `Open from ${context.pluginId}`, + }; + + default: + // By returning undefined the extension will be hidden + return undefined; + } + }, + }) + .configureExtensionLink({ + title: 'Open from time series or pie charts (onClick)', + description: 'This link will only be visible on time series and pie charts', + extensionPointId: PluginExtensionPoints.DashboardPanelMenu, + onClick: (_, { openModal, context }) => { + const targets = context?.targets ?? []; + const title = context?.title; + + if (!isSupported(context)) { + return; + } + + // Show a modal to display a UI for selecting between the available queries (targets) + // in case there are more available. + if (targets.length > 1) { + return openModal({ + title: `Select query from "${title}"`, + body: (props) => , + }); + } + + const [target] = targets; + selectQuery(target); + }, + configure: (context) => { + // Will only be visible for the Command Extensions dashboard + if (context?.dashboard?.title !== 'Link Extensions (onClick)') { + return undefined; + } + + if (!isSupported(context)) { + return; + } + + switch (context?.pluginId) { + case 'timeseries': + return {}; // Does not apply any overrides + case 'piechart': + return { + title: `Open from ${context.pluginId}`, + }; + + default: + // By returning undefined the extension will be hidden + return undefined; + } + }, + }); + +function isSupported(context?: PluginExtensionPanelContext): boolean { + const targets = context?.targets ?? []; + return targets.length > 0; +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/package.json b/e2e/test-plugins/grafana-extensionstest-app/package.json new file mode 100644 index 00000000000..0da20ae736b --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/package.json @@ -0,0 +1,48 @@ +{ + "name": "@test-plugins/extensions-test-app", + "version": "1.0.0", + "private": true, + "scripts": { + "build": "webpack -c ./webpack.config.ts --env production", + "dev": "webpack -w -c ./webpack.config.ts --env development", + "typecheck": "tsc --noEmit", + "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx ." + }, + "author": "Grafana Labs", + "license": "Apache-2.0", + "devDependencies": { + "@grafana/eslint-config": "7.0.0", + "@grafana/plugin-configs": "11.3.0-pre", + "@types/lodash": "4.17.7", + "@types/node": "20.14.14", + "@types/prismjs": "1.26.4", + "@types/react": "18.3.3", + "@types/react-dom": "18.2.25", + "@types/semver": "7.5.8", + "@types/uuid": "9.0.8", + "glob": "10.4.1", + "ts-node": "10.9.2", + "typescript": "5.5.4", + "webpack": "5.91.0", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": ">=20" + }, + "dependencies": { + "@emotion/css": "11.11.2", + "@grafana/data": "workspace:*", + "@grafana/runtime": "workspace:*", + "@grafana/schema": "workspace:*", + "@grafana/ui": "workspace:*", + "react": "18.2.0", + "react-dom": "18.2.0", + "react-router-dom": "^6.22.0", + "rxjs": "7.8.1", + "tslib": "2.6.3" + }, + "peerDependencies": { + "@grafana/runtime": "*" + }, + "packageManager": "yarn@4.4.0" +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/pages/AddedComponents.tsx b/e2e/test-plugins/grafana-extensionstest-app/pages/AddedComponents.tsx new file mode 100644 index 00000000000..b7f3242f3a6 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/pages/AddedComponents.tsx @@ -0,0 +1,27 @@ +import { PluginPage, usePluginComponents } from '@grafana/runtime'; +import { Stack } from '@grafana/ui'; + +import { testIds } from '../testIds'; + +type ReusableComponentProps = { + name: string; +}; + +export function AddedComponents() { + const { components } = usePluginComponents({ + extensionPointId: 'plugins/grafana-extensionexample2-app/addComponent/v1', + }); + + return ( + + +
+

Component extensions defined with addComponent and retrived with usePluginComponents hook

+ {components.map((Component, i) => { + return ; + })} +
+ + + ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/pages/AddedLinks.tsx b/e2e/test-plugins/grafana-extensionstest-app/pages/AddedLinks.tsx new file mode 100644 index 00000000000..dbfd00c36c4 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/pages/AddedLinks.tsx @@ -0,0 +1,25 @@ +import { PluginPage, usePluginLinks } from '@grafana/runtime'; + +import { testIds } from '../testIds'; + +export const LINKS_EXTENSION_POINT_ID = 'plugins/grafana-extensionstest-app/use-plugin-links/v1'; + +export function AddedLinks() { + const { links, isLoading } = usePluginLinks({ extensionPointId: LINKS_EXTENSION_POINT_ID }); + + return ( + +
+ {isLoading ? ( +
Loading...
+ ) : ( + links.map(({ id, title, path, onClick }) => ( + + {title} + + )) + )} +
+ + ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/pages/ExposedComponents.tsx b/e2e/test-plugins/grafana-extensionstest-app/pages/ExposedComponents.tsx new file mode 100644 index 00000000000..28775391881 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/pages/ExposedComponents.tsx @@ -0,0 +1,25 @@ +import { PluginPage, usePluginComponent } from '@grafana/runtime'; + +import { testIds } from '../testIds'; + +type ReusableComponentProps = { + name: string; +}; + +export function ExposedComponents() { + const { component: ReusableComponent } = usePluginComponent( + 'grafana-extensionexample1-app/reusable-component/v1' + ); + + if (!ReusableComponent) { + return null; + } + + return ( + +
+ +
+ + ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/pages/LegacyGetters.tsx b/e2e/test-plugins/grafana-extensionstest-app/pages/LegacyGetters.tsx new file mode 100644 index 00000000000..910eed92e5b --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/pages/LegacyGetters.tsx @@ -0,0 +1,62 @@ +import { + PluginPage, + getPluginComponentExtensions, + getPluginExtensions, + getPluginLinkExtensions, +} from '@grafana/runtime'; +import { Stack } from '@grafana/ui'; + +import { ActionButton } from '../components/ActionButton'; +import { testIds } from '../testIds'; + +type AppExtensionContext = {}; +type ReusableComponentProps = { + name: string; +}; + +export function LegacyGetters() { + const extensionPointId1 = 'plugins/grafana-extensionstest-app/actions'; + const extensionPointId2 = 'plugins/grafana-extensionexample2-app/configure-extension-component/v1'; + const context: AppExtensionContext = {}; + + const { extensions } = getPluginExtensions({ + extensionPointId: extensionPointId1, + context, + }); + + const { extensions: linkExtensions } = getPluginLinkExtensions({ + extensionPointId: extensionPointId1, + }); + + const { extensions: componentExtensions } = getPluginComponentExtensions({ + extensionPointId: extensionPointId2, + }); + + return ( + + +
+

+ Link extensions defined with configureExtensionLink or configureExtensionComponent and retrived using + getPluginExtensions +

+ +
+
+

Link extensions defined with configureExtensionLink and retrived using getPluginLinkExtensions

+ +
+
+

+ Component extensions defined with configureExtensionComponent and retrived using + getPluginComponentExtensions +

+ {componentExtensions.map((extension) => { + const Component = extension.component; + return ; + })} +
+ + + ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/pages/LegacyHooks.tsx b/e2e/test-plugins/grafana-extensionstest-app/pages/LegacyHooks.tsx new file mode 100644 index 00000000000..ab963f07169 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/pages/LegacyHooks.tsx @@ -0,0 +1,62 @@ +import { + PluginPage, + usePluginComponentExtensions, + usePluginExtensions, + usePluginLinkExtensions, +} from '@grafana/runtime'; +import { Stack } from '@grafana/ui'; + +import { ActionButton } from '../components/ActionButton'; +import { testIds } from '../testIds'; + +type AppExtensionContext = {}; +type ReusableComponentProps = { + name: string; +}; + +export function LegacyHooks() { + const extensionPointId1 = 'plugins/grafana-extensionstest-app/actions'; + const extensionPointId2 = 'plugins/grafana-extensionexample2-app/configure-extension-component/v1'; + const context: AppExtensionContext = {}; + + const { extensions } = usePluginExtensions({ + extensionPointId: extensionPointId1, + context, + }); + + const { extensions: linkExtensions } = usePluginLinkExtensions({ + extensionPointId: extensionPointId1, + }); + + const { extensions: componentExtensions } = usePluginComponentExtensions({ + extensionPointId: extensionPointId2, + }); + + return ( + + +
+

+ Link extensions defined with configureExtensionLink or configureExtensionComponent and retrived using + usePluginExtensions +

+ +
+
+

Link extensions defined with configureExtensionLink and retrived using usePluginLinkExtensions

+ +
+
+

+ Component extensions defined with configureExtensionComponent and retrived using + usePluginComponentExtensions +

+ {componentExtensions.map((extension) => { + const Component = extension.component; + return ; + })} +
+ + + ); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/pages/index.tsx b/e2e/test-plugins/grafana-extensionstest-app/pages/index.tsx new file mode 100644 index 00000000000..6e955da302b --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/pages/index.tsx @@ -0,0 +1,5 @@ +export { ExposedComponents } from './ExposedComponents'; +export { LegacyGetters } from './LegacyGetters'; +export { LegacyHooks } from './LegacyHooks'; +export { AddedComponents } from './AddedComponents'; +export { AddedLinks } from './AddedLinks'; diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugin.json b/e2e/test-plugins/grafana-extensionstest-app/plugin.json new file mode 100644 index 00000000000..0924f5aad10 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugin.json @@ -0,0 +1,67 @@ +{ + "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json", + "type": "app", + "name": "Extensions test app", + "preload": true, + "id": "grafana-extensionstest-app", + "info": { + "keywords": ["app"], + "description": "", + "author": { + "name": "Grafana" + }, + "logos": { + "small": "img/logo.svg", + "large": "img/logo.svg" + }, + "screenshots": [], + "version": "%VERSION%", + "updated": "%TODAY%" + }, + "includes": [ + { + "type": "page", + "name": "Legacy Getters", + "path": "/a/grafana-extensionstest-app/legacy-getters", + "role": "Admin", + "addToNav": true, + "defaultNav": false + }, + { + "type": "page", + "name": "Legacy Hooks", + "path": "/a/grafana-extensionstest-app/legacy-hooks", + "role": "Admin", + "addToNav": true, + "defaultNav": false + }, + { + "type": "page", + "name": "Exposed components", + "path": "/a/grafana-extensionstest-app/exposed-components", + "role": "Admin", + "addToNav": true, + "defaultNav": false + }, + { + "type": "page", + "name": "Added components", + "path": "/a/grafana-extensionstest-app/added-components", + "role": "Admin", + "addToNav": true, + "defaultNav": false + }, + { + "type": "page", + "name": "Added links", + "path": "/a/grafana-extensionstest-app/added-links", + "role": "Admin", + "addToNav": true, + "defaultNav": false + } + ], + "dependencies": { + "grafanaDependency": ">=10.4.0", + "plugins": [] + } +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/components/App/App.tsx b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/components/App/App.tsx new file mode 100644 index 00000000000..cb3af35cd37 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/components/App/App.tsx @@ -0,0 +1,13 @@ +import * as React from 'react'; +import { AppRootProps } from '@grafana/data'; +import { testIds } from '../../../../testIds'; + +export class App extends React.PureComponent { + render() { + return ( +
+ Hello Grafana! +
+ ); + } +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/components/App/index.tsx b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/components/App/index.tsx new file mode 100644 index 00000000000..ac7ba3b3a24 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/components/App/index.tsx @@ -0,0 +1 @@ +export * from './App'; diff --git a/e2e/custom-plugins/app-with-exposed-components/plugins/myorg-componentexposer-app/img/logo.svg b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/img/logo.svg similarity index 100% rename from e2e/custom-plugins/app-with-exposed-components/plugins/myorg-componentexposer-app/img/logo.svg rename to e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/img/logo.svg diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/module.tsx b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/module.tsx new file mode 100644 index 00000000000..ae1a2efe4d9 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/module.tsx @@ -0,0 +1,28 @@ +import { AppPlugin } from '@grafana/data'; + +import { LINKS_EXTENSION_POINT_ID } from '../../pages/AddedLinks'; +import { testIds } from '../../testIds'; + +import { App } from './components/App'; +import pluginJson from './plugin.json'; + +export const plugin = new AppPlugin<{}>() + .setRootPage(App) + .configureExtensionLink({ + title: 'Go to A', + description: 'Navigating to pluging A', + extensionPointId: 'plugins/grafana-extensionstest-app/actions', + path: '/a/grafana-extensionexample1-app/', + }) + .exposeComponent({ + id: 'grafana-extensionexample1-app/reusable-component/v1', + title: 'Exposed component', + description: 'A component that can be reused by other app plugins.', + component: ({ name }: { name: string }) =>
Hello {name}!
, + }) + .addLink({ + title: 'Basic link', + description: '...', + targets: [LINKS_EXTENSION_POINT_ID], + path: `/a/${pluginJson.id}/`, + }); diff --git a/e2e/custom-plugins/app-with-exposed-components/plugins/myorg-componentexposer-app/plugin.json b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/plugin.json similarity index 86% rename from e2e/custom-plugins/app-with-exposed-components/plugins/myorg-componentexposer-app/plugin.json rename to e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/plugin.json index 3487cd45540..3d012351bbe 100644 --- a/e2e/custom-plugins/app-with-exposed-components/plugins/myorg-componentexposer-app/plugin.json +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample1-app/plugin.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json", "type": "app", - "name": "A App", - "id": "myorg-componentexposer-app", + "name": "C App", + "id": "grafana-extensionexample1-app", "preload": true, "info": { "keywords": ["app"], @@ -22,7 +22,7 @@ { "type": "page", "name": "Default", - "path": "/a/myorg-componentexposer-app", + "path": "/a/grafana-extensionexample1-app", "role": "Admin", "addToNav": false, "defaultNav": false diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/components/App/App.tsx b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/components/App/App.tsx new file mode 100644 index 00000000000..3c018a9c0f2 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/components/App/App.tsx @@ -0,0 +1,8 @@ +import * as React from 'react'; +import { AppRootProps } from '@grafana/data'; + +export class App extends React.PureComponent { + render() { + return
Hello Grafana!
; + } +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/components/App/index.tsx b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/components/App/index.tsx new file mode 100644 index 00000000000..ac7ba3b3a24 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/components/App/index.tsx @@ -0,0 +1 @@ +export * from './App'; diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/img/logo.svg b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/img/logo.svg new file mode 100644 index 00000000000..3d284dea3af --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/img/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/module.tsx b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/module.tsx new file mode 100644 index 00000000000..7c68c104597 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/module.tsx @@ -0,0 +1,33 @@ +import { AppPlugin } from '@grafana/data'; + +import { testIds } from '../../testIds'; + +import { App } from './components/App'; + +export const plugin = new AppPlugin<{}>() + .setRootPage(App) + .configureExtensionLink({ + title: 'Open from B', + description: 'Open a modal from plugin B', + extensionPointId: 'plugins/grafana-extensionstest-app/actions', + onClick: (_, { openModal }) => { + openModal({ + title: 'Modal from app B', + body: () =>
From plugin B
, + }); + }, + }) + .configureExtensionComponent({ + extensionPointId: 'plugins/grafana-extensionexample2-app/configure-extension-component/v1', + title: 'Configure extension component from B', + description: 'A component that can be reused by other app plugins. Shared using configureExtensionComponent api', + component: ({ name }: { name: string }) =>
Hello {name}!
, + }) + .addComponent<{ name: string }>({ + targets: 'plugins/grafana-extensionexample2-app/addComponent/v1', + title: 'Added component from B', + description: 'A component that can be reused by other app plugins. Shared using addComponent api', + component: ({ name }: { name: string }) => ( +
Hello {name}!
+ ), + }); diff --git a/e2e/custom-plugins/app-with-extension-point/plugins/myorg-b-app/plugin.json b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/plugin.json similarity index 68% rename from e2e/custom-plugins/app-with-extension-point/plugins/myorg-b-app/plugin.json rename to e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/plugin.json index 7bd55c0e572..f27f9e1113b 100644 --- a/e2e/custom-plugins/app-with-extension-point/plugins/myorg-b-app/plugin.json +++ b/e2e/test-plugins/grafana-extensionstest-app/plugins/grafana-extensionexample2-app/plugin.json @@ -1,14 +1,14 @@ { "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json", "type": "app", - "name": "B App", - "id": "myorg-b-app", + "name": "D App", + "id": "grafana-extensionexample2-app", "preload": true, "info": { "keywords": ["app"], "description": "Will extend root app with ui extensions", "author": { - "name": "Myorg" + "name": "grafana" }, "logos": { "small": "img/logo.svg", @@ -22,7 +22,7 @@ { "type": "page", "name": "Default", - "path": "/a/myorg-b-app", + "path": "/a/grafana-extensionexample2-app", "role": "Admin", "addToNav": false, "defaultNav": false @@ -31,13 +31,5 @@ "dependencies": { "grafanaDependency": ">=10.3.3", "plugins": [] - }, - "extensions": [ - { - "extensionPointId": "plugins/myorg-extensionpoint-app/actions", - "title": "Open from B", - "description": "Open a modal from plugin B", - "type": "link" - } - ] + } } diff --git a/e2e/test-plugins/grafana-extensionstest-app/testIds.ts b/e2e/test-plugins/grafana-extensionstest-app/testIds.ts new file mode 100644 index 00000000000..29a9c0b0726 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/testIds.ts @@ -0,0 +1,40 @@ +export const testIds = { + container: 'main-app-body', + actions: { + button: 'action-button', + }, + modal: { + container: 'container', + open: 'open-link', + }, + appA: { + container: 'a-app-body', + }, + appB: { + modal: 'b-app-modal', + reusableComponent: 'b-app-configure-extension-component', + reusableAddedComponent: 'b-app-add-component', + exposedComponent: 'b-app-exposed-component', + }, + legacyGettersPage: { + container: 'data-testid pg-legacy-getters-container', + section1: 'get-plugin-extensions', + section2: 'configure-extension-link-get-plugin-link-extensions', + section3: 'configure-extension-component-get-plugin-component-extensions', + }, + legacyHooksPage: { + container: 'data-testid pg-legacy-hooks-container', + section1: 'use-plugin-extensions', + section2: 'configure-extension-link-use-plugin-link-extensions', + section3: 'configure-extension-component-use-plugin-component-extensions', + }, + exposedComponentsPage: { + container: 'data-testid pg-exposed-components-container', + }, + addedComponentsPage: { + container: 'data-testid pg-added-components-container', + }, + addedLinksPage: { + container: 'data-testid pg-added-links-container', + }, +}; diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/extensionPoints.getters.spec.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/extensionPoints.getters.spec.ts new file mode 100644 index 00000000000..0d451b56977 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/extensionPoints.getters.spec.ts @@ -0,0 +1,52 @@ +import { test, expect } from '@grafana/plugin-e2e'; + +import { ensureExtensionRegistryIsPopulated } from '../utils'; +import { testIds } from '../../testIds'; +import pluginJson from '../../plugin.json'; + +test.describe('getPluginExtensions + configureExtensionLink', () => { + test('should extend the actions menu with a link to a-app plugin', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-getters`); + await ensureExtensionRegistryIsPopulated(page); + const section = await page.getByTestId(testIds.legacyGettersPage.section1); + await section.getByTestId(testIds.actions.button).click(); + await page.getByTestId(testIds.container).getByText('Go to A').click(); + await page.getByTestId(testIds.modal.open).click(); + await expect(page.getByTestId(testIds.appA.container)).toBeVisible(); + }); +}); + +test.describe('getPluginExtensions + configureExtensionComponent', () => { + test('should extend main app with component extension from app B', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-getters`); + await ensureExtensionRegistryIsPopulated(page); + const section = await page.getByTestId(testIds.legacyGettersPage.section1); + await section.getByTestId(testIds.actions.button).click(); + await page.getByTestId(testIds.container).getByText('Open from B').click(); + await expect(page.getByTestId(testIds.appB.modal)).toBeVisible(); + }); +}); + +test.describe('getPluginLinkExtensions + configureExtensionLink', () => { + test('should extend the actions menu with a link to a-app plugin', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-getters`); + await ensureExtensionRegistryIsPopulated(page); + const section = await page.getByTestId(testIds.legacyGettersPage.section2); + await section.getByTestId(testIds.actions.button).click(); + await page.getByTestId(testIds.container).getByText('Go to A').click(); + await page.getByTestId(testIds.modal.open).click(); + await expect(page.getByTestId(testIds.appA.container)).toBeVisible(); + }); +}); + +test.describe('getPluginComponentExtensions + configureExtensionComponent', () => { + test('should extend the actions menu with a command triggered from b-app plugin', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-getters`); + await ensureExtensionRegistryIsPopulated(page); + await expect( + page + .getByTestId('configure-extension-component-get-plugin-component-extensions') + .getByTestId(testIds.appB.reusableComponent) + ).toHaveText('Hello World!'); + }); +}); diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/extensionPoints.hooks.spec.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/extensionPoints.hooks.spec.ts new file mode 100644 index 00000000000..d5c96eefa31 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/extensionPoints.hooks.spec.ts @@ -0,0 +1,45 @@ +import { test, expect } from '@grafana/plugin-e2e'; + +import { testIds } from '../../testIds'; +import pluginJson from '../../plugin.json'; + +test.describe('usePluginExtensions + configureExtensionLink', () => { + test('should extend the actions menu with a link to a-app plugin', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-hooks`); + const section = await page.getByTestId(testIds.legacyHooksPage.section1); + await section.getByTestId(testIds.actions.button).click(); + await page.getByTestId(testIds.container).getByText('Go to A').click(); + await page.getByTestId(testIds.modal.open).click(); + await expect(page.getByTestId(testIds.appA.container)).toBeVisible(); + }); +}); + +test.describe('usePluginExtensions + configureExtensionComponent', () => { + test('should extend main app with component extension from app B', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-hooks`); + const section = await page.getByTestId(testIds.legacyHooksPage.section1); + await section.getByTestId(testIds.actions.button).click(); + await page.getByTestId(testIds.container).getByText('Open from B').click(); + await expect(page.getByTestId(testIds.appB.modal)).toBeVisible(); + }); +}); + +test.describe('usePluginLinkExtensions + configureExtensionLink', () => { + test('should extend the actions menu with a link to a-app plugin', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-hooks`); + const section = await page.getByTestId(testIds.legacyHooksPage.section2); + await section.getByTestId(testIds.actions.button).click(); + await page.getByTestId(testIds.container).getByText('Go to A').click(); + await page.getByTestId(testIds.modal.open).click(); + await expect(page.getByTestId(testIds.appA.container)).toBeVisible(); + }); +}); + +test.describe('usePluginComponentExtensions + configureExtensionComponent', () => { + test('should extend the actions menu with a command triggered from b-app plugin', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/legacy-hooks`); + await expect( + page.getByTestId(testIds.legacyHooksPage.section3).getByTestId(testIds.appB.reusableComponent) + ).toHaveText('Hello World!'); + }); +}); diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/linkExtensions.spec.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/linkExtensions.spec.ts new file mode 100644 index 00000000000..20be9c23d3f --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/legacy/linkExtensions.spec.ts @@ -0,0 +1,42 @@ +import { expect, test } from '@grafana/plugin-e2e'; +import { ensureExtensionRegistryIsPopulated } from '../utils'; + +const panelTitle = 'Link with defaults'; +const extensionTitle = 'Open from time series...'; + +const linkOnClickDashboardUid = 'dbfb47c5-e5e5-4d28-8ac7-35f349b95946'; +const linkPathDashboardUid = 'd1fbb077-cd44-4738-8c8a-d4e66748b719'; + +test.describe('configureExtensionLink targeting core extension points', () => { + test('configureExtensionLink - should add link extension (path) with defaults to time series panel.', async ({ + gotoDashboardPage, + page, + }) => { + const dashboardPage = await gotoDashboardPage({ uid: linkPathDashboardUid }); + await ensureExtensionRegistryIsPopulated(page); + const panel = await dashboardPage.getPanelByTitle(panelTitle); + await panel.clickOnMenuItem(extensionTitle, { parentItem: 'Extensions' }); + await expect(page.getByRole('heading', { name: 'Extensions test app' })).toBeVisible(); + }); + + test('should add link extension (onclick) with defaults to time series panel', async ({ + gotoDashboardPage, + page, + }) => { + const dashboardPage = await gotoDashboardPage({ uid: linkOnClickDashboardUid }); + await ensureExtensionRegistryIsPopulated(page); + const panel = await dashboardPage.getPanelByTitle(panelTitle); + await panel.clickOnMenuItem(extensionTitle, { parentItem: 'Extensions' }); + await expect(page.getByRole('dialog')).toContainText('Select query from "Link with defaults"'); + }); + + test('should add link extension (onclick) with new title to pie chart panel', async ({ gotoDashboardPage, page }) => { + const panelTitle = 'Link with new name'; + const extensionTitle = 'Open from piechart'; + const dashboardPage = await gotoDashboardPage({ uid: linkOnClickDashboardUid }); + await ensureExtensionRegistryIsPopulated(page); + const panel = await dashboardPage.getPanelByTitle(panelTitle); + await panel.clickOnMenuItem(extensionTitle, { parentItem: 'Extensions' }); + await expect(page.getByRole('dialog')).toContainText('Select query from "Link with new name"'); + }); +}); diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/useExposedComponent.spec.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/useExposedComponent.spec.ts new file mode 100644 index 00000000000..12d270ae565 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/useExposedComponent.spec.ts @@ -0,0 +1,8 @@ +import { test, expect } from '@grafana/plugin-e2e'; +import { testIds } from '../testIds'; +import pluginJson from '../plugin.json'; + +test('should display component exposed by another app', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/exposed-components`); + await expect(page.getByTestId(testIds.appB.exposedComponent)).toHaveText('Hello World!'); +}); diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/usePluginComponents.spec.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/usePluginComponents.spec.ts new file mode 100644 index 00000000000..a0d6d2246a0 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/usePluginComponents.spec.ts @@ -0,0 +1,11 @@ +import { test, expect } from '@grafana/plugin-e2e'; + +import pluginJson from '../plugin.json'; +import { testIds } from '../testIds'; + +test('should render component with usePluginComponents hook', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/added-components`); + await expect( + page.getByTestId(testIds.addedComponentsPage.container).getByTestId(testIds.appB.reusableAddedComponent) + ).toHaveText('Hello World!'); +}); diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/usePluginLinks.spec.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/usePluginLinks.spec.ts new file mode 100644 index 00000000000..cfeef4bfcdf --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/usePluginLinks.spec.ts @@ -0,0 +1,10 @@ +import { test, expect } from '@grafana/plugin-e2e'; + +import pluginJson from '../plugin.json'; +import { testIds } from '../testIds'; + +test('path link', async ({ page }) => { + await page.goto(`/a/${pluginJson.id}/added-links`); + await page.getByTestId(testIds.addedLinksPage.container).getByText('Basic link').click(); + await expect(page.getByTestId(testIds.appA.container)).toHaveText('Hello Grafana!'); +}); diff --git a/e2e/test-plugins/grafana-extensionstest-app/tests/utils.ts b/e2e/test-plugins/grafana-extensionstest-app/tests/utils.ts new file mode 100644 index 00000000000..1d134f52cab --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tests/utils.ts @@ -0,0 +1,10 @@ +import { Page } from '@playwright/test'; + +import { selectors } from '@grafana/e2e-selectors'; + +export async function ensureExtensionRegistryIsPopulated(page: Page) { + // Due to these plugins using the old getter extensions api we need to force a refresh by navigating home then back + // to guarantee the extensions are available to the plugin before we interact with the page. + await page.getByTestId(selectors.components.Breadcrumbs.breadcrumb('Home')).click(); + await page.goBack(); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/tsconfig.json b/e2e/test-plugins/grafana-extensionstest-app/tsconfig.json new file mode 100644 index 00000000000..40352099203 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/tsconfig.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "jsx": "react-jsx", + "types": ["node", "jest", "@testing-library/jest-dom"] + }, + "extends": "@grafana/plugin-configs/tsconfig.json", + "include": ["."] +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/utils/utils.routing.ts b/e2e/test-plugins/grafana-extensionstest-app/utils/utils.routing.ts new file mode 100644 index 00000000000..b9e4c9926bb --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/utils/utils.routing.ts @@ -0,0 +1,6 @@ +import { PLUGIN_BASE_URL } from '../constants'; + +// Prefixes the route with the base URL of the plugin +export function prefixRoute(route: string): string { + return `${PLUGIN_BASE_URL}/${route}`; +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/utils/utils.ts b/e2e/test-plugins/grafana-extensionstest-app/utils/utils.ts new file mode 100644 index 00000000000..5244f2afbb0 --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/utils/utils.ts @@ -0,0 +1,5 @@ +import { DataQuery } from '@grafana/data'; + +export function selectQuery(target: DataQuery): void { + alert(`You selected query "${target.refId}"`); +} diff --git a/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts b/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts new file mode 100644 index 00000000000..3303ed94f3c --- /dev/null +++ b/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts @@ -0,0 +1,44 @@ +import CopyWebpackPlugin from 'copy-webpack-plugin'; +import grafanaConfig from '@grafana/plugin-configs/webpack.config'; +import { mergeWithCustomize, unique } from 'webpack-merge'; +import { Configuration } from 'webpack'; + +function skipFiles(f: string): boolean { + if (f.includes('/dist/')) { + // avoid copying files already in dist + return false; + } + if (f.includes('/node_modules/')) { + // avoid copying tsconfig.json + return false; + } + if (f.includes('/package.json')) { + // avoid copying package.json + return false; + } + return true; +} + +const config = async (env: Record): Promise => { + const baseConfig = await grafanaConfig(env); + const customConfig = { + plugins: [ + new CopyWebpackPlugin({ + patterns: [ + // To `compiler.options.output` + { from: 'README.md', to: '.', force: true }, + { from: 'plugin.json', to: '.' }, + { from: 'CHANGELOG.md', to: '.', force: true }, + { from: '**/*.json', to: '.', filter: skipFiles }, + { from: '**/*.svg', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional + ], + }), + ], + }; + + return mergeWithCustomize({ + customizeArray: unique('plugins', ['CopyPlugin'], (plugin) => plugin.constructor && plugin.constructor.name), + })(baseConfig, customConfig); +}; + +export default config; diff --git a/go.mod b/go.mod index 6fc8040651c..54cf82071fe 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.22.4 +go 1.23.0 // contains openapi encoder fixes. remove ASAP replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code @@ -13,13 +13,13 @@ replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0. require ( buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.10.0-20240523185345-933eab74d046.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.34.1-20240523185345-933eab74d046.1 // @grafana/observability-traces-and-profiling - cloud.google.com/go/kms v1.15.7 // @grafana/grafana-backend-group - cloud.google.com/go/storage v1.38.0 // @grafana/grafana-backend-group + cloud.google.com/go/kms v1.18.5 // @grafana/grafana-backend-group + cloud.google.com/go/storage v1.43.0 // @grafana/grafana-backend-group cuelang.org/go v0.6.0-0.dev // @grafana/grafana-as-code filippo.io/age v1.1.1 // @grafana/identity-access-team github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // @grafana/partner-datasources github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // @grafana/grafana-backend-group - github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 // @grafana/grafana-backend-group + github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // @grafana/grafana-backend-group github.com/Azure/azure-storage-blob-go v0.15.0 // @grafana/grafana-backend-group github.com/Azure/go-autorest/autorest v0.11.29 // @grafana/grafana-backend-group github.com/Azure/go-autorest/autorest/adal v0.9.23 // @grafana/grafana-backend-group @@ -34,7 +34,7 @@ require ( github.com/andybalholm/brotli v1.0.6 // @grafana/partner-datasources github.com/apache/arrow/go/v15 v15.0.2 // @grafana/observability-metrics github.com/armon/go-radix v1.0.0 // @grafana/grafana-app-platform-squad - github.com/aws/aws-sdk-go v1.51.31 // @grafana/aws-datasources + github.com/aws/aws-sdk-go v1.55.5 // @grafana/aws-datasources github.com/beevik/etree v1.2.0 // @grafana/grafana-backend-group github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-backend github.com/blang/semver/v4 v4.0.0 // indirect; @grafana/grafana-release-guild @@ -70,13 +70,13 @@ require ( github.com/golang/snappy v0.0.4 // @grafana/alerting-backend github.com/google/go-cmp v0.6.0 // @grafana/grafana-backend-group github.com/google/uuid v1.6.0 // @grafana/grafana-backend-group - github.com/google/wire v0.5.0 // @grafana/grafana-backend-group - github.com/googleapis/gax-go/v2 v2.12.3 // @grafana/grafana-backend-group + github.com/google/wire v0.6.0 // @grafana/grafana-backend-group + github.com/googleapis/gax-go/v2 v2.13.0 // @grafana/grafana-backend-group github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad - github.com/grafana/alerting v0.0.0-20240812131556-611a23ff0f7f // @grafana/alerting-backend + github.com/grafana/alerting v0.0.0-20240827075410-70248a7a3a67 // @grafana/alerting-backend github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db // @grafana/identity-access-team - github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828 // @grafana/identity-access-team + github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db // @grafana/identity-access-team github.com/grafana/codejen v0.0.3 // @grafana/dataviz-squad github.com/grafana/cuetsy v0.1.11 // @grafana/grafana-as-code github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics @@ -89,10 +89,10 @@ require ( github.com/grafana/grafana-cloud-migration-snapshot v1.2.0 // @grafana/grafana-operator-experience-squad github.com/grafana/grafana-google-sdk-go v0.1.0 // @grafana/partner-datasources github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79 // @grafana/grafana-backend-group - github.com/grafana/grafana-plugin-sdk-go v0.243.0 // @grafana/plugins-platform-backend + github.com/grafana/grafana-plugin-sdk-go v0.244.0 // @grafana/plugins-platform-backend github.com/grafana/grafana/pkg/aggregator v0.0.0-20240813192817-1b0e6b5c09b2 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808213237-f4d2e064f435 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/pkg/apiserver v0.0.0-20240708134731-e9876749d440 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da // @grafana/grafana-app-platform-squad // This needs to be here for other projects that import grafana/grafana // For local development grafana/grafana will always use the local files // Check go.work file for details @@ -138,7 +138,7 @@ require ( github.com/openfga/openfga v1.5.4 // @grafana/identity-access-team github.com/patrickmn/go-cache v2.1.0+incompatible // @grafana/alerting-backend github.com/prometheus/alertmanager v0.27.0 // @grafana/alerting-backend - github.com/prometheus/client_golang v1.19.1 // @grafana/alerting-backend + github.com/prometheus/client_golang v1.20.0 // @grafana/alerting-backend github.com/prometheus/client_model v0.6.1 // @grafana/grafana-backend-group github.com/prometheus/common v0.55.0 // @grafana/alerting-backend github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 // @grafana/alerting-backend @@ -171,7 +171,7 @@ require ( go.opentelemetry.io/otel/trace v1.28.0 // @grafana/grafana-backend-group go.uber.org/atomic v1.11.0 // @grafana/alerting-backend go.uber.org/goleak v1.3.0 // @grafana/grafana-search-and-storage - gocloud.dev v0.25.0 // @grafana/grafana-app-platform-squad + gocloud.dev v0.39.0 // @grafana/grafana-app-platform-squad golang.org/x/crypto v0.26.0 // @grafana/grafana-backend-group golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // @grafana/alerting-backend golang.org/x/mod v0.18.0 // indirect; @grafana/grafana-backend-group @@ -179,10 +179,10 @@ require ( golang.org/x/oauth2 v0.22.0 // @grafana/identity-access-team golang.org/x/sync v0.8.0 // @grafana/alerting-backend golang.org/x/text v0.17.0 // @grafana/grafana-backend-group - golang.org/x/time v0.5.0 // @grafana/grafana-backend-group + golang.org/x/time v0.6.0 // @grafana/grafana-backend-group golang.org/x/tools v0.22.0 // @grafana/grafana-as-code gonum.org/v1/gonum v0.14.0 // @grafana/observability-metrics - google.golang.org/api v0.176.0 // @grafana/grafana-backend-group + google.golang.org/api v0.191.0 // @grafana/grafana-backend-group google.golang.org/grpc v1.65.0 // @grafana/plugins-platform-backend google.golang.org/protobuf v1.34.2 // @grafana/plugins-platform-backend gopkg.in/ini.v1 v1.67.0 // @grafana/alerting-backend @@ -204,15 +204,15 @@ require ( ) require ( - cloud.google.com/go v0.112.1 // indirect - cloud.google.com/go/auth v0.2.2 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.1 // indirect - cloud.google.com/go/compute/metadata v0.3.0 // indirect - cloud.google.com/go/iam v1.1.6 // indirect + cloud.google.com/go v0.115.0 // indirect + cloud.google.com/go/auth v0.8.1 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect + cloud.google.com/go/iam v1.1.13 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect @@ -236,10 +236,6 @@ require ( github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 // indirect - github.com/aws/smithy-go v1.20.3 // indirect github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect @@ -303,9 +299,10 @@ require ( github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/s2a-go v0.1.7 // indirect + github.com/google/s2a-go v0.1.8 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240624122844-a89deaeb7365 // @grafana/grafana-search-and-storage + github.com/grafana/grafana/pkg/storage/unified/apistore v0.0.0-20240821183201-2f012860344d // @grafana/grafana-search-and-storage + github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240821161612-71f0dae39e9d // @grafana/grafana-search-and-storage github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db // indirect github.com/grafana/sqlds/v3 v3.2.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect @@ -346,7 +343,7 @@ require ( github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect github.com/karlseguin/ccache/v3 v3.0.5 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/kr/text v0.2.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect @@ -443,12 +440,12 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // @grafana/identity-access-team - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/term v0.23.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect; @grafana/grafana-backend-group - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect + google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect; @grafana/grafana-backend-group + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -481,6 +478,8 @@ require ( ) require ( + cloud.google.com/go/longrunning v0.5.12 // indirect + github.com/at-wat/mqtt-go v0.19.4 // indirect github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 // indirect github.com/hairyhenderson/go-which v0.2.0 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect diff --git a/go.sum b/go.sum index fe17f694855..952ffb51aa1 100644 --- a/go.sum +++ b/go.sum @@ -25,7 +25,6 @@ cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPT cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.82.0/go.mod h1:vlKccHJGuFBFufnAnuB08dfEH9Y3H7dzDzRECFdC2TA= cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= @@ -51,8 +50,8 @@ cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYN cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= -cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= -cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= @@ -190,11 +189,11 @@ cloud.google.com/go/assuredworkloads v1.11.3/go.mod h1:vEjfTKYyRUaIeA0bsGJceFV2J cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U= cloud.google.com/go/assuredworkloads v1.11.5/go.mod h1:FKJ3g3ZvkL2D7qtqIGnDufFkHxwIpNM9vtmhvt+6wqk= cloud.google.com/go/auth v0.2.0/go.mod h1:+yb+oy3/P0geX6DLKlqiGHARGR6EX2GRtYCzWOCQSbU= -cloud.google.com/go/auth v0.2.2 h1:gmxNJs4YZYcw6YvKRtVBaF2fyUE6UrWPyzU8jHvYfmI= -cloud.google.com/go/auth v0.2.2/go.mod h1:2bDNJWtWziDT3Pu1URxHHbkHE/BbOCuyUiKIGcNvafo= +cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= +cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= cloud.google.com/go/auth/oauth2adapt v0.2.0/go.mod h1:AfqujpDAlTfLfeCIl/HJZZlIxD8+nJoZ5e0x1IxGq5k= -cloud.google.com/go/auth/oauth2adapt v0.2.1 h1:VSPmMmUlT8CkIZ2PzD9AlLN+R3+D1clXMWHHa6vG/Ag= -cloud.google.com/go/auth/oauth2adapt v0.2.1/go.mod h1:tOdK/k+D2e4GEwfBRA48dKNQiDsqIXxLh7VU319eV0g= +cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= +cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= @@ -335,7 +334,6 @@ cloud.google.com/go/cloudtasks v1.12.3/go.mod h1:GPVXhIOSGEaR+3xT4Fp72ScI+HjHffS cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0= cloud.google.com/go/cloudtasks v1.12.6/go.mod h1:b7c7fe4+TJsFZfDyzO51F7cjq7HLUlRi/KZQLQjDsaY= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= -cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= @@ -363,8 +361,9 @@ cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZ cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= @@ -685,7 +684,6 @@ cloud.google.com/go/gsuiteaddons v1.6.3/go.mod h1:sCFJkZoMrLZT3JTb8uJqgKPNshH2tf cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE= cloud.google.com/go/gsuiteaddons v1.6.5/go.mod h1:Lo4P2IvO8uZ9W+RaC6s1JVxo42vgy+TX5a6hfBZ0ubs= cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= -cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc= @@ -701,8 +699,9 @@ cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+K cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= -cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= +cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= +cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk= @@ -731,7 +730,6 @@ cloud.google.com/go/iot v1.7.2/go.mod h1:q+0P5zr1wRFpw7/MOgDXrG/HVA+l+cSwdObffkr cloud.google.com/go/iot v1.7.3/go.mod h1:t8itFchkol4VgNbHnIq9lXoOOtHNR3uAACQMYbN9N4I= cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk= cloud.google.com/go/iot v1.7.5/go.mod h1:nq3/sqTz3HGaWJi1xNiX7F41ThOzpud67vwk0YsSsqs= -cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI= cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= @@ -747,8 +745,9 @@ cloud.google.com/go/kms v1.15.3/go.mod h1:AJdXqHxS2GlPyduM99s9iGqi2nwbviBbhV/hdm cloud.google.com/go/kms v1.15.4/go.mod h1:L3Sdj6QTHK8dfwK5D1JLsAyELsNMnd3tAIwGS4ltKpc= cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI= cloud.google.com/go/kms v1.15.6/go.mod h1:yF75jttnIdHfGBoE51AKsD/Yqf+/jICzB9v1s1acsms= -cloud.google.com/go/kms v1.15.7 h1:7caV9K3yIxvlQPAcaFffhlT7d1qpxjB1wHBtjWa13SM= cloud.google.com/go/kms v1.15.7/go.mod h1:ub54lbsa6tDkUwnu4W7Yt1aAIFLnspgh0kPGToDukeI= +cloud.google.com/go/kms v1.18.5 h1:75LSlVs60hyHK3ubs2OHd4sE63OAMcM2BdSJc2bkuM4= +cloud.google.com/go/kms v1.18.5/go.mod h1:yXunGUGzabH8rjUPImp2ndHiGolHeWJJ0LODLedicIY= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= @@ -782,6 +781,8 @@ cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUz cloud.google.com/go/longrunning v0.5.3/go.mod h1:y/0ga59EYu58J6SHmmQOvekvND2qODbu8ywBBW7EK7Y= cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= +cloud.google.com/go/longrunning v0.5.12 h1:5LqSIdERr71CqfUsFlJdBpOkBH8FBCFD7P1nTWy3TYE= +cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU= cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE= cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM= cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= @@ -831,8 +832,6 @@ cloud.google.com/go/metastore v1.13.1/go.mod h1:IbF62JLxuZmhItCppcIfzBBfUFq0DIB9 cloud.google.com/go/metastore v1.13.2/go.mod h1:KS59dD+unBji/kFebVp8XU/quNSyo8b6N6tPGspKszA= cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE= cloud.google.com/go/metastore v1.13.4/go.mod h1:FMv9bvPInEfX9Ac1cVcRXp8EBBQnBcqH6gz3KvJ9BAE= -cloud.google.com/go/monitoring v1.1.0/go.mod h1:L81pzz7HKn14QCMaCs6NTQkdBnE87TElyanS95vIcl4= -cloud.google.com/go/monitoring v1.4.0/go.mod h1:y6xnxfwI3hTFWOdkOaD7nfJVlwuC3/mS/5kvtT131p4= cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk= cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= @@ -970,7 +969,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/pubsub v1.19.0/go.mod h1:/O9kmSe9bb9KRnIAWkzmqhPjHo6LtzGOBYd/kr06XSs= cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI= cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0= cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8= @@ -1080,7 +1078,6 @@ cloud.google.com/go/scheduler v1.10.3/go.mod h1:8ANskEM33+sIbpJ+R4xRfw/jzOG+ZFE8 cloud.google.com/go/scheduler v1.10.4/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= cloud.google.com/go/scheduler v1.10.5/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= cloud.google.com/go/scheduler v1.10.6/go.mod h1:pe2pNCtJ+R01E06XCDOJs1XvAMbv28ZsQEbqknxGOuE= -cloud.google.com/go/secretmanager v1.3.0/go.mod h1:+oLTkouyiYiabAQNugCeTS3PAArGiMJuBqvJnJsyH+U= cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4= cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4= @@ -1179,7 +1176,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKuqnZI01LAA= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= @@ -1188,8 +1184,8 @@ cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjp cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= cloud.google.com/go/storage v1.37.0/go.mod h1:i34TiT2IhiNDmcj65PqwCjcoUX7Z5pLzS8DEmoiFq1k= -cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= -cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= +cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= +cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= @@ -1225,8 +1221,6 @@ cloud.google.com/go/tpu v1.6.2/go.mod h1:NXh3NDwt71TsPZdtGWgAG5ThDfGd32X1mJ2cMaR cloud.google.com/go/tpu v1.6.3/go.mod h1:lxiueqfVMlSToZY1151IaZqp89ELPSrk+3HIQ5HRkbY= cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y= cloud.google.com/go/tpu v1.6.5/go.mod h1:P9DFOEBIBhuEcZhXi+wPoVy/cji+0ICFi4TtTkMHSSs= -cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= -cloud.google.com/go/trace v1.2.0/go.mod h1:Wc8y/uYyOhPy12KEnXG9XGrvfMz5F5SrYecQlbW1rwM= cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= @@ -1340,9 +1334,6 @@ cloud.google.com/go/workflows v1.12.1/go.mod h1:5A95OhD/edtOhQd/O741NSfIMezNTbCw cloud.google.com/go/workflows v1.12.2/go.mod h1:+OmBIgNqYJPVggnMo9nqmizW0qEXHhmnAzK/CnBqsHc= cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g= cloud.google.com/go/workflows v1.12.4/go.mod h1:yQ7HUqOkdJK4duVtMeBCAOPiN1ZF1E9pAMX51vpwB/w= -contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= -contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -1350,15 +1341,10 @@ filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg= filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= -github.com/Azure/azure-amqp-common-go/v3 v3.2.1/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI= -github.com/Azure/azure-amqp-common-go/v3 v3.2.2/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v59.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0/go.mod h1:ON4tFdPTwRcgWEaVDrN3584Ef+b7GgSJaXxe5fW9t4M= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw= @@ -1366,16 +1352,14 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3q github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2/go.mod h1:5FDJtLEO/GxwNgUxbwrY3LP0pEoThTQJtk2oysdXHxM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.0/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 h1:GJHeeA2N7xrG3q30L2UXDyuWRzDM900/65j70wcM4Ww= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0/go.mod h1:NBanQUfSWiWn3QEpWDTCU0IjBECKOYvl2R8xdRtMtiM= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2/go.mod h1:aiYBYui4BJ/BJCAIKs92XiPyQfTaBWqvHujDwKb6CBU= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= @@ -1384,10 +1368,10 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNic github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc= github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= -github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 h1:TOFrNxfjslms5nLLIMjW7N0+zSALX4KiGsptmpb16AA= -github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0/go.mod h1:EAyXOW1F6BTJPiK2pDvmnvxOHPxoTYWoqBeIlql+QhI= -github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 h1:Lg6BW0VPmCwcMlvOviL3ruHFO+H9tZNqscK0AeuFjGM= -github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA= +github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM= +github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0/go.mod h1:Pu5Zksi2KrU7LPbZbNINx6fuVrUp/ffvpxdDj+i8LeE= +github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw= +github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.6.0 h1:ui3YNbxfW7J3tTFIZMH6LIGRjCngp+J+nIFlnizfNTE= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.6.0/go.mod h1:gZmgV+qBqygoznvqo2J9oKZAFziqhLZ2xE/WVUmzkHA= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2/go.mod h1:FbdwsQ2EzwvXxOPcMFYO8ogEc9uMMIj3YkmCdXdAFmk= @@ -1401,32 +1385,20 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= -github.com/Azure/azure-service-bus-go v0.11.5/go.mod h1:MI6ge2CuQWBVq+ly456MY7XqNLJip5LO1iSFodbNLbU= -github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk= github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58= -github.com/Azure/go-amqp v0.16.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-amqp v0.16.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest v0.11.22/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs= github.com/Azure/go-autorest/autorest v0.11.29 h1:I4+HL/JDvErx2LjyzaVxllw2lRDB5/BT2Bm4g20iqYw= github.com/Azure/go-autorest/autorest v0.11.29/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/adal v0.9.17/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/adal v0.9.22/go.mod h1:XuAbAEUv2Tta//+voMI038TrJBqjKam0me7qR+L8Cmk= github.com/Azure/go-autorest/autorest/adal v0.9.23 h1:Yepx8CvFxwNKpH6ja7RZ+sKX+DWYNldbLiALMC3BTz8= github.com/Azure/go-autorest/autorest/adal v0.9.23/go.mod h1:5pcMqFkdPhviJdlEy3kC/v1ZLnQl0MH6XA5YCcMhy4c= -github.com/Azure/go-autorest/autorest/azure/auth v0.5.9/go.mod h1:hg3/1yw0Bq87O3KvvnJoAh34/0zbP7SFizX/qN5JvjU= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= @@ -1458,7 +1430,6 @@ github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/FZambia/eagle v0.1.0 h1:9gyX6x+xjoIfglgyPTcYm7dvY7FJ93us1QY5De4CyXA= github.com/FZambia/eagle v0.1.0/go.mod h1:YjGSPVkQTNcVLfzEUQJNgW9ScPR0K4u/Ky0yeFa4oDA= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbPSRmHvSXXHOwGRyeXh1jVdquA2G8= github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= @@ -1571,66 +1542,57 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/at-wat/mqtt-go v0.19.4 h1:R2cbCU7O5PHQ38unbe1Y51ncG3KsFEJV6QeipDoqdLQ= +github.com/at-wat/mqtt-go v0.19.4/go.mod h1:AsiWc9kqVOhqq7LzUeWT/AkKUBfx3Sw5cEe8lc06fqA= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.50.29/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.51.25/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go v1.51.31 h1:4TM+sNc+Dzs7wY1sJ0+J8i60c6rkgnKP1pvPx8ghsSY= -github.com/aws/aws-sdk-go v1.51.31/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= -github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o= -github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM= -github.com/aws/aws-sdk-go-v2/config v1.15.3/go.mod h1:9YL3v07Xc/ohTsxFXzan9ZpFpdTOFl4X65BAKYaz8jg= -github.com/aws/aws-sdk-go-v2/config v1.24.0 h1:4LEk29JO3w+y9dEo/5Tq5QTP7uIEw+KQrKiHOs4xlu4= -github.com/aws/aws-sdk-go-v2/config v1.24.0/go.mod h1:11nNDAuK86kOUHeuEQo8f3CkcV5xuUxvPwFjTZE/PnQ= -github.com/aws/aws-sdk-go-v2/credentials v1.11.2 h1:RQQ5fzclAKJyY5TvF+fkjJEwzK4hnxQCLOu5JXzDmQo= -github.com/aws/aws-sdk-go-v2/credentials v1.11.2/go.mod h1:j8YsY9TXTm31k4eFhspiQicfXPLZ0gYXA50i4gxPE8g= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 h1:LWPg5zjHV9oz/myQr4wMs0gi4CjnDN/ILmyZUFYXZsU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3/go.mod h1:uk1vhHHERfSVCUnqSqz8O48LBYDSC+k6brng09jcMOk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3 h1:ir7iEq78s4txFGgwcLqD6q9IIPzTQNRJXulJd9h/zQo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3/go.mod h1:0dHuD2HZZSiwfJSy1FO5bX1hQ1TxVV1QXXjpn3XUE44= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9/go.mod h1:AnVH5pvai0pAF4lXRq0bmhbes1u9R8wTE+g+183bZNM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 h1:5SAoZ4jYpGH4721ZNoS1znQrhOfZinOhc4XuTXx/nVc= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13/go.mod h1:+rdA6ZLpaSeM7tSg/B0IEDinCIBJGmW8rKDFkYpP04g= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88H3UmEcsBoVKq309quMvm3Ds8e9d4eJM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 h1:WIijqeaAO7TYFLbhsZmi2rgLEAtWOC1LhxCAVTJlSKw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13/go.mod h1:i+kbfa76PQbWw/ULoWnp51EYVWH4ENln76fLQE3lXT8= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 h1:by9P+oy3P/CwggN4ClnW2D4oL91QV7pBzBICi1chZvQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE= +github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= +github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= +github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90= +github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 h1:zeN9UtUlA6FTx0vFSayxSX32HDw73Yb6Hh2izDSFxXY= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10/go.mod h1:3HKuexPDcwLWPaqpW2UR/9n8N/u/3CKcGAzSs8p8u8g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 h1:Z5r7SycxmSllHYmaAZPpmN8GviDrSGhMS6bldqtXZPw= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15/go.mod h1:CetW7bDE00QoGEmPUoZuRog07SGVAUVW6LFpNP0YfIg= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 h1:T4pFel53bkHjL2mMo+4DKE6r6AuoZnM0fg7k1/ratr4= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1/go.mod h1:GeUru+8VzrTXV/83XyMJ80KpH8xO89VPoUileyNQ+tc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3 h1:I0dcwWitE752hVSMrsLCxqNQ+UdEp3nACx2bYNMQq+k= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3/go.mod h1:Seb8KNmD6kVTjwRjVEgOT5hPin6sq+v4C2ycJQDwuH8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3 h1:Gh1Gpyh01Yvn7ilO/b/hr01WgNpaszfbKMUgqM186xQ= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3/go.mod h1:wlY6SVjuwvh3TVRpTqdy4I1JpBFLX4UGeKZdWntaocw= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3 h1:BKjwCJPnANbkwQ8vzSbaZDKawwagDubrH/z/c0X+kbQ= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2IaN6rZ+Op7zX+bOUMdL4fsrYZiD0dsjLhNKwZc= -github.com/aws/aws-sdk-go-v2/service/kms v1.16.3/go.mod h1:QuiHPBqlOFCi4LqdSskYYAWpQlx3PKmohy+rE2F+o5g= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3 h1:rMPtwA7zzkSQZhhz9U3/SoIDz/NZ7Q+iRn4EIO8rSyU= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3/go.mod h1:g1qvDuRsJY+XghsV6zg00Z4KJ7DtFFCx8fJD2a491Ak= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4/go.mod h1:PJc8s+lxyU8rrre0/4a0pn2wgwiDvOEzoOjcJUBr67o= -github.com/aws/aws-sdk-go-v2/service/sns v1.17.4/go.mod h1:kElt+uCcXxcqFyc+bQqZPFD9DME/eC6oHBXvFzQ9Bcw= -github.com/aws/aws-sdk-go-v2/service/sqs v1.18.3/go.mod h1:skmQo0UPvsjsuYYSYMVmrPc1HWCbHUJyrCEp+ZaLzqM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.24.1/go.mod h1:NR/xoKjdbRJ+qx0pMR4mI+N/H1I1ynHwXnO6FowXJc0= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 h1:frW4ikGcxfAEDfmQqWgMLp+F1n4nRo9sF39OcIb5BkQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.3/go.mod h1:7UQ/e69kU7LDPtY40OyoHYgRmgfGM4mgsLYtcObdveU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 h1:ORnrOK0C4WmYV/uYt3koHEWBLYsRDwk2Np+eEoyV4Z0= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 h1:cJGRyzCSVwZC7zZZ1xbx9m32UnrKydRYhOvcD1NYP9Q= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.3/go.mod h1:bfBj0iVmsUyUg4weDB4NxktD9rDGeKSVWnjTnwbx9b8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 h1:YPYe6ZmvUfDDDELqEKtAd6bo8zxhkm+XEFEzQisqUIE= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17/go.mod h1:oBtcnYua/CgzCWYN7NZ5j7PotFDaFSUjCYVTtfyn7vw= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f h1:y06x6vGnFYfXUoVMbrcP1Uzpj4JG01eB5vRps9G8agM= @@ -1781,8 +1743,6 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -1822,10 +1782,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= -github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= -github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0= @@ -1835,8 +1793,6 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc= github.com/digitalocean/godo v1.113.0 h1:CLtCxlP4wDAjKIQ+Hshht/UNbgAp8/J/XBH1ZtDCF9Y= github.com/digitalocean/godo v1.113.0/go.mod h1:Z2mTP848Vi3IXXl5YbPekUgr4j4tOePomA+OE1Ag98w= -github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI= @@ -1924,7 +1880,6 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= @@ -1935,7 +1890,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= @@ -1949,9 +1903,6 @@ github.com/gchaincl/sqlhooks v1.3.0/go.mod h1:9BypXnereMT0+Ys8WGWHqzgkkOfHIhyeUC github.com/getkin/kin-openapi v0.125.0 h1:jyQCyf2qXS1qvs2U00xQzkGCqYPhEhZDmSmVt65fXno= github.com/getkin/kin-openapi v0.125.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A= github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= @@ -1962,7 +1913,6 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -2043,7 +1993,6 @@ github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhO github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= @@ -2070,11 +2019,8 @@ github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -2084,7 +2030,6 @@ github.com/goccy/go-yaml v1.9.8/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXK github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng= github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= @@ -2101,7 +2046,6 @@ github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= @@ -2110,10 +2054,8 @@ github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17w github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-migrate/migrate/v4 v4.7.0 h1:gONcHxHApDTKXDyLH/H97gEHmpu1zcnnbAaq2zgrPrs= github.com/golang-migrate/migrate/v4 v4.7.0/go.mod h1:Qvut3N4xKWjoH3sokBccML6WyHSnggXm/DvMMnTsQIc= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -2203,20 +2145,18 @@ github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoG github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/go-replayers/grpcreplay v1.1.0/go.mod h1:qzAvJ8/wi57zq7gWqaE6AwLM6miiXUQwP1S+I9icmhk= -github.com/google/go-replayers/httpreplay v1.1.1/go.mod h1:gN9GeLIs7l6NUoVaSSnv2RiqK1NiwAmD0MrKeC9IIks= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= -github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc= +github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -2230,7 +2170,6 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210506205249-923b5ab0fc1a/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -2242,9 +2181,10 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= -github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= -github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= +github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -2255,8 +2195,8 @@ github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= -github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= +github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -2282,8 +2222,9 @@ github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2e github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= -github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/cLCKqA= github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4= +github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= +github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gophercloud/gophercloud v1.11.0 h1:ls0O747DIq1D8SUHc7r2vI8BFbMLeLFuENaAIfEx7OM= @@ -2302,16 +2243,15 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grafana/alerting v0.0.0-20240812131556-611a23ff0f7f h1:c8QAFXkilBiF29xc7oKO2IkbGE3bp9NIKgiNLazdooY= -github.com/grafana/alerting v0.0.0-20240812131556-611a23ff0f7f/go.mod h1:DLj8frbtCaITljC2jc0L85JQViPF3mPfOSiYhm1osso= +github.com/grafana/alerting v0.0.0-20240827075410-70248a7a3a67 h1:3spByRvTR3Qo7uDCEVVLB7+5VYH1q4hxwqVLdNpcS6k= +github.com/grafana/alerting v0.0.0-20240827075410-70248a7a3a67/go.mod h1:GMLi6d09Xqo96fCVUjNk//rcjP5NKEdjOzfWIffD5r4= github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db h1:z++X4DdoX+aNlZNT1ZY4cykiFay4+f077pa0AG48SGg= github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db/go.mod h1:ptt910z9KFfpVSIbSbXvTRR7tS19mxD7EtmVbbJi/WE= -github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828 h1:Hk6Oe0o1yIfdm2+2F3yHLjuaktukGVEOjju2txQXu8c= -github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db h1:mDk0bwRV6rDrLSmKXftcPf9kLA9uH6EvxJvzpPW9bso= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw= github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s= github.com/grafana/cue v0.0.0-20230926092038-971951014e3f h1:TmYAMnqg3d5KYEAaT6PtTguL2GjLfvr6wnAX8Azw6tQ= @@ -2341,20 +2281,22 @@ github.com/grafana/grafana-google-sdk-go v0.1.0/go.mod h1:Vo2TKWfDVmNTELBUM+3lkr github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79 h1:r+mU5bGMzcXCRVAuOrTn54S80qbfVkvTdUJZfSfTNbs= github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79/go.mod h1:wc6Hbh3K2TgCUSfBC/BOzabItujtHMESZeFk5ZhdxhQ= github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk= -github.com/grafana/grafana-plugin-sdk-go v0.243.0 h1:Xrkv7rN0aL5AK7b8zVsuD0ryCJX4HlaXUGGKjMuHeL4= -github.com/grafana/grafana-plugin-sdk-go v0.243.0/go.mod h1:JDrwijH50ym2SxBd4zNoQ4K+sdC1VppH4kVS8B1Nh0U= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/grafana/pkg/aggregator v0.0.0-20240813192817-1b0e6b5c09b2 h1:2H9x4q53pkfUGtSNYD1qSBpNnxrFgylof/TYADb5xMI= github.com/grafana/grafana/pkg/aggregator v0.0.0-20240813192817-1b0e6b5c09b2/go.mod h1:gBLBniiSUQvyt4LRrpIeysj8Many0DV+hdUKifRE0Ec= -github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808213237-f4d2e064f435 h1:lmw60EW7JWlAEvgggktOyVkH4hF1m/+LSF/Ap0NCyi8= -github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808213237-f4d2e064f435/go.mod h1:ORVFiW/KNRY52lNjkGwnFWCxNVfE97bJG2jr2fetq0I= -github.com/grafana/grafana/pkg/apiserver v0.0.0-20240708134731-e9876749d440 h1:833vWSgndCcOXycwCq2Y98W8+W2ouuuhTL+Gf3BNKg8= -github.com/grafana/grafana/pkg/apiserver v0.0.0-20240708134731-e9876749d440/go.mod h1:qfZc7FEYBdKcxHUTtWtEAH+ArbMIkEQnbVPzr8giY3k= +github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da h1:2E3c/I3ayAy4Z1GwIPqXNZcpUccRapE1aBXA1ho4g7o= +github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da/go.mod h1:p09fvU5ujNL/Ig8HB7g4f+S0zyYbQq3x/f0jA4ujVOM= +github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da h1:xQMb8cRZYu7D0IO9q/lB7qFQpLGAoPUnCase1CGHrXY= +github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da/go.mod h1:8kZIdcgyLiHBwXbZFFzg9XxM9zD8Ie3wkDhxWuqa5Oo= github.com/grafana/grafana/pkg/promlib v0.0.6 h1:FuRyHMIgVVXkLuJnCflNfk3gqJflmyiI+/ZuJ9MoAfY= github.com/grafana/grafana/pkg/promlib v0.0.6/go.mod h1:shFkrG1fQ/PPNRGhxAPNMLp0SAeG/jhqaLoG6n2191M= github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 h1:SNEeqY22DrGr5E9kGF1mKSqlOom14W9+b1u4XEGJowA= github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435/go.mod h1:8cz+z0i57IjN6MYmu/zZQdCg9CQcsnEHbaJBBEf3KQo= -github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240624122844-a89deaeb7365 h1:XRHqYGxjN2+/4QHPoOtr7kYTL9p2P5UxTXfnbiaO/NI= -github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240624122844-a89deaeb7365/go.mod h1:X4dwV2eQI8z8G2aHXvhZZXu/y/rb3psQXuaZa66WZfA= +github.com/grafana/grafana/pkg/storage/unified/apistore v0.0.0-20240821183201-2f012860344d h1:3oeqPfkTy3hJproHFj6NHx0mJDMU8bpU7ERcKF+C+dA= +github.com/grafana/grafana/pkg/storage/unified/apistore v0.0.0-20240821183201-2f012860344d/go.mod h1:M55oqs8MKOMCUkRCcPf9+a9r1kjiH8Dx5SR91EbfOgA= +github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240821161612-71f0dae39e9d h1:cmJmy/KdlD+8EOWn9AogfRMr9tWoWPDnZ180sQxD/IA= +github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240821161612-71f0dae39e9d/go.mod h1:KL0LyEIlmuRi/zzuCopFZSmSJzBVu2hMGHIK74i4iE8= github.com/grafana/grafana/pkg/util/xorm v0.0.1 h1:72QZjxWIWpSeOF8ob4aMV058kfgZyeetkAB8dmeti2o= github.com/grafana/grafana/pkg/util/xorm v0.0.1/go.mod h1:eNfbB9f2jM8o9RfwqwjY8SYm5tvowJ8Ly+iE4P9rXII= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= @@ -2398,8 +2340,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hairyhenderson/go-which v0.2.0 h1:vxoCKdgYc6+MTBzkJYhWegksHjjxuXPNiqo5G2oBM+4= github.com/hairyhenderson/go-which v0.2.0/go.mod h1:U1BQQRCjxYHfOkXDyCgst7OZVknbqI7KuGKhGnmyIik= -github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= -github.com/hanwen/go-fuse/v2 v2.1.0/go.mod h1:oRyA5eK+pvJyv5otpO/DgccS8y/RvYMaO00GgRLGryc= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= @@ -2534,51 +2474,14 @@ github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso= github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA= github.com/ionos-cloud/sdk-go/v6 v6.1.11 h1:J/uRN4UWO3wCyGOeDdMKv8LWRzKu6UIkLEaes38Kzh8= github.com/ionos-cloud/sdk-go/v6 v6.1.11/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= -github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= -github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= -github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= -github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= -github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= -github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= -github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= -github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= -github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA= github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= -github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= -github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= -github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= -github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= -github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw= github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= -github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= @@ -2608,7 +2511,6 @@ github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuT github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jmattheis/goverter v1.4.0/go.mod h1:iVIl/4qItWjWj2g3vjouGoYensJbRqDHpzlEVMHHFeY= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -2616,7 +2518,6 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= @@ -2655,14 +2556,13 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= -github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -2682,12 +2582,10 @@ github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NB github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= @@ -2699,10 +2597,7 @@ github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+O github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= @@ -2738,7 +2633,6 @@ github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxq github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM= github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -2747,13 +2641,10 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= -github.com/mattn/go-ieproxy v0.0.3/go.mod h1:6ZpRmhBaYuBX1U2za+9rC9iCGLsSp2tftelZne7CPko= github.com/mattn/go-ieproxy v0.0.11 h1:MQ/5BuGSgDAHZOJe6YY80IF2UVCfGkwfo6AeD7HtHYo= github.com/mattn/go-ieproxy v0.0.11/go.mod h1:/NsJd+kxZBmjMc5hrJCKMbP57B84rvq9BiDRbtO9AS0= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= @@ -2822,7 +2713,6 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -3030,7 +2920,6 @@ github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFu github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= @@ -3069,8 +2958,8 @@ github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -3153,11 +3042,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= -github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/russellhaering/goxmldsig v1.4.0 h1:8UcDh/xGyQiyrW+Fq5t8f+l2DLB1+zlhYzkPUJ7Qhys= github.com/russellhaering/goxmldsig v1.4.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -3267,7 +3153,6 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= @@ -3318,10 +3203,7 @@ github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaO github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= -github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI= @@ -3388,7 +3270,6 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -3423,7 +3304,6 @@ go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwD go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc= go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= -go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -3509,7 +3389,6 @@ go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -3517,7 +3396,6 @@ go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= @@ -3525,30 +3403,25 @@ go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk= -gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y= +gocloud.dev v0.39.0 h1:EYABYGhAalPUaMrbSKOr5lejxoxvXj99nE8XFtsDgds= +gocloud.dev v0.39.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -3562,17 +3435,13 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -3737,13 +3606,10 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -3792,7 +3658,6 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -3865,7 +3730,6 @@ golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3907,7 +3771,6 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3929,7 +3792,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3949,20 +3811,16 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220110181412-a018aaa089fe/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3997,11 +3855,10 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -4054,13 +3911,12 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -4072,9 +3928,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425222832-ad9eeb80039a/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -4083,7 +3937,6 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -4159,8 +4012,6 @@ golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= -golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -4169,8 +4020,9 @@ golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.7.0/go.mod h1:L02bwd0sqlsvRv41G7wGWFCsVNZFv/k1xzGIxeANHGM= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= @@ -4206,7 +4058,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -4215,15 +4066,10 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E= google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.64.0/go.mod h1:931CdxA8Rm4t6zqTFGSsgwbAEZ2+GMYurbndwSimebM= -google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= -google.golang.org/api v0.68.0/go.mod h1:sOM8pTpwgflXRhz+oC8H2Dr+UcbMqkPPWNJo88Q7TH8= -google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7C80= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= @@ -4266,8 +4112,8 @@ google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYl google.golang.org/api v0.164.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o= google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= google.golang.org/api v0.174.0/go.mod h1:aC7tB6j0HR1Nl0ni5ghpx6iLasmAX78Zkh/wgxAAjLg= -google.golang.org/api v0.176.0 h1:dHj1/yv5Dm/eQTXiP9hNCRT3xzJHWXeNdRq29XbMxoE= -google.golang.org/api v0.176.0/go.mod h1:Rra+ltKu14pps/4xTycZfobMgLpbosoaaL7c+SEMrO8= +google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= +google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -4328,9 +4174,7 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210517163617-5e0236093d7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -4346,31 +4190,21 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211018162055-cf77aa76bad2/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220216160803-4663080d8bc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= @@ -4461,8 +4295,9 @@ google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqt google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4stdSSsxPDK8Azkrk/ECl5HvdPf6nbZrTS5M= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc= google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= @@ -4493,8 +4328,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go. google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be/go.mod h1:dvdCTIoAGbkWbcIKBniID56/7XHTt6WfxXNMxuziJ+w= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c= google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw= @@ -4539,8 +4374,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240415141817-7cd4c1c1f9ec/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -4650,7 +4485,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -4804,7 +4638,6 @@ modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ= -nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/go.work b/go.work index 5e9b02fc37a..862037b80de 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.4 +go 1.23.0 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. @@ -12,6 +12,7 @@ use ( ./pkg/build/wire // skip:golangci-lint ./pkg/promlib ./pkg/semconv + ./pkg/storage/unified/apistore ./pkg/storage/unified/resource ./pkg/util/xorm // skip:golangci-lint ) diff --git a/go.work.sum b/go.work.sum index b9ea373c6c3..448f00a3af1 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,137 +1,391 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20230802163732-1c33ebd9ecfa.1 h1:tdpHgTbmbvEIARu+bixzmleMi14+3imnpoFXz+Qzjp4= buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20230802163732-1c33ebd9ecfa.1/go.mod h1:xafc+XIsTxTy76GJQ1TKgvJWsSugFBqMaN27WhUblew= -buf.build/gen/go/grpc-ecosystem/grpc-gateway/bufbuild/connect-go v1.4.1-20221127060915-a1ecdc58eccd.1 h1:vp9EaPFSb75qe/793x58yE5fY1IJ/gdxb/kcDUzavtI= -buf.build/gen/go/grpc-ecosystem/grpc-gateway/bufbuild/connect-go v1.4.1-20221127060915-a1ecdc58eccd.1/go.mod h1:YDq2B5X5BChU0lxAG5MxHpDb8mx1fv9OGtF2mwOe7hY= cel.dev/expr v0.15.0 h1:O1jzfJCQBfL5BFoYktaxwIhuttaQPsVWerH9/EEKx0w= cel.dev/expr v0.15.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg= +cloud.google.com/go v0.112.2/go.mod h1:iEqjp//KquGIJV/m+Pk3xecgKNhV+ry+vVTsy4TbDms= cloud.google.com/go/accessapproval v1.7.5 h1:uzmAMSgYcnlHa9X9YSQZ4Q1wlfl4NNkZyQgho1Z6p04= +cloud.google.com/go/accessapproval v1.7.11 h1:MgtE8CI+YJWPGGHnxQ9z1VQqV87h+vSGy2MeM/m0ggQ= +cloud.google.com/go/accessapproval v1.7.11/go.mod h1:KGK3+CLDWm4BvjN0wFtZqdFUGhxlTvTF6PhAwQJGL4M= cloud.google.com/go/accesscontextmanager v1.8.5 h1:2GLNaNu9KRJhJBFTIVRoPwk6xE5mUDgD47abBq4Zp/I= +cloud.google.com/go/accesscontextmanager v1.8.11 h1:IQ3KLJmNKPgstN0ZcRw0niU4KfsiOZmzvcGCF+NT618= +cloud.google.com/go/accesscontextmanager v1.8.11/go.mod h1:nwPysISS3KR5qXipAU6cW/UbDavDdTBBgPohbkhGSok= cloud.google.com/go/aiplatform v1.60.0 h1:0cSrii1ZeLr16MbBoocyy5KVnrSdiQ3KN/vtrTe7RqE= +cloud.google.com/go/aiplatform v1.68.0 h1:EPPqgHDJpBZKRvv+OsB3cr0jYz3EL2pZ+802rBPcG8U= +cloud.google.com/go/aiplatform v1.68.0/go.mod h1:105MFA3svHjC3Oazl7yjXAmIR89LKhRAeNdnDKJczME= cloud.google.com/go/analytics v0.23.0 h1:Q+y94XH84jM8SK8O7qiY/PJRexb6n7dRbQ6PiUa4YGM= +cloud.google.com/go/analytics v0.23.6 h1:BY8ZY7hQwKBi+lNp1IkiMTOK4xe4lxZCeYv3S9ARXtE= +cloud.google.com/go/analytics v0.23.6/go.mod h1:cFz5GwWHrWQi8OHKP9ep3Z4pvHgGcG9lPnFQ+8kXsNo= cloud.google.com/go/apigateway v1.6.5 h1:sPXnpk+6TneKIrjCjcpX5YGsAKy3PTdpIchoj8/74OE= +cloud.google.com/go/apigateway v1.6.11 h1:VtEvpnqqY2T5gZBzo+p7C87yGH3omHUkPIbRQkmGS9I= +cloud.google.com/go/apigateway v1.6.11/go.mod h1:4KsrYHn/kSWx8SNUgizvaz+lBZ4uZfU7mUDsGhmkWfM= cloud.google.com/go/apigeeconnect v1.6.5 h1:CrfIKv9Go3fh/QfQgisU3MeP90Ww7l/sVGmr3TpECo8= +cloud.google.com/go/apigeeconnect v1.6.11 h1:CftZgGXFRLJeD2/5ZIdWuAMxW/88UG9tHhRPI/NY75M= +cloud.google.com/go/apigeeconnect v1.6.11/go.mod h1:iMQLTeKxtKL+sb0D+pFlS/TO6za2IUOh/cwMEtn/4g0= cloud.google.com/go/apigeeregistry v0.8.3 h1:C+QU2K+DzDjk4g074ouwHQGkoff1h5OMQp6sblCVreQ= +cloud.google.com/go/apigeeregistry v0.8.9 h1:3vLwk0tS9L++6ZyV4RDH4UCydfVoqxJbpWvqG6MTtUw= +cloud.google.com/go/apigeeregistry v0.8.9/go.mod h1:4XivwtSdfSO16XZdMEQDBCMCWDp3jkCBRhVgamQfLSA= cloud.google.com/go/apikeys v0.6.0 h1:B9CdHFZTFjVti89tmyXXrO+7vSNo2jvZuHG8zD5trdQ= cloud.google.com/go/appengine v1.8.5 h1:l2SviT44zWQiOv8bPoMBzW0vOcMO22iO0s+nVtVhdts= +cloud.google.com/go/appengine v1.8.11 h1:ZLoWWwakgRzRnXX2bsgk2g1sdzti3wq+ebunTJsZNog= +cloud.google.com/go/appengine v1.8.11/go.mod h1:xET3coaDUj+OP4TgnZlgQ+rG2R9fG2nblya13czP56Q= cloud.google.com/go/area120 v0.8.5 h1:vTs08KPLN/iMzTbxpu5ciL06KcsrVPMjz4IwcQyZ4uY= +cloud.google.com/go/area120 v0.8.11 h1:UID1dl7lW2zs8OpYVtVZ5WsXU9kUcxC1nd3nnToHW70= +cloud.google.com/go/area120 v0.8.11/go.mod h1:VBxJejRAJqeuzXQBbh5iHBYUkIjZk5UzFZLCXmzap2o= cloud.google.com/go/artifactregistry v1.14.7 h1:W9sVlyb1VRcUf83w7aM3yMsnp4HS4PoyGqYQNG0O5lI= +cloud.google.com/go/artifactregistry v1.14.13 h1:NNK4vYVA5NGQmbmYidfJhnfmYU6SSSRUM2oopNouJNs= +cloud.google.com/go/artifactregistry v1.14.13/go.mod h1:zQ/T4xoAFPtcxshl+Q4TJBgsy7APYR/BLd2z3xEAqRA= cloud.google.com/go/asset v1.17.2 h1:xgFnBP3luSbUcC9RWJvb3Zkt+y/wW6PKwPHr3ssnIP8= +cloud.google.com/go/asset v1.19.5 h1:/R2XZS6lR8oj/Y3L+epD2yy7mf44Zp62H4xZ4vzaR/Y= +cloud.google.com/go/asset v1.19.5/go.mod h1:sqyLOYaLLfc4ACcn3YxqHno+J7lRt9NJTdO50zCUcY0= cloud.google.com/go/assuredworkloads v1.11.5 h1:gCrN3IyvqY3cP0wh2h43d99CgH3G+WYs9CeuFVKChR8= +cloud.google.com/go/assuredworkloads v1.11.11 h1:pwZp9o8aF5QmX4Z0YNlRe1ZOUzDw0UALmkem3aPobZc= +cloud.google.com/go/assuredworkloads v1.11.11/go.mod h1:vaYs6+MHqJvLKYgZBOsuuOhBgNNIguhRU0Kt7JTGcnI= +cloud.google.com/go/auth v0.3.0/go.mod h1:lBv6NKTWp8E3LPzmO1TbiiRKc4drLOfHsgmlH9ogv5w= +cloud.google.com/go/auth v0.5.1/go.mod h1:vbZT8GjzDf3AVqCcQmqeeM32U9HBFc32vVVAbwDsa6s= +cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4= +cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth v0.7.3/go.mod h1:HJtWUx1P5eqjy/f6Iq5KeytNpbAcGolPhOgyop2LlzA= +cloud.google.com/go/auth v0.8.0/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= +cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= cloud.google.com/go/automl v1.13.5 h1:ijiJy9sYWh75WrqImXsfWc1e3HR3iO+ef9fvW03Ig/4= +cloud.google.com/go/automl v1.13.11 h1:FBCLjGS+Did/wtRHqyS055bRs/EJXx3meTvHPcdZgk8= +cloud.google.com/go/automl v1.13.11/go.mod h1:oMJdXRDOVC+Eq3PnGhhxSut5Hm9TSyVx1aLEOgerOw8= cloud.google.com/go/baremetalsolution v1.2.4 h1:LFydisRmS7hQk9P/YhekwuZGqb45TW4QavcrMToWo5A= +cloud.google.com/go/baremetalsolution v1.2.10 h1:VvBiXT9QJ4VpNVyfzHhLScY1aymZxpQgOa20yUvgphw= +cloud.google.com/go/baremetalsolution v1.2.10/go.mod h1:eO2c2NMRy5ytcNPhG78KPsWGNsX5W/tUsCOWmYihx6I= cloud.google.com/go/batch v1.8.0 h1:2HK4JerwVaIcCh/lJiHwh6+uswPthiMMWhiSWLELayk= +cloud.google.com/go/batch v1.9.2 h1:o1RAjc0ExGAAm41YB9LbJZyJDgZR4M6SKyITsd/Smr4= +cloud.google.com/go/batch v1.9.2/go.mod h1:smqwS4sleDJVAEzBt/TzFfXLktmWjFNugGDWl8coKX4= cloud.google.com/go/beyondcorp v1.0.4 h1:qs0J0O9Ol2h1yA0AU+r7l3hOCPzs2MjE1d6d/kaHIKo= +cloud.google.com/go/beyondcorp v1.0.10 h1:K4blSIQZn3YO4F4LmvWrH52pb8Y0L3NOrwkf22+x67M= +cloud.google.com/go/beyondcorp v1.0.10/go.mod h1:G09WxvxJASbxbrzaJUMVvNsB1ZiaKxpbtkjiFtpDtbo= cloud.google.com/go/bigquery v1.59.1 h1:CpT+/njKuKT3CEmswm6IbhNu9u35zt5dO4yPDLW+nG4= +cloud.google.com/go/bigquery v1.62.0 h1:SYEA2f7fKqbSRRBHb7g0iHTtZvtPSPYdXfmqsjpsBwo= +cloud.google.com/go/bigquery v1.62.0/go.mod h1:5ee+ZkF1x/ntgCsFQJAQTM3QkAZOecfCmvxhkJsWRSA= +cloud.google.com/go/bigtable v1.27.2-0.20240802230159-f371928b558f h1:UR2/6M/bSN8PPQlhaq+57w21VZLcEvq4ujsHd1p/G2s= +cloud.google.com/go/bigtable v1.27.2-0.20240802230159-f371928b558f/go.mod h1:avmXcmxVbLJAo9moICRYMgDyTTPoV0MA0lHKnyqV4fQ= cloud.google.com/go/billing v1.18.2 h1:oWUEQvuC4JvtnqLZ35zgzdbuHt4Itbftvzbe6aEyFdE= +cloud.google.com/go/billing v1.18.9 h1:sGRWx7PvsfHuZyx151Xr6CrORIgjvCMO4GRabihSdQQ= +cloud.google.com/go/billing v1.18.9/go.mod h1:bKTnh8MBfCMUT1fzZ936CPN9rZG7ZEiHB2J3SjIjByc= cloud.google.com/go/binaryauthorization v1.8.1 h1:1jcyh2uIUwSZkJ/JmL8kd5SUkL/Krbv8zmYLEbAz6kY= +cloud.google.com/go/binaryauthorization v1.8.7 h1:ItT9uR/0/ok2Ru3LCcbSIBUPsKqTA49ZmxCupqQaeFo= +cloud.google.com/go/binaryauthorization v1.8.7/go.mod h1:cRj4teQhOme5SbWQa96vTDATQdMftdT5324BznxANtg= cloud.google.com/go/certificatemanager v1.7.5 h1:UMBr/twXvH3jcT5J5/YjRxf2tvwTYIfrpemTebe0txc= +cloud.google.com/go/certificatemanager v1.8.5 h1:ASC9N81NU8JnGzi9kiY2QTqtTgOziwGv48sjt3YG420= +cloud.google.com/go/certificatemanager v1.8.5/go.mod h1:r2xINtJ/4xSz85VsqvjY53qdlrdCjyniib9Jp98ZKKM= cloud.google.com/go/channel v1.17.5 h1:/omiBnyFjm4S1ETHoOmJbL7LH7Ljcei4rYG6Sj3hc80= +cloud.google.com/go/channel v1.17.11 h1:AkKyMl2pSoJxBQtjAd6LYOtMgOaCl/kuiKoSg/Gf/H4= +cloud.google.com/go/channel v1.17.11/go.mod h1:gjWCDBcTGQce/BSMoe2lAqhlq0dIRiZuktvBKXUawp0= cloud.google.com/go/cloudbuild v1.15.1 h1:ZB6oOmJo+MTov9n629fiCrO9YZPOg25FZvQ7gIHu5ng= +cloud.google.com/go/cloudbuild v1.16.5 h1:RvK5r8JBCLNg9XmfGPy05t3bmhLJV3Xh3sDHGHAATgM= +cloud.google.com/go/cloudbuild v1.16.5/go.mod h1:HXLpZ8QeYZgmDIWpbl9Gs22p6o6uScgQ/cV9HF9cIZU= cloud.google.com/go/clouddms v1.7.4 h1:Sr0Zo5EAcPQiCBgHWICg3VGkcdS/LLP1d9SR7qQBM/s= +cloud.google.com/go/clouddms v1.7.10 h1:EA3y9v5TZiAlwgHJh2vPOEelqYiCxXBYZRCNnGK5q+g= +cloud.google.com/go/clouddms v1.7.10/go.mod h1:PzHELq0QDyA7VaD9z6mzh2mxeBz4kM6oDe8YxMxd4RA= cloud.google.com/go/cloudtasks v1.12.6 h1:EUt1hIZ9bLv8Iz9yWaCrqgMnIU+Tdh0yXM1MMVGhjfE= +cloud.google.com/go/cloudtasks v1.12.12 h1:p91Brp4nJkyRRI/maYdO+FT+e9tU+2xoGr20s2rvalU= +cloud.google.com/go/cloudtasks v1.12.12/go.mod h1:8UmM+duMrQpzzRREo0i3x3TrFjsgI/3FQw3664/JblA= cloud.google.com/go/compute v1.25.1 h1:ZRpHJedLtTpKgr3RV1Fx23NuaAEN1Zfx9hw1u4aJdjU= cloud.google.com/go/compute v1.25.1/go.mod h1:oopOIR53ly6viBYxaDhBfJwzUAxf1zE//uf3IB011ls= +cloud.google.com/go/compute v1.27.4 h1:XM8ulx6crjdl09XBfji7viFgZOEQuIxBwKmjRH9Rtmc= +cloud.google.com/go/compute v1.27.4/go.mod h1:7JZS+h21ERAGHOy5qb7+EPyXlQwzshzrx1x6L9JhTqU= cloud.google.com/go/contactcenterinsights v1.13.0 h1:6Vs/YnDG5STGjlWMEjN/xtmft7MrOTOnOZYUZtGTx0w= +cloud.google.com/go/contactcenterinsights v1.13.6 h1:LRcI5RAlLIbjwT312sGt+gyXcaXTr+v7uEQlNyArO9g= +cloud.google.com/go/contactcenterinsights v1.13.6/go.mod h1:mL+DbN3pMQGaAbDC4wZhryLciwSwHf5Tfk4Itr72Zyk= cloud.google.com/go/container v1.31.0 h1:MAaNH7VRNPWEhvqOypq2j+7ONJKrKzon4v9nS3nLZe0= +cloud.google.com/go/container v1.38.0 h1:GP5zLamfvPZeOTifnGBSER/br76D5eJ97xhcXXrh5tM= +cloud.google.com/go/container v1.38.0/go.mod h1:U0uPBvkVWOJGY/0qTVuPS7NeafFEUsHSPqT5pB8+fCY= cloud.google.com/go/containeranalysis v0.11.4 h1:doJ0M1ljS4hS0D2UbHywlHGwB7sQLNrt9vFk9Zyi7vY= +cloud.google.com/go/containeranalysis v0.12.1 h1:Xb8Eu7vVmWR5nAl5WPTGTx/dCr+R+oF7VbuYV47EHHs= +cloud.google.com/go/containeranalysis v0.12.1/go.mod h1:+/lcJIQSFt45TC0N9Nq7/dPbl0isk6hnC4EvBBqyXsM= cloud.google.com/go/datacatalog v1.19.3 h1:A0vKYCQdxQuV4Pi0LL9p39Vwvg4jH5yYveMv50gU5Tw= +cloud.google.com/go/datacatalog v1.21.0 h1:vl0pQT9TZ5rKi9e69FgtXNCR7I8MVRj4+CnbeXhz6UQ= +cloud.google.com/go/datacatalog v1.21.0/go.mod h1:DB0QWF9nelpsbB0eR/tA0xbHZZMvpoFD1XFy3Qv/McI= cloud.google.com/go/dataflow v0.9.5 h1:RYHtcPhmE664+F0Je46p+NvFbG8z//KCXp+uEqB4jZU= +cloud.google.com/go/dataflow v0.9.11 h1:YIhStasKFDESaUdpnsHsp/5bACYL/yvW0OuZ6zPQ6nY= +cloud.google.com/go/dataflow v0.9.11/go.mod h1:CCLufd7I4pPfyp54qMgil/volrL2ZKYjXeYLfQmBGJs= cloud.google.com/go/dataform v0.9.2 h1:5e4eqGrd0iDTCg4Q+VlAao5j2naKAA7xRurNtwmUknU= +cloud.google.com/go/dataform v0.9.8 h1:oNtTx9PdH7aPnvrKIsPrh+Y6Mw+8Bw5/ZgLWVHAev/c= +cloud.google.com/go/dataform v0.9.8/go.mod h1:cGJdyVdunN7tkeXHPNosuMzmryx55mp6cInYBgxN3oA= cloud.google.com/go/datafusion v1.7.5 h1:HQ/BUOP8OIGJxuztpYvNvlb+/U+/Bfs9SO8tQbh61fk= +cloud.google.com/go/datafusion v1.7.11 h1:GVcVisjVKmoj1eNnIp3G3qjjo+7koHr0Kf8tF6Cjqe0= +cloud.google.com/go/datafusion v1.7.11/go.mod h1:aU9zoBHgYmoPp4dzccgm/Gi4xWDMXodSZlNZ4WNeptw= cloud.google.com/go/datalabeling v0.8.5 h1:GpIFRdm0qIZNsxqURFJwHt0ZBJZ0nF/mUVEigR7PH/8= +cloud.google.com/go/datalabeling v0.8.11 h1:7jSuJEAc7upeMmyICzqfU0OyxUV38JSWW+8r5GmoHX0= +cloud.google.com/go/datalabeling v0.8.11/go.mod h1:6IGUV3z7hlkAU5ndKVshv/8z+7pxE+k0qXsEjyzO1Xg= cloud.google.com/go/dataplex v1.14.2 h1:fxIfdU8fxzR3clhOoNI7XFppvAmndxDu1AMH+qX9WKQ= +cloud.google.com/go/dataplex v1.18.2 h1:bIU1r1YnsX6P1qTnaRnah/STHoLJ3EHUZVCjJl2+1Eo= +cloud.google.com/go/dataplex v1.18.2/go.mod h1:NuBpJJMGGQn2xctX+foHEDKRbizwuiHJamKvvSteY3Q= cloud.google.com/go/dataproc v1.12.0 h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU= cloud.google.com/go/dataproc/v2 v2.4.0 h1:/u81Fd+BvCLp+xjctI1DiWVJn6cn9/s3Akc8xPH02yk= +cloud.google.com/go/dataproc/v2 v2.5.3 h1:OgTfUARkF8AfkNmoyT0wyLLXNh4LbT3l55s5gUlvFOk= +cloud.google.com/go/dataproc/v2 v2.5.3/go.mod h1:RgA5QR7v++3xfP7DlgY3DUmoDSTaaemPe0ayKrQfyeg= cloud.google.com/go/dataqna v0.8.5 h1:9ybXs3nr9BzxSGC04SsvtuXaHY0qmJSLIpIAbZo9GqQ= +cloud.google.com/go/dataqna v0.8.11 h1:bEUidOYRS0EQ7qHbZtcnospuks72iTapboszXU9poz8= +cloud.google.com/go/dataqna v0.8.11/go.mod h1:74Icl1oFKKZXPd+W7YDtqJLa+VwLV6wZ+UF+sHo2QZQ= cloud.google.com/go/datastore v1.15.0 h1:0P9WcsQeTWjuD1H14JIY7XQscIPQ4Laje8ti96IC5vg= +cloud.google.com/go/datastore v1.17.1 h1:6Me8ugrAOAxssGhSo8im0YSuy4YvYk4mbGvCadAH5aE= +cloud.google.com/go/datastore v1.17.1/go.mod h1:mtzZ2HcVtz90OVrEXXGDc2pO4NM1kiBQy8YV4qGe0ZM= cloud.google.com/go/datastream v1.10.4 h1:o1QDKMo/hk0FN7vhoUQURREuA0rgKmnYapB+1M+7Qz4= +cloud.google.com/go/datastream v1.10.10 h1:klGhjQCLoLIRHMzMFIqM73cPNKliGveqC+Vrms+ce6A= +cloud.google.com/go/datastream v1.10.10/go.mod h1:NqchuNjhPlISvWbk426/AU/S+Kgv7srlID9P5XOAbtg= cloud.google.com/go/deploy v1.17.1 h1:m27Ojwj03gvpJqCbodLYiVmE9x4/LrHGGMjzc0LBfM4= +cloud.google.com/go/deploy v1.21.0 h1:/qnNETfztKemA9JmUBOrnH/rG/XFkHOBHygN1Vy5lkg= +cloud.google.com/go/deploy v1.21.0/go.mod h1:PaOfS47VrvmYnxG5vhHg0KU60cKeWcqyLbMBjxS8DW8= cloud.google.com/go/dialogflow v1.49.0 h1:KqG0oxGE71qo0lRVyAoeBozefCvsMfcDzDjoLYSY0F4= +cloud.google.com/go/dialogflow v1.55.0 h1:H28O0WAm2waHpNAz2n9jbv8FApfXxeKAkfHObdP2MMk= +cloud.google.com/go/dialogflow v1.55.0/go.mod h1:0u0hSlJiFpMkMpMNoFrQETwDjaRm8Q8hYKv+jz5JeRA= cloud.google.com/go/dlp v1.11.2 h1:lTipOuJaSjlYnnotPMbEhKURLC6GzCMDDzVbJAEbmYM= +cloud.google.com/go/dlp v1.16.0 h1:mYjBqgVjseYXlx1TOOFsxSeZLboqxxKR7TqRGOG9vIU= +cloud.google.com/go/dlp v1.16.0/go.mod h1:LtPZxZAenBXKzvWIOB2hdHIXuEcK0wW0En8//u+/nNA= cloud.google.com/go/documentai v1.25.0 h1:lI62GMEEPO6vXJI9hj+G9WjOvnR0hEjvjokrnex4cxA= +cloud.google.com/go/documentai v1.31.0 h1:YRkFK+0ZgEciz1svDkuL9fjbQLq8xvVa1d3NUlhO6B4= +cloud.google.com/go/documentai v1.31.0/go.mod h1:5ajlDvaPyl9tc+K/jZE8WtYIqSXqAD33Z1YAYIjfad4= cloud.google.com/go/domains v0.9.5 h1:Mml/R6s3vQQvFPpi/9oX3O5dRirgjyJ8cksK8N19Y7g= +cloud.google.com/go/domains v0.9.11 h1:8peNiXtaMNIF9Wybci859M/yprFcEve1R2z08pErUBs= +cloud.google.com/go/domains v0.9.11/go.mod h1:efo5552kUyxsXEz30+RaoIS2lR7tp3M/rhiYtKXkhkk= cloud.google.com/go/edgecontainer v1.1.5 h1:tBY32km78ScpK2aOP84JoW/+wtpx5WluyPUSEE3270U= +cloud.google.com/go/edgecontainer v1.2.5 h1:wTo0ulZDSsDzeoVjICJZjZMzZ1Nn9y//AwAQlXbaTbs= +cloud.google.com/go/edgecontainer v1.2.5/go.mod h1:OAb6tElD3F3oBujFAup14PKOs9B/lYobTb6LARmoACY= cloud.google.com/go/errorreporting v0.3.0 h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0= +cloud.google.com/go/errorreporting v0.3.1 h1:E/gLk+rL7u5JZB9oq72iL1bnhVlLrnfslrgcptjJEUE= +cloud.google.com/go/errorreporting v0.3.1/go.mod h1:6xVQXU1UuntfAf+bVkFk6nld41+CPyF2NSPCyXE3Ztk= cloud.google.com/go/essentialcontacts v1.6.6 h1:13eHn5qBnsawxI7mIrv4jRIEmQ1xg0Ztqw5ZGqtUNfA= +cloud.google.com/go/essentialcontacts v1.6.12 h1:JaQXS+qCFYs8yectfZHpzw4+NjTvFqTuDMCtfPzMvbw= +cloud.google.com/go/essentialcontacts v1.6.12/go.mod h1:UGhWTIYewH8Ma4wDRJp8cMAHUCeAOCKsuwd6GLmmQLc= cloud.google.com/go/eventarc v1.13.4 h1:ORkd6/UV5FIdA8KZQDLNZYKS7BBOrj0p01DXPmT4tE4= +cloud.google.com/go/eventarc v1.13.10 h1:HVJmOVc+7eVFAqMpJRrq0nY0KlYBEBVZW7Gz7TxTio8= +cloud.google.com/go/eventarc v1.13.10/go.mod h1:KlCcOMApmUaqOEZUpZRVH+p0nnnsY1HaJB26U4X5KXE= cloud.google.com/go/filestore v1.8.1 h1:X5G4y/vrUo1B8Nsz93qSWTMAcM8LXbGUldq33OdcdCw= +cloud.google.com/go/filestore v1.8.7 h1:LF9t5MClPyFJMuXdez/AjF1uyO9xHKUFF3GUqA+xFPI= +cloud.google.com/go/filestore v1.8.7/go.mod h1:dKfyH0YdPAKdYHqAR/bxZeil85Y5QmrEVQwIYuRjcXI= cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw= +cloud.google.com/go/firestore v1.16.0 h1:YwmDHcyrxVRErWcgxunzEaZxtNbc8QoFYA/JOEwDPgc= +cloud.google.com/go/firestore v1.16.0/go.mod h1:+22v/7p+WNBSQwdSwP57vz47aZiY+HrDkrOsJNhk7rg= cloud.google.com/go/functions v1.16.0 h1:IWVylmK5F6hJ3R5zaRW7jI5PrWhCvtBVU4axQLmXSo4= +cloud.google.com/go/functions v1.16.6 h1:tPe3/48RpjcFk96VeB6jOKQpK8nliGJLsgjh6pUOyFQ= +cloud.google.com/go/functions v1.16.6/go.mod h1:wOzZakhMueNQaBUJdf0yjsJIe0GBRu+ZTvdSTzqHLs0= cloud.google.com/go/gaming v1.10.1 h1:5qZmZEWzMf8GEFgm9NeC3bjFRpt7x4S6U7oLbxaf7N8= cloud.google.com/go/gkebackup v1.3.5 h1:iuE8KNtTsPOc79qeWoNS8zOWoXPD9SAdOmwgxtlCmh8= +cloud.google.com/go/gkebackup v1.5.4 h1:mufh0PNpvqbfLV+TcxzSGESX8jGBcjKgctldv7kwQns= +cloud.google.com/go/gkebackup v1.5.4/go.mod h1:V+llvHlRD0bCyrkYaAMJX+CHralceQcaOWjNQs8/Ymw= cloud.google.com/go/gkeconnect v0.8.5 h1:17d+ZSSXKqG/RwZCq3oFMIWLPI8Zw3b8+a9/BEVlwH0= +cloud.google.com/go/gkeconnect v0.8.11 h1:4bZAzvqhuv1uP+i4yG9cEMQ6ggdP26nBVjUgroPU6IM= +cloud.google.com/go/gkeconnect v0.8.11/go.mod h1:ejHv5ehbceIglu1GsMwlH0nZpTftjxEY6DX7tvaM8gA= cloud.google.com/go/gkehub v0.14.5 h1:RboLNFzf9wEMSo7DrKVBlf+YhK/A/jrLN454L5Tz99Q= +cloud.google.com/go/gkehub v0.14.11 h1:hQkVCcOiW/vPVYsthvKl1nje430/TpdFfgeIuqcYVOA= +cloud.google.com/go/gkehub v0.14.11/go.mod h1:CsmDJ4qbBnSPkoBltEubK6qGOjG0xNfeeT5jI5gCnRQ= cloud.google.com/go/gkemulticloud v1.1.1 h1:rsSZAGLhyjyE/bE2ToT5fqo1qSW7S+Ubsc9jFOcbhSI= +cloud.google.com/go/gkemulticloud v1.2.4 h1:6zV05tyl37HoEjCGGY+zHFNxnKQCjvVpiqWAUVgGaEs= +cloud.google.com/go/gkemulticloud v1.2.4/go.mod h1:PjTtoKLQpIRztrL+eKQw8030/S4c7rx/WvHydDJlpGE= cloud.google.com/go/grafeas v0.3.4 h1:D4x32R/cHX3MTofKwirz015uEdVk4uAxvZkZCZkOrF4= +cloud.google.com/go/grafeas v0.3.6 h1:7bcA10EBgTsxeAVypJhz2Dv3fhrdlO7Ml8l7ZZA2IkE= +cloud.google.com/go/grafeas v0.3.6/go.mod h1:to6ECAPgRO2xeqD8ISXHc70nObJuaKZThreQOjeOH3o= cloud.google.com/go/gsuiteaddons v1.6.5 h1:CZEbaBwmbYdhFw21Fwbo+C35HMe36fTE0FBSR4KSfWg= +cloud.google.com/go/gsuiteaddons v1.6.11 h1:zydWX0nVT0Ut/P1X25Sy+4Rqe2PH04IzhwlF1BJd8To= +cloud.google.com/go/gsuiteaddons v1.6.11/go.mod h1:U7mk5PLBzDpHhgHv5aJkuvLp9RQzZFpa8hgWAB+xVIk= +cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE= +cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg= cloud.google.com/go/iap v1.9.4 h1:94zirc2r4t6KzhAMW0R6Dme005eTP6yf7g6vN4IhRrA= +cloud.google.com/go/iap v1.9.10 h1:j7jQqqSkZ2nWAOCiyaZfnJ+REycTJ2NP2dUEjLoW4aA= +cloud.google.com/go/iap v1.9.10/go.mod h1:pO0FEirrhMOT1H0WVwpD5dD9r3oBhvsunyBQtNXzzc0= cloud.google.com/go/ids v1.4.5 h1:xd4U7pgl3GHV+MABnv1BF4/Vy/zBF7CYC8XngkOLzag= +cloud.google.com/go/ids v1.4.11 h1:JhlR1d0XhMsj6YmSmbLbbXV5CGkffnUkPj0HNxJYNtc= +cloud.google.com/go/ids v1.4.11/go.mod h1:+ZKqWELpJm8WcRRsSvKZWUdkriu4A3XsLLzToTv3418= cloud.google.com/go/iot v1.7.5 h1:munTeBlbqI33iuTYgXy7S8lW2TCgi5l1hA4roSIY+EE= +cloud.google.com/go/iot v1.7.11 h1:UBqSUZA6+7bM+mv6uvhl8tVsyT2Fi50njtBFRbrKSlI= +cloud.google.com/go/iot v1.7.11/go.mod h1:0vZJOqFy9kVLbUXwTP95e0dWHakfR4u5IWqsKMGIfHk= +cloud.google.com/go/kms v1.18.4/go.mod h1:SG1bgQ3UWW6/KdPo9uuJnzELXY5YTTMJtDYvajiQ22g= cloud.google.com/go/language v1.12.3 h1:iaJZg6K4j/2PvZZVcjeO/btcWWIllVRBhuTFjGO4LXs= +cloud.google.com/go/language v1.13.0 h1:6Pl97Ei85A3wBJwjXW2S/1IWeUvhQf/lIPQBItnp0FA= +cloud.google.com/go/language v1.13.0/go.mod h1:B9FbD17g1EkilctNGUDAdSrBHiFOlKNErLljO7jplDU= cloud.google.com/go/lifesciences v0.9.5 h1:gXvN70m2p+4zgJFzaz6gMKaxTuF9WJ0USYoMLWAOm8g= +cloud.google.com/go/lifesciences v0.9.11 h1:xyPSYICJWZElcELYgWCKs5PltyNX3TzOKaQAZA7d/I0= +cloud.google.com/go/lifesciences v0.9.11/go.mod h1:NMxu++FYdv55TxOBEvLIhiAvah8acQwXsz79i9l9/RY= cloud.google.com/go/logging v1.9.0 h1:iEIOXFO9EmSiTjDmfpbRjOxECO7R8C7b8IXUGOj7xZw= +cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs= +cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A= cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= +cloud.google.com/go/longrunning v0.5.6/go.mod h1:vUaDrWYOMKRuhiv6JBnn49YxCPz2Ayn9GqyjaBT8/mA= +cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng= +cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c= +cloud.google.com/go/longrunning v0.5.11/go.mod h1:rDn7//lmlfWV1Dx6IB4RatCPenTwwmqXuiP0/RgoEO4= cloud.google.com/go/managedidentities v1.6.5 h1:+bpih1piZVLxla/XBqeSUzJBp8gv9plGHIMAI7DLpDM= +cloud.google.com/go/managedidentities v1.6.11 h1:YU6NtRRBX5R1f3a8ryqhh1dUb1/pt3rnhSO50b63yZY= +cloud.google.com/go/managedidentities v1.6.11/go.mod h1:df+8oZ1D4Eri+NrcpuiR5Hd6MGgiMqn0ZCzNmBYPS0A= cloud.google.com/go/maps v1.6.4 h1:EVCZAiDvog9So46460BGbCasPhi613exoaQbpilMVlk= +cloud.google.com/go/maps v1.11.6 h1:HMI0drvgnT+BtsjBofb1Z80P53n63ybmm7l+1w1og9I= +cloud.google.com/go/maps v1.11.6/go.mod h1:MOS/NN0L6b7Kumr8bLux9XTpd8+D54DYxBMUjq+XfXs= cloud.google.com/go/mediatranslation v0.8.5 h1:c76KdIXljQHSCb/Cy47S8H4s05A4zbK3pAFGzwcczZo= +cloud.google.com/go/mediatranslation v0.8.11 h1:QvO405ocKTmcJqjfqL1zps08yrKk8rE+0E1ZNSWfjbw= +cloud.google.com/go/mediatranslation v0.8.11/go.mod h1:3sNEm0fx61eHk7rfzBzrljVV9XKr931xI3OFacQBVFg= cloud.google.com/go/memcache v1.10.5 h1:yeDv5qxRedFosvpMSEswrqUsJM5OdWvssPHFliNFTc4= +cloud.google.com/go/memcache v1.10.11 h1:DGPEJOVL4Qix2GLKQKcgzGpNLD7gAnCFLr9ch9YSIhU= +cloud.google.com/go/memcache v1.10.11/go.mod h1:ubJ7Gfz/xQawQY5WO5pht4Q0dhzXBFeEszAeEJnwBHU= cloud.google.com/go/metastore v1.13.4 h1:dR7vqWXlK6IYR8Wbu9mdFfwlVjodIBhd1JRrpZftTEg= +cloud.google.com/go/metastore v1.13.10 h1:E5eAxzIRoVP0DrV+ZtTLMYkkjSs4fcfsbL7wv1mXV2U= +cloud.google.com/go/metastore v1.13.10/go.mod h1:RPhMnBxUmTLT1fN7fNbPqtH5EoGHueDxubmJ1R1yT84= cloud.google.com/go/monitoring v1.18.0 h1:NfkDLQDG2UR3WYZVQE8kwSbUIEyIqJUPl+aOQdFH1T4= +cloud.google.com/go/monitoring v1.20.3/go.mod h1:GPIVIdNznIdGqEjtRKQWTLcUeRnPjZW85szouimiczU= +cloud.google.com/go/monitoring v1.20.4 h1:zwcViK7mT9SV0kzKqLOI3spRadvsmvw/R9z1MHNeC0E= +cloud.google.com/go/monitoring v1.20.4/go.mod h1:v7F/UcLRw15EX7xq565N7Ae5tnYEE28+Cl717aTXG4c= cloud.google.com/go/networkconnectivity v1.14.4 h1:GBfXFhLyPspnaBE3nI/BRjdhW8vcbpT9QjE/4kDCDdc= +cloud.google.com/go/networkconnectivity v1.14.10 h1:2EE8pKiv1AI8fBdZCdiUjNgQ+TaBgwE4GxIze4fDdY0= +cloud.google.com/go/networkconnectivity v1.14.10/go.mod h1:f7ZbGl4CV08DDb7lw+NmMXQTKKjMhgCEEwFbEukWuOY= cloud.google.com/go/networkmanagement v1.9.4 h1:aLV5GcosBNmd6M8+a0ekB0XlLRexv4fvnJJrYnqeBcg= +cloud.google.com/go/networkmanagement v1.13.6 h1:6TGn7ZZXyj5rloN0vv5Aw0awYbfbheNRg8BKroT7/2g= +cloud.google.com/go/networkmanagement v1.13.6/go.mod h1:WXBijOnX90IFb6sberjnGrVtZbgDNcPDUYOlGXmG8+4= cloud.google.com/go/networksecurity v0.9.5 h1:+caSxBTj0E8OYVh/5wElFdjEMO1S/rZtE1152Cepchc= +cloud.google.com/go/networksecurity v0.9.11 h1:6wUzyHCwDEOkDbAJjT6jxsAi+vMfe3aj2JWwqSFVXOQ= +cloud.google.com/go/networksecurity v0.9.11/go.mod h1:4xbpOqCwplmFgymAjPFM6ZIplVC6+eQ4m7sIiEq9oJA= cloud.google.com/go/notebooks v1.11.3 h1:FH48boYmrWVQ6k0Mx/WrnNafXncT5iSYxA8CNyWTgy0= +cloud.google.com/go/notebooks v1.11.9 h1:c8I0EaLGqStRmvX29L7jb4mOrpigxn1mGyBt65OdS0s= +cloud.google.com/go/notebooks v1.11.9/go.mod h1:JmnRX0eLgHRJiyxw8HOgumW9iRajImZxr7r75U16uXw= cloud.google.com/go/optimization v1.6.3 h1:63NZaWyN+5rZEKHPX4ACpw3BjgyeuY8+rCehiCMaGPY= +cloud.google.com/go/optimization v1.6.9 h1:++U21U9LWFdgnnVFaq4kDeOafft6gI/CHzsiJ173c6U= +cloud.google.com/go/optimization v1.6.9/go.mod h1:mcvkDy0p4s5k7iSaiKrwwpN0IkteHhGmuW5rP9nXA5M= cloud.google.com/go/orchestration v1.8.5 h1:YHgWMlrPttIVGItgGfuvO2KM7x+y9ivN/Yk92pMm1a4= +cloud.google.com/go/orchestration v1.9.6 h1:xfczjtNDabsXTnDySAwD/TMfDSkcxEgH1rxfS6BVQtM= +cloud.google.com/go/orchestration v1.9.6/go.mod h1:gQvdIsHESZJigimnbUA8XLbYeFlSg/z+A7ppds5JULg= cloud.google.com/go/orgpolicy v1.12.1 h1:2JbXigqBJVp8Dx5dONUttFqewu4fP0p3pgOdIZAhpYU= +cloud.google.com/go/orgpolicy v1.12.7 h1:StymaN9vS7949m15Nwgf5aKd9yaRtzWJ4VqHdbXcOEM= +cloud.google.com/go/orgpolicy v1.12.7/go.mod h1:Os3GlUFRPf1UxOHTup5b70BARnhHeQNNVNZzJXPbWYI= cloud.google.com/go/osconfig v1.12.5 h1:Mo5jGAxOMKH/PmDY7fgY19yFcVbvwREb5D5zMPQjFfo= +cloud.google.com/go/osconfig v1.13.2 h1:IbbTg7jtTEn4+iEJwgbCYck5NLMOc2eKrqVpQb7Xx6c= +cloud.google.com/go/osconfig v1.13.2/go.mod h1:eupylkWQJCwSIEMkpVR4LqpgKkQi0mD4m1DzNCgpQso= cloud.google.com/go/oslogin v1.13.1 h1:1K4nOT5VEZNt7XkhaTXupBYos5HjzvJMfhvyD2wWdFs= +cloud.google.com/go/oslogin v1.13.7 h1:q9x7tjKtfBpXMpiJKwb5UyhMA3GrwmJHvx56uCEuS8M= +cloud.google.com/go/oslogin v1.13.7/go.mod h1:xq027cL0fojpcEcpEQdWayiDn8tIx3WEFYMM6+q7U+E= cloud.google.com/go/phishingprotection v0.8.5 h1:DH3WFLzEoJdW/6xgsmoDqOwT1xddFi7gKu0QGZQhpGU= +cloud.google.com/go/phishingprotection v0.8.11 h1:3Kr7TINZ+8pbdWe3JnJf9c84ibz60NRTvwLdVtI3SK8= +cloud.google.com/go/phishingprotection v0.8.11/go.mod h1:Mge0cylqVFs+D0EyxlsTOJ1Guf3qDgrztHzxZqkhRQM= cloud.google.com/go/policytroubleshooter v1.10.3 h1:c0WOzC6hz964QWNBkyKfna8A2jOIx1zzZa43Gx/P09o= +cloud.google.com/go/policytroubleshooter v1.10.9 h1:EHXkBYgHQtVH8P41G2xxmQbMwQh+o5ggno8l3/9CXaA= +cloud.google.com/go/policytroubleshooter v1.10.9/go.mod h1:X8HEPVBWz8E+qwI/QXnhBLahEHdcuPO3M9YvSj0LDek= cloud.google.com/go/privatecatalog v0.9.5 h1:UZ0assTnATXSggoxUIh61RjTQ4P9zCMk/kEMbn0nMYA= +cloud.google.com/go/privatecatalog v0.9.11 h1:t8dJpQf22H6COeDvp7TDl7+KuwLT6yVmqAVRIUIUj6U= +cloud.google.com/go/privatecatalog v0.9.11/go.mod h1:awEF2a8M6UgoqVJcF/MthkF8SSo6OoWQ7TtPNxUlljY= cloud.google.com/go/pubsub v1.36.1 h1:dfEPuGCHGbWUhaMCTHUFjfroILEkx55iUmKBZTP5f+Y= +cloud.google.com/go/pubsub v1.41.0 h1:ZPaM/CvTO6T+1tQOs/jJ4OEMpjtel0PTLV7j1JK+ZrI= +cloud.google.com/go/pubsub v1.41.0/go.mod h1:g+YzC6w/3N91tzG66e2BZtp7WrpBBMXVa3Y9zVoOGpk= cloud.google.com/go/pubsublite v1.8.1 h1:pX+idpWMIH30/K7c0epN6V703xpIcMXWRjKJsz0tYGY= +cloud.google.com/go/pubsublite v1.8.2 h1:jLQozsEVr+c6tOU13vDugtnaBSUy/PD5zK6mhm+uF1Y= +cloud.google.com/go/pubsublite v1.8.2/go.mod h1:4r8GSa9NznExjuLPEJlF1VjOPOpgf3IT6k8x/YgaOPI= cloud.google.com/go/recaptchaenterprise v1.3.1 h1:u6EznTGzIdsyOsvm+Xkw0aSuKFXQlyjGE9a4exk6iNQ= cloud.google.com/go/recaptchaenterprise/v2 v2.9.2 h1:U3Wfq12X9cVMuTpsWDSURnXF0Z9hSPTHj+xsnXDRLsw= +cloud.google.com/go/recaptchaenterprise/v2 v2.14.2 h1:80Mx0i3uyv5dPNUYsNPFk9GJ+19AmTlnWnXFCTC9NkI= +cloud.google.com/go/recaptchaenterprise/v2 v2.14.2/go.mod h1:MwPgdgvBkE46aWuuXeBTCB8hQJ88p+CpXInROZYCTkc= cloud.google.com/go/recommendationengine v0.8.5 h1:ineqLswaCSBY0csYv5/wuXJMBlxATK6Xc5jJkpiTEdM= +cloud.google.com/go/recommendationengine v0.8.11 h1:STJYdA/e/MAh2ZSdjss5YE/d0t0nt0WotBF9V0pgpPQ= +cloud.google.com/go/recommendationengine v0.8.11/go.mod h1:cEkU4tCXAF88a4boMFZym7U7uyxvVwcQtKzS85IbQio= cloud.google.com/go/recommender v1.12.1 h1:LVLYS3r3u0MSCxQSDUtLSkporEGi9OAE6hGvayrZNPs= +cloud.google.com/go/recommender v1.12.7 h1:asEAoj4a3inPCdH8nbPaZDJWhR/xwfKi4tuSmIlaS2I= +cloud.google.com/go/recommender v1.12.7/go.mod h1:lG8DVtczLltWuaCv4IVpNphONZTzaCC9KdxLYeZM5G4= cloud.google.com/go/redis v1.14.2 h1:QF0maEdVv0Fj/2roU8sX3NpiDBzP9ICYTO+5F32gQNo= +cloud.google.com/go/redis v1.16.4 h1:9CO6EcuM9/CpgtcjG6JZV+GFw3oDrRfwLwmvwo/uM1o= +cloud.google.com/go/redis v1.16.4/go.mod h1:unCVfLP5eFrVhGLDnb7IaSaWxuZ+7cBgwwBwbdG9m9w= cloud.google.com/go/resourcemanager v1.9.5 h1:AZWr1vWVDKGwfLsVhcN+vcwOz3xqqYxtmMa0aABCMms= +cloud.google.com/go/resourcemanager v1.9.11 h1:N8CmqszjKNOgJnrQVsg+g8VWIEGgcwsD5rPiay9cMC4= +cloud.google.com/go/resourcemanager v1.9.11/go.mod h1:SbNAbjVLoi2rt9G74bEYb3aw1iwvyWPOJMnij4SsmHA= cloud.google.com/go/resourcesettings v1.6.5 h1:BTr5MVykJwClASci/7Og4Qfx70aQ4n3epsNLj94ZYgw= +cloud.google.com/go/resourcesettings v1.7.4 h1:1VwLfvJi8QtGrKPwuisGqr6gcgaCSR6A57wIvN+fqkM= +cloud.google.com/go/resourcesettings v1.7.4/go.mod h1:seBdLuyeq+ol2u9G2+74GkSjQaxaBWF+vVb6mVzQFG0= cloud.google.com/go/retail v1.16.0 h1:Fn1GuAua1c6crCGqfJ1qMxG1Xh10Tg/x5EUODEHMqkw= +cloud.google.com/go/retail v1.17.4 h1:YJgpBwCarAPqzaJS8ycIhyn2sAQT1RhTJRiTVBjtJAI= +cloud.google.com/go/retail v1.17.4/go.mod h1:oPkL1FzW7D+v/hX5alYIx52ro2FY/WPAviwR1kZZTMs= cloud.google.com/go/run v1.3.4 h1:m9WDA7DzTpczhZggwYlZcBWgCRb+kgSIisWn1sbw2rQ= +cloud.google.com/go/run v1.4.0 h1:ai1rnbX92iPqWg9MrbDbebsxlUSAiOK6N9dEDDQeVA0= +cloud.google.com/go/run v1.4.0/go.mod h1:4G9iHLjdOC+CQ0CzA0+6nLeR6NezVPmlj+GULmb0zE4= cloud.google.com/go/scheduler v1.10.6 h1:5U8iXLoQ03qOB+ZXlAecU7fiE33+u3QiM9nh4cd0eTE= +cloud.google.com/go/scheduler v1.10.12 h1:8BxDXoHCcsAe2fXsvFrkBbTxgl+5JBrIy1+/HRS0nxY= +cloud.google.com/go/scheduler v1.10.12/go.mod h1:6DRtOddMWJ001HJ6MS148rtLSh/S2oqd2hQC3n5n9fQ= cloud.google.com/go/secretmanager v1.11.5 h1:82fpF5vBBvu9XW4qj0FU2C6qVMtj1RM/XHwKXUEAfYY= +cloud.google.com/go/secretmanager v1.13.5/go.mod h1:/OeZ88l5Z6nBVilV0SXgv6XJ243KP2aIhSWRMrbvDCQ= +cloud.google.com/go/secretmanager v1.13.6 h1:0ZEl/LuoB4xQsjVfQt3Gi/dZfOv36n4JmdPrMargzYs= +cloud.google.com/go/secretmanager v1.13.6/go.mod h1:x2ySyOrqv3WGFRFn2Xk10iHmNmvmcEVSSqc30eb1bhw= cloud.google.com/go/security v1.15.5 h1:wTKJQ10j8EYgvE8Y+KhovxDRVDk2iv/OsxZ6GrLP3kE= +cloud.google.com/go/security v1.17.4 h1:ERhxAa02mnMEIIAXvzje+qJ+yWniP6l5uOX+k9ELCaA= +cloud.google.com/go/security v1.17.4/go.mod h1:KMuDJH+sEB3KTODd/tLJ7kZK+u2PQt+Cfu0oAxzIhgo= cloud.google.com/go/securitycenter v1.24.4 h1:/5jjkZ+uGe8hZ7pvd7pO30VW/a+pT2MrrdgOqjyucKQ= +cloud.google.com/go/securitycenter v1.33.1 h1:K+jfFUTum2jl//uWCN+QKkKXRgidxTyGfGTqXPyDvUY= +cloud.google.com/go/securitycenter v1.33.1/go.mod h1:jeFisdYUWHr+ig72T4g0dnNCFhRwgwGoQV6GFuEwafw= cloud.google.com/go/servicecontrol v1.11.1 h1:d0uV7Qegtfaa7Z2ClDzr9HJmnbJW7jn0WhZ7wOX6hLE= cloud.google.com/go/servicedirectory v1.11.4 h1:da7HFI1229kyzIyuVEzHXip0cw0d+E0s8mjQby0WN+k= +cloud.google.com/go/servicedirectory v1.11.11 h1:8Ky2lY0CWJJIIlsc+rKTn6C3SqOuVEwT3brDC6TJCjk= +cloud.google.com/go/servicedirectory v1.11.11/go.mod h1:pnynaftaj9LmRLIc6t3r7r7rdCZZKKxui/HaF/RqYfs= cloud.google.com/go/servicemanagement v1.8.0 h1:fopAQI/IAzlxnVeiKn/8WiV6zKndjFkvi+gzu+NjywY= cloud.google.com/go/serviceusage v1.6.0 h1:rXyq+0+RSIm3HFypctp7WoXxIA563rn206CfMWdqXX4= cloud.google.com/go/shell v1.7.5 h1:3Fq2hzO0ZSyaqBboJrFkwwf/qMufDtqwwA6ep8EZxEI= +cloud.google.com/go/shell v1.7.11 h1:RobTXyL33DQITYQh//KJ9GjS4bsdj4fGmm2rkb/ywzM= +cloud.google.com/go/shell v1.7.11/go.mod h1:SywZHWac7onifaT9m9MmegYp3GgCLm+tgk+w2lXK8vg= cloud.google.com/go/spanner v1.57.0 h1:fJq+ZfQUDHE+cy1li0bJA8+sy2oiSGhuGqN5nqVaZdU= +cloud.google.com/go/spanner v1.65.0 h1:XK15cs9lFFQo5n4Wh9nfrcPXAxWln6NdodDiQKmoD08= +cloud.google.com/go/spanner v1.65.0/go.mod h1:dQGB+w5a67gtyE3qSKPPxzniedrnAmV6tewQeBY7Hxs= cloud.google.com/go/speech v1.21.1 h1:nuFc+Kj5B8de75nN4FdPyUbI2SiBoHZG6BLurXL56Q0= +cloud.google.com/go/speech v1.24.0 h1:3j+WpeBY57C0FDJxg317vpKgOLjL/kNxlcNPGSqXkqE= +cloud.google.com/go/speech v1.24.0/go.mod h1:HcVyIh5jRXM5zDMcbFCW+DF2uK/MSGN6Rastt6bj1ic= +cloud.google.com/go/storage v1.41.0/go.mod h1:J1WCa/Z2FcgdEDuPUY8DxT5I+d9mFKsCepp5vR6Sq80= cloud.google.com/go/storagetransfer v1.10.4 h1:dy4fL3wO0VABvzM05ycMUPFHxTPbJz9Em8ikAJVqSbI= +cloud.google.com/go/storagetransfer v1.10.10 h1:GfxaYqX+kwlrSrJAENNmRTCGmSTgvouvS3XhgwKpOT8= +cloud.google.com/go/storagetransfer v1.10.10/go.mod h1:8+nX+WgQ2ZJJnK8e+RbK/zCXk8T7HdwyQAJeY7cEcm0= cloud.google.com/go/talent v1.6.6 h1:JssV0CE3FNujuSWn7SkosOzg7qrMxVnt6txOfGcMSa4= +cloud.google.com/go/talent v1.6.12 h1:JN721EjG+UTfHVVaMhyxwKCCJPjUc8PiS0RnW/7kWfE= +cloud.google.com/go/talent v1.6.12/go.mod h1:nT9kNVuJhZX2QgqKZS6t6eCWZs5XEBYRBv6bIMnPmo4= cloud.google.com/go/texttospeech v1.7.5 h1:dxY2Q5mHCbrGa3oPR2O3PCicdnvKa1JmwGQK36EFLOw= +cloud.google.com/go/texttospeech v1.7.11 h1:jzko1ahItjLYEWr6n3lTIoBSinD1JzavEuDzYLWZNko= +cloud.google.com/go/texttospeech v1.7.11/go.mod h1:Ua125HU+WT2IkIo5MzQtuNpNEk72soShJQVdorZ1SAE= cloud.google.com/go/tpu v1.6.5 h1:C8YyYda8WtNdBoCgFwwBzZd+S6+EScHOxM/z1h0NNp8= +cloud.google.com/go/tpu v1.6.11 h1:uMrwnK05cocNt3OOp+mZ16xlvIKaXUt3QUXkUbG4LdM= +cloud.google.com/go/tpu v1.6.11/go.mod h1:W0C4xaSj1Ay3VX/H96FRvLt2HDs0CgdRPVI4e7PoCDk= cloud.google.com/go/trace v1.10.5 h1:0pr4lIKJ5XZFYD9GtxXEWr0KkVeigc3wlGpZco0X1oA= +cloud.google.com/go/trace v1.10.11/go.mod h1:fUr5L3wSXerNfT0f1bBg08W4axS2VbHGgYcfH4KuTXU= +cloud.google.com/go/trace v1.10.12 h1:GoGZv1iAXEa73HgSGNjRl2vKqp5/f2AeKqErRFXA2kg= +cloud.google.com/go/trace v1.10.12/go.mod h1:tYkAIta/gxgbBZ/PIzFxSH5blajgX4D00RpQqCG/GZs= cloud.google.com/go/translate v1.10.1 h1:upovZ0wRMdzZvXnu+RPam41B0mRJ+coRXFP2cYFJ7ew= +cloud.google.com/go/translate v1.10.3/go.mod h1:GW0vC1qvPtd3pgtypCv4k4U8B7EdgK9/QEF2aJEUovs= +cloud.google.com/go/translate v1.10.7 h1:W16MpZ2Z3TWoHbNHmyHz9As276lGVTSwxRcquv454R0= +cloud.google.com/go/translate v1.10.7/go.mod h1:mH/+8tvcItuy1cOWqU+/Y3iFHgkVUObNIQYI/kiFFiY= cloud.google.com/go/video v1.20.4 h1:TXwotxkShP1OqgKsbd+b8N5hrIHavSyLGvYnLGCZ7xc= +cloud.google.com/go/video v1.22.0 h1:+FTZi7NtT4FV2Y1j3zC3zYjaRrlGqKsZpbLweredEWM= +cloud.google.com/go/video v1.22.0/go.mod h1:CxPshUNAb1ucnzbtruEHlAal9XY+SPG2cFqC/woJzII= cloud.google.com/go/videointelligence v1.11.5 h1:mYaWH8uhUCXLJCN3gdXswKzRa2+lK0zN6/KsIubm6pE= +cloud.google.com/go/videointelligence v1.11.11 h1:zl8xijOEavernn/t6mZZ4fg0pIVc2yquHH73oj0Leo4= +cloud.google.com/go/videointelligence v1.11.11/go.mod h1:dab2Ca3AXT6vNJmt3/6ieuquYRckpsActDekLcsd6dU= cloud.google.com/go/vision v1.2.0 h1:/CsSTkbmO9HC8iQpxbK8ATms3OQaX3YQUeTMGCxlaK4= cloud.google.com/go/vision/v2 v2.8.0 h1:W52z1b6LdGI66MVhE70g/NFty9zCYYcjdKuycqmlhtg= +cloud.google.com/go/vision/v2 v2.8.6 h1:HyFEUXQa0SvlF0LASCn/x+juNCH4kIXQrUqi6SIcYvE= +cloud.google.com/go/vision/v2 v2.8.6/go.mod h1:G3v0uovxCye3u369JfrHGY43H6u/IQ08x9dw5aVH8yY= cloud.google.com/go/vmmigration v1.7.5 h1:5v9RT2vWyuw3pK2ox0HQpkoftO7Q7/8591dTxxQc79g= +cloud.google.com/go/vmmigration v1.7.11 h1:yqwkTPpvSw9dUfnl9/APAVrwO9UW1jJZtgbZpNQ+WdU= +cloud.google.com/go/vmmigration v1.7.11/go.mod h1:PmD1fDB0TEHGQR1tDZt9GEXFB9mnKKalLcTVRJKzcQA= cloud.google.com/go/vmwareengine v1.1.1 h1:EGdDi9QbqThfZq3ILcDK5g+m9jTevc34AY5tACx5v7k= +cloud.google.com/go/vmwareengine v1.2.0 h1:9Fjn/RoeOMo8UQt1TbXmmw7rJApC26BqnISAI1AERcc= +cloud.google.com/go/vmwareengine v1.2.0/go.mod h1:rPjCHu6hG9N8d6PhkoDWFkqL9xpbFY+ueVW+0pNFbZg= cloud.google.com/go/vpcaccess v1.7.5 h1:XyL6hTLtEM/eE4F1GEge8xUN9ZCkiVWn44K/YA7z1rQ= +cloud.google.com/go/vpcaccess v1.7.11 h1:1XgRP+Q2X6MvE/xnexpQ7ydgav+IO5UcKUIJEbL65J8= +cloud.google.com/go/vpcaccess v1.7.11/go.mod h1:a2cuAiSCI4TVK0Dt6/dRjf22qQvfY+podxst2VvAkcI= cloud.google.com/go/webrisk v1.9.5 h1:251MvGuC8wisNN7+jqu9DDDZAi38KiMXxOpA/EWy4dE= +cloud.google.com/go/webrisk v1.9.11 h1:2qwEqnXrToIv2Y4xvsUSxCk7R2Ki+3W2+GNyrytoKTQ= +cloud.google.com/go/webrisk v1.9.11/go.mod h1:mK6M8KEO0ZI7VkrjCq3Tjzw4vYq+3c4DzlMUDVaiswE= cloud.google.com/go/websecurityscanner v1.6.5 h1:YqWZrZYabG88TZt7364XWRJGhxmxhony2ZUyZEYMF2k= +cloud.google.com/go/websecurityscanner v1.6.11 h1:r3ePI3YN7ujwX8c9gIkgbVjYVwP4yQA4X2z6P7+HNxI= +cloud.google.com/go/websecurityscanner v1.6.11/go.mod h1:vhAZjksELSg58EZfUQ1BMExD+hxqpn0G0DuyCZQjiTg= cloud.google.com/go/workflows v1.12.4 h1:uHNmUiatTbPQ4H1pabwfzpfEYD4BBnqDHqMm2IesOh4= +cloud.google.com/go/workflows v1.12.10 h1:EGJeZmwgE71jxFOI5s9iKST2Bivif3DSzlqVbiXACXQ= +cloud.google.com/go/workflows v1.12.10/go.mod h1:RcKqCiOmKs8wFUEf3EwWZPH5eHc7Oq0kamIyOUCk0IE= +code.cloudfoundry.org/clock v1.1.0 h1:XLzC6W3Ah/Y7ht1rmZ6+QfPdt1iGWEAAtIZXgiaj57c= +code.cloudfoundry.org/clock v1.1.0/go.mod h1:yA3fxddT9RINQL2XHS7PS+OXxKCGhfrZmlNUCIM6AKo= contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9 h1:yxE46rQA0QaqPGqN2UnwXvgCrRqtjR1CsGSWVTRjvv4= +contrib.go.opencensus.io/exporter/aws v0.0.0-20230502192102-15967c811cec h1:CSNP8nIEQt4sZEo2sGUiWSmVJ9c5QdyIQvwzZAsn+8Y= +contrib.go.opencensus.io/exporter/aws v0.0.0-20230502192102-15967c811cec/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= contrib.go.opencensus.io/exporter/stackdriver v0.13.10 h1:a9+GZPUe+ONKUwULjlEOucMMG0qfSCCenlji0Nhqbys= +contrib.go.opencensus.io/exporter/stackdriver v0.13.14 h1:zBakwHardp9Jcb8sQHcHpXy/0+JIb1M8KjigCJzx7+4= +contrib.go.opencensus.io/exporter/stackdriver v0.13.14/go.mod h1:5pSSGY0Bhuk7waTHuDf4aQ8D2DrhgETRo9fy6k3Xlzc= contrib.go.opencensus.io/integrations/ocsql v0.1.7 h1:G3k7C0/W44zcqkpRSFyjU9f6HZkbwIrL//qqnlqWZ60= +contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= docker.io/go-docker v1.0.0 h1:VdXS/aNYQxyA9wdLD5z8Q8Ro688/hG8HzKxYVEVbE6s= docker.io/go-docker v1.0.0/go.mod h1:7tiAn5a0LFmjbPDbyTPOaTTOuG1ZRNXdPA6RvKY+fpY= @@ -140,18 +394,37 @@ git.sr.ht/~sbinet/gg v0.3.1 h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik= github.com/99designs/basicauth-go v0.0.0-20160802081356-2a93ba0f464d h1:j6oB/WPCigdOkxtuPl1VSIiLpy7Mdsu6phQffbF19Ng= github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e h1:rl2Aq4ZODqTDkeSqQBy+fzpZPamacO1Srp8zq7jf2Sc= github.com/Azure/azure-amqp-common-go/v3 v3.2.2 h1:CJpxNAGxP7UBhDusRUoaOn0uOorQyAYhQYLnNgkRhlY= +github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= +github.com/Azure/azure-amqp-common-go/v3 v3.2.3/go.mod h1:7rPmbSfszeovxGfc5fSAXE4ehlXQZHpMja2OtxC2Tas= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0/go.mod h1:99EvauvlcJ1U06amZiksfYz/3aFGyIhWGHVyiZXtBAI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0/go.mod h1:bhXu1AjYL+wutSL/kpSq6s7733q2Rb0yuot9Zgfqa/0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg= +github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.7.1 h1:o/Ws6bEqMeKZUfj1RRm3mQ51O8JGU5w+Qdg2AhHib6A= +github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.7.1/go.mod h1:6QAMYBAbQeeKX+REFJMZ1nFWu9XLw/PPcjYpuc9RDFs= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0/go.mod h1:+6KLcKIVgxoBDMqMO/Nvy7bZ9a0nbU3I1DtFQK3YvB4= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 h1:YUUxeiOWgdAQE3pXt2H7QXzZs0q8UBjgRbl56qo8GYM= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2/go.mod h1:dmXQgZuiSubAecswZE+Sm8jkvEa7kQgTPVRvwL/nd0E= github.com/Azure/azure-service-bus-go v0.11.5 h1:EVMicXGNrSX+rHRCBgm/TRQ4VUZ1m3yAYM/AB2R/SOs= github.com/Azure/go-amqp v0.16.4 h1:/1oIXrq5zwXLHaoYDliJyiFjJSpJZMWGgtMX9e0/Z30= +github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= +github.com/Azure/go-amqp v1.0.5 h1:po5+ljlcNSU8xtapHTe8gIc8yHxCzC03E8afH2g1ftU= +github.com/Azure/go-amqp v1.0.5/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE= github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 h1:wkAZRgT/pn8HhFyzfe9UnqOjJYqlembgCTi72Bm/xKk= github.com/Azure/go-autorest/autorest/azure/auth v0.5.12/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg= github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 h1:0W/yGmFdTIT77fvdlGZ0LMISoLHFJ7Tx4U0yeB+uFs4= github.com/Azure/go-autorest/autorest/azure/cli v0.4.5/go.mod h1:ADQAXrkgm7acgWVUNamOgh8YNrv4p27l3Wc55oVfpzg= +github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= +github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= @@ -163,6 +436,11 @@ github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oM github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0 h1:YNu23BtH0PKF+fg3ykSorCp6jSTjcEtfnYLzbmcjVRA= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.36.0 h1:kAtNAWwvTt5+iew6baV0kbOrtjYTXPtWNSyOFlcxkBU= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.36.0/go.mod h1:VRKXU8C7Y/aUKjRBTGfw0Ndv4YqNxlB8zAPJJDxbASE= +github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 h1:oVLqHXhnYtUwM89y9T1fXGaK9wTkXHgNp8/ZNMQzUxE= +github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0= +github.com/IBM/sarama v1.40.1/go.mod h1:+5OFwA5Du9I6QrznhaMHsuwWdWZNMjaBSIxEWEgKOYE= github.com/IBM/sarama v1.43.0 h1:YFFDn8mMI2QL0wOrG0J2sFoVIAFl7hS9JQi2YZsXtJc= github.com/IBM/sarama v1.43.0/go.mod h1:zlE6HEbC/SMQ9mhEYaF7nNLYOUyrs0obySKCckWP9BM= github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk= @@ -171,6 +449,7 @@ github.com/KimMachineGun/automemlimit v0.6.0 h1:p/BXkH+K40Hax+PuWWPQ478hPjsp9h1C github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID3+o= github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= @@ -183,6 +462,8 @@ github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 h1:KkH3I3sJuOLP github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= +github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= +github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw= github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= @@ -221,15 +502,26 @@ github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhi github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= +github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw= github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY= github.com/aws/aws-sdk-go v1.44.321/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1 h1:w/fPGB0t5rWwA43mux4e9ozFSH5zF1moQemlA131PWc= github.com/aws/aws-sdk-go-v2/service/kms v1.16.3 h1:nUP29LA4GZZPihNSo5ZcF4Rl73u+bN5IBRnrQA0jFK4= +github.com/aws/aws-sdk-go-v2/service/kms v1.35.3 h1:UPTdlTOwWUX49fVi7cymEN6hDqCwe3LNv1vi7TXUutk= +github.com/aws/aws-sdk-go-v2/service/kms v1.35.3/go.mod h1:gjDP16zn+WWalyaUqwCCioQ8gU8lzttCCc9jYsiQI/8= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4 h1:EmIEXOjAdXtxa2OGM1VAajZV/i06Q8qd4kBpJd9/p1k= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4 h1:NgRFYyFpiMD62y4VPXh4DosPFbZd4vdMVBWKk0VmWXc= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4/go.mod h1:TKKN7IQoM7uTnyuFm9bm9cw5P//ZYTl4m3htBWQ1G/c= github.com/aws/aws-sdk-go-v2/service/sns v1.17.4 h1:7TdmoJJBwLFyakXjfrGztejwY5Ie1JEto7YFfznCmAw= +github.com/aws/aws-sdk-go-v2/service/sns v1.31.3 h1:eSTEdxkfle2G98FE+Xl3db/XAXXVTJPNQo9K/Ar8oAI= +github.com/aws/aws-sdk-go-v2/service/sns v1.31.3/go.mod h1:1dn0delSO3J69THuty5iwP0US2Glt0mx2qBBlI13pvw= github.com/aws/aws-sdk-go-v2/service/sqs v1.18.3 h1:uHjK81fESbGy2Y9lspub1+C6VN5W2UXTDo2A/Pm4G0U= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.3 h1:Vjqy5BZCOIsn4Pj8xzyqgGmsSqzz7y/WXbN3RgOoVrc= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.3/go.mod h1:L0enV3GCRd5iG9B64W35C4/hwsCB00Ib+DKVGTadKHI= github.com/aws/aws-sdk-go-v2/service/ssm v1.24.1 h1:zc1YLcknvxdW/i1MuJKmEnFB2TNkOfguuQaGRvJXPng= +github.com/aws/aws-sdk-go-v2/service/ssm v1.52.4 h1:hgSBvRT7JEWx2+vEGI9/Ld5rZtl7M5lu8PqdvOmbRHw= +github.com/aws/aws-sdk-go-v2/service/ssm v1.52.4/go.mod h1:v7NIzEFIHBiicOMaMTuEmbnzGnqW0d+6ulNALul6fYE= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= @@ -253,7 +545,6 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U= github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgfKw= github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= @@ -269,14 +560,13 @@ github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nC github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c h1:2zRrJWIt/f9c9HhNHAgrRgq0San5gRRUJTBXLkchal0= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= -github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= -github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= @@ -305,11 +595,13 @@ github.com/dave/patsy v0.0.0-20210517141501-957256f50cba h1:1o36L4EKbZzazMk8iGC4 github.com/dave/rebecca v0.9.1 h1:jxVfdOxRirbXL28vXMvUvJ1in3djwkVKXCq339qhBL0= github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g= github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY= +github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA= github.com/denisenkom/go-mssqldb v0.12.0 h1:VtrkII767ttSPNRfFekePK3sctr+joXgO58stqQbtUA= github.com/devigned/tab v0.1.1 h1:3mD6Kb1mUOYeLpJvTVSDwSg5ZsfSxfvxGRTxRsJsITA= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dhui/dktest v0.3.0 h1:kwX5a7EkLcjo7VpsPQSYJcKGbXBXdjI9FGjuUj1jn6I= github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= +github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ= github.com/drone/drone-runtime v1.1.0 h1:IsKbwiLY6+ViNBzX0F8PERJVZZcEJm9rgxEh3uZP5IE= @@ -319,8 +611,10 @@ github.com/drone/drone-yaml v1.2.3/go.mod h1:QsqliFK8nG04AHFN9tTn9XJomRBQHD4wcej github.com/drone/funcmap v0.0.0-20211123105308-29742f68a7d1 h1:E8hjIYiEyI+1S2XZSLpMkqT9V8+YMljFNBWrFpuVM3A= github.com/drone/funcmap v0.0.0-20211123105308-29742f68a7d1/go.mod h1:Hph0/pT6ZxbujnE1Z6/08p5I0XXuOsppqF6NQlGOK0E= github.com/drone/signal v1.0.0 h1:NrnM2M/4yAuU/tXs6RP1a1ZfxnaHwYkd0kJurA1p6uI= +github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-resiliency v1.6.0 h1:CqGDTLtpwuWKn6Nj3uNUdflaq+/kIPsg0gfNzHton30= github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= @@ -328,14 +622,11 @@ github.com/elastic/go-sysinfo v1.11.2 h1:mcm4OSYVMyws6+n2HIVMGkln5HOpo5Ie1ZmbbNn github.com/elastic/go-sysinfo v1.11.2/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ= github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= -github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/expr-lang/expr v1.16.2 h1:JvMnzUs3LeVHBvGFcXYmXo+Q6DPDmzrlcSBO6Wy3w4s= github.com/expr-lang/expr v1.16.2/go.mod h1:uCkhfG+x7fcZ5A5sXHKuQ07jGZRl6J0FCAaf2k4PtVQ= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= -github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= @@ -347,8 +638,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/fsouza/fake-gcs-server v1.7.0 h1:Un0BXUXrRWYSmYyC1Rqm2e2WJfTPyDy/HGMz31emTi8= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= -github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= @@ -368,7 +659,6 @@ github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4F github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 h1:NxXI5pTAtpEaU49bpLpQoDsu1zrteW/vxzTz8Cd2UAs= github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9/go.mod h1:gWuR/CrFDDeVRFQwHPvsv9soJVB/iqymhuZQuJ3a9OM= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI= github.com/go-pdf/fpdf v0.6.0 h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -389,6 +679,7 @@ github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4 h1:vF83LI8tAakwEwvWZtr github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 h1:EcQR3gusLHN46TAD+G+EbaaqJArt5vHhNpXAa12PQf4= github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= @@ -398,12 +689,20 @@ github.com/google/go-jsonnet v0.18.0 h1:/6pTy6g+Jh1a1I2UMoAODkqELFiVIdOxbNwv0DDz github.com/google/go-jsonnet v0.18.0/go.mod h1:C3fTzyVJDslXdiTqw/bTFk7vSGyCtH3MGRbDfvEwGd0= github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9 h1:OF1IPgv+F4NmqmJ98KTjdN97Vs1JxDPB3vbmYzV2dpk= github.com/google/go-replayers/grpcreplay v1.1.0 h1:S5+I3zYyZ+GQz68OfbURDdt/+cSMqCK1wrvNx7WBzTE= +github.com/google/go-replayers/grpcreplay v1.3.0 h1:1Keyy0m1sIpqstQmgz307zhiJ1pV4uIlFds5weTmxbo= +github.com/google/go-replayers/grpcreplay v1.3.0/go.mod h1:v6NgKtkijC0d3e3RW8il6Sy5sqRVUwoQa4mHOGEy8DI= github.com/google/go-replayers/httpreplay v1.1.1 h1:H91sIMlt1NZzN7R+/ASswyouLJfW0WLW7fhyUFvDEkY= +github.com/google/go-replayers/httpreplay v1.2.0 h1:VM1wEyyjaoU53BwrOnaf9VhAyQQEEioJvFYxYcLRKzk= +github.com/google/go-replayers/httpreplay v1.2.0/go.mod h1:WahEFFZZ7a1P4VM1qEeHy+tME4bwyqPcwWbNlUI1Mcg= github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/googleapis/cloud-bigtable-clients-test v0.0.2 h1:S+sCHWAiAc+urcEnvg5JYJUOdlQEm/SEzQ/c/IdAH5M= +github.com/googleapis/cloud-bigtable-clients-test v0.0.2/go.mod h1:mk3CrkrouRgtnhID6UZQDK3DrFFa7cYCAJcEmNsHYrY= github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.4/go.mod h1:KYEYLorsnIGDi/rPC8b5TdlB9kbKoFubselGIoBMCwI= +github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E= github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 h1:zC34cGQu69FG7qzJ3WiKW244WfhDC3xxYMeNOX2gtUQ= github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -413,9 +712,15 @@ github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/grafana/authlib v0.0.0-20240730122259-a0d13672efb1/go.mod h1:YA9We4kTafu7mlMnUh3In6Q2wpg8fYN3ycgCKOK1TB8= +github.com/grafana/authlib/claims v0.0.0-20240809101159-74eaccc31a06/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU= +github.com/grafana/grafana-plugin-sdk-go v0.235.0/go.mod h1:6n9LbrjGL3xAATntYVNcIi90G9BVHRJjzHKz5FXVfWw= +github.com/grafana/prometheus-alertmanager v0.25.1-0.20240422145632-c33c6b5b6e6b h1:HCbWyVL6vi7gxyO76gQksSPH203oBJ1MJ3JcG1OQlsg= +github.com/grafana/prometheus-alertmanager v0.25.1-0.20240422145632-c33c6b5b6e6b/go.mod h1:01sXtHoRwI8W324IPAzuxDFOmALqYLCOhvSC2fUHWXc= github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= @@ -423,10 +728,15 @@ github.com/hamba/avro/v2 v2.17.2 h1:6PKpEWzJfNnvBgn7m2/8WYaDOUASxfDU+Jyb4ojDgFY= github.com/hamba/avro/v2 v2.17.2/go.mod h1:Q9YK+qxAhtVrNqOhwlZTATLgLA8qxG2vtvkhK8fJ7Jo= github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc= github.com/hanwen/go-fuse/v2 v2.1.0 h1:+32ffteETaLYClUj0a3aHjZ1hOPxxaNEHiZiujuDaek= +github.com/hanwen/go-fuse/v2 v2.5.1 h1:OQBE8zVemSocRxA4OaFJbjJ5hlpCmIWbGr7r0M4uoQQ= +github.com/hanwen/go-fuse/v2 v2.5.1/go.mod h1:xKwi1cF7nXAOBCXujD5ie0ZKsxc8GGSA1rlMJc+8IJs= +github.com/hashicorp/consul/api v1.14.0/go.mod h1:bcaw5CSZ7NE9qfOfKCI1xb7ZKjzu/MyvQkCLTfqLqxQ= github.com/hashicorp/consul/api v1.15.3/go.mod h1:/g/qgcoBcEXALCNZgRRisyTW0nY86++L0KbeAMXYCeY= +github.com/hashicorp/consul/sdk v0.10.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw= github.com/hashicorp/consul/sdk v0.11.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw= github.com/hashicorp/consul/sdk v0.16.0 h1:SE9m0W6DEfgIVCJX7xU+iv/hUl4m/nxqMTnCdMxDpJ8= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE= github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw= @@ -434,6 +744,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyf github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ= github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.4.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/serf v0.10.0/go.mod h1:bXN03oZc5xlH46k/K1qTrpXb9ERKyY1/i/N5mxvgrZw= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hudl/fargo v1.4.0 h1:ZDDILMbB37UlAVLlWcJ2Iz1XuahZZTDZfdCKeclfq2s= @@ -441,28 +753,37 @@ github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSAS github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465 h1:KwWnWVWCNtNq/ewIX7HIKnELmEx2nDP42yskD/pi7QE= github.com/influxdata/influxdb v1.7.6 h1:8mQ7A/V+3noMGCt/P9pD09ISaiz9XvgCk303UYA3gcs= github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig= -github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ= +github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= +github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns= +github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= +github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx v3.2.0+incompatible h1:0Vihzu20St42/UDsvZGdNE6jak7oi/UOeMzwMPHkgFY= github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/puddle v1.2.1 h1:gI8os0wpRXFd4FiAY2dWiqRK037tjj3t7rKFeO4X5iw= github.com/jackspirou/syscerts v0.0.0-20160531025014-b68f5469dff1 h1:9Xm8CKtMZIXgcopfdWk/qZ1rt0HjMgfMR9nxxSeK6vk= github.com/jackspirou/syscerts v0.0.0-20160531025014-b68f5469dff1/go.mod h1:zuHl3Hh+e9P6gmBPvcqR1HjkaWHC/csgyskg6IaFKFo= github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= +github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= github.com/jedib0t/go-pretty/v6 v6.2.4 h1:wdaj2KHD2W+mz8JgJ/Q6L/T5dB7kyqEFI16eLq7GEmk= github.com/jedib0t/go-pretty/v6 v6.2.4/go.mod h1:+nE9fyyHGil+PuISTCrp7avEdo6bqoMwqZnuiK2r2a0= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jhump/gopoet v0.1.0 h1:gYjOPnzHd2nzB37xYQZxj4EIQNpBrBskRqQQ3q4ZgSg= github.com/jhump/goprotoc v0.5.0 h1:Y1UgUX+txUznfqcGdDef8ZOVlyQvnV0pKWZH08RmZuo= github.com/jmattheis/goverter v1.4.0 h1:SrboBYMpGkj1XSgFhWwqzdP024zIa1+58YzUm+0jcBE= @@ -470,6 +791,8 @@ github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jon-whit/go-grpc-prometheus v1.4.0 h1:/wmpGDJcLXuEjXryWhVYEGt9YBRhtLwFEN7T+Flr8sw= github.com/jon-whit/go-grpc-prometheus v1.4.0/go.mod h1:iTPm+Iuhh3IIqR0iGZ91JJEg5ax6YQEe1I0f6vtBuao= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= @@ -498,7 +821,11 @@ github.com/kevinmbeaulieu/eq-go v1.0.0/go.mod h1:G3S8ajA56gKBZm4UB9AOyoOS37JO3ro github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 h1:veS9QfglfvqAw2e+eeNT/SbGySq8ajECXJ9e4fPoLhY= +github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= @@ -508,6 +835,7 @@ github.com/knadh/koanf/v2 v2.1.0/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkX github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kshvakov/clickhouse v1.3.5 h1:PDTYk9VYgbjPAWry3AoDREeMgOVUFij6bh6IjlloHL0= github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zGq8= @@ -534,6 +862,10 @@ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvls github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g= github.com/microcosm-cc/bluemonday v1.0.25 h1:4NEwSfiJ+Wva0VxN5B8OwMicaJvD8r9tlJWm9rtloEg= github.com/microcosm-cc/bluemonday v1.0.25/go.mod h1:ZIOjCQp1OrzBBPIJmfX4qDYFuhU02nx4bn030ixfHLE= +github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81TI5Es90b2t/MwX5KqY= +github.com/microsoft/ApplicationInsights-Go v0.4.4/go.mod h1:fKRUseBqkw6bDiXTs3ESTiU/4YTIHsQS4W3fP2ieF4U= +github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA= +github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/mitchellh/cli v1.1.5 h1:OxRIeJXpAMztws/XHlN2vu6imG5Dpq+j61AzAX5fLng= @@ -550,9 +882,15 @@ github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8 h1:P48LjvUQpT github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4 h1:dnMxwus89s86tI8rcGVp2HwZzlz7c5o92VOy7dSckBQ= github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU= github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI= +github.com/nats-io/jwt/v2 v2.2.1-0.20220330180145-442af02fd36a h1:lem6QCvxR0Y28gth9P+wV2K/zYUUAkJ+55U8cpS0p5I= +github.com/nats-io/jwt/v2 v2.2.1-0.20220330180145-442af02fd36a/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= github.com/nats-io/nats-server/v2 v2.5.0 h1:wsnVaaXH9VRSg+A2MVg5Q727/CqxnmPLGFQ3YZYKTQg= +github.com/nats-io/nats-server/v2 v2.8.4 h1:0jQzze1T9mECg8YZEl8+WYUXb9JKluJfCBriPUtluB4= +github.com/nats-io/nats-server/v2 v2.8.4/go.mod h1:8zZa+Al3WsESfmgSs98Fi06dRWLH5Bnq90m5bKD/eT4= +github.com/nats-io/nats.go v1.15.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= github.com/nats-io/nats.go v1.31.0 h1:/WFBHEc/dOKBF6qf1TZhrdEfTmOZ5JzdJ+Y3m6Y/p7E= github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8= +github.com/nats-io/nkeys v0.4.5/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= github.com/nats-io/nkeys v0.4.6 h1:IzVe95ru2CT6ta874rt9saQRkWfe2nFj1NtvYSLqMzY= github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= @@ -622,22 +960,27 @@ github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ul github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/phpdave11/gofpdf v1.4.2 h1:KPKiIbfwbvC/wOncwhrpRdXVj2CZTCFlw4wnoyjtHfQ= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= +github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs= github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A= github.com/pkg/profile v1.2.1 h1:F++O52m40owAmADcojzM+9gyjmMOY/T4oYJkgFDH8RE= -github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= -github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo= github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/common/assets v0.2.0 h1:0P5OrzoHrYBOSM1OigWL3mY8ZvV2N4zIE/5AahrSrfM= github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97/go.mod h1:LoBCZeRh+5hX+fSULNyFnagYlQG/gBsyA/deNzROkq8= github.com/prometheus/statsd_exporter v0.26.0 h1:SQl3M6suC6NWQYEzOvIv+EF6dAMYEqIuZy+o4H9F5Ig= github.com/prometheus/statsd_exporter v0.26.0/go.mod h1:GXFLADOmBTVDrHc7b04nX8ooq3azG61pnECNqT7O5DM= +github.com/rabbitmq/amqp091-go v1.2.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= +github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA= +github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= +github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2 h1:1jfy6i1g66ijpffgfaF/7pIFYZnSZzvo9P9DFkFmRIM= +github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= @@ -666,7 +1009,6 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stoewer/parquet-cli v0.0.7 h1:rhdZODIbyMS3twr4OM3am8BPPT5pbfMcHLH93whDM5o= github.com/stoewer/parquet-cli v0.0.7/go.mod h1:bskxHdj8q3H1EmfuCqjViFoeO3NEvs5lzZAQvI8Nfjk= github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= @@ -739,8 +1081,10 @@ github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b h1:7gd+rd8P3bqcn/96gOZa3F5dpJr/vEiDQYlNb/y2uNs= go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= -go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg= -go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= +go.einride.tech/aip v0.67.1 h1:d/4TW92OxXBngkSOwWS2CH5rez869KpKMaN44mdxkFI= +go.einride.tech/aip v0.67.1/go.mod h1:ZGX4/zKw8dcgzdLsrvpOOGxfxI2QSk12SlP7d6c0/XI= +go.etcd.io/etcd/api/v3 v3.5.13/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +go.etcd.io/etcd/client/pkg/v3 v3.5.13/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= go.opentelemetry.io/collector v0.97.0 h1:qyOju13byHIKEK/JehmTiGMj4pFLa4kDyrOCtTmjHU0= go.opentelemetry.io/collector v0.97.0/go.mod h1:V6xquYAaO2VHVu4DBK28JYuikRdZajh7DH5Vl/Y8NiA= go.opentelemetry.io/collector/component v0.97.0 h1:vanKhXl5nptN8igRH4PqVYHOILif653vaPIKv6LCZCI= @@ -806,10 +1150,10 @@ go.opentelemetry.io/collector/service v0.95.0/go.mod h1:4yappQmDE5UZmLE9wwtj6IPM go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= go.opentelemetry.io/contrib/propagators/b3 v1.23.0 h1:aaIGWc5JdfRGpCafLRxMJbD65MfTa206AwSKkvGS0Hg= go.opentelemetry.io/contrib/propagators/b3 v1.23.0/go.mod h1:Gyz7V7XghvwTq+mIhLFlTgcc03UDroOg8vezs4NLhwU= +go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= go.opentelemetry.io/otel/bridge/opencensus v1.26.0 h1:DZzxj9QjznMVoehskOJnFP2gsTCWtDTFBDvFhPAY7nc= go.opentelemetry.io/otel/bridge/opencensus v1.26.0/go.mod h1:rJiX0KrF5m8Tm1XE8jLczpAv5zUaDcvhKecFG0ZoFG4= go.opentelemetry.io/otel/bridge/opentracing v1.26.0 h1:Q/dHj0DOhfLMAs5u5ucAbC7gy66x9xxsZRLpHCJ4XhI= @@ -818,58 +1162,101 @@ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1 h1:ZqR go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1/go.mod h1:D7ynngPWlGJrqyGSDOdscuv7uqttfCE3jcBvffDv9y4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.23.1 h1:q/Nj5/2TZRIt6PderQ9oU0M00fzoe8UZuINGw6ETGTw= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.23.1/go.mod h1:DTE9yAu6r08jU3xa68GiSeI7oRcSEQ2RpKbbQGO+dWM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0/go.mod h1:z46paqbJ9l7c9fIPCXTqTGwhQZ5XoTIsfeFYWboizjs= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= go.opentelemetry.io/otel/exporters/prometheus v0.46.0/go.mod h1:ztwVUHe5DTR/1v7PeuGRnU5Bbd4QKYwApWmuutKsJSs= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.23.1 h1:C8r95vDR125t815KD+b1tI0Fbc1pFnwHTBxkbIZ6Szc= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.23.1/go.mod h1:Qr0qomr64jentMtOjWMbtYeJMSuMSlsPEjmnRA2sWZ4= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 h1:s0PHtIkN+3xrbDOpt2M8OTG92cWqUESvzh2MxiR5xY8= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0/go.mod h1:hZlFbDbRt++MMPCCfSJfmhkGIWnX1h3XjkfxZUjLrIA= +go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= +go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= +go.opentelemetry.io/otel/sdk v1.26.0/go.mod h1:0p8MXpqLeJ0pzcszQQN4F0S5FVjBLgypeGSngLsmirs= go.opentelemetry.io/otel/sdk/metric v1.26.0 h1:cWSks5tfriHPdWFnl+qpX3P681aAYqlZHcAyHw5aU9Y= go.opentelemetry.io/otel/sdk/metric v1.26.0/go.mod h1:ClMFFknnThJCksebJwz7KIyEDHO+nTB6gK8obLy8RyE= +go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4= golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk= golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= gonum.org/v1/plot v0.10.1 h1:dnifSs43YJuNMDzB7v8wV64O4ABBHReuAVAoBxqBqS4= google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.177.0/go.mod h1:srbhue4MLjkjbkux5p3dw/ocYOSZTaIEvf7bCOnFQDw= +google.golang.org/api v0.183.0/go.mod h1:q43adC5/pHoSZTx5h2mSmdF7NcyfW9JuDyIOJAgS9ZQ= +google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk= +google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= +google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/genproto v0.0.0-20240528184218-531527333157/go.mod h1:ubQlAQnzejB8uZzszhrTCU2Fyp6Vi7ZE5nn0c3W8+qQ= +google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:mCr1K1c8kX+1iSBREvU3Juo11CB+QOEWxbRS01wWl5M= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6/go.mod h1:10yRODfgim2/T8csjQsMPgZOMvtytXKTDRzH6HRGzRw= +google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.mod h1:vPrPUTsDCYxXWjP7clS81mZ6/803D8K4iM9Ma27VKas= google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= +google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= +google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys= +google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:OFMYQFHJ4TM3JRlWDZhJbZfra2uqc3WLBZiaaqP4DtU= google.golang.org/genproto/googleapis/bytestream v0.0.0-20240325203815-454cdb8f5daa h1:wBkzraZsSqhj1M4L/nMrljUU6XasJkgHvUsq8oRGwF0= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240730163845-b1a4ccb954bf h1:T4tsZBlZYXK3j40sQNP5MBO32I+rn6ypV1PpklsiV8k= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:5/MT647Cn/GGhwTpXC7QqcaR5Cnee4v4MKCU1/nwnIQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/cheggaaa/pb.v1 v1.0.25 h1:Ev7yu1/f6+d+b3pi5vPdRPc6nNtP1umSfcWiEfRqv6I= @@ -884,7 +1271,6 @@ gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/telebot.v3 v3.2.1 h1:3I4LohaAyJBiivGmkfB+CiVu7QFOWkuZ4+KHgO/G3rs= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.1.3 h1:qTakTkI6ni6LFD5sBwwsdSO+AQqbSIxOauHTTQKZ/7o= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= @@ -893,7 +1279,6 @@ k8s.io/code-generator v0.31.0/go.mod h1:84y4w3es8rOJOUUP1rLsIiGlO1JuEaPFXQPA9e/K k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks= k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw= lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo= modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q= modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y= @@ -906,6 +1291,8 @@ modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws= modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= +nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0= +nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= diff --git a/hack/go.mod b/hack/go.mod index e5507f966e0..32b2a9e2a43 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.22.4 +go 1.23.0 require k8s.io/code-generator v0.31.0 diff --git a/kinds/dashboard/dashboard_kind.cue b/kinds/dashboard/dashboard_kind.cue index 58ae9457718..6a24fc92266 100644 --- a/kinds/dashboard/dashboard_kind.cue +++ b/kinds/dashboard/dashboard_kind.cue @@ -294,7 +294,8 @@ lineage: schemas: [{ // `textbox`: Display a free text input field with an optional default value. // `custom`: Define the variable options manually using a comma-separated list. // `system`: Variables defined by Grafana. See: https://grafana.com/docs/grafana/latest/dashboards/variables/add-template-variables/#global-variables - #VariableType: "query" | "adhoc" | "groupby" | "constant" | "datasource" | "interval" | "textbox" | "custom" | "system" @cuetsy(kind="type") @grafanamaturity(NeedsExpertReview) + #VariableType: "query" | "adhoc" | "groupby" | "constant" | "datasource" | "interval" | "textbox" | "custom" | + "system" | "snapshot" @cuetsy(kind="type") @grafanamaturity(NeedsExpertReview) // Color mode for a field. You can specify a single color, or select a continuous (gradient) color schemes, based on a value. // Continuous color interpolates a color using the percentage of a value relative to min and max. @@ -594,7 +595,7 @@ lineage: schemas: [{ // Dynamically load the panel libraryPanel?: #LibraryPanelRef - // Sets panel queries cache timeout. + // Sets panel queries cache timeout. cacheTimeout?: string // Overrides the data source configured time-to-live for a query cache item in milliseconds diff --git a/package.json b/package.json index 457f1b37e4c..a8496511f13 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ "e2e:playwright": "yarn playwright test", "e2e:playwright:server": "./e2e/plugin-e2e/start-and-run-suite", "e2e:storybook": "PORT=9001 ./e2e/run-suite storybook true", + "e2e:plugin:build": "nx run-many -t build --projects='@test-plugins/*'", + "e2e:plugin:build:dev": "nx run-many -t dev --projects='@test-plugins/*' --maxParallel=100", "test": "jest --notify --watch", "test:coverage": "jest --coverage", "test:coverage:changes": "jest --coverage --changedSince=origin/main", @@ -68,8 +70,8 @@ }, "devDependencies": { "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.3", - "@babel/runtime": "7.25.0", + "@babel/preset-env": "7.25.4", + "@babel/runtime": "7.25.4", "@betterer/betterer": "5.4.0", "@betterer/cli": "5.4.0", "@betterer/eslint": "5.4.0", @@ -77,10 +79,10 @@ "@emotion/eslint-plugin": "11.11.0", "@grafana/eslint-config": "7.0.0", "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules", - "@grafana/plugin-e2e": "1.6.1", + "@grafana/plugin-e2e": "1.7.1", "@grafana/tsconfig": "^2.0.0", "@manypkg/get-packages": "^2.2.0", - "@playwright/test": "1.46.0", + "@playwright/test": "1.46.1", "@pmmmwh/react-refresh-webpack-plugin": "0.5.15", "@react-types/button": "3.9.6", "@react-types/menu": "3.9.11", @@ -134,7 +136,7 @@ "@types/react-router-dom": "5.3.3", "@types/react-table": "7.7.20", "@types/react-test-renderer": "18.3.0", - "@types/react-transition-group": "4.4.10", + "@types/react-transition-group": "4.4.11", "@types/react-virtualized-auto-sizer": "1.0.4", "@types/react-window": "1.8.8", "@types/react-window-infinite-loader": "^1", @@ -161,7 +163,7 @@ "chrome-remote-interface": "0.33.2", "codeowners": "^5.1.1", "copy-webpack-plugin": "12.0.2", - "core-js": "3.38.0", + "core-js": "3.38.1", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "6.0.0", "cypress": "13.10.0", @@ -190,7 +192,7 @@ "html-loader": "5.1.0", "html-webpack-plugin": "5.6.0", "http-server": "14.1.1", - "i18next-parser": "9.0.1", + "i18next-parser": "9.0.2", "ini": "^4.1.3", "jest": "29.7.0", "jest-canvas-mock": "2.5.2", @@ -202,7 +204,7 @@ "jest-watch-typeahead": "^2.2.2", "knip": "^5.10.0", "lerna": "8.1.8", - "mini-css-extract-plugin": "2.9.0", + "mini-css-extract-plugin": "2.9.1", "msw": "2.3.5", "mutationobserver-shim": "0.3.7", "ngtemplate-loader": "2.1.0", @@ -219,19 +221,19 @@ "react-test-renderer": "18.2.0", "redux-mock-store": "1.5.4", "rimraf": "5.0.7", - "rudder-sdk-js": "2.48.15", + "rudder-sdk-js": "2.48.16", "sass": "1.77.8", "sass-loader": "14.2.1", "smtp-tester": "^2.1.0", "style-loader": "4.0.0", - "stylelint": "16.8.1", + "stylelint": "16.8.2", "stylelint-config-sass-guidelines": "11.1.0", "terser-webpack-plugin": "5.3.10", "testing-library-selector": "0.3.1", "tracelib": "1.0.1", "ts-jest": "29.2.4", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0", "webpack-assets-manifest": "^5.1.0", "webpack-bundle-analyzer": "4.10.2", @@ -254,7 +256,7 @@ "@grafana/azure-sdk": "0.0.3", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/faro-core": "^1.3.6", "@grafana/faro-web-sdk": "^1.3.6", "@grafana/faro-web-tracing": "^1.8.2", @@ -266,7 +268,7 @@ "@grafana/prometheus": "workspace:*", "@grafana/runtime": "workspace:*", "@grafana/saga-icons": "workspace:*", - "@grafana/scenes": "^5.8.0", + "@grafana/scenes": "^5.10.1", "@grafana/schema": "workspace:*", "@grafana/sql": "workspace:*", "@grafana/ui": "workspace:*", @@ -274,7 +276,7 @@ "@kusto/monaco-kusto": "^10.0.0", "@leeoniya/ufuzzy": "1.0.14", "@lezer/common": "1.2.1", - "@lezer/highlight": "1.2.0", + "@lezer/highlight": "1.2.1", "@lezer/lr": "1.3.3", "@locker/near-membrane-dom": "0.13.6", "@locker/near-membrane-shared": "0.13.6", @@ -285,11 +287,11 @@ "@opentelemetry/exporter-collector": "0.25.0", "@opentelemetry/semantic-conventions": "1.25.1", "@popperjs/core": "2.11.8", - "@react-aria/dialog": "3.5.16", - "@react-aria/focus": "3.18.1", - "@react-aria/overlays": "3.23.1", - "@react-aria/utils": "3.25.1", - "@react-awesome-query-builder/ui": "6.6.2", + "@react-aria/dialog": "3.5.17", + "@react-aria/focus": "3.18.2", + "@react-aria/overlays": "3.23.2", + "@react-aria/utils": "3.25.2", + "@react-awesome-query-builder/ui": "6.6.3", "@reduxjs/toolkit": "2.2.7", "@testing-library/react-hooks": "^8.0.1", "@visx/event": "3.3.0", @@ -349,7 +351,7 @@ "nanoid": "^5.0.4", "node-forge": "^1.3.1", "ol": "7.4.0", - "ol-ext": "4.0.21", + "ol-ext": "4.0.23", "pluralize": "^8.0.0", "prismjs": "1.29.0", "rc-slider": "10.6.2", @@ -431,7 +433,8 @@ "packages/*", "packages/!(grafana-icons)/**", "plugins-bundled/internal/*", - "public/app/plugins/*/*" + "public/app/plugins/*/*", + "e2e/test-plugins/*" ] }, "engines": { diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 04ac3d12bbb..db9852ccf9b 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -79,7 +79,7 @@ "rollup-plugin-dts": "^5.0.0", "rollup-plugin-esbuild": "5.0.0", "rollup-plugin-node-externals": "^5.0.0", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "peerDependencies": { "react": "^18.0.0", diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts index 005e89554da..2db23e03fca 100644 --- a/packages/grafana-data/src/index.ts +++ b/packages/grafana-data/src/index.ts @@ -515,6 +515,7 @@ export { type UserVariableModel, type SystemVariable, type BaseVariableModel, + type SnapshotVariableModel, } from './types/templateVars'; export { type Threshold, ThresholdsMode, type ThresholdsConfig } from './types/thresholds'; export { @@ -555,6 +556,7 @@ export { type PluginExtensionCommandPaletteContext, type PluginExtensionOpenModalOptions, type PluginExposedComponentConfig, + type PluginAddedComponentConfig, } from './types/pluginExtensions'; export { type ScopeDashboardBindingSpec, diff --git a/packages/grafana-data/src/types/app.ts b/packages/grafana-data/src/types/app.ts index 9c16723c737..87756072998 100644 --- a/packages/grafana-data/src/types/app.ts +++ b/packages/grafana-data/src/types/app.ts @@ -9,6 +9,7 @@ import { PluginExtensionComponentConfig, PluginExposedComponentConfig, PluginExtensionConfig, + PluginAddedComponentConfig, } from './pluginExtensions'; /** @@ -58,6 +59,7 @@ export interface AppPluginMeta extends PluginMeta export class AppPlugin extends GrafanaPlugin> { private _exposedComponentConfigs: PluginExposedComponentConfig[] = []; + private _addedComponentConfigs: PluginAddedComponentConfig[] = []; private _extensionConfigs: PluginExtensionConfig[] = []; // Content under: /a/${plugin-id}/* @@ -104,6 +106,10 @@ export class AppPlugin extends GrafanaPlugin extends GrafanaPlugin( - extensionConfig: { targets: string | string[] } & Omit< - PluginExtensionComponentConfig, - 'type' | 'extensionPointId' - > - ) { - const { targets, ...extension } = extensionConfig; - const targetsArray = Array.isArray(targets) ? targets : [targets]; - - targetsArray.forEach((target) => { - this._extensionConfigs.push({ - ...extension, - extensionPointId: target, - type: PluginExtensionTypes.component, - } as PluginExtensionComponentConfig); - }); + addComponent(addedComponentConfig: PluginAddedComponentConfig) { + this._addedComponentConfigs.push(addedComponentConfig as PluginAddedComponentConfig); return this; } @@ -168,6 +160,7 @@ export class AppPlugin extends GrafanaPlugin { panelId?: number; panelPluginId?: string; dashboardUID?: string; + headers?: Record; /** Filters to dynamically apply to all queries */ filters?: AdHocVariableFilter[]; diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 1c577afa5f0..2b3667bed7a 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -42,7 +42,6 @@ export interface FeatureToggles { logRequestsInstrumentedAsUnknown?: boolean; topnav?: boolean; grpcServer?: boolean; - unifiedStorage?: boolean; cloudWatchCrossAccountQuerying?: boolean; showDashboardValidationWarnings?: boolean; mysqlAnsiQuotes?: boolean; @@ -60,7 +59,6 @@ export interface FeatureToggles { influxqlStreamingParser?: boolean; influxdbRunQueriesInParallel?: boolean; prometheusRunQueriesInParallel?: boolean; - prometheusDataplane?: boolean; lokiMetricDataplane?: boolean; lokiLogsDataplane?: boolean; dataplaneFrontendFallback?: boolean; @@ -106,7 +104,6 @@ export interface FeatureToggles { alertingInsights?: boolean; externalCorePlugins?: boolean; pluginsAPIMetrics?: boolean; - idForwarding?: boolean; externalServiceAccounts?: boolean; panelMonitoring?: boolean; enableNativeHTTPHistogram?: boolean; @@ -204,4 +201,5 @@ export interface FeatureToggles { backgroundPluginInstaller?: boolean; dataplaneAggregator?: boolean; adhocFilterOneOf?: boolean; + lokiSendDashboardPanelNames?: boolean; } diff --git a/packages/grafana-data/src/types/pluginExtensions.ts b/packages/grafana-data/src/types/pluginExtensions.ts index 0c027f3b1ed..f5dd20c62aa 100644 --- a/packages/grafana-data/src/types/pluginExtensions.ts +++ b/packages/grafana-data/src/types/pluginExtensions.ts @@ -95,6 +95,28 @@ export type PluginExtensionComponentConfig = { extensionPointId: string; }; +export type PluginAddedComponentConfig = { + /** + * The target extension points where the component will be added + */ + targets: string | string[]; + + /** + * The title of the component + */ + title: string; + + /** + * A short description of the component + */ + description: string; + + /** + * The React component that will added to the target extension points + */ + component: React.ComponentType; +}; + export type PluginExposedComponentConfig = { /** * The unique identifier of the component diff --git a/packages/grafana-data/src/types/scopes.ts b/packages/grafana-data/src/types/scopes.ts index 7c2b9fc01aa..86e6ca33ee0 100644 --- a/packages/grafana-data/src/types/scopes.ts +++ b/packages/grafana-data/src/types/scopes.ts @@ -2,6 +2,7 @@ export interface ScopeDashboardBindingSpec { dashboard: string; dashboardTitle: string; scope: string; + groups?: string[]; } // TODO: Use Resource from apiserver when we export the types diff --git a/packages/grafana-data/src/types/templateVars.ts b/packages/grafana-data/src/types/templateVars.ts index 1b01e5b9e53..14a1cd38fc8 100644 --- a/packages/grafana-data/src/types/templateVars.ts +++ b/packages/grafana-data/src/types/templateVars.ts @@ -22,7 +22,8 @@ export type TypedVariableModel = | CustomVariableModel | UserVariableModel | OrgVariableModel - | DashboardVariableModel; + | DashboardVariableModel + | SnapshotVariableModel; export enum VariableRefresh { never, // removed from the UI @@ -178,3 +179,8 @@ export interface BaseVariableModel { description: string | null; usedInRepeat?: boolean; } + +export interface SnapshotVariableModel extends VariableWithOptions { + type: 'snapshot'; + query: string; +} diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 71c99e89d75..e54b77ed1d4 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -51,6 +51,6 @@ "dependencies": { "@grafana/tsconfig": "^2.0.0", "tslib": "2.6.3", - "typescript": "5.4.5" + "typescript": "5.5.4" } } diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index 41b89610d6d..aca8388c771 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -57,7 +57,7 @@ }, "devDependencies": { "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.3", + "@babel/preset-env": "7.25.4", "@babel/preset-react": "7.24.7", "@grafana/tsconfig": "^2.0.0", "@rollup/plugin-node-resolve": "15.2.3", @@ -82,7 +82,7 @@ "rollup-plugin-node-externals": "^5.0.0", "ts-jest": "29.2.4", "ts-node": "10.9.2", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "peerDependencies": { "react": "^18.0.0", diff --git a/packages/grafana-icons/package.json b/packages/grafana-icons/package.json index a0166934b15..6796b8fa5bc 100644 --- a/packages/grafana-icons/package.json +++ b/packages/grafana-icons/package.json @@ -58,7 +58,7 @@ "rollup-plugin-esbuild": "5.0.0", "rollup-plugin-node-externals": "5.0.0", "ts-node": "10.9.2", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0", diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json index db965c0b913..738201a680a 100644 --- a/packages/grafana-o11y-ds-frontend/package.json +++ b/packages/grafana-o11y-ds-frontend/package.json @@ -20,7 +20,7 @@ "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", "@grafana/e2e-selectors": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", "@grafana/schema": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", @@ -44,7 +44,7 @@ "react": "18.2.0", "ts-jest": "29.2.4", "ts-node": "10.9.2", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "peerDependencies": { "react": "^18.0.0", diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json index 1373acf6369..9e97b4553c2 100644 --- a/packages/grafana-plugin-configs/package.json +++ b/packages/grafana-plugin-configs/package.json @@ -17,7 +17,7 @@ "glob": "10.4.1", "replace-in-file-webpack-plugin": "1.0.6", "swc-loader": "0.2.6", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "packageManager": "yarn@4.4.0" diff --git a/packages/grafana-plugin-configs/utils.ts b/packages/grafana-plugin-configs/utils.ts index a8b3dbd113c..3a74dd90af6 100644 --- a/packages/grafana-plugin-configs/utils.ts +++ b/packages/grafana-plugin-configs/utils.ts @@ -12,13 +12,29 @@ export function getPluginJson() { } export async function getEntries(): Promise> { - const pluginModules = await glob(path.resolve(process.cwd(), `module.{ts,tsx}`), { absolute: true }); - if (pluginModules.length > 0) { - return { - module: pluginModules[0], - }; - } - throw new Error('Could not find module.ts or module.tsx file'); + const pluginsJson = await glob(path.resolve(process.cwd(), '**/plugin.json'), { + ignore: ['**/dist/**'], + absolute: true, + }); + + const plugins = await Promise.all( + pluginsJson.map((pluginJson) => { + const folder = path.dirname(pluginJson); + return glob(`${folder}/module.{ts,tsx,js,jsx}`, { absolute: true }); + }) + ); + + let result: Record = {}; + return plugins.reduce((result, modules) => { + return modules.reduce((result, module) => { + const pluginPath = path.dirname(module); + const pluginName = path.relative(process.cwd(), pluginPath).replace(/src\/?/i, ''); + const entryName = pluginName === '' ? 'module' : `${pluginName}/module`; + + result[entryName] = module; + return result; + }, result); + }, result); } export function hasLicense() { diff --git a/packages/grafana-plugin-configs/webpack.config.ts b/packages/grafana-plugin-configs/webpack.config.ts index e3b5bd097bb..f2c0a382d0c 100644 --- a/packages/grafana-plugin-configs/webpack.config.ts +++ b/packages/grafana-plugin-configs/webpack.config.ts @@ -59,7 +59,6 @@ const config = async (env: Record): Promise => { 'redux', 'rxjs', 'react-router', - 'react-router-dom', 'd3', 'angular', '@grafana/ui', diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 2782c01e490..1b5e8621530 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -39,7 +39,7 @@ "@emotion/css": "11.11.2", "@floating-ui/react": "0.26.22", "@grafana/data": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/faro-web-sdk": "1.9.0", "@grafana/runtime": "11.3.0-pre", "@grafana/schema": "11.3.0-pre", @@ -47,9 +47,9 @@ "@hello-pangea/dnd": "16.6.0", "@leeoniya/ufuzzy": "1.0.14", "@lezer/common": "1.2.1", - "@lezer/highlight": "1.2.0", + "@lezer/highlight": "1.2.1", "@lezer/lr": "1.4.2", - "@prometheus-io/lezer-promql": "0.53.1", + "@prometheus-io/lezer-promql": "0.53.2", "@reduxjs/toolkit": "2.2.7", "d3": "7.9.0", "date-fns": "3.6.0", @@ -136,7 +136,7 @@ "style-loader": "4.0.0", "testing-library-selector": "0.3.1", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0", "webpack-cli": "5.1.4" }, diff --git a/packages/grafana-prometheus/src/result_transformer.test.ts b/packages/grafana-prometheus/src/result_transformer.test.ts index 761216b4230..5dfc9d53ee9 100644 --- a/packages/grafana-prometheus/src/result_transformer.test.ts +++ b/packages/grafana-prometheus/src/result_transformer.test.ts @@ -29,11 +29,6 @@ jest.mock('@grafana/runtime', () => ({ }, }; }, - config: { - featureToggles: { - prometheusDataplane: true, - }, - }, })); describe('Prometheus Result Transformer', () => { diff --git a/packages/grafana-prometheus/src/result_transformer.ts b/packages/grafana-prometheus/src/result_transformer.ts index 7a901a0f995..d3bac7fff9c 100644 --- a/packages/grafana-prometheus/src/result_transformer.ts +++ b/packages/grafana-prometheus/src/result_transformer.ts @@ -17,7 +17,7 @@ import { TIME_SERIES_TIME_FIELD_NAME, TIME_SERIES_VALUE_FIELD_NAME, } from '@grafana/data'; -import { config, getDataSourceSrv } from '@grafana/runtime'; +import { getDataSourceSrv } from '@grafana/runtime'; import { ExemplarTraceIdDestination, PromMetric, PromQuery, PromValue } from './types'; @@ -54,21 +54,19 @@ export function transformV2( options: { exemplarTraceIdDestinations?: ExemplarTraceIdDestination[] } ) { // migration for dataplane field name issue - if (config.featureToggles.prometheusDataplane) { - // update displayNameFromDS in the field config - response.data.forEach((f: DataFrame) => { - const target = request.targets.find((t) => t.refId === f.refId); - // check that the legend is selected as auto - if (target && target.legendFormat === '__auto') { - f.fields.forEach((field) => { - if (field.labels?.__name__ && field.labels?.__name__ === field.name) { - const fieldCopy = { ...field, name: TIME_SERIES_VALUE_FIELD_NAME }; - field.config.displayNameFromDS = getFieldDisplayName(fieldCopy, f, response.data); - } - }); - } - }); - } + // update displayNameFromDS in the field config + response.data.forEach((f: DataFrame) => { + const target = request.targets.find((t) => t.refId === f.refId); + // check that the legend is selected as auto + if (target && target.legendFormat === '__auto') { + f.fields.forEach((field) => { + if (field.labels?.__name__ && field.labels?.__name__ === field.name) { + const fieldCopy = { ...field, name: TIME_SERIES_VALUE_FIELD_NAME }; + field.config.displayNameFromDS = getFieldDisplayName(fieldCopy, f, response.data); + } + }); + } + }); const [tableFrames, framesWithoutTable] = partition(response.data, (df) => isTableResult(df, request)); const processedTableFrames = transformDFToTable(tableFrames); diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 4497f035587..7fd58d6f783 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -71,7 +71,7 @@ "rollup-plugin-esbuild": "5.0.0", "rollup-plugin-node-externals": "^5.0.0", "rollup-plugin-sourcemaps": "0.6.3", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "peerDependencies": { "react": "^18.0.0", diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts index ad37ef63f28..f92f4023bf0 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/grafana-runtime/src/config.ts @@ -269,7 +269,7 @@ function overrideFeatureTogglesFromUrl(config: GrafanaBootConfig) { // Although most flags can not be changed from the URL in production, // some of them are safe (and useful!) to change dynamically from the browser URL - const safeRuntimeFeatureFlags = new Set(['queryServiceFromUI']); + const safeRuntimeFeatureFlags = new Set(['queryServiceFromUI', 'dashboardSceneSolo']); const params = new URLSearchParams(window.location.search); params.forEach((value, key) => { diff --git a/packages/grafana-runtime/src/services/index.ts b/packages/grafana-runtime/src/services/index.ts index 1a2cf79cc51..e1415c47a9e 100644 --- a/packages/grafana-runtime/src/services/index.ts +++ b/packages/grafana-runtime/src/services/index.ts @@ -26,11 +26,11 @@ export { usePluginExtensions, usePluginLinkExtensions, usePluginComponentExtensions, - usePluginComponents, usePluginLinks, } from './pluginExtensions/usePluginExtensions'; export { setPluginComponentHook, usePluginComponent } from './pluginExtensions/usePluginComponent'; +export { setPluginComponentsHook, usePluginComponents } from './pluginExtensions/usePluginComponents'; export { isPluginExtensionLink, isPluginExtensionComponent } from './pluginExtensions/utils'; export { setCurrentUser } from './user'; diff --git a/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts b/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts index 7ab1014bfcb..664661dcaf6 100644 --- a/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts +++ b/packages/grafana-runtime/src/services/pluginExtensions/getPluginExtensions.ts @@ -16,6 +16,11 @@ export type GetPluginExtensionsOptions = { limitPerPlugin?: number; }; +export type UsePluginComponentOptions = { + extensionPointId: string; + limitPerPlugin?: number; +}; + export type GetPluginExtensionsResult = { extensions: T[]; }; @@ -30,6 +35,11 @@ export type UsePluginComponentResult = { isLoading: boolean; }; +export type UsePluginComponentsResult = { + components: Array>; + isLoading: boolean; +}; + let singleton: GetPluginExtensions | undefined; export function setPluginExtensionGetter(instance: GetPluginExtensions): void { diff --git a/packages/grafana-runtime/src/services/pluginExtensions/usePluginComponents.ts b/packages/grafana-runtime/src/services/pluginExtensions/usePluginComponents.ts new file mode 100644 index 00000000000..aafe2bb8aac --- /dev/null +++ b/packages/grafana-runtime/src/services/pluginExtensions/usePluginComponents.ts @@ -0,0 +1,24 @@ +import { GetPluginExtensionsOptions, UsePluginComponentsResult } from './getPluginExtensions'; + +export type UsePluginComponents = ( + options: GetPluginExtensionsOptions +) => UsePluginComponentsResult; + +let singleton: UsePluginComponents | undefined; + +export function setPluginComponentsHook(hook: UsePluginComponents): void { + // We allow overriding the registry in tests + if (singleton && process.env.NODE_ENV !== 'test') { + throw new Error('setPluginComponentsHook() function should only be called once, when Grafana is starting.'); + } + singleton = hook; +} + +export function usePluginComponents( + options: GetPluginExtensionsOptions +): UsePluginComponentsResult { + if (!singleton) { + throw new Error('setPluginComponentsHook(options) can only be used after the Grafana instance has started.'); + } + return singleton(options) as UsePluginComponentsResult; +} diff --git a/packages/grafana-runtime/src/services/pluginExtensions/usePluginExtensions.ts b/packages/grafana-runtime/src/services/pluginExtensions/usePluginExtensions.ts index ff6bac57621..439d8163ccf 100644 --- a/packages/grafana-runtime/src/services/pluginExtensions/usePluginExtensions.ts +++ b/packages/grafana-runtime/src/services/pluginExtensions/usePluginExtensions.ts @@ -39,22 +39,6 @@ export function usePluginLinks(options: GetPluginExtensionsOptions): { }, [extensions, isLoading]); } -export function usePluginComponents( - options: GetPluginExtensionsOptions -): { components: Array>; isLoading: boolean } { - const { extensions, isLoading } = usePluginExtensions(options); - - return useMemo( - () => ({ - components: extensions - .filter(isPluginExtensionComponent) - .map(({ component }) => component as React.ComponentType), - isLoading, - }), - [extensions, isLoading] - ); -} - /** * @deprecated Use usePluginLinks() instead. */ diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts index 8d3d9ce7f47..c256f77baea 100644 --- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts +++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts @@ -140,6 +140,85 @@ describe('DataSourceWithBackend', () => { `); }); + test('correctly passes datasource headers', () => { + const { mock, ds } = createMockDatasource(); + ds.query({ + maxDataPoints: 10, + intervalMs: 5000, + targets: [{ refId: 'A' }, { refId: 'B', datasource: { type: 'sample' } }], + dashboardUID: 'dashA', + panelId: 123, + filters: [{ key: 'key1', operator: '=', value: 'val1' }], + range: getDefaultTimeRange(), + queryGroupId: 'abc', + interval: '5s', + scopedVars: {}, + timezone: '', + requestId: 'request-123', + startTime: 0, + app: '', + headers: { + 'X-Test-Header': 'test', + }, + }); + + const args = mock.calls[0][0]; + + expect(mock.calls.length).toBe(1); + expect(args).toMatchInlineSnapshot(` + { + "data": { + "from": "1697133600000", + "queries": [ + { + "applyTemplateVariablesCalled": true, + "datasource": { + "type": "dummy", + "uid": "abc", + }, + "datasourceId": 1234, + "filters": [ + { + "key": "key1", + "operator": "=", + "value": "val1", + }, + ], + "intervalMs": 5000, + "maxDataPoints": 10, + "queryCachingTTL": undefined, + "refId": "A", + }, + { + "datasource": { + "type": "sample", + "uid": "", + }, + "datasourceId": undefined, + "intervalMs": 5000, + "maxDataPoints": 10, + "queryCachingTTL": undefined, + "refId": "B", + }, + ], + "to": "1697155200000", + }, + "headers": { + "X-Dashboard-Uid": "dashA", + "X-Datasource-Uid": "abc, ", + "X-Panel-Id": "123", + "X-Plugin-Id": "dummy, sample", + "X-Query-Group-Id": "abc", + "X-Test-Header": "test", + }, + "hideFromInspector": false, + "method": "POST", + "requestId": "request-123", + "url": "/api/ds/query?ds_type=dummy&requestId=request-123", + } + `); + }); + test('correctly creates expression queries', () => { const { mock, ds } = createMockDatasource(); ds.query({ diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts index 7172ae63740..04d7293bab8 100644 --- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts +++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts @@ -201,7 +201,7 @@ class DataSourceWithBackend< }); } - const headers: Record = {}; + const headers: Record = request.headers ?? {}; headers[PluginRequestHeaders.PluginID] = Array.from(pluginIDs).join(', '); headers[PluginRequestHeaders.DatasourceUID] = Array.from(dsUIDs).join(', '); diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 3bb8624372c..5d6a90dd2e5 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -45,7 +45,7 @@ "rollup-plugin-dts": "^5.0.0", "rollup-plugin-esbuild": "5.0.0", "rollup-plugin-node-externals": "^5.0.0", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "dependencies": { "tslib": "2.6.3" diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts index 784b96494f4..a67ab34ae38 100644 --- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts +++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts @@ -349,7 +349,7 @@ export type DashboardLinkType = ('link' | 'dashboards'); * `custom`: Define the variable options manually using a comma-separated list. * `system`: Variables defined by Grafana. See: https://grafana.com/docs/grafana/latest/dashboards/variables/add-template-variables/#global-variables */ -export type VariableType = ('query' | 'adhoc' | 'groupby' | 'constant' | 'datasource' | 'interval' | 'textbox' | 'custom' | 'system'); +export type VariableType = ('query' | 'adhoc' | 'groupby' | 'constant' | 'datasource' | 'interval' | 'textbox' | 'custom' | 'system' | 'snapshot'); /** * Color mode for a field. You can specify a single color, or select a continuous (gradient) color schemes, based on a value. diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index f6796f0bf92..42054ef4aea 100644 --- a/packages/grafana-sql/package.json +++ b/packages/grafana-sql/package.json @@ -17,10 +17,10 @@ "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", "@grafana/e2e-selectors": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", - "@react-awesome-query-builder/ui": "6.6.2", + "@react-awesome-query-builder/ui": "6.6.3", "immutable": "4.3.7", "lodash": "4.17.21", "react": "18.2.0", @@ -52,7 +52,7 @@ "jest": "^29.6.4", "ts-jest": "29.2.4", "ts-node": "10.9.2", - "typescript": "5.4.5" + "typescript": "5.5.4" }, "peerDependencies": { "@grafana/runtime": "10.4.0-pre" diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index c937b635087..f70c2dfc234 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -58,10 +58,10 @@ "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", - "@react-aria/dialog": "3.5.16", - "@react-aria/focus": "3.18.1", - "@react-aria/overlays": "3.23.1", - "@react-aria/utils": "3.25.1", + "@react-aria/dialog": "3.5.17", + "@react-aria/focus": "3.18.2", + "@react-aria/overlays": "3.23.2", + "@react-aria/utils": "3.25.2", "@tanstack/react-virtual": "^3.5.1", "@types/jquery": "3.5.30", "@types/lodash": "4.17.7", @@ -153,7 +153,7 @@ "@types/react-highlight-words": "0.20.0", "@types/react-router-dom": "5.3.3", "@types/react-test-renderer": "18.3.0", - "@types/react-transition-group": "4.4.10", + "@types/react-transition-group": "4.4.11", "@types/react-window": "1.8.8", "@types/slate": "0.47.11", "@types/slate-plain-serializer": "0.7.5", @@ -163,7 +163,7 @@ "@types/uuid": "9.0.8", "chance": "1.1.12", "common-tags": "1.8.2", - "core-js": "3.38.0", + "core-js": "3.38.1", "css-loader": "7.1.2", "csstype": "3.1.3", "esbuild": "0.20.2", @@ -185,7 +185,7 @@ "storybook": "^8.1.6", "storybook-dark-mode": "^4.0.1", "style-loader": "4.0.0", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/packages/grafana-ui/src/components/BigValue/PercentChange.tsx b/packages/grafana-ui/src/components/BigValue/PercentChange.tsx index 222cccf13b6..24de61cbbc6 100644 --- a/packages/grafana-ui/src/components/BigValue/PercentChange.tsx +++ b/packages/grafana-ui/src/components/BigValue/PercentChange.tsx @@ -1,3 +1,5 @@ +import { IconName } from '@grafana/data'; + import { Icon } from '../Icon/Icon'; import { PercentChangeStyles } from './BigValueLayout'; @@ -8,8 +10,12 @@ export interface Props { } export const PercentChange = ({ percentChange, styles }: Props) => { - const percentChangeIcon = - percentChange && (percentChange > 0 ? 'arrow-up' : percentChange < 0 ? 'arrow-down' : undefined); + let percentChangeIcon: IconName | undefined = undefined; + if (percentChange > 0) { + percentChangeIcon = 'arrow-up'; + } else if (percentChange < 0) { + percentChangeIcon = 'arrow-down'; + } return (
@@ -22,5 +28,5 @@ export const PercentChange = ({ percentChange, styles }: Props) => { }; export const percentChangeString = (percentChange: number) => { - return percentChange?.toLocaleString(undefined, { style: 'percent', maximumSignificantDigits: 3 }) ?? ''; + return percentChange.toLocaleString(undefined, { style: 'percent', maximumSignificantDigits: 3 }); }; diff --git a/packages/grafana-ui/src/components/Collapse/Collapse.tsx b/packages/grafana-ui/src/components/Collapse/Collapse.tsx index 97e0389aa8a..f7d67fc8b23 100644 --- a/packages/grafana-ui/src/components/Collapse/Collapse.tsx +++ b/packages/grafana-ui/src/components/Collapse/Collapse.tsx @@ -33,7 +33,6 @@ const getStyles = (theme: GrafanaTheme2) => ({ bodyContentWrapper: css({ label: 'bodyContentWrapper', flex: 1, - overflow: 'hidden', }), loader: css({ label: 'collapse__loader', diff --git a/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx b/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx index 9f1a7dc44bf..3b20190fa3e 100644 --- a/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx +++ b/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx @@ -221,7 +221,7 @@ class Portal extends PureComponent, {}> { const { index = 0, origin = 'query', style } = props; this.node = document.createElement('div'); this.node.setAttribute('style', style); - this.node.classList.add(`slate-typeahead`, `slate-typeahead-${origin}-${index}`); + this.node.classList.add(`slate-typeahead-${origin}-${index}`); document.body.appendChild(this.node); } @@ -244,8 +244,18 @@ class Portal extends PureComponent, {}> { const getStyles = (theme: GrafanaTheme2) => ({ typeahead: css({ - maxHeight: 300, - overflowY: 'auto', + position: 'relative', + zIndex: theme.zIndex.typeahead, + borderRadius: theme.shape.radius.default, + border: `1px solid ${theme.components.panel.borderColor}`, + maxHeight: '66vh', + overflowY: 'scroll', + overflowX: 'hidden', + outline: 'none', + listStyle: 'none', + background: theme.components.panel.background, + color: theme.colors.text.primary, + boxShadow: theme.shadows.z2, strong: { color: theme.v1.palette.yellow, diff --git a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx index d2d362162a4..54b6648efef 100644 --- a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx +++ b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx @@ -313,8 +313,10 @@ export const TooltipPlugin2 = ({ } // only pinnable tooltip is visible *and* is within proximity to series/point else if (_isHovering && closestSeriesIdx != null && !_isPinned) { - _isPinned = true; - scheduleRender(true); + setTimeout(() => { + _isPinned = true; + scheduleRender(true); + }, 0); } } }); @@ -608,14 +610,29 @@ export const TooltipPlugin2 = ({ size.width = width; size.height = height; - const event = plot!.cursor.event; + let event = plot!.cursor.event; // if not viaSync, re-dispatch real event if (event != null) { + // we expect to re-dispatch mousemove, but on mobile we'll get mouseup or click + const isMobile = event.type !== 'mousemove'; + + if (isMobile) { + event = new MouseEvent('mousemove', { + view: window, + bubbles: true, + cancelable: true, + clientX: event.clientX, + clientY: event.clientY, + screenX: event.screenX, + screenY: event.screenY, + }); + } + // this works around the fact that uPlot does not unset cursor.event (for perf reasons) // so if the last real mouse event was mouseleave and you manually trigger u.setCursor() // it would end up re-dispatching mouseleave - const isStaleEvent = performance.now() - event.timeStamp > 16; + const isStaleEvent = isMobile ? false : performance.now() - event.timeStamp > 16; !isStaleEvent && plot!.over.dispatchEvent(event); } else { diff --git a/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx b/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx index 6434df3cdb6..0aacc8db438 100644 --- a/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx +++ b/packages/grafana-ui/src/themes/GlobalStyles/GlobalStyles.tsx @@ -23,6 +23,7 @@ import { getRcTimePickerStyles } from './rcTimePicker'; import { getSkeletonStyles } from './skeletonStyles'; import { getSlateStyles } from './slate'; import { getUplotStyles } from './uPlot'; +import { getUtilityClassStyles } from './utilityClasses'; /** @internal */ export function GlobalStyles() { @@ -51,6 +52,7 @@ export function GlobalStyles() { getSkeletonStyles(theme), getSlateStyles(theme), getUplotStyles(theme), + getUtilityClassStyles(theme), getLegacySelectStyles(theme), ]} /> diff --git a/packages/grafana-ui/src/themes/GlobalStyles/dashboardGrid.ts b/packages/grafana-ui/src/themes/GlobalStyles/dashboardGrid.ts index bbd6d6da876..6fd77b0e77e 100644 --- a/packages/grafana-ui/src/themes/GlobalStyles/dashboardGrid.ts +++ b/packages/grafana-ui/src/themes/GlobalStyles/dashboardGrid.ts @@ -20,6 +20,9 @@ export function getDashboardGridStyles(theme: GrafanaTheme2) { }, [theme.breakpoints.down('md')]: { + '.react-grid-layout': { + height: 'unset !important', + }, '.react-grid-item': { display: 'block !important', transitionProperty: 'none !important', diff --git a/packages/grafana-ui/src/themes/GlobalStyles/elements.ts b/packages/grafana-ui/src/themes/GlobalStyles/elements.ts index 6586dbb6e0d..58b63a8e1c1 100644 --- a/packages/grafana-ui/src/themes/GlobalStyles/elements.ts +++ b/packages/grafana-ui/src/themes/GlobalStyles/elements.ts @@ -35,7 +35,7 @@ export function getElementStyles(theme: GrafanaTheme2) { // Need type assertion here due to the use of !important // see https://github.com/frenic/csstype/issues/114#issuecomment-697201978 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions - overflowY: 'scroll !important' as 'scroll', + overflowY: 'auto !important' as 'auto', paddingRight: '0 !important', '@media print': { overflow: 'visible', diff --git a/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts b/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts new file mode 100644 index 00000000000..ac14021ea41 --- /dev/null +++ b/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts @@ -0,0 +1,141 @@ +import { css } from '@emotion/react'; + +import { GrafanaTheme2 } from '@grafana/data'; + +function buttonBackgroundMixin( + startColor: string, + endColor: string, + textColor = '#fff', + textShadow = '0px 1px 0 rgba(0, 0, 0, 0.1)' +) { + return { + backgroundColor: startColor, + backgroundImage: `linear-gradient(to bottom, ${startColor}, ${endColor})`, + backgroundRepeat: 'repeat-x', + color: textColor, + textShadow: textShadow, + borderColor: startColor, + + // in these cases the gradient won't cover the background, so we override + '&:hover, &:focus, &:active, &.active, &.disabled, &[disabled]': { + color: textColor, + backgroundImage: 'none', + backgroundColor: startColor, + }, + }; +} + +function buttonSizeMixin(paddingY: string, paddingX: string, fontSize: string, borderRadius: string) { + return { + padding: `${paddingY} ${paddingX}`, + fontSize: fontSize, + borderRadius: borderRadius, + }; +} + +export function getUtilityClassStyles(theme: GrafanaTheme2) { + return css({ + '.highlight-word': { + color: theme.v1.palette.orange, + }, + '.hide': { + display: 'none', + }, + '.show': { + display: 'block', + }, + '.invisible': { + // can't avoid type assertion here due to !important + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + visibility: 'hidden !important' as 'hidden', + }, + '.absolute': { + position: 'absolute', + }, + '.flex-grow-1': { + flexGrow: 1, + }, + '.flex-shrink-1': { + flexShrink: 1, + }, + '.flex-shrink-0': { + flexShrink: 0, + }, + '.center-vh': { + height: '100%', + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + justifyContent: 'center', + justifyItems: 'center', + }, + '.btn': { + display: 'inline-flex', + alignItems: 'center', + justifyContent: 'center', + fontWeight: theme.typography.fontWeightMedium, + lineHeight: theme.typography.body.lineHeight, + textAlign: 'center', + verticalAlign: 'middle', + cursor: 'pointer', + border: 'none', + height: `${theme.spacing.gridSize * theme.components.height.md}px`, + ...buttonSizeMixin( + theme.spacing(0), + theme.spacing(2), + `${theme.typography.fontSize}px`, + theme.shape.radius.default + ), + + '&, &:active, &.active': { + '&:focus, &.focus': { + outline: 'none', + }, + }, + '&:focus, &:hover': { + textDecoration: 'none', + }, + '&.focus': { + textDecoration: 'none', + }, + '&:active, &.active': { + backgroundImage: 'none', + outline: 0, + }, + '&.disabled, &[disabled], &:disabled': { + cursor: 'not-allowed', + opacity: 0.65, + boxShadow: 'none', + pointerEvents: 'none', + }, + }, + '.btn-small': { + ...buttonSizeMixin(theme.spacing(0.5), theme.spacing(1), theme.typography.size.sm, theme.shape.radius.default), + height: `${theme.spacing.gridSize * theme.components.height.sm}px`, + }, + // Deprecated, only used by old plugins + '.btn-mini': { + ...buttonSizeMixin(theme.spacing(0.5), theme.spacing(1), theme.typography.size.sm, theme.shape.radius.default), + height: `${theme.spacing.gridSize * theme.components.height.sm}px`, + }, + '.btn-success, .btn-primary': { + ...buttonBackgroundMixin(theme.colors.primary.main, theme.colors.primary.shade), + }, + '.btn-danger': { + ...buttonBackgroundMixin(theme.colors.error.main, theme.colors.error.shade), + }, + '.btn-secondary': { + ...buttonBackgroundMixin(theme.colors.secondary.main, theme.colors.secondary.shade, theme.colors.text.primary), + }, + '.btn-inverse': { + ...buttonBackgroundMixin( + theme.isDark ? theme.v1.palette.dark6 : theme.v1.palette.gray5, + theme.isDark ? theme.v1.palette.dark5 : theme.v1.palette.gray4, + theme.colors.text.primary + ), + '&': { + boxShadow: 'none', + }, + }, + }); +} diff --git a/pkg/aggregator/apiserver/plugin/admission.go b/pkg/aggregator/apiserver/plugin/admission.go new file mode 100644 index 00000000000..344e032280e --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission.go @@ -0,0 +1,127 @@ +package plugin + +import ( + "encoding/json" + "fmt" + "net/http" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/admission" + "github.com/grafana/grafana/pkg/aggregator/apiserver/util" + grafanasemconv "github.com/grafana/grafana/pkg/semconv" + "k8s.io/component-base/tracing" + "k8s.io/klog/v2" +) + +func (h *PluginHandler) AdmissionMutationHandler() http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + span := tracing.SpanFromContext(ctx) + span.AddEvent("AdmissionMutationHandler") + responder := &util.Responder{ResponseWriter: w} + ar, err := admission.ParseRequest(h.admissionCodecs, r) + if err != nil { + responder.Error(w, r, err) + return + } + + span.AddEvent("GetPluginContext", + grafanasemconv.GrafanaPluginId(h.dataplaneService.Spec.PluginID), + ) + pluginContext, err := h.pluginContextProvider.GetPluginContext(ctx, h.dataplaneService.Spec.PluginID, "") + if err != nil { + responder.Error(w, r, fmt.Errorf("unable to get plugin context: %w", err)) + return + } + + req, err := admission.ToAdmissionRequest(pluginContext, ar) + if err != nil { + responder.Error(w, r, fmt.Errorf("unable to convert admission request: %w", err)) + return + } + + ctx = backend.WithGrafanaConfig(ctx, pluginContext.GrafanaConfig) + span.AddEvent("MutateAdmission start") + rsp, err := h.client.MutateAdmission(ctx, req) + if err != nil { + responder.Error(w, r, err) + return + } + span.AddEvent("MutateAdmission end") + + span.AddEvent("FromMutationResponse start") + res, err := admission.FromMutationResponse(ar.Request.Object.Raw, rsp) + if err != nil { + responder.Error(w, r, err) + return + } + res.SetGroupVersionKind(ar.GroupVersionKind()) + res.Response.UID = ar.Request.UID + + respBytes, err := json.Marshal(res) + if err != nil { + klog.Error(err) + responder.Error(w, r, err) + return + } + + w.Header().Set("Content-Type", "application/json") + if _, err := w.Write(respBytes); err != nil { + klog.Error(err) + } + }) +} + +func (h *PluginHandler) AdmissionValidationHandler() http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + span := tracing.SpanFromContext(ctx) + span.AddEvent("AdmissionValidationHandler") + responder := &util.Responder{ResponseWriter: w} + ar, err := admission.ParseRequest(h.admissionCodecs, r) + if err != nil { + responder.Error(w, r, err) + return + } + + span.AddEvent("GetPluginContext", + grafanasemconv.GrafanaPluginId(h.dataplaneService.Spec.PluginID), + ) + pluginContext, err := h.pluginContextProvider.GetPluginContext(ctx, h.dataplaneService.Spec.PluginID, "") + if err != nil { + responder.Error(w, r, fmt.Errorf("unable to get plugin context: %w", err)) + return + } + + req, err := admission.ToAdmissionRequest(pluginContext, ar) + if err != nil { + responder.Error(w, r, fmt.Errorf("unable to convert admission request: %w", err)) + return + } + + ctx = backend.WithGrafanaConfig(ctx, pluginContext.GrafanaConfig) + span.AddEvent("ValidateAdmission start") + rsp, err := h.client.ValidateAdmission(ctx, req) + if err != nil { + responder.Error(w, r, err) + return + } + span.AddEvent("ValidateAdmission end") + + res := admission.FromValidationResponse(rsp) + res.SetGroupVersionKind(ar.GroupVersionKind()) + res.Response.UID = ar.Request.UID + + respBytes, err := json.Marshal(res) + if err != nil { + klog.Error(err) + responder.Error(w, r, err) + return + } + + w.Header().Set("Content-Type", "application/json") + if _, err := w.Write(respBytes); err != nil { + klog.Error(err) + } + }) +} diff --git a/pkg/aggregator/apiserver/plugin/admission/admission.go b/pkg/aggregator/apiserver/plugin/admission/admission.go new file mode 100644 index 00000000000..f62be4492ce --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/admission.go @@ -0,0 +1,78 @@ +package admission + +import ( + "errors" + "fmt" + "io" + "net/http" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + admissionv1 "k8s.io/api/admission/v1" + "k8s.io/apimachinery/pkg/runtime/serializer" +) + +func ToAdmissionRequest(pluginCtx backend.PluginContext, a *admissionv1.AdmissionReview) (*backend.AdmissionRequest, error) { + if a.Request == nil { + return nil, errors.New("admission review request is nil") + } + op, err := ToAdmissionOperation(a.Request.Operation) + if err != nil { + return nil, err + } + + return &backend.AdmissionRequest{ + PluginContext: pluginCtx, + Operation: op, + Kind: backend.GroupVersionKind{ + Group: a.Request.Kind.Group, + Version: a.Request.Kind.Version, + Kind: a.Request.Kind.Kind, + }, + ObjectBytes: a.Request.Object.Raw, + OldObjectBytes: a.Request.OldObject.Raw, + }, nil +} + +func ToAdmissionOperation(o admissionv1.Operation) (backend.AdmissionRequestOperation, error) { + switch o { + case admissionv1.Create: + return backend.AdmissionRequestCreate, nil + case admissionv1.Delete: + return backend.AdmissionRequestDelete, nil + case admissionv1.Update: + return backend.AdmissionRequestUpdate, nil + case admissionv1.Connect: + // TODO: CONNECT is missing from the plugin SDK + return 3, nil + } + return 0, errors.New("unknown admission review operation") +} + +func ParseRequest(codecs serializer.CodecFactory, r *http.Request) (*admissionv1.AdmissionReview, error) { + var body []byte + if r.Body != nil { + if data, err := io.ReadAll(r.Body); err == nil { + body = data + } + } + + contentType := r.Header.Get("Content-Type") + if contentType != "application/json" { + return nil, fmt.Errorf("contentType=%s, expect application/json", contentType) + } + + deserializer := codecs.UniversalDeserializer() + obj, gvk, err := deserializer.Decode(body, nil, nil) + if err != nil { + return nil, fmt.Errorf("failed to decode request: %v", err) + } + + ar, ok := obj.(*admissionv1.AdmissionReview) + if !ok { + return nil, fmt.Errorf("expected AdmissionReview v1, got %T", obj) + } + + ar.SetGroupVersionKind(*gvk) + + return ar, nil +} diff --git a/pkg/aggregator/apiserver/plugin/admission/admission_test.go b/pkg/aggregator/apiserver/plugin/admission/admission_test.go new file mode 100644 index 00000000000..b1017b3e68e --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/admission_test.go @@ -0,0 +1,97 @@ +package admission_test + +import ( + "bytes" + "encoding/json" + "net/http" + "testing" + + admissionv1 "k8s.io/api/admission/v1" + v1 "k8s.io/api/authentication/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + example "k8s.io/apiserver/pkg/apis/example/v1" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/admission" + "github.com/stretchr/testify/require" +) + +func TestParseRequest(t *testing.T) { + exampleObj := example.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: "example", + }, + Spec: example.PodSpec{ + ServiceAccountName: "example", + }, + } + + raw, err := json.Marshal(exampleObj) + require.NoError(t, err) + + expectedAR := &admissionv1.AdmissionReview{ + TypeMeta: metav1.TypeMeta{ + Kind: "AdmissionReview", + APIVersion: admissionv1.SchemeGroupVersion.String(), + }, + Request: &admissionv1.AdmissionRequest{ + UID: "1234", + Kind: metav1.GroupVersionKind{Group: "example.k8s.io", Version: "v1", Kind: "Pod"}, + Resource: metav1.GroupVersionResource{Group: "example.k8s.io", Version: "v1", Resource: "pods"}, + Operation: admissionv1.Create, + UserInfo: v1.UserInfo{}, + Object: runtime.RawExtension{Raw: raw}, + OldObject: runtime.RawExtension{}, + DryRun: new(bool), + }, + } + + body, err := json.Marshal(expectedAR) + require.NoError(t, err) + + t.Run("should parse request", func(t *testing.T) { + req, err := http.NewRequest("POST", "/admission", bytes.NewBuffer(body)) + require.NoError(t, err) + req.Header.Set("Content-Type", "application/json") + + ar, err := admission.ParseRequest(admission.GetCodecs(), req) + if err != nil { + t.Fatalf("failed to parse request: %v", err) + } + + require.Equal(t, expectedAR, ar) + }) +} + +func TestToAdmissionRequest(t *testing.T) { + pluginCtx := backend.PluginContext{} + admissionReview := &admissionv1.AdmissionReview{ + Request: &admissionv1.AdmissionRequest{ + Operation: admissionv1.Update, + Kind: metav1.GroupVersionKind{ + Group: "example.k8s.io", + Version: "v1", + Kind: "Pod", + }, + Object: runtime.RawExtension{ + Raw: []byte(`{"foo":"bar"}`), + }, + OldObject: runtime.RawExtension{ + Raw: []byte(`{"bar":"foo"}`), + }, + }, + } + + expectedAdmissionRequest := &backend.AdmissionRequest{ + PluginContext: pluginCtx, + Operation: backend.AdmissionRequestUpdate, + Kind: backend.GroupVersionKind{Group: "example.k8s.io", Version: "v1", Kind: "Pod"}, + ObjectBytes: []byte(`{"foo":"bar"}`), + OldObjectBytes: []byte(`{"bar":"foo"}`), + } + + admissionRequest, err := admission.ToAdmissionRequest(pluginCtx, admissionReview) + require.NoError(t, err) + require.Equal(t, expectedAdmissionRequest, admissionRequest) +} diff --git a/pkg/aggregator/apiserver/plugin/admission/mutation.go b/pkg/aggregator/apiserver/plugin/admission/mutation.go new file mode 100644 index 00000000000..07a017e0c29 --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/mutation.go @@ -0,0 +1,56 @@ +package admission + +import ( + "encoding/json" + "errors" + "net/http" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/mattbaird/jsonpatch" + admissionv1 "k8s.io/api/admission/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +func FromMutationResponse(current []byte, r *backend.MutationResponse) (*admissionv1.AdmissionReview, error) { + res := &admissionv1.AdmissionReview{ + Response: &admissionv1.AdmissionResponse{ + Allowed: r.Allowed, + Warnings: r.Warnings, + }, + } + + if !r.Allowed { + res.Response.Result = &metav1.Status{ + Status: metav1.StatusFailure, + Message: "Internal error", + Reason: metav1.StatusReasonInternalError, + Code: http.StatusInternalServerError, + } + if r.Result != nil { + res.Response.Result.Message = r.Result.Message + res.Response.Result.Reason = metav1.StatusReason(r.Result.Reason) + res.Response.Result.Code = r.Result.Code + } + return res, nil + } + + if r.Allowed && len(r.ObjectBytes) == 0 { + return nil, errors.New("empty mutation response object bytes") + } + + patch, err := jsonpatch.CreatePatch(current, r.ObjectBytes) + if err != nil { + return nil, err + } + + raw, err := json.Marshal(patch) + if err != nil { + return nil, err + } + + res.Response.Patch = raw + pt := admissionv1.PatchTypeJSONPatch + res.Response.PatchType = &pt + + return res, nil +} diff --git a/pkg/aggregator/apiserver/plugin/admission/mutation_test.go b/pkg/aggregator/apiserver/plugin/admission/mutation_test.go new file mode 100644 index 00000000000..c89dac4ee0a --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/mutation_test.go @@ -0,0 +1,99 @@ +package admission_test + +import ( + "testing" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/admission" + "github.com/stretchr/testify/require" + admissionv1 "k8s.io/api/admission/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +func TestFromMutationResponse(t *testing.T) { + warnings := []string{"warning 1", "warning 2"} + + exampleObj := []byte(`{"key": "value"}`) + + result := &backend.StatusResult{ + Status: "Failure", + Message: "message", + Reason: "reason", + Code: 200, + } + + t.Run("should return expected patch", func(t *testing.T) { + response := &backend.MutationResponse{ + Allowed: true, + Warnings: warnings, + ObjectBytes: []byte(`{"key": "value2"}`), + } + pt := admissionv1.PatchTypeJSONPatch + expectedAdmissionResponse := &admissionv1.AdmissionResponse{ + Allowed: true, + Warnings: warnings, + Patch: []byte(`[{"op":"replace","path":"/key","value":"value2"}]`), + PatchType: &pt, + } + expectedAdmissionReview := &admissionv1.AdmissionReview{ + Response: expectedAdmissionResponse, + } + actualAdmissionReview, err := admission.FromMutationResponse(exampleObj, response) + require.NoError(t, err) + require.Equal(t, expectedAdmissionReview, actualAdmissionReview) + }) + + t.Run("should error if MutationResponse has empty ObjectBytes", func(t *testing.T) { + response := &backend.MutationResponse{ + Allowed: true, + Warnings: warnings, + } + _, err := admission.FromMutationResponse(exampleObj, response) + require.Error(t, err) + }) + + t.Run("should include Result in AdmissionResponse when not allowed", func(t *testing.T) { + response := &backend.MutationResponse{ + Allowed: false, + Warnings: warnings, + Result: result, + } + expectedAdmissionResponse := &admissionv1.AdmissionResponse{ + Allowed: false, + Warnings: warnings, + Result: &metav1.Status{ + Status: result.Status, + Message: result.Message, + Reason: metav1.StatusReason(result.Reason), + Code: result.Code, + }, + } + expectedAdmissionReview := &admissionv1.AdmissionReview{ + Response: expectedAdmissionResponse, + } + actualAdmissionReview, err := admission.FromMutationResponse(exampleObj, response) + require.NoError(t, err) + require.Equal(t, expectedAdmissionReview, actualAdmissionReview) + }) + + t.Run("should handle nil Warnings and Result", func(t *testing.T) { + response := &backend.MutationResponse{ + Allowed: false, + } + expectedAdmissionResponse := &admissionv1.AdmissionResponse{ + Allowed: false, + Result: &metav1.Status{ + Status: metav1.StatusFailure, + Message: "Internal error", + Reason: metav1.StatusReasonInternalError, + Code: 500, + }, + } + expectedAdmissionReview := &admissionv1.AdmissionReview{ + Response: expectedAdmissionResponse, + } + actualAdmissionReview, err := admission.FromMutationResponse(exampleObj, response) + require.NoError(t, err) + require.Equal(t, expectedAdmissionReview, actualAdmissionReview) + }) +} diff --git a/pkg/aggregator/apiserver/plugin/admission/scheme.go b/pkg/aggregator/apiserver/plugin/admission/scheme.go new file mode 100644 index 00000000000..2738347fcdf --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/scheme.go @@ -0,0 +1,15 @@ +package admission + +import ( + admissionv1 "k8s.io/api/admission/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" +) + +func GetCodecs() serializer.CodecFactory { + scheme := runtime.NewScheme() + codecs := serializer.NewCodecFactory(scheme) + utilruntime.Must(admissionv1.AddToScheme(scheme)) + return codecs +} diff --git a/pkg/aggregator/apiserver/plugin/admission/validation.go b/pkg/aggregator/apiserver/plugin/admission/validation.go new file mode 100644 index 00000000000..6f181710bed --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/validation.go @@ -0,0 +1,36 @@ +package admission + +import ( + "net/http" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + admissionv1 "k8s.io/api/admission/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +func FromValidationResponse(r *backend.ValidationResponse) *admissionv1.AdmissionReview { + res := &admissionv1.AdmissionResponse{ + Allowed: r.Allowed, + Warnings: r.Warnings, + } + + if !r.Allowed { + res.Result = &metav1.Status{ + Status: metav1.StatusFailure, + Message: "Internal error", + Reason: metav1.StatusReasonInternalError, + Code: http.StatusInternalServerError, + } + if r.Result != nil { + res.Result.Message = r.Result.Message + res.Result.Reason = metav1.StatusReason(r.Result.Reason) + res.Result.Code = r.Result.Code + } + } + + resAR := &admissionv1.AdmissionReview{ + Response: res, + } + + return resAR +} diff --git a/pkg/aggregator/apiserver/plugin/admission/validation_test.go b/pkg/aggregator/apiserver/plugin/admission/validation_test.go new file mode 100644 index 00000000000..8e5228262a4 --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission/validation_test.go @@ -0,0 +1,82 @@ +package admission_test + +import ( + "testing" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/admission" + "github.com/stretchr/testify/require" + admissionv1 "k8s.io/api/admission/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +func TestFromValidationResponse(t *testing.T) { + warnings := []string{"warning 1", "warning 2"} + + result := &backend.StatusResult{ + Status: "Failure", + Message: "message", + Reason: "reason", + Code: 200, + } + + t.Run("should include Result in AdmissionResponse when not allowed", func(t *testing.T) { + response := &backend.ValidationResponse{ + Allowed: false, + Warnings: warnings, + Result: result, + } + expectedAdmissionResponse := &admissionv1.AdmissionResponse{ + Allowed: false, + Warnings: warnings, + Result: &metav1.Status{ + Status: result.Status, + Message: result.Message, + Reason: metav1.StatusReason(result.Reason), + Code: result.Code, + }, + } + expectedAdmissionReview := &admissionv1.AdmissionReview{ + Response: expectedAdmissionResponse, + } + actualAdmissionReview := admission.FromValidationResponse(response) + require.Equal(t, expectedAdmissionReview, actualAdmissionReview) + }) + + t.Run("should not include Result in AdmissionResponse when allowed", func(t *testing.T) { + response := &backend.ValidationResponse{ + Allowed: true, + Warnings: warnings, + Result: result, + } + expectedAdmissionResponse := &admissionv1.AdmissionResponse{ + Allowed: true, + Warnings: warnings, + } + expectedAdmissionReview := &admissionv1.AdmissionReview{ + Response: expectedAdmissionResponse, + } + actualAdmissionReview := admission.FromValidationResponse(response) + require.Equal(t, expectedAdmissionReview, actualAdmissionReview) + }) + + t.Run("should handle nil Warnings and Result", func(t *testing.T) { + response := &backend.ValidationResponse{ + Allowed: false, + } + expectedAdmissionResponse := &admissionv1.AdmissionResponse{ + Allowed: false, + Result: &metav1.Status{ + Status: metav1.StatusFailure, + Message: "Internal error", + Reason: metav1.StatusReasonInternalError, + Code: 500, + }, + } + expectedAdmissionReview := &admissionv1.AdmissionReview{ + Response: expectedAdmissionResponse, + } + actualAdmissionReview := admission.FromValidationResponse(response) + require.Equal(t, expectedAdmissionReview, actualAdmissionReview) + }) +} diff --git a/pkg/aggregator/apiserver/plugin/admission_test.go b/pkg/aggregator/apiserver/plugin/admission_test.go new file mode 100644 index 00000000000..a90aca0f29a --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/admission_test.go @@ -0,0 +1,218 @@ +package plugin + +import ( + "bytes" + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "testing" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + admissionv1 "k8s.io/api/admission/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + + "github.com/grafana/grafana/pkg/aggregator/apis/aggregation/v0alpha1" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/fakes" +) + +func TestAdmissionMutation(t *testing.T) { + dps := v0alpha1.DataPlaneService{ + Spec: v0alpha1.DataPlaneServiceSpec{ + PluginID: "testds", + Group: "testds.example.com", + Version: "v1", + Services: []v0alpha1.Service{ + { + Type: v0alpha1.AdmissionControlServiceType, + }, + }, + }, + } + + pluginContext := backend.PluginContext{ + DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{ + ID: 1, + }, + } + contextProvider := &fakes.FakePluginContextProvider{ + PluginContext: pluginContext, + } + + admissionReview := &admissionv1.AdmissionReview{ + TypeMeta: metav1.TypeMeta{ + Kind: "AdmissionReview", + APIVersion: admissionv1.SchemeGroupVersion.String(), + }, + Request: &admissionv1.AdmissionRequest{ + UID: "1234", + Operation: admissionv1.Update, + Kind: metav1.GroupVersionKind{ + Group: "example.k8s.io", + Version: "v1", + Kind: "Pod", + }, + Object: runtime.RawExtension{ + Raw: []byte(`{"foo":"bar"}`), + }, + OldObject: runtime.RawExtension{ + Raw: []byte(`{"bar":"foo"}`), + }, + }, + } + + pluginRes := &backend.MutationResponse{ + Allowed: true, + ObjectBytes: []byte(`{"foo": "foo"}`), + } + + jsonAdmissionReview, err := json.Marshal(admissionReview) + require.NoError(t, err) + + pc := &fakes.FakePluginClient{ + MutateAdmissionFunc: newFakeMutateAdmissionHandler(pluginRes, nil), + } + + delegate := fakes.NewFakeHTTPHandler(http.StatusNotFound, []byte(`Not Found`)) + handler := NewPluginHandler(pc, dps, contextProvider, delegate) + + t.Run("should return mutation response", func(t *testing.T) { + req, err := http.NewRequest("POST", "/apis/testds.example.com/v1/admission/mutate", bytes.NewBuffer(jsonAdmissionReview)) + assert.NoError(t, err) + req.Header.Set("Content-Type", "application/json") + + rr := httptest.NewRecorder() + handler.ServeHTTP(rr, req) + + assert.Equal(t, http.StatusOK, rr.Code) + pt := admissionv1.PatchTypeJSONPatch + expectedRes := &admissionv1.AdmissionReview{ + TypeMeta: metav1.TypeMeta{ + Kind: "AdmissionReview", + APIVersion: admissionv1.SchemeGroupVersion.String(), + }, + Response: &admissionv1.AdmissionResponse{ + UID: admissionReview.Request.UID, + Allowed: true, + Patch: []byte(`[{"op":"replace","path":"/foo","value":"foo"}]`), + PatchType: &pt, + }, + } + actualRes := &admissionv1.AdmissionReview{} + assert.NoError(t, json.NewDecoder(rr.Body).Decode(actualRes)) + require.Equal(t, expectedRes, actualRes) + }) +} + +func TestAdmissionValidation(t *testing.T) { + dps := v0alpha1.DataPlaneService{ + Spec: v0alpha1.DataPlaneServiceSpec{ + PluginID: "testds", + Group: "testds.example.com", + Version: "v1", + Services: []v0alpha1.Service{ + { + Type: v0alpha1.AdmissionControlServiceType, + }, + }, + }, + } + + pluginContext := backend.PluginContext{ + DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{ + ID: 1, + }, + } + contextProvider := &fakes.FakePluginContextProvider{ + PluginContext: pluginContext, + } + + admissionReview := &admissionv1.AdmissionReview{ + TypeMeta: metav1.TypeMeta{ + Kind: "AdmissionReview", + APIVersion: admissionv1.SchemeGroupVersion.String(), + }, + Request: &admissionv1.AdmissionRequest{ + UID: "1234", + Operation: admissionv1.Update, + Kind: metav1.GroupVersionKind{ + Group: "example.k8s.io", + Version: "v1", + Kind: "Pod", + }, + Object: runtime.RawExtension{ + Raw: []byte(`{"foo":"bar"}`), + }, + OldObject: runtime.RawExtension{ + Raw: []byte(`{"bar":"foo"}`), + }, + }, + } + + pluginRes := &backend.ValidationResponse{ + Allowed: false, + Result: &backend.StatusResult{ + Status: "Failure", + Message: "message", + Reason: "NotFound", + Code: 404, + }, + Warnings: []string{"warning 1", "warning 2"}, + } + + jsonAdmissionReview, err := json.Marshal(admissionReview) + require.NoError(t, err) + + pc := &fakes.FakePluginClient{ + ValidateAdmissionFunc: newFakeValidateAdmissionHandler(pluginRes, nil), + } + + delegate := fakes.NewFakeHTTPHandler(http.StatusNotFound, []byte(`Not Found`)) + handler := NewPluginHandler(pc, dps, contextProvider, delegate) + + t.Run("should return validation response", func(t *testing.T) { + req, err := http.NewRequest("POST", "/apis/testds.example.com/v1/admission/validate", bytes.NewBuffer(jsonAdmissionReview)) + assert.NoError(t, err) + req.Header.Set("Content-Type", "application/json") + + rr := httptest.NewRecorder() + handler.ServeHTTP(rr, req) + + assert.Equal(t, http.StatusOK, rr.Code) + expectedRes := &admissionv1.AdmissionReview{ + TypeMeta: metav1.TypeMeta{ + Kind: "AdmissionReview", + APIVersion: admissionv1.SchemeGroupVersion.String(), + }, + Response: &admissionv1.AdmissionResponse{ + UID: admissionReview.Request.UID, + Allowed: false, + Result: &metav1.Status{ + Status: metav1.StatusFailure, + Message: "message", + Reason: metav1.StatusReasonNotFound, + Code: 404, + }, + Warnings: pluginRes.Warnings, + }, + } + actualRes := &admissionv1.AdmissionReview{} + assert.NoError(t, json.NewDecoder(rr.Body).Decode(actualRes)) + require.Equal(t, expectedRes, actualRes) + }) +} + +func newFakeMutateAdmissionHandler(response *backend.MutationResponse, err error) backend.MutateAdmissionFunc { + return func(ctx context.Context, req *backend.AdmissionRequest) (*backend.MutationResponse, error) { + return response, err + } +} + +func newFakeValidateAdmissionHandler(response *backend.ValidationResponse, err error) backend.ValidateAdmissionFunc { + return func(ctx context.Context, req *backend.AdmissionRequest) (*backend.ValidationResponse, error) { + return response, err + } +} diff --git a/pkg/aggregator/apiserver/plugin/fakes/client.go b/pkg/aggregator/apiserver/plugin/fakes/client.go new file mode 100644 index 00000000000..2b177ca4c7f --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/fakes/client.go @@ -0,0 +1,38 @@ +package fakes + +import ( + "context" + "errors" + + "github.com/grafana/grafana-plugin-sdk-go/backend" +) + +type FakePluginClient struct { + backend.QueryDataHandlerFunc + backend.MutateAdmissionFunc + backend.ValidateAdmissionFunc +} + +func (pc *FakePluginClient) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { + if pc.QueryDataHandlerFunc != nil { + return pc.QueryDataHandlerFunc(ctx, req) + } + + return nil, errors.New("QueryDataHandlerFunc not implemented") +} + +func (pc *FakePluginClient) ValidateAdmission(ctx context.Context, req *backend.AdmissionRequest) (*backend.ValidationResponse, error) { + if pc.ValidateAdmissionFunc != nil { + return pc.ValidateAdmissionFunc(ctx, req) + } + + return nil, errors.New("ValidateAdmissionFunc not implemented") +} + +func (pc *FakePluginClient) MutateAdmission(ctx context.Context, req *backend.AdmissionRequest) (*backend.MutationResponse, error) { + if pc.MutateAdmissionFunc != nil { + return pc.MutateAdmissionFunc(ctx, req) + } + + return nil, errors.New("MutateAdmissionFunc not implemented") +} diff --git a/pkg/aggregator/apiserver/plugin/fakes/http.go b/pkg/aggregator/apiserver/plugin/fakes/http.go new file mode 100644 index 00000000000..64961113da6 --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/fakes/http.go @@ -0,0 +1,13 @@ +package fakes + +import "net/http" + +func NewFakeHTTPHandler(status int, res []byte) http.HandlerFunc { + return func(w http.ResponseWriter, req *http.Request) { + w.WriteHeader(status) + _, err := w.Write(res) + if err != nil { + panic(err) + } + } +} diff --git a/pkg/aggregator/apiserver/plugin/fakes/plugin_context.go b/pkg/aggregator/apiserver/plugin/fakes/plugin_context.go new file mode 100644 index 00000000000..530e2b774da --- /dev/null +++ b/pkg/aggregator/apiserver/plugin/fakes/plugin_context.go @@ -0,0 +1,16 @@ +package fakes + +import ( + "context" + + "github.com/grafana/grafana-plugin-sdk-go/backend" +) + +type FakePluginContextProvider struct { + PluginContext backend.PluginContext + Err error +} + +func (f FakePluginContextProvider) GetPluginContext(ctx context.Context, pluginID, dsUID string) (backend.PluginContext, error) { + return f.PluginContext, f.Err +} diff --git a/pkg/aggregator/apiserver/plugin/handler.go b/pkg/aggregator/apiserver/plugin/handler.go index 162d73bfce2..cd09bf45efb 100644 --- a/pkg/aggregator/apiserver/plugin/handler.go +++ b/pkg/aggregator/apiserver/plugin/handler.go @@ -6,15 +6,15 @@ import ( "path" "github.com/grafana/grafana-plugin-sdk-go/backend" + "k8s.io/apimachinery/pkg/runtime/serializer" aggregationv0alpha1 "github.com/grafana/grafana/pkg/aggregator/apis/aggregation/v0alpha1" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/admission" ) type PluginClient interface { backend.QueryDataHandler - backend.StreamHandler backend.AdmissionHandler - backend.CallResourceHandler } type PluginContextProvider interface { @@ -29,6 +29,8 @@ type PluginHandler struct { pluginContextProvider PluginContextProvider dataplaneService aggregationv0alpha1.DataPlaneService + + admissionCodecs serializer.CodecFactory } func NewPluginHandler( @@ -43,6 +45,7 @@ func NewPluginHandler( client: client, pluginContextProvider: pluginContextProvider, dataplaneService: dataplaneService, + admissionCodecs: admission.GetCodecs(), } h.registerRoutes() return h @@ -54,7 +57,8 @@ func (h *PluginHandler) registerRoutes() { for _, service := range h.dataplaneService.Spec.Services { switch service.Type { case aggregationv0alpha1.AdmissionControlServiceType: - // TODO: implement in future PR + h.mux.Handle(proxyPath("/admission/mutate"), h.AdmissionMutationHandler()) + h.mux.Handle(proxyPath("/admission/validate"), h.AdmissionValidationHandler()) case aggregationv0alpha1.ConversionServiceType: // TODO: implement in future PR case aggregationv0alpha1.DataSourceProxyServiceType: diff --git a/pkg/aggregator/apiserver/plugin/query_test.go b/pkg/aggregator/apiserver/plugin/query_test.go index 7b28c7b4214..97bfabb3a08 100644 --- a/pkg/aggregator/apiserver/plugin/query_test.go +++ b/pkg/aggregator/apiserver/plugin/query_test.go @@ -14,7 +14,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/data" datav0alpha1 "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1" "github.com/grafana/grafana/pkg/aggregator/apis/aggregation/v0alpha1" - "github.com/grafana/grafana/pkg/plugins/manager/fakes" + "github.com/grafana/grafana/pkg/aggregator/apiserver/plugin/fakes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -38,8 +38,8 @@ func TestQueryDataHandler(t *testing.T) { ID: 1, }, } - contextProvider := &fakePluginContextProvider{ - pluginContext: pluginContext, + contextProvider := &fakes.FakePluginContextProvider{ + PluginContext: pluginContext, } res := &backend.QueryDataResponse{ @@ -58,7 +58,7 @@ func TestQueryDataHandler(t *testing.T) { QueryDataHandlerFunc: newfakeQueryDataHandler(res, nil), } - delegate := newFakeHTTPHandler(http.StatusNotFound, []byte(`Not Found`)) + delegate := fakes.NewFakeHTTPHandler(http.StatusNotFound, []byte(`Not Found`)) handler := NewPluginHandler(pc, dps, contextProvider, delegate) qdr := datav0alpha1.QueryDataRequest{ @@ -176,27 +176,8 @@ func TestQueryDataHandler(t *testing.T) { }) } -type fakePluginContextProvider struct { - pluginContext backend.PluginContext - err error -} - -func (f fakePluginContextProvider) GetPluginContext(ctx context.Context, pluginID, dsUID string) (backend.PluginContext, error) { - return f.pluginContext, f.err -} - func newfakeQueryDataHandler(res *backend.QueryDataResponse, err error) backend.QueryDataHandlerFunc { return func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { return res, err } } - -func newFakeHTTPHandler(status int, res []byte) http.HandlerFunc { - return func(w http.ResponseWriter, req *http.Request) { - w.WriteHeader(status) - _, err := w.Write(res) - if err != nil { - panic(err) - } - } -} diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index c21658e3896..55398f00f5e 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,12 +1,13 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.22.4 +go 1.23.0 require ( github.com/emicklei/go-restful/v3 v3.11.0 - github.com/grafana/grafana-plugin-sdk-go v0.243.0 + github.com/grafana/grafana-plugin-sdk-go v0.244.0 github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808213237-f4d2e064f435 github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 + github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel v1.28.0 k8s.io/api v0.31.0 @@ -36,6 +37,7 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -75,8 +77,9 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattetti/filebuffer v1.0.1 // indirect @@ -94,7 +97,7 @@ require ( github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect @@ -133,16 +136,16 @@ require ( golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/term v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect - golang.org/x/time v0.5.0 // indirect + golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.22.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/pkg/aggregator/go.sum b/pkg/aggregator/go.sum index 1b3a878d367..365a5e0f8df 100644 --- a/pkg/aggregator/go.sum +++ b/pkg/aggregator/go.sum @@ -53,6 +53,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= @@ -128,7 +130,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grafana/grafana-plugin-sdk-go v0.243.0 h1:Xrkv7rN0aL5AK7b8zVsuD0ryCJX4HlaXUGGKjMuHeL4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808213237-f4d2e064f435 h1:lmw60EW7JWlAEvgggktOyVkH4hF1m/+LSF/Ap0NCyi8= github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808213237-f4d2e064f435/go.mod h1:ORVFiW/KNRY52lNjkGwnFWCxNVfE97bJG2jr2fetq0I= github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 h1:SNEeqY22DrGr5E9kGF1mKSqlOom14W9+b1u4XEGJowA= @@ -136,6 +139,7 @@ github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435/go.mod github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= @@ -175,8 +179,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -187,10 +191,14 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38 h1:hQWBtNqRYrI7CWIaUSXXtNKR90KzcUA5uiuxFVWw7sU= +github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0= github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM= github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -239,8 +247,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -344,6 +352,7 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1: go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -401,6 +410,7 @@ golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -424,16 +434,16 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -451,8 +461,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -460,12 +470,12 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= diff --git a/pkg/api/folder_bench_test.go b/pkg/api/folder_bench_test.go index dc4a844254b..059a0260287 100644 --- a/pkg/api/folder_bench_test.go +++ b/pkg/api/folder_bench_test.go @@ -31,7 +31,6 @@ import ( "github.com/grafana/grafana/pkg/services/contexthandler/ctxkey" contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model" "github.com/grafana/grafana/pkg/services/dashboards" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/dashboards/database" dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service" "github.com/grafana/grafana/pkg/services/featuremgmt" @@ -261,7 +260,7 @@ func setupDB(b testing.TB) benchScenario { UserID: userID, TeamID: teamID, OrgID: orgID, - Permission: dashboardaccess.PERMISSION_VIEW, + Permission: team.PermissionTypeMember, Created: now, Updated: now, }) diff --git a/pkg/api/frontend_logging.go b/pkg/api/frontend_logging.go index 7ad646fc815..a71c9d3ae0c 100644 --- a/pkg/api/frontend_logging.go +++ b/pkg/api/frontend_logging.go @@ -30,7 +30,7 @@ func GrafanaJavascriptAgentLogMessageHandler(store *frontendlogging.SourceMapSto // Meta object is standard across event types, adding it globally. - if event.Logs != nil && len(event.Logs) > 0 { + if len(event.Logs) > 0 { for _, logEntry := range event.Logs { var ctx = frontendlogging.CtxVector{} ctx = event.AddMetaToContext(ctx) @@ -64,7 +64,7 @@ func GrafanaJavascriptAgentLogMessageHandler(store *frontendlogging.SourceMapSto } } - if event.Measurements != nil && len(event.Measurements) > 0 { + if len(event.Measurements) > 0 { for _, measurementEntry := range event.Measurements { for measurementName, measurementValue := range measurementEntry.Values { var ctx = frontendlogging.CtxVector{} @@ -75,7 +75,7 @@ func GrafanaJavascriptAgentLogMessageHandler(store *frontendlogging.SourceMapSto } } } - if event.Exceptions != nil && len(event.Exceptions) > 0 { + if len(event.Exceptions) > 0 { for _, exception := range event.Exceptions { var ctx = frontendlogging.CtxVector{} ctx = event.AddMetaToContext(ctx) diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index c8e1170454c..9bf8c35ef75 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -274,7 +274,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro PluginAdminExternalManageEnabled: hs.Cfg.PluginAdminEnabled && hs.Cfg.PluginAdminExternalManageEnabled, PluginCatalogHiddenPlugins: hs.Cfg.PluginCatalogHiddenPlugins, PluginCatalogManagedPlugins: hs.managedPluginsService.ManagedPlugins(c.Req.Context()), - PluginCatalogPreinstalledPlugins: hs.Cfg.InstallPlugins, + PluginCatalogPreinstalledPlugins: hs.Cfg.PreinstallPlugins, ExpressionsEnabled: hs.Cfg.ExpressionsEnabled, AwsAllowedAuthProviders: hs.Cfg.AWSAllowedAuthProviders, AwsAssumeRoleEnabled: hs.Cfg.AWSAssumeRoleEnabled, diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go index 70d77d68bb0..746b3c9a3f4 100644 --- a/pkg/api/pluginproxy/ds_proxy.go +++ b/pkg/api/pluginproxy/ds_proxy.go @@ -271,9 +271,7 @@ func (proxy *DataSourceProxy) director(req *http.Request) { } } - if proxy.features.IsEnabled(req.Context(), featuremgmt.FlagIdForwarding) { - proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser) - } + proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser) } func (proxy *DataSourceProxy) validateRequest() error { diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go index dd5f36a3cb9..8288c15276f 100644 --- a/pkg/api/pluginproxy/pluginproxy.go +++ b/pkg/api/pluginproxy/pluginproxy.go @@ -185,10 +185,7 @@ func (proxy PluginProxy) director(req *http.Request) { req.Header.Set("X-Grafana-Context", string(ctxJSON)) proxyutil.ApplyUserHeader(proxy.cfg.SendUserHeader, req, proxy.ctx.SignedInUser) - - if proxy.features.IsEnabled(req.Context(), featuremgmt.FlagIdForwarding) { - proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser) - } + proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser) if err := addHeaders(&req.Header, proxy.matchedRoute, data); err != nil { proxy.ctx.JsonApiErr(500, "Failed to render plugin headers", err) diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go index 6b25d977ff1..0bbb49b7b47 100644 --- a/pkg/api/plugins.go +++ b/pkg/api/plugins.go @@ -458,7 +458,7 @@ func (hs *HTTPServer) InstallPlugin(c *contextmodel.ReqContext) response.Respons hs.log.Info("Plugin install/update requested", "pluginId", pluginID, "user", c.Login) - for _, preinstalled := range hs.Cfg.InstallPlugins { + for _, preinstalled := range hs.Cfg.PreinstallPlugins { if preinstalled.ID == pluginID && preinstalled.Version != "" { return response.Error(http.StatusConflict, "Cannot update a pinned pre-installed plugin", nil) } @@ -502,7 +502,7 @@ func (hs *HTTPServer) UninstallPlugin(c *contextmodel.ReqContext) response.Respo return response.Error(http.StatusNotFound, "Plugin not installed", nil) } - for _, preinstalled := range hs.Cfg.InstallPlugins { + for _, preinstalled := range hs.Cfg.PreinstallPlugins { if preinstalled.ID == pluginID { return response.Error(http.StatusConflict, "Cannot uninstall a pre-installed plugin", nil) } diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go index d1d44affb75..fd1ad0df80f 100644 --- a/pkg/api/plugins_test.go +++ b/pkg/api/plugins_test.go @@ -95,7 +95,7 @@ func Test_PluginsInstallAndUninstall(t *testing.T) { hs.Cfg.PluginAdminEnabled = tc.pluginAdminEnabled hs.Cfg.PluginAdminExternalManageEnabled = tc.pluginAdminExternalManageEnabled hs.Cfg.RBAC.SingleOrganization = tc.singleOrganization - hs.Cfg.InstallPlugins = []setting.InstallPlugin{{ID: "grafana-preinstalled-datasource", Version: "1.0.0"}} + hs.Cfg.PreinstallPlugins = []setting.InstallPlugin{{ID: "grafana-preinstalled-datasource", Version: "1.0.0"}} hs.orgService = &orgtest.FakeOrgService{ExpectedOrg: &org.Org{}} hs.accesscontrolService = &actest.FakeService{} diff --git a/pkg/api/quota.go b/pkg/api/quota.go index 42be8ac2a54..58ff3b11ca6 100644 --- a/pkg/api/quota.go +++ b/pkg/api/quota.go @@ -47,7 +47,9 @@ func (hs *HTTPServer) GetOrgQuotas(c *contextmodel.ReqContext) response.Response } func (hs *HTTPServer) getOrgQuotasHelper(c *contextmodel.ReqContext, orgID int64) response.Response { - q, err := hs.QuotaService.GetQuotasByScope(c.Req.Context(), quota.OrgScope, orgID) + ctx, span := hs.tracer.Start(c.Req.Context(), "api.getOrgQuotasHelper") + defer span.End() + q, err := hs.QuotaService.GetQuotasByScope(ctx, quota.OrgScope, orgID) if err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "failed to get quota", err) } @@ -70,6 +72,8 @@ func (hs *HTTPServer) getOrgQuotasHelper(c *contextmodel.ReqContext, orgID int64 // 404: notFoundError // 500: internalServerError func (hs *HTTPServer) UpdateOrgQuota(c *contextmodel.ReqContext) response.Response { + ctx, span := hs.tracer.Start(c.Req.Context(), "api.UpdateOrgQuota") + defer span.End() cmd := quota.UpdateQuotaCmd{} var err error if err := web.Bind(c.Req, &cmd); err != nil { @@ -81,7 +85,7 @@ func (hs *HTTPServer) UpdateOrgQuota(c *contextmodel.ReqContext) response.Respon } cmd.Target = web.Params(c.Req)[":target"] - if err := hs.QuotaService.Update(c.Req.Context(), &cmd); err != nil { + if err := hs.QuotaService.Update(ctx, &cmd); err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "Failed to update org quotas", err) } return response.Success("Organization quota updated") @@ -114,12 +118,14 @@ func (hs *HTTPServer) UpdateOrgQuota(c *contextmodel.ReqContext) response.Respon // 404: notFoundError // 500: internalServerError func (hs *HTTPServer) GetUserQuotas(c *contextmodel.ReqContext) response.Response { + ctx, span := hs.tracer.Start(c.Req.Context(), "api.GetUserQuotas") + defer span.End() id, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64) if err != nil { return response.Err(quota.ErrBadRequest.Errorf("id is invalid: %w", err)) } - q, err := hs.QuotaService.GetQuotasByScope(c.Req.Context(), quota.UserScope, id) + q, err := hs.QuotaService.GetQuotasByScope(ctx, quota.UserScope, id) if err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "Failed to get org quotas", err) } @@ -143,6 +149,8 @@ func (hs *HTTPServer) GetUserQuotas(c *contextmodel.ReqContext) response.Respons // 404: notFoundError // 500: internalServerError func (hs *HTTPServer) UpdateUserQuota(c *contextmodel.ReqContext) response.Response { + ctx, span := hs.tracer.Start(c.Req.Context(), "api.UpdateUserQuota") + defer span.End() cmd := quota.UpdateQuotaCmd{} var err error if err := web.Bind(c.Req, &cmd); err != nil { @@ -154,7 +162,7 @@ func (hs *HTTPServer) UpdateUserQuota(c *contextmodel.ReqContext) response.Respo } cmd.Target = web.Params(c.Req)[":target"] - if err := hs.QuotaService.Update(c.Req.Context(), &cmd); err != nil { + if err := hs.QuotaService.Update(ctx, &cmd); err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "Failed to update org quotas", err) } return response.Success("Organization quota updated") diff --git a/pkg/api/webassets/webassets.go b/pkg/api/webassets/webassets.go index 777dede6db1..44447a911ad 100644 --- a/pkg/api/webassets/webassets.go +++ b/pkg/api/webassets/webassets.go @@ -121,17 +121,17 @@ func readWebAssets(r io.Reader) (*dtos.EntryPointAssets, error) { } if entryPoints.App == nil || len(entryPoints.App.Assets.JS) == 0 { - return nil, fmt.Errorf("missing app entry") + return nil, fmt.Errorf("missing app entry, try running `yarn build`") } if entryPoints.Dark == nil || len(entryPoints.Dark.Assets.CSS) == 0 { - return nil, fmt.Errorf("missing dark entry") + return nil, fmt.Errorf("missing dark entry, try running `yarn build`") } if entryPoints.Light == nil || len(entryPoints.Light.Assets.CSS) == 0 { - return nil, fmt.Errorf("missing light entry") + return nil, fmt.Errorf("missing light entry, try running `yarn build`") + } + if entryPoints.Swagger == nil || len(entryPoints.Swagger.Assets.JS) == 0 { + return nil, fmt.Errorf("missing swagger entry, try running `yarn build`") } - // if entryPoints.Swagger == nil || len(entryPoints.Swagger.Assets.JS) == 0 { - // return nil, fmt.Errorf("missing swagger entry") - // } rsp := &dtos.EntryPointAssets{ JSFiles: make([]dtos.EntryPointAsset, 0, len(entryPoints.App.Assets.JS)), diff --git a/pkg/apimachinery/apis/common/v0alpha1/unstructured.go b/pkg/apimachinery/apis/common/v0alpha1/unstructured.go index 3a735623a68..af26531c59a 100644 --- a/pkg/apimachinery/apis/common/v0alpha1/unstructured.go +++ b/pkg/apimachinery/apis/common/v0alpha1/unstructured.go @@ -101,6 +101,14 @@ func (u *Unstructured) GetNestedString(fields ...string) string { return val } +func (u *Unstructured) GetNestedBool(fields ...string) bool { + val, found, err := unstructured.NestedBool(u.Object, fields...) + if !found || err != nil { + return false + } + return val +} + func (u *Unstructured) GetNestedStringSlice(fields ...string) []string { val, found, err := unstructured.NestedStringSlice(u.Object, fields...) if !found || err != nil { diff --git a/pkg/apimachinery/apis/identity/v0alpha1/types.go b/pkg/apimachinery/apis/identity/v0alpha1/types.go deleted file mode 100644 index 05c286d79ac..00000000000 --- a/pkg/apimachinery/apis/identity/v0alpha1/types.go +++ /dev/null @@ -1,101 +0,0 @@ -package v0alpha1 - -import ( - "github.com/grafana/authlib/claims" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type User struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec UserSpec `json:"spec,omitempty"` -} - -type UserSpec struct { - Name string `json:"name,omitempty"` - Login string `json:"login,omitempty"` - Email string `json:"email,omitempty"` - EmailVerified bool `json:"emailVerified,omitempty"` - Disabled bool `json:"disabled,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type UserList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - - Items []User `json:"items,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type Team struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec TeamSpec `json:"spec,omitempty"` -} - -type TeamSpec struct { - Title string `json:"name,omitempty"` - Email string `json:"email,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type TeamList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - - Items []Team `json:"items,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type ServiceAccount struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec ServiceAccountSpec `json:"spec,omitempty"` -} - -type ServiceAccountSpec struct { - Name string `json:"name,omitempty"` - Email string `json:"email,omitempty"` - EmailVerified bool `json:"emailVerified,omitempty"` - Disabled bool `json:"disabled,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type ServiceAccountList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - - Items []ServiceAccount `json:"items,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -type IdentityDisplayResults struct { - metav1.TypeMeta `json:",inline"` - - // Request keys used to lookup the display value - // +listType=set - Keys []string `json:"keys"` - - // Matching items (the caller may need to remap from keys to results) - // +listType=atomic - Display []IdentityDisplay `json:"display"` - - // Input keys that were not useable - // +listType=set - InvalidKeys []string `json:"invalidKeys,omitempty"` -} - -type IdentityDisplay struct { - IdentityType claims.IdentityType `json:"type"` // The namespaced UID, eg `user|api-key|...` - UID string `json:"uid"` // The namespaced UID, eg `xyz` - Display string `json:"display"` - AvatarURL string `json:"avatarURL,omitempty"` - - // Legacy internal ID -- usage of this value should be phased out - InternalID int64 `json:"internalId,omitempty"` -} diff --git a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.openapi.go b/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.openapi.go deleted file mode 100644 index a5e4db9ca2b..00000000000 --- a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.openapi.go +++ /dev/null @@ -1,529 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -// SPDX-License-Identifier: AGPL-3.0-only - -// Code generated by openapi-gen. DO NOT EDIT. - -package v0alpha1 - -import ( - common "k8s.io/kube-openapi/pkg/common" - spec "k8s.io/kube-openapi/pkg/validation/spec" -) - -func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { - return map[string]common.OpenAPIDefinition{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.IdentityDisplay": schema_apimachinery_apis_identity_v0alpha1_IdentityDisplay(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.IdentityDisplayResults": schema_apimachinery_apis_identity_v0alpha1_IdentityDisplayResults(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccount": schema_apimachinery_apis_identity_v0alpha1_ServiceAccount(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccountList": schema_apimachinery_apis_identity_v0alpha1_ServiceAccountList(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccountSpec": schema_apimachinery_apis_identity_v0alpha1_ServiceAccountSpec(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.Team": schema_apimachinery_apis_identity_v0alpha1_Team(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.TeamList": schema_apimachinery_apis_identity_v0alpha1_TeamList(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.TeamSpec": schema_apimachinery_apis_identity_v0alpha1_TeamSpec(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.User": schema_apimachinery_apis_identity_v0alpha1_User(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.UserList": schema_apimachinery_apis_identity_v0alpha1_UserList(ref), - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.UserSpec": schema_apimachinery_apis_identity_v0alpha1_UserSpec(ref), - } -} - -func schema_apimachinery_apis_identity_v0alpha1_IdentityDisplay(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "type": { - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - "uid": { - SchemaProps: spec.SchemaProps{ - Description: "The namespaced UID, eg `user|api-key|...`", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - "display": { - SchemaProps: spec.SchemaProps{ - Description: "The namespaced UID, eg `xyz`", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - "avatarURL": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "internalId": { - SchemaProps: spec.SchemaProps{ - Description: "Legacy internal ID -- usage of this value should be phased out", - Type: []string{"integer"}, - Format: "int64", - }, - }, - }, - Required: []string{"type", "uid", "display"}, - }, - }, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_IdentityDisplayResults(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "keys": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-type": "set", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "Request keys used to lookup the display value", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - "display": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-type": "atomic", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "Matching items (the caller may need to remap from keys to results)", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.IdentityDisplay"), - }, - }, - }, - }, - }, - "invalidKeys": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-type": "set", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "Input keys that were not useable", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - }, - Required: []string{"keys", "display"}, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.IdentityDisplay"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_ServiceAccount(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "spec": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccountSpec"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccountSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_ServiceAccountList(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), - }, - }, - "items": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccount"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.ServiceAccount", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_ServiceAccountSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "email": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "emailVerified": { - SchemaProps: spec.SchemaProps{ - Type: []string{"boolean"}, - Format: "", - }, - }, - "disabled": { - SchemaProps: spec.SchemaProps{ - Type: []string{"boolean"}, - Format: "", - }, - }, - }, - }, - }, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_Team(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "spec": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.TeamSpec"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.TeamSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_TeamList(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), - }, - }, - "items": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.Team"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.Team", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_TeamSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "email": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_User(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "spec": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.UserSpec"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.UserSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_UserList(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), - }, - }, - "items": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.User"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1.User", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, - } -} - -func schema_apimachinery_apis_identity_v0alpha1_UserSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "login": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "email": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "emailVerified": { - SchemaProps: spec.SchemaProps{ - Type: []string{"boolean"}, - Format: "", - }, - }, - "disabled": { - SchemaProps: spec.SchemaProps{ - Type: []string{"boolean"}, - Format: "", - }, - }, - }, - }, - }, - } -} diff --git a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list deleted file mode 100644 index 93ccd0928ad..00000000000 --- a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list +++ /dev/null @@ -1,3 +0,0 @@ -API rule violation: names_match,github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1,IdentityDisplay,IdentityType -API rule violation: names_match,github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1,IdentityDisplay,InternalID -API rule violation: names_match,github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1,TeamSpec,Title diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 85d6e6af540..418e3beab91 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,10 +1,10 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.22.4 +go 1.23.0 require ( github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db // @grafana/identity-access-team - github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828 // @grafana/identity-access-team + github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db // @grafana/identity-access-team github.com/stretchr/testify v1.9.0 k8s.io/apimachinery v0.31.0 k8s.io/apiserver v0.31.0 @@ -35,9 +35,9 @@ require ( golang.org/x/crypto v0.26.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/pkg/apimachinery/go.sum b/pkg/apimachinery/go.sum index 2aa9ab11c0d..66b4df6cb6c 100644 --- a/pkg/apimachinery/go.sum +++ b/pkg/apimachinery/go.sum @@ -30,8 +30,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db h1:z++X4DdoX+aNlZNT1ZY4cykiFay4+f077pa0AG48SGg= github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db/go.mod h1:ptt910z9KFfpVSIbSbXvTRR7tS19mxD7EtmVbbJi/WE= -github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828 h1:Hk6Oe0o1yIfdm2+2F3yHLjuaktukGVEOjju2txQXu8c= -github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db h1:mDk0bwRV6rDrLSmKXftcPf9kLA9uH6EvxJvzpPW9bso= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -106,8 +106,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -131,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/pkg/apimachinery/identity/requester.go b/pkg/apimachinery/identity/requester.go index ac44d236b29..5105a9dfb5f 100644 --- a/pkg/apimachinery/identity/requester.go +++ b/pkg/apimachinery/identity/requester.go @@ -73,7 +73,6 @@ type Requester interface { // HasUniqueId returns true if the entity has a unique id HasUniqueId() bool // GetIDToken returns a signed token representing the identity that can be forwarded to plugins and external services. - // Will only be set when featuremgmt.FlagIdForwarding is enabled. GetIDToken() string } diff --git a/pkg/apis/dashboard/v0alpha1/register.go b/pkg/apis/dashboard/v0alpha1/register.go index 103f9e579db..c7c4b742432 100644 --- a/pkg/apis/dashboard/v0alpha1/register.go +++ b/pkg/apis/dashboard/v0alpha1/register.go @@ -38,7 +38,35 @@ var DashboardResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, nil } } - return nil, fmt.Errorf("expected dashboard or summary") + return nil, fmt.Errorf("expected dashboard") + }, + }, +) + +var LibraryPanelResourceInfo = common.NewResourceInfo(GROUP, VERSION, + "librarypanels", "librarypanel", "LibraryPanel", + func() runtime.Object { return &LibraryPanel{} }, + func() runtime.Object { return &LibraryPanelList{} }, + utils.TableColumns{ + Definition: []metav1.TableColumnDefinition{ + {Name: "Name", Type: "string", Format: "name"}, + {Name: "Title", Type: "string", Description: "The dashboard name"}, + {Name: "Type", Type: "string", Description: "the panel type"}, + {Name: "Created At", Type: "date"}, + }, + Reader: func(obj any) ([]interface{}, error) { + dash, ok := obj.(*LibraryPanel) + if ok { + if dash != nil { + return []interface{}{ + dash.Name, + dash.Spec.Title, + dash.Spec.Type, + dash.CreationTimestamp.UTC().Format(time.RFC3339), + }, nil + } + } + return nil, fmt.Errorf("expected library panel") }, }, ) diff --git a/pkg/apis/dashboard/v0alpha1/types.go b/pkg/apis/dashboard/v0alpha1/types.go index b2fd3897317..81763a61239 100644 --- a/pkg/apis/dashboard/v0alpha1/types.go +++ b/pkg/apis/dashboard/v0alpha1/types.go @@ -3,6 +3,7 @@ package v0alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1" common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" ) @@ -66,6 +67,65 @@ type VersionsQueryOptions struct { Version int64 `json:"version,omitempty"` } +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type LibraryPanel struct { + metav1.TypeMeta `json:",inline"` + // Standard object's metadata + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + // +optional + metav1.ObjectMeta `json:"metadata,omitempty"` + + // Panel properties + Spec LibraryPanelSpec `json:"spec"` + + // Status will show errors + Status *LibraryPanelStatus `json:"status,omitempty"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type LibraryPanelList struct { + metav1.TypeMeta `json:",inline"` + // +optional + metav1.ListMeta `json:"metadata,omitempty"` + + Items []LibraryPanel `json:"items,omitempty"` +} + +type LibraryPanelSpec struct { + // The panel type + Type string `json:"type"` + + // The panel type + PluginVersion string `json:"pluginVersion,omitempty"` + + // The panel title + Title string `json:"title,omitempty"` + + // Library panel description + Description string `json:"description,omitempty"` + + // The options schema depends on the panel type + Options common.Unstructured `json:"options"` + + // The fieldConfig schema depends on the panel type + FieldConfig common.Unstructured `json:"fieldConfig"` + + // The default datasource type + Datasource *data.DataSourceRef `json:"datasource,omitempty"` + + // The datasource queries + // +listType=set + Targets []data.DataQuery `json:"targets,omitempty"` +} + +type LibraryPanelStatus struct { + // Translation warnings (mostly things that were in SQL columns but not found in the saved body) + Warnings []string `json:"warnings,omitempty"` + + // The properties previously stored in SQL that are not included in this model + Missing common.Unstructured `json:"missing,omitempty"` +} + // This is like the legacy DTO where access and metadata are all returned in a single call // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DashboardWithAccessInfo struct { diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go index 46e4700ab07..38f222045e1 100644 --- a/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/dashboard/v0alpha1/zz_generated.deepcopy.go @@ -8,6 +8,7 @@ package v0alpha1 import ( + datav0alpha1 "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -199,6 +200,123 @@ func (in *DashboardWithAccessInfo) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LibraryPanel) DeepCopyInto(out *LibraryPanel) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + if in.Status != nil { + in, out := &in.Status, &out.Status + *out = new(LibraryPanelStatus) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LibraryPanel. +func (in *LibraryPanel) DeepCopy() *LibraryPanel { + if in == nil { + return nil + } + out := new(LibraryPanel) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *LibraryPanel) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LibraryPanelList) DeepCopyInto(out *LibraryPanelList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]LibraryPanel, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LibraryPanelList. +func (in *LibraryPanelList) DeepCopy() *LibraryPanelList { + if in == nil { + return nil + } + out := new(LibraryPanelList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *LibraryPanelList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LibraryPanelSpec) DeepCopyInto(out *LibraryPanelSpec) { + *out = *in + in.Options.DeepCopyInto(&out.Options) + in.FieldConfig.DeepCopyInto(&out.FieldConfig) + if in.Datasource != nil { + in, out := &in.Datasource, &out.Datasource + *out = new(datav0alpha1.DataSourceRef) + **out = **in + } + if in.Targets != nil { + in, out := &in.Targets, &out.Targets + *out = make([]datav0alpha1.DataQuery, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LibraryPanelSpec. +func (in *LibraryPanelSpec) DeepCopy() *LibraryPanelSpec { + if in == nil { + return nil + } + out := new(LibraryPanelSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LibraryPanelStatus) DeepCopyInto(out *LibraryPanelStatus) { + *out = *in + if in.Warnings != nil { + in, out := &in.Warnings, &out.Warnings + *out = make([]string, len(*in)) + copy(*out, *in) + } + in.Missing.DeepCopyInto(&out.Missing) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LibraryPanelStatus. +func (in *LibraryPanelStatus) DeepCopy() *LibraryPanelStatus { + if in == nil { + return nil + } + out := new(LibraryPanelStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *VersionsQueryOptions) DeepCopyInto(out *VersionsQueryOptions) { *out = *in diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go index 5b43ab61377..2744c84dbea 100644 --- a/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go +++ b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go @@ -22,6 +22,10 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardVersionInfo": schema_pkg_apis_dashboard_v0alpha1_DashboardVersionInfo(ref), "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardVersionList": schema_pkg_apis_dashboard_v0alpha1_DashboardVersionList(ref), "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.DashboardWithAccessInfo": schema_pkg_apis_dashboard_v0alpha1_DashboardWithAccessInfo(ref), + "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanel": schema_pkg_apis_dashboard_v0alpha1_LibraryPanel(ref), + "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelList": schema_pkg_apis_dashboard_v0alpha1_LibraryPanelList(ref), + "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelSpec": schema_pkg_apis_dashboard_v0alpha1_LibraryPanelSpec(ref), + "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelStatus": schema_pkg_apis_dashboard_v0alpha1_LibraryPanelStatus(ref), "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.VersionsQueryOptions": schema_pkg_apis_dashboard_v0alpha1_VersionsQueryOptions(ref), } } @@ -392,6 +396,217 @@ func schema_pkg_apis_dashboard_v0alpha1_DashboardWithAccessInfo(ref common.Refer } } +func schema_pkg_apis_dashboard_v0alpha1_LibraryPanel(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Description: "Standard object's metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Description: "Panel properties", + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelSpec"), + }, + }, + "status": { + SchemaProps: spec.SchemaProps{ + Description: "Status will show errors", + Ref: ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelStatus"), + }, + }, + }, + Required: []string{"spec"}, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelSpec", "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanelStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_dashboard_v0alpha1_LibraryPanelList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanel"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1.LibraryPanel", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_dashboard_v0alpha1_LibraryPanelSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "type": { + SchemaProps: spec.SchemaProps{ + Description: "The panel type", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "pluginVersion": { + SchemaProps: spec.SchemaProps{ + Description: "The panel type", + Type: []string{"string"}, + Format: "", + }, + }, + "title": { + SchemaProps: spec.SchemaProps{ + Description: "The panel title", + Type: []string{"string"}, + Format: "", + }, + }, + "description": { + SchemaProps: spec.SchemaProps{ + Description: "Library panel description", + Type: []string{"string"}, + Format: "", + }, + }, + "options": { + SchemaProps: spec.SchemaProps{ + Description: "The options schema depends on the panel type", + Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"), + }, + }, + "fieldConfig": { + SchemaProps: spec.SchemaProps{ + Description: "The fieldConfig schema depends on the panel type", + Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"), + }, + }, + "datasource": { + SchemaProps: spec.SchemaProps{ + Description: "The default datasource type", + Ref: ref("github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataSourceRef"), + }, + }, + "targets": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "set", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "The datasource queries", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataQuery"), + }, + }, + }, + }, + }, + }, + Required: []string{"type", "options", "fieldConfig"}, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataQuery", "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataSourceRef", "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"}, + } +} + +func schema_pkg_apis_dashboard_v0alpha1_LibraryPanelStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "warnings": { + SchemaProps: spec.SchemaProps{ + Description: "Translation warnings (mostly things that were in SQL columns but not found in the saved body)", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "missing": { + SchemaProps: spec.SchemaProps{ + Description: "The properties previously stored in SQL that are not included in this model", + Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"}, + } +} + func schema_pkg_apis_dashboard_v0alpha1_VersionsQueryOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/pkg/apis/dashboard/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi_violation_exceptions.list new file mode 100644 index 00000000000..8131ccde7c9 --- /dev/null +++ b/pkg/apis/dashboard/v0alpha1/zz_generated.openapi_violation_exceptions.list @@ -0,0 +1 @@ +API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1,LibraryPanelStatus,Warnings diff --git a/pkg/apimachinery/apis/identity/v0alpha1/doc.go b/pkg/apis/identity/v0alpha1/doc.go similarity index 100% rename from pkg/apimachinery/apis/identity/v0alpha1/doc.go rename to pkg/apis/identity/v0alpha1/doc.go diff --git a/pkg/apimachinery/apis/identity/v0alpha1/register.go b/pkg/apis/identity/v0alpha1/register.go similarity index 67% rename from pkg/apimachinery/apis/identity/v0alpha1/register.go rename to pkg/apis/identity/v0alpha1/register.go index 3c1ddaeaa1f..68c82f71969 100644 --- a/pkg/apimachinery/apis/identity/v0alpha1/register.go +++ b/pkg/apis/identity/v0alpha1/register.go @@ -95,6 +95,56 @@ var ServiceAccountResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, ) +var SSOSettingResourceInfo = common.NewResourceInfo( + GROUP, VERSION, "ssosettings", "ssosetting", "SSOSetting", + func() runtime.Object { return &SSOSetting{} }, + func() runtime.Object { return &SSOSettingList{} }, + utils.TableColumns{ + Definition: []metav1.TableColumnDefinition{ + {Name: "Name", Type: "string", Format: "name"}, + {Name: "Source", Type: "string"}, + {Name: "Enabled", Type: "boolean"}, + {Name: "Created At", Type: "string", Format: "date"}, + }, + Reader: func(obj any) ([]interface{}, error) { + m, ok := obj.(*SSOSetting) + if !ok { + return nil, fmt.Errorf("expected sso setting") + } + return []interface{}{ + m.Name, + m.Spec.Source, + m.Spec.Settings.GetNestedBool("enabled"), + m.CreationTimestamp.UTC().Format(time.RFC3339), + }, nil + }, + }, +) + +var TeamBindingResourceInfo = common.NewResourceInfo( + GROUP, VERSION, "teambindings", "teambinding", "TeamBinding", + func() runtime.Object { return &TeamBinding{} }, + func() runtime.Object { return &TeamBindingList{} }, + utils.TableColumns{ + Definition: []metav1.TableColumnDefinition{ + {Name: "Name", Type: "string", Format: "name"}, + {Name: "Team", Type: "string"}, + {Name: "Created At", Type: "string", Format: "date"}, + }, + Reader: func(obj any) ([]interface{}, error) { + m, ok := obj.(*TeamBinding) + if !ok { + return nil, fmt.Errorf("expected team binding") + } + return []interface{}{ + m.Name, + m.Spec.TeamRef.Name, + m.CreationTimestamp.UTC().Format(time.RFC3339), + }, nil + }, + }, +) + var ( // SchemeGroupVersion is group version used to register these objects SchemeGroupVersion = schema.GroupVersion{Group: GROUP, Version: VERSION} @@ -105,15 +155,10 @@ var ( AddToScheme = localSchemeBuilder.AddToScheme ) -func init() { - localSchemeBuilder.Register(func(s *runtime.Scheme) error { - return AddKnownTypes(s, VERSION) - }) -} - // Adds the list of known types to the given scheme. -func AddKnownTypes(scheme *runtime.Scheme, version string) error { - scheme.AddKnownTypes(schema.GroupVersion{Group: GROUP, Version: version}, +func AddKnownTypes(scheme *runtime.Scheme, version string) { + scheme.AddKnownTypes( + schema.GroupVersion{Group: GROUP, Version: version}, &User{}, &UserList{}, &ServiceAccount{}, @@ -121,9 +166,11 @@ func AddKnownTypes(scheme *runtime.Scheme, version string) error { &Team{}, &TeamList{}, &IdentityDisplayResults{}, + &SSOSetting{}, + &SSOSettingList{}, + &TeamBinding{}, + &TeamBindingList{}, ) - // metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil } // Resource takes an unqualified resource and returns a Group qualified GroupResource diff --git a/pkg/apis/identity/v0alpha1/types_identity.go b/pkg/apis/identity/v0alpha1/types_identity.go new file mode 100644 index 00000000000..3ad562f2315 --- /dev/null +++ b/pkg/apis/identity/v0alpha1/types_identity.go @@ -0,0 +1,33 @@ +package v0alpha1 + +import ( + "github.com/grafana/authlib/claims" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type IdentityDisplayResults struct { + metav1.TypeMeta `json:",inline"` + + // Request keys used to lookup the display value + // +listType=set + Keys []string `json:"keys"` + + // Matching items (the caller may need to remap from keys to results) + // +listType=atomic + Display []IdentityDisplay `json:"display"` + + // Input keys that were not useable + // +listType=set + InvalidKeys []string `json:"invalidKeys,omitempty"` +} + +type IdentityDisplay struct { + IdentityType claims.IdentityType `json:"type"` // The namespaced UID, eg `user|api-key|...` + UID string `json:"uid"` // The namespaced UID, eg `xyz` + Display string `json:"display"` + AvatarURL string `json:"avatarURL,omitempty"` + + // Legacy internal ID -- usage of this value should be phased out + InternalID int64 `json:"internalId,omitempty"` +} diff --git a/pkg/apis/identity/v0alpha1/types_servier_account.go b/pkg/apis/identity/v0alpha1/types_servier_account.go new file mode 100644 index 00000000000..a00d8bb7663 --- /dev/null +++ b/pkg/apis/identity/v0alpha1/types_servier_account.go @@ -0,0 +1,26 @@ +package v0alpha1 + +import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type ServiceAccount struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec ServiceAccountSpec `json:"spec,omitempty"` +} + +type ServiceAccountSpec struct { + Name string `json:"name,omitempty"` + Email string `json:"email,omitempty"` + EmailVerified bool `json:"emailVerified,omitempty"` + Disabled bool `json:"disabled,omitempty"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type ServiceAccountList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + + Items []ServiceAccount `json:"items,omitempty"` +} diff --git a/pkg/apis/identity/v0alpha1/types_sso.go b/pkg/apis/identity/v0alpha1/types_sso.go new file mode 100644 index 00000000000..64eaed7d4b6 --- /dev/null +++ b/pkg/apis/identity/v0alpha1/types_sso.go @@ -0,0 +1,43 @@ +package v0alpha1 + +import ( + common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type SSOSetting struct { + metav1.TypeMeta `json:",inline"` + // Standard object's metadata + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + // +optional + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec SSOSettingSpec `json:"spec,omitempty"` +} + +// SSOSettingSpec defines model for SSOSettingSpec. +type SSOSettingSpec struct { + Source Source `json:"source"` + Settings common.Unstructured `json:"settings"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type SSOSettingList struct { + metav1.TypeMeta `json:",inline"` + // +optional + metav1.ListMeta `json:"metadata,omitempty"` + + Items []SSOSetting `json:"items,omitempty"` +} + +// Source for settings. +// +enum +type Source string + +// Defines values for ItemType. +const ( + SourceDB Source = "db" + // system is from config file, env or argument + SourceSystem Source = "system" +) diff --git a/pkg/apis/identity/v0alpha1/types_team.go b/pkg/apis/identity/v0alpha1/types_team.go new file mode 100644 index 00000000000..3a70bd8c36f --- /dev/null +++ b/pkg/apis/identity/v0alpha1/types_team.go @@ -0,0 +1,70 @@ +package v0alpha1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type Team struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec TeamSpec `json:"spec,omitempty"` +} + +type TeamSpec struct { + Title string `json:"name,omitempty"` + Email string `json:"email,omitempty"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type TeamList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + + Items []Team `json:"items,omitempty"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type TeamBinding struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec TeamBindingSpec `json:"spec,omitempty"` +} + +type TeamBindingSpec struct { + Subjects []TeamSubject `json:"subjects,omitempty"` + TeamRef TeamRef `json:"teamRef,omitempty"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type TeamBindingList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + + Items []TeamBinding `json:"items,omitempty"` +} + +type TeamSubject struct { + // Name is the unique identifier for subject. + Name string `json:"name,omitempty"` + + // Permission subject has in permission. + // Can be either admin or member. + Permission TeamPermission `json:"permission,omitempty"` +} + +type TeamRef struct { + // Name is the unique identifier for a team. + Name string `json:"name,omitempty"` +} + +// TeamPermission for subject +// +enum +type TeamPermission string + +const ( + TeamPermissionAdmin TeamPermission = "admin" + TeamPermissionMember TeamPermission = "member" +) diff --git a/pkg/apis/identity/v0alpha1/types_user.go b/pkg/apis/identity/v0alpha1/types_user.go new file mode 100644 index 00000000000..4fc1f3448b7 --- /dev/null +++ b/pkg/apis/identity/v0alpha1/types_user.go @@ -0,0 +1,27 @@ +package v0alpha1 + +import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type User struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec UserSpec `json:"spec,omitempty"` +} + +type UserSpec struct { + Name string `json:"name,omitempty"` + Login string `json:"login,omitempty"` + Email string `json:"email,omitempty"` + EmailVerified bool `json:"emailVerified,omitempty"` + Disabled bool `json:"disabled,omitempty"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +type UserList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + + Items []User `json:"items,omitempty"` +} diff --git a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/identity/v0alpha1/zz_generated.deepcopy.go similarity index 60% rename from pkg/apimachinery/apis/identity/v0alpha1/zz_generated.deepcopy.go rename to pkg/apis/identity/v0alpha1/zz_generated.deepcopy.go index fba461df2e9..1e74f720214 100644 --- a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/identity/v0alpha1/zz_generated.deepcopy.go @@ -67,6 +67,83 @@ func (in *IdentityDisplayResults) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SSOSetting) DeepCopyInto(out *SSOSetting) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SSOSetting. +func (in *SSOSetting) DeepCopy() *SSOSetting { + if in == nil { + return nil + } + out := new(SSOSetting) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *SSOSetting) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SSOSettingList) DeepCopyInto(out *SSOSettingList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]SSOSetting, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SSOSettingList. +func (in *SSOSettingList) DeepCopy() *SSOSettingList { + if in == nil { + return nil + } + out := new(SSOSettingList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *SSOSettingList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SSOSettingSpec) DeepCopyInto(out *SSOSettingSpec) { + *out = *in + in.Settings.DeepCopyInto(&out.Settings) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SSOSettingSpec. +func (in *SSOSettingSpec) DeepCopy() *SSOSettingSpec { + if in == nil { + return nil + } + out := new(SSOSettingSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ServiceAccount) DeepCopyInto(out *ServiceAccount) { *out = *in @@ -170,6 +247,88 @@ func (in *Team) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TeamBinding) DeepCopyInto(out *TeamBinding) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TeamBinding. +func (in *TeamBinding) DeepCopy() *TeamBinding { + if in == nil { + return nil + } + out := new(TeamBinding) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *TeamBinding) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TeamBindingList) DeepCopyInto(out *TeamBindingList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]TeamBinding, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TeamBindingList. +func (in *TeamBindingList) DeepCopy() *TeamBindingList { + if in == nil { + return nil + } + out := new(TeamBindingList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *TeamBindingList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TeamBindingSpec) DeepCopyInto(out *TeamBindingSpec) { + *out = *in + if in.Subjects != nil { + in, out := &in.Subjects, &out.Subjects + *out = make([]TeamSubject, len(*in)) + copy(*out, *in) + } + out.TeamRef = in.TeamRef + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TeamBindingSpec. +func (in *TeamBindingSpec) DeepCopy() *TeamBindingSpec { + if in == nil { + return nil + } + out := new(TeamBindingSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TeamList) DeepCopyInto(out *TeamList) { *out = *in @@ -203,6 +362,22 @@ func (in *TeamList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TeamRef) DeepCopyInto(out *TeamRef) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TeamRef. +func (in *TeamRef) DeepCopy() *TeamRef { + if in == nil { + return nil + } + out := new(TeamRef) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TeamSpec) DeepCopyInto(out *TeamSpec) { *out = *in @@ -219,6 +394,22 @@ func (in *TeamSpec) DeepCopy() *TeamSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TeamSubject) DeepCopyInto(out *TeamSubject) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TeamSubject. +func (in *TeamSubject) DeepCopy() *TeamSubject { + if in == nil { + return nil + } + out := new(TeamSubject) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *User) DeepCopyInto(out *User) { *out = *in diff --git a/pkg/apimachinery/apis/identity/v0alpha1/zz_generated.defaults.go b/pkg/apis/identity/v0alpha1/zz_generated.defaults.go similarity index 100% rename from pkg/apimachinery/apis/identity/v0alpha1/zz_generated.defaults.go rename to pkg/apis/identity/v0alpha1/zz_generated.defaults.go diff --git a/pkg/apis/identity/v0alpha1/zz_generated.openapi.go b/pkg/apis/identity/v0alpha1/zz_generated.openapi.go new file mode 100644 index 00000000000..0c71545ef9b --- /dev/null +++ b/pkg/apis/identity/v0alpha1/zz_generated.openapi.go @@ -0,0 +1,821 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +// SPDX-License-Identifier: AGPL-3.0-only + +// Code generated by openapi-gen. DO NOT EDIT. + +package v0alpha1 + +import ( + common "k8s.io/kube-openapi/pkg/common" + spec "k8s.io/kube-openapi/pkg/validation/spec" +) + +func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { + return map[string]common.OpenAPIDefinition{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplay": schema_pkg_apis_identity_v0alpha1_IdentityDisplay(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplayResults": schema_pkg_apis_identity_v0alpha1_IdentityDisplayResults(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSetting": schema_pkg_apis_identity_v0alpha1_SSOSetting(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingList": schema_pkg_apis_identity_v0alpha1_SSOSettingList(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingSpec": schema_pkg_apis_identity_v0alpha1_SSOSettingSpec(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccount": schema_pkg_apis_identity_v0alpha1_ServiceAccount(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountList": schema_pkg_apis_identity_v0alpha1_ServiceAccountList(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountSpec": schema_pkg_apis_identity_v0alpha1_ServiceAccountSpec(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.Team": schema_pkg_apis_identity_v0alpha1_Team(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBinding": schema_pkg_apis_identity_v0alpha1_TeamBinding(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingList": schema_pkg_apis_identity_v0alpha1_TeamBindingList(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingSpec": schema_pkg_apis_identity_v0alpha1_TeamBindingSpec(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamList": schema_pkg_apis_identity_v0alpha1_TeamList(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef": schema_pkg_apis_identity_v0alpha1_TeamRef(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSpec": schema_pkg_apis_identity_v0alpha1_TeamSpec(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSubject": schema_pkg_apis_identity_v0alpha1_TeamSubject(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.User": schema_pkg_apis_identity_v0alpha1_User(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserList": schema_pkg_apis_identity_v0alpha1_UserList(ref), + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserSpec": schema_pkg_apis_identity_v0alpha1_UserSpec(ref), + } +} + +func schema_pkg_apis_identity_v0alpha1_IdentityDisplay(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "type": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "uid": { + SchemaProps: spec.SchemaProps{ + Description: "The namespaced UID, eg `user|api-key|...`", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "display": { + SchemaProps: spec.SchemaProps{ + Description: "The namespaced UID, eg `xyz`", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "avatarURL": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "internalId": { + SchemaProps: spec.SchemaProps{ + Description: "Legacy internal ID -- usage of this value should be phased out", + Type: []string{"integer"}, + Format: "int64", + }, + }, + }, + Required: []string{"type", "uid", "display"}, + }, + }, + } +} + +func schema_pkg_apis_identity_v0alpha1_IdentityDisplayResults(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "keys": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "set", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "Request keys used to lookup the display value", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "display": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "Matching items (the caller may need to remap from keys to results)", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplay"), + }, + }, + }, + }, + }, + "invalidKeys": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "set", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "Input keys that were not useable", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + }, + Required: []string{"keys", "display"}, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.IdentityDisplay"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_SSOSetting(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Description: "Standard object's metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingSpec"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSettingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_SSOSettingList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSetting"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.SSOSetting", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_SSOSettingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "SSOSettingSpec defines model for SSOSettingSpec.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "source": { + SchemaProps: spec.SchemaProps{ + Description: "Possible enum values:\n - `\"db\"`\n - `\"system\"` system is from config file, env or argument", + Default: "", + Type: []string{"string"}, + Format: "", + Enum: []interface{}{"db", "system"}, + }, + }, + "settings": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"), + }, + }, + }, + Required: []string{"source", "settings"}, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_ServiceAccount(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountSpec"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccountSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_ServiceAccountList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccount"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.ServiceAccount", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_ServiceAccountSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "email": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "emailVerified": { + SchemaProps: spec.SchemaProps{ + Type: []string{"boolean"}, + Format: "", + }, + }, + "disabled": { + SchemaProps: spec.SchemaProps{ + Type: []string{"boolean"}, + Format: "", + }, + }, + }, + }, + }, + } +} + +func schema_pkg_apis_identity_v0alpha1_Team(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSpec"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamBinding(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingSpec"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBindingSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamBindingList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBinding"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamBinding", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamBindingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "subjects": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSubject"), + }, + }, + }, + }, + }, + "teamRef": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamRef", "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.TeamSubject"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.Team"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.Team", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamRef(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Description: "Name is the unique identifier for a team.", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "email": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + } +} + +func schema_pkg_apis_identity_v0alpha1_TeamSubject(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Description: "Name is the unique identifier for subject.", + Type: []string{"string"}, + Format: "", + }, + }, + "permission": { + SchemaProps: spec.SchemaProps{ + Description: "Permission subject has in permission. Can be either admin or member.\n\nPossible enum values:\n - `\"admin\"`\n - `\"member\"`", + Type: []string{"string"}, + Format: "", + Enum: []interface{}{"admin", "member"}, + }, + }, + }, + }, + }, + } +} + +func schema_pkg_apis_identity_v0alpha1_User(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserSpec"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.UserSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_UserList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("github.com/grafana/grafana/pkg/apis/identity/v0alpha1.User"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/grafana/grafana/pkg/apis/identity/v0alpha1.User", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_pkg_apis_identity_v0alpha1_UserSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "login": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "email": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "emailVerified": { + SchemaProps: spec.SchemaProps{ + Type: []string{"boolean"}, + Format: "", + }, + }, + "disabled": { + SchemaProps: spec.SchemaProps{ + Type: []string{"boolean"}, + Format: "", + }, + }, + }, + }, + }, + } +} diff --git a/pkg/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list new file mode 100644 index 00000000000..429f6a92576 --- /dev/null +++ b/pkg/apis/identity/v0alpha1/zz_generated.openapi_violation_exceptions.list @@ -0,0 +1,4 @@ +API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,TeamBindingSpec,Subjects +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,IdentityDisplay,IdentityType +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,IdentityDisplay,InternalID +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/identity/v0alpha1,TeamSpec,Title diff --git a/pkg/apis/scope/v0alpha1/register.go b/pkg/apis/scope/v0alpha1/register.go index 7d301cba8a9..660af02ec4a 100644 --- a/pkg/apis/scope/v0alpha1/register.go +++ b/pkg/apis/scope/v0alpha1/register.go @@ -53,6 +53,7 @@ var ScopeDashboardBindingResourceInfo = common.NewResourceInfo(GROUP, VERSION, {Name: "Created At", Type: "date"}, {Name: "Dashboard", Type: "string"}, {Name: "Scope", Type: "string"}, + {Name: "Groups", Type: "array"}, }, Reader: func(obj any) ([]interface{}, error) { m, ok := obj.(*ScopeDashboardBinding) @@ -64,6 +65,7 @@ var ScopeDashboardBindingResourceInfo = common.NewResourceInfo(GROUP, VERSION, m.CreationTimestamp.UTC().Format(time.RFC3339), m.Spec.Dashboard, m.Spec.Scope, + m.Spec.Groups, }, nil }, }, diff --git a/pkg/apis/scope/v0alpha1/types.go b/pkg/apis/scope/v0alpha1/types.go index 2683368d148..9064687ece0 100644 --- a/pkg/apis/scope/v0alpha1/types.go +++ b/pkg/apis/scope/v0alpha1/types.go @@ -60,9 +60,16 @@ type ScopeDashboardBinding struct { } type ScopeDashboardBindingSpec struct { - Dashboard string `json:"dashboard"` + Dashboard string `json:"dashboard"` + + // DashboardTitle should be populated and update from the dashboard DashboardTitle string `json:"dashboardTitle"` + // Groups is used for the grouping of dashboards that are suggested based + // on a scope. The source of truth for this information has not been + // determined yet. + Groups []string `json:"groups,omitempty"` + Scope string `json:"scope"` } diff --git a/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go index dcf457e6cef..a529a79ab15 100644 --- a/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go @@ -108,7 +108,7 @@ func (in *ScopeDashboardBinding) DeepCopyInto(out *ScopeDashboardBinding) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec + in.Spec.DeepCopyInto(&out.Spec) return } @@ -166,6 +166,11 @@ func (in *ScopeDashboardBindingList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ScopeDashboardBindingSpec) DeepCopyInto(out *ScopeDashboardBindingSpec) { *out = *in + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } return } diff --git a/pkg/apis/scope/v0alpha1/zz_generated.openapi.go b/pkg/apis/scope/v0alpha1/zz_generated.openapi.go index 1bcc51f93a4..af5079a01a8 100644 --- a/pkg/apis/scope/v0alpha1/zz_generated.openapi.go +++ b/pkg/apis/scope/v0alpha1/zz_generated.openapi.go @@ -265,9 +265,25 @@ func schema_pkg_apis_scope_v0alpha1_ScopeDashboardBindingSpec(ref common.Referen }, "dashboardTitle": { SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", + Description: "DashboardTitle should be populated and update from the dashboard", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "groups": { + SchemaProps: spec.SchemaProps{ + Description: "Groups is used for the grouping of dashboards that are suggested based on a scope. The source of truth for this information has not been determined yet.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, }, }, "scope": { diff --git a/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list index e0fabd106cb..a50285a2a54 100644 --- a/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list +++ b/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list @@ -1,2 +1,3 @@ API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,FindScopeDashboardBindingsResults,Items +API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeDashboardBindingSpec,Groups API rule violation: names_match,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeNodeSpec,LinkID diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index c66d073d737..5e7937c7e4c 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,12 +1,12 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.22.4 +go 1.23.0 require ( github.com/google/go-cmp v0.6.0 - github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828 + github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240701135906-559738ce6ae1 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel/trace v1.28.0 k8s.io/apimachinery v0.31.0 @@ -40,6 +40,8 @@ require ( github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -60,14 +62,14 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/term v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect - golang.org/x/time v0.5.0 // indirect + golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.22.0 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/pkg/apiserver/go.sum b/pkg/apiserver/go.sum index 9246d6bc4cd..66724337e95 100644 --- a/pkg/apiserver/go.sum +++ b/pkg/apiserver/go.sum @@ -77,8 +77,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828 h1:Hk6Oe0o1yIfdm2+2F3yHLjuaktukGVEOjju2txQXu8c= -github.com/grafana/authlib/claims v0.0.0-20240814072707-6cffd53bb828/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db h1:mDk0bwRV6rDrLSmKXftcPf9kLA9uH6EvxJvzpPW9bso= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240701135906-559738ce6ae1 h1:ItDcDxUjVLPKja+hogpqgW/kj8LxUL2qscelXIsN1Bs= github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240701135906-559738ce6ae1/go.mod h1:DkxMin+qOh1Fgkxfbt+CUfBqqsCQJMG9op8Os/irBPA= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= @@ -97,6 +97,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -105,6 +107,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -127,8 +131,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -248,16 +252,16 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -279,12 +283,12 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= diff --git a/pkg/apiserver/rest/dualwriter_mode2.go b/pkg/apiserver/rest/dualwriter_mode2.go index 3b611f6e1ed..86ab89e9cc0 100644 --- a/pkg/apiserver/rest/dualwriter_mode2.go +++ b/pkg/apiserver/rest/dualwriter_mode2.go @@ -138,17 +138,13 @@ func (d *DualWriterMode2) List(ctx context.Context, options *metainternalversion // Record the index of each LegacyStorage object so it can later be replaced by // an equivalent Storage object if it exists. - optionsStorage, indexMap, err := parseList(legacyList) + legacyNames, err := parseList(legacyList) if err != nil { return nil, err } - if optionsStorage.LabelSelector == nil { - return ll, nil - } - startStorage := time.Now() - sl, err := d.Storage.List(ctx, &optionsStorage) + sl, err := d.Storage.List(ctx, options) if err != nil { log.Error(err, "unable to list objects from storage") d.recordStorageDuration(true, mode2Str, d.kind, method, startStorage) @@ -163,14 +159,10 @@ func (d *DualWriterMode2) List(ctx context.Context, options *metainternalversion } for _, obj := range storageList { - accessor, err := meta.Accessor(obj) - if err != nil { - return nil, err - } - name := accessor.GetName() - if legacyIndex, ok := indexMap[name]; ok { - legacyList[legacyIndex] = obj - areEqual := Compare(obj, legacyList[legacyIndex]) + name := getName(obj) + if i, ok := legacyNames[name]; ok { + legacyList[i] = obj + areEqual := Compare(obj, legacyList[i]) d.recordOutcome(mode2Str, name, areEqual, method) if !areEqual { log.WithValues("name", name).Info("object from legacy and storage are not equal") @@ -212,16 +204,13 @@ func (d *DualWriterMode2) DeleteCollection(ctx context.Context, deleteValidation } // Only the items deleted by the legacy DeleteCollection call are selected for deletion by Storage. - optionsStorage, _, err := parseList(legacyList) + _, err = parseList(legacyList) if err != nil { return nil, err } - if optionsStorage.LabelSelector == nil { - return deleted, nil - } startStorage := time.Now() - res, err := d.Storage.DeleteCollection(ctx, deleteValidation, options, &optionsStorage) + res, err := d.Storage.DeleteCollection(ctx, deleteValidation, options, listOptions) if err != nil { log.WithValues("deleted", res).Error(err, "failed to delete collection successfully from Storage") d.recordStorageDuration(true, mode2Str, d.kind, method, startStorage) @@ -366,22 +355,17 @@ func (d *DualWriterMode2) ConvertToTable(ctx context.Context, object runtime.Obj return d.Storage.ConvertToTable(ctx, object, tableOptions) } -func parseList(legacyList []runtime.Object) (metainternalversion.ListOptions, map[string]int, error) { - options := metainternalversion.ListOptions{} - originKeys := []string{} +func parseList(legacyList []runtime.Object) (map[string]int, error) { indexMap := map[string]int{} for i, obj := range legacyList { accessor, err := utils.MetaAccessor(obj) if err != nil { - return options, nil, err + return nil, err } indexMap[accessor.GetName()] = i } - if len(originKeys) == 0 { - return options, nil, nil - } - return options, indexMap, nil + return indexMap, nil } func enrichLegacyObject(originalObj, returnedObj runtime.Object) error { diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 5fa6a696dfe..c547676f24c 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.22.4 +go 1.23.0 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires @@ -16,19 +16,18 @@ replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014 replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.52.0 require ( - cloud.google.com/go/storage v1.38.0 // @grafana/grafana-backend-group + cloud.google.com/go/storage v1.43.0 // @grafana/grafana-backend-group github.com/Masterminds/semver/v3 v3.2.0 // @grafana/grafana-release-guild - github.com/aws/aws-sdk-go v1.51.31 // @grafana/aws-datasources + github.com/aws/aws-sdk-go v1.55.5 // @grafana/aws-datasources github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild github.com/docker/docker v26.0.2+incompatible // @grafana/grafana-release-guild github.com/drone/drone-cli v1.6.1 // @grafana/grafana-release-guild github.com/gogo/protobuf v1.3.2 // indirect; @grafana/alerting-backend - github.com/golang/protobuf v1.5.4 // indirect; @grafana/grafana-backend-group github.com/google/go-cmp v0.6.0 // @grafana/grafana-backend-group github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-release-guild github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-release-guild github.com/google/uuid v1.6.0 // indirect; @grafana/grafana-backend-group - github.com/googleapis/gax-go/v2 v2.12.3 // indirect; @grafana/grafana-backend-group + github.com/googleapis/gax-go/v2 v2.13.0 // indirect; @grafana/grafana-backend-group github.com/jmespath/go-jmespath v0.4.0 // indirect; @grafana/grafana-backend-group github.com/stretchr/testify v1.9.0 // @grafana/grafana-backend-group github.com/urfave/cli v1.22.15 // @grafana/grafana-backend-group @@ -43,20 +42,20 @@ require ( golang.org/x/oauth2 v0.22.0 // @grafana/identity-access-team golang.org/x/sync v0.8.0 // indirect; @grafana/alerting-backend golang.org/x/text v0.17.0 // indirect; @grafana/grafana-backend-group - golang.org/x/time v0.5.0 // indirect; @grafana/grafana-backend-group + golang.org/x/time v0.6.0 // indirect; @grafana/grafana-backend-group golang.org/x/tools v0.22.0 // indirect; @grafana/grafana-as-code - google.golang.org/api v0.176.0 // @grafana/grafana-backend-group + google.golang.org/api v0.191.0 // @grafana/grafana-backend-group google.golang.org/grpc v1.65.0 // indirect; @grafana/plugins-platform-backend google.golang.org/protobuf v1.34.2 // indirect; @grafana/plugins-platform-backend gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-backend ) require ( - cloud.google.com/go v0.112.1 // indirect - cloud.google.com/go/auth v0.2.2 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.1 // indirect - cloud.google.com/go/compute/metadata v0.3.0 // indirect - cloud.google.com/go/iam v1.1.6 // indirect + cloud.google.com/go v0.115.0 // indirect + cloud.google.com/go/auth v0.8.1 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect + cloud.google.com/go/iam v1.1.13 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/bmatcuk/doublestar v1.1.1 // indirect github.com/buildkite/yaml v2.1.0+incompatible // indirect @@ -75,7 +74,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/s2a-go v0.1.7 // indirect + github.com/google/s2a-go v0.1.8 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect @@ -87,16 +86,17 @@ require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect - golang.org/x/sys v0.23.0 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect; @grafana/grafana-backend-group - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + golang.org/x/sys v0.24.0 // indirect + google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect; @grafana/grafana-backend-group + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) require dagger.io/dagger v0.11.8-rc.2 require ( + cloud.google.com/go/longrunning v0.5.12 // indirect github.com/99designs/gqlgen v0.17.44 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Khan/genqlient v0.7.0 // indirect diff --git a/pkg/build/go.sum b/pkg/build/go.sum index 9f5d8a6f69e..5eef149b39b 100644 --- a/pkg/build/go.sum +++ b/pkg/build/go.sum @@ -1,16 +1,18 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= -cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= -cloud.google.com/go/auth v0.2.2 h1:gmxNJs4YZYcw6YvKRtVBaF2fyUE6UrWPyzU8jHvYfmI= -cloud.google.com/go/auth v0.2.2/go.mod h1:2bDNJWtWziDT3Pu1URxHHbkHE/BbOCuyUiKIGcNvafo= -cloud.google.com/go/auth/oauth2adapt v0.2.1 h1:VSPmMmUlT8CkIZ2PzD9AlLN+R3+D1clXMWHHa6vG/Ag= -cloud.google.com/go/auth/oauth2adapt v0.2.1/go.mod h1:tOdK/k+D2e4GEwfBRA48dKNQiDsqIXxLh7VU319eV0g= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= -cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= -cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= -cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= +cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= +cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= +cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= +cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= +cloud.google.com/go/longrunning v0.5.12 h1:5LqSIdERr71CqfUsFlJdBpOkBH8FBCFD7P1nTWy3TYE= +cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU= +cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= +cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= dagger.io/dagger v0.11.8-rc.2 h1:HCP3gXgAfJJBFitJm0jRdKWJsIKgSWNmVN9UV+CkOdk= dagger.io/dagger v0.11.8-rc.2/go.mod h1:kIzxLfN8N8FXUCN9u5EHLBJUJMJm0t6XynecUzp0A5w= github.com/99designs/basicauth-go v0.0.0-20160802081356-2a93ba0f464d/go.mod h1:3cARGAK9CfW3HoxCy1a0G4TKrdiKke8ftOMEOHyySYs= @@ -35,8 +37,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/aws/aws-sdk-go v1.51.31 h1:4TM+sNc+Dzs7wY1sJ0+J8i60c6rkgnKP1pvPx8ghsSY= -github.com/aws/aws-sdk-go v1.51.31/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ= @@ -131,17 +133,17 @@ github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FC github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= -github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= -github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc= +github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0= +github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= +github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/cLCKqA= -github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4= +github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= +github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= @@ -300,16 +302,16 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -324,21 +326,19 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/api v0.176.0 h1:dHj1/yv5Dm/eQTXiP9hNCRT3xzJHWXeNdRq29XbMxoE= -google.golang.org/api v0.176.0/go.mod h1:Rra+ltKu14pps/4xTycZfobMgLpbosoaaL7c+SEMrO8= +google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= +google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 1aef58c93d1..9d3457f15bd 100644 --- a/pkg/build/wire/go.mod +++ b/pkg/build/wire/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build/wire -go 1.22.4 +go 1.23.0 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt index ae23f88c391..41c0cfaf75a 100644 --- a/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt +++ b/pkg/build/wire/internal/wire/testdata/UnexportedStruct/want/wire_errs.txt @@ -1 +1 @@ -example.com/foo/wire.go:x:y: foo not exported by package bar \ No newline at end of file +example.com/foo/wire.go:x:y: name foo not exported by package bar \ No newline at end of file diff --git a/pkg/cmd/grafana-cli/commands/conflict_user_command.go b/pkg/cmd/grafana-cli/commands/conflict_user_command.go index 1839dc7013f..01eb1336ec4 100644 --- a/pkg/cmd/grafana-cli/commands/conflict_user_command.go +++ b/pkg/cmd/grafana-cli/commands/conflict_user_command.go @@ -85,12 +85,7 @@ func initializeConflictResolver(cmd *utils.ContextCommandLine, f Formatter, ctx return nil, fmt.Errorf("%v: %w", "failed to get user service", err) } routing := routing.ProvideRegister() - if err != nil { - return nil, fmt.Errorf("%v: %w", "failed to initialize tracer config", err) - } - if err != nil { - return nil, fmt.Errorf("%v: %w", "failed to initialize tracer service", err) - } + acService, err := acimpl.ProvideService(cfg, replstore, routing, nil, nil, nil, features, tracer, zanzana.NewNoopClient(), permreg.ProvidePermissionRegistry()) if err != nil { return nil, fmt.Errorf("%v: %w", "failed to get access control", err) @@ -123,9 +118,9 @@ func runListConflictUsers() func(context *cli.Context) error { logger.Info(color.GreenString("No Conflicting users found.\n\n")) return nil } - logger.Infof("\n\nShowing conflicts\n\n") - logger.Infof(r.ToStringPresentation()) - logger.Infof("\n") + logger.Info("\n\nShowing conflicts\n\n") + logger.Info(r.ToStringPresentation()) + logger.Info("\n") if len(r.DiscardedBlocks) != 0 { r.logDiscardedUsers() } @@ -461,7 +456,8 @@ func (r *ConflictResolver) showChanges() { } } b.WriteString("Keep the following user.\n") - b.WriteString(fmt.Sprintf("%s\n", block)) + b.WriteString(block) + b.WriteByte('\n') b.WriteString(color.GreenString(fmt.Sprintf("id: %s, email: %s, login: %s\n", mainUser.ID, mainUser.Email, mainUser.Login))) for _, r := range fmt.Sprintf("%s%s", mainUser.Email, mainUser.Login) { if unicode.IsUpper(r) { @@ -482,7 +478,7 @@ func (r *ConflictResolver) showChanges() { b.WriteString("\n\n") } logger.Info("\n\nChanges that will take place\n\n") - logger.Infof(b.String()) + logger.Info(b.String()) } // Formatter make it possible for us to write to terminal and to a file diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go index de4ae3f9b7c..42a8317a175 100644 --- a/pkg/cmd/grafana-cli/commands/install_command.go +++ b/pkg/cmd/grafana-cli/commands/install_command.go @@ -134,7 +134,9 @@ func doInstallPlugin(ctx context.Context, pluginID, version string, o pluginInst Logger: services.Logger, }) - compatOpts := repo.NewCompatOpts(services.GrafanaVersion, runtime.GOOS, runtime.GOARCH) + // FIXME: Re-enable grafanaVersion. This check was broken in 10.2 so disabling it for the moment. + // Expected to be re-enabled in 12.x. + compatOpts := repo.NewCompatOpts("", runtime.GOOS, runtime.GOARCH) var archive *repo.PluginArchive var err error diff --git a/pkg/expr/hysteresis.go b/pkg/expr/hysteresis.go index 685af6ebaf1..d55c78a801d 100644 --- a/pkg/expr/hysteresis.go +++ b/pkg/expr/hysteresis.go @@ -45,7 +45,7 @@ func (h *HysteresisCommand) Execute(ctx context.Context, now time.Time, vars mat if results.IsNoData() { return mathexp.Results{Values: mathexp.Values{mathexp.NewNoData()}}, nil } - if h.LoadedDimensions == nil || len(h.LoadedDimensions) == 0 { + if len(h.LoadedDimensions) == 0 { return h.LoadingThresholdFunc.Execute(traceCtx, now, vars, tracer) } var loadedVals, unloadedVals mathexp.Values diff --git a/pkg/infra/filestorage/test_utils.go b/pkg/infra/filestorage/test_utils.go index 0445807a094..806741ac6e4 100644 --- a/pkg/infra/filestorage/test_utils.go +++ b/pkg/infra/filestorage/test_utils.go @@ -275,7 +275,7 @@ func handleQuery(t *testing.T, ctx context.Context, query interface{}, queryName file, fileFound, err := fs.Get(ctx, inputPath, options) require.NoError(t, err, "%s: should be able to get file %s", queryName, inputPath) - if q.checks != nil && len(q.checks) > 0 { + if len(q.checks) > 0 { require.NotNil(t, file, "%s %s", queryName, inputPath) require.True(t, fileFound, "%s %s", queryName, inputPath) require.Equal(t, strings.ToLower(inputPath), strings.ToLower(file.FullPath), "%s %s", queryName, inputPath) @@ -289,7 +289,7 @@ func handleQuery(t *testing.T, ctx context.Context, query interface{}, queryName resp, err := fs.List(ctx, inputPath, q.input.paging, q.input.options) require.NoError(t, err, "%s: should be able to list files in %s", queryName, inputPath) require.NotNil(t, resp) - if q.list != nil && len(q.list) > 0 { + if len(q.list) > 0 { runChecks(t, queryName, inputPath, resp, q.list) } else { require.NotNil(t, resp, "%s %s", queryName, inputPath) diff --git a/pkg/infra/filestorage/wrapper_test.go b/pkg/infra/filestorage/wrapper_test.go index 0fd9d55f085..6e013f32c46 100644 --- a/pkg/infra/filestorage/wrapper_test.go +++ b/pkg/infra/filestorage/wrapper_test.go @@ -1,7 +1,6 @@ package filestorage import ( - "fmt" "testing" "github.com/stretchr/testify/require" @@ -35,7 +34,7 @@ func TestFilestorage_getParentFolderPath(t *testing.T) { }, } for _, tt := range tests { - t.Run(fmt.Sprintf(tt.name), func(t *testing.T) { + t.Run(tt.name, func(t *testing.T) { require.Equal(t, tt.expected, getParentFolderPath(tt.path)) }) } diff --git a/pkg/kinds/dashboard/dashboard_spec_gen.go b/pkg/kinds/dashboard/dashboard_spec_gen.go index 60ac16f3ea0..de16129aa20 100644 --- a/pkg/kinds/dashboard/dashboard_spec_gen.go +++ b/pkg/kinds/dashboard/dashboard_spec_gen.go @@ -168,6 +168,7 @@ const ( VariableTypeGroupby VariableType = "groupby" VariableTypeInterval VariableType = "interval" VariableTypeQuery VariableType = "query" + VariableTypeSnapshot VariableType = "snapshot" VariableTypeSystem VariableType = "system" VariableTypeTextbox VariableType = "textbox" ) diff --git a/pkg/login/social/connectors/generic_oauth.go b/pkg/login/social/connectors/generic_oauth.go index 5d85302dd40..1e386d1d2e2 100644 --- a/pkg/login/social/connectors/generic_oauth.go +++ b/pkg/login/social/connectors/generic_oauth.go @@ -104,7 +104,7 @@ func (s *SocialGenericOAuth) Validate(ctx context.Context, newSettings ssoModels return ssosettings.ErrInvalidOAuthConfig("If Team Ids are configured then Team Ids attribute path and Teams URL must be configured.") } - if info.AllowedGroups != nil && len(info.AllowedGroups) > 0 && info.GroupsAttributePath == "" { + if len(info.AllowedGroups) > 0 && info.GroupsAttributePath == "" { return ssosettings.ErrInvalidOAuthConfig("If Allowed groups is configured then Groups attribute path must be configured.") } @@ -497,7 +497,7 @@ func (s *SocialGenericOAuth) fetchPrivateEmail(ctx context.Context, client *http IsConfirmed bool `json:"is_confirmed"` } - response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/emails")) + response, err := s.httpGet(ctx, client, s.info.ApiUrl+"/emails") if err != nil { s.log.Error("Error getting email address", "url", s.info.ApiUrl+"/emails", "error", err) return "", fmt.Errorf("%v: %w", "Error getting email address", err) @@ -559,7 +559,7 @@ func (s *SocialGenericOAuth) fetchTeamMembershipsFromDeprecatedTeamsUrl(ctx cont Id int `json:"id"` } - response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/teams")) + response, err := s.httpGet(ctx, client, s.info.ApiUrl+"/teams") if err != nil { s.log.Error("Error getting team memberships", "url", s.info.ApiUrl+"/teams", "error", err) return []string{}, err @@ -586,7 +586,7 @@ func (s *SocialGenericOAuth) fetchTeamMembershipsFromTeamsUrl(ctx context.Contex return []string{}, nil } - response, err := s.httpGet(ctx, client, fmt.Sprintf(s.teamsUrl)) + response, err := s.httpGet(ctx, client, s.teamsUrl) if err != nil { s.log.Error("Error getting team memberships", "url", s.teamsUrl, "error", err) return nil, err @@ -600,7 +600,7 @@ func (s *SocialGenericOAuth) fetchOrganizations(ctx context.Context, client *htt Login string `json:"login"` } - response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/orgs")) + response, err := s.httpGet(ctx, client, s.info.ApiUrl+"/orgs") if err != nil { s.log.Error("Error getting organizations", "url", s.info.ApiUrl+"/orgs", "error", err) return nil, false diff --git a/pkg/login/social/connectors/github_oauth.go b/pkg/login/social/connectors/github_oauth.go index 348e59f1ddd..124b642f822 100644 --- a/pkg/login/social/connectors/github_oauth.go +++ b/pkg/login/social/connectors/github_oauth.go @@ -190,7 +190,7 @@ func (s *SocialGithub) fetchPrivateEmail(ctx context.Context, client *http.Clien Verified bool `json:"verified"` } - response, err := s.httpGet(ctx, client, fmt.Sprintf(s.info.ApiUrl+"/emails")) + response, err := s.httpGet(ctx, client, s.info.ApiUrl+"/emails") if err != nil { return "", fmt.Errorf("Error getting email address: %s", err) } @@ -213,7 +213,7 @@ func (s *SocialGithub) fetchPrivateEmail(ctx context.Context, client *http.Clien } func (s *SocialGithub) fetchTeamMemberships(ctx context.Context, client *http.Client) ([]GithubTeam, error) { - url := fmt.Sprintf(s.info.ApiUrl + "/teams?per_page=100") + url := s.info.ApiUrl + "/teams?per_page=100" hasMore := true teams := make([]GithubTeam, 0) @@ -347,7 +347,7 @@ func (s *SocialGithub) UserInfo(ctx context.Context, client *http.Client, token userInfo.Name = data.Name } - organizationsUrl := fmt.Sprintf(s.info.ApiUrl + "/orgs?per_page=100") + organizationsUrl := s.info.ApiUrl + "/orgs?per_page=100" if !s.isTeamMember(ctx, client) { return nil, ErrMissingTeamMembership.Errorf("User is not a member of any of the allowed teams: %v", s.teamIds) diff --git a/pkg/middleware/gziper.go b/pkg/middleware/gziper.go index 02069695bf6..0d9a0a97c65 100644 --- a/pkg/middleware/gziper.go +++ b/pkg/middleware/gziper.go @@ -42,6 +42,7 @@ func prefix(p string) matcher { return func(s string) bool { return strings.HasP func substr(p string) matcher { return func(s string) bool { return strings.Contains(s, p) } } var gzipIgnoredPaths = []matcher{ + prefix("/apis"), // apiserver handles its own compression https://github.com/kubernetes/kubernetes/blob/b60e01f881aa8a74b44d0ac1000e4f67f854273b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go#L155-L158 prefix("/api/datasources"), prefix("/api/plugins"), prefix("/api/plugin-proxy/"), diff --git a/pkg/plugins/ifaces.go b/pkg/plugins/ifaces.go index b8f5d20ed1e..5606d4b6259 100644 --- a/pkg/plugins/ifaces.go +++ b/pkg/plugins/ifaces.go @@ -69,6 +69,7 @@ type FS interface { Base() string Files() ([]string, error) + Rel(string) (string, error) } type FSRemover interface { diff --git a/pkg/plugins/localfiles.go b/pkg/plugins/localfiles.go index 5981d13256e..0385f69dc94 100644 --- a/pkg/plugins/localfiles.go +++ b/pkg/plugins/localfiles.go @@ -77,6 +77,10 @@ func (f LocalFS) fileIsAllowed(basePath string, absolutePath string, info os.Fil return true, nil } +func (f LocalFS) Rel(p string) (string, error) { + return filepath.Rel(f.basePath, p) +} + // walkFunc returns a filepath.WalkFunc that accumulates absolute file paths into acc by walking over f.Base(). // f.fileIsAllowed is used as WalkFunc, see its documentation for more information on which files are collected. func (f LocalFS) walkFunc(basePath string, acc map[string]struct{}) filepath.WalkFunc { diff --git a/pkg/plugins/manager/fakes/fakes.go b/pkg/plugins/manager/fakes/fakes.go index b648e94c579..8abcb907b32 100644 --- a/pkg/plugins/manager/fakes/fakes.go +++ b/pkg/plugins/manager/fakes/fakes.go @@ -403,35 +403,43 @@ func (f *FakeActionSetRegistry) RegisterActionSets(_ context.Context, _ string, return f.ExpectedErr } -type FakePluginFiles struct { +type FakePluginFS struct { OpenFunc func(name string) (fs.File, error) RemoveFunc func() error + RelFunc func(string) (string, error) base string } -func NewFakePluginFiles(base string) *FakePluginFiles { - return &FakePluginFiles{ +func NewFakePluginFS(base string) *FakePluginFS { + return &FakePluginFS{ base: base, } } -func (f *FakePluginFiles) Open(name string) (fs.File, error) { +func (f *FakePluginFS) Open(name string) (fs.File, error) { if f.OpenFunc != nil { return f.OpenFunc(name) } return nil, nil } -func (f *FakePluginFiles) Base() string { +func (f *FakePluginFS) Rel(_ string) (string, error) { + if f.RelFunc != nil { + return f.RelFunc(f.base) + } + return "", nil +} + +func (f *FakePluginFS) Base() string { return f.base } -func (f *FakePluginFiles) Files() ([]string, error) { +func (f *FakePluginFS) Files() ([]string, error) { return []string{}, nil } -func (f *FakePluginFiles) Remove() error { +func (f *FakePluginFS) Remove() error { if f.RemoveFunc != nil { return f.RemoveFunc() } diff --git a/pkg/plugins/manager/loader/assetpath/assetpath.go b/pkg/plugins/manager/loader/assetpath/assetpath.go index eb24b0434a8..e26ce3bae1d 100644 --- a/pkg/plugins/manager/loader/assetpath/assetpath.go +++ b/pkg/plugins/manager/loader/assetpath/assetpath.go @@ -27,14 +27,16 @@ func ProvideService(cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) *S type PluginInfo struct { pluginJSON plugins.JSONData class plugins.Class - dir string + fs plugins.FS + parent *PluginInfo } -func NewPluginInfo(pluginJSON plugins.JSONData, class plugins.Class, fs plugins.FS) PluginInfo { +func NewPluginInfo(pluginJSON plugins.JSONData, class plugins.Class, fs plugins.FS, parent *PluginInfo) PluginInfo { return PluginInfo{ pluginJSON: pluginJSON, class: class, - dir: fs.Base(), + fs: fs, + parent: parent, } } @@ -45,33 +47,77 @@ func DefaultService(cfg *config.PluginManagementCfg) *Service { // Base returns the base path for the specified plugin. func (s *Service) Base(n PluginInfo) (string, error) { if n.class == plugins.ClassCore { - baseDir := getBaseDir(n.dir) + baseDir := getBaseDir(n.fs.Base()) return path.Join("public/app/plugins", string(n.pluginJSON.Type), baseDir), nil } + if n.class == plugins.ClassCDN { + return n.fs.Base(), nil + } if s.cdn.PluginSupported(n.pluginJSON.ID) { return s.cdn.AssetURL(n.pluginJSON.ID, n.pluginJSON.Info.Version, "") } + if n.parent != nil { + if s.cdn.PluginSupported(n.parent.pluginJSON.ID) { + relPath, err := n.parent.fs.Rel(n.fs.Base()) + if err != nil { + return "", err + } + return s.cdn.AssetURL(n.parent.pluginJSON.ID, n.parent.pluginJSON.Info.Version, relPath) + } + } + return path.Join("public/plugins", n.pluginJSON.ID), nil } // Module returns the module.js path for the specified plugin. func (s *Service) Module(n PluginInfo) (string, error) { if n.class == plugins.ClassCore { - if filepath.Base(n.dir) == "dist" { + if filepath.Base(n.fs.Base()) == "dist" { // The core plugin has been built externally, use the module from the dist folder } else { - baseDir := getBaseDir(n.dir) + baseDir := getBaseDir(n.fs.Base()) return path.Join("core:plugin", baseDir), nil } } + if n.class == plugins.ClassCDN { + return pluginscdn.JoinPath(n.fs.Base(), "module.js") + } + if s.cdn.PluginSupported(n.pluginJSON.ID) { return s.cdn.AssetURL(n.pluginJSON.ID, n.pluginJSON.Info.Version, "module.js") } + if n.parent != nil { + if s.cdn.PluginSupported(n.parent.pluginJSON.ID) { + relPath, err := n.parent.fs.Rel(n.fs.Base()) + if err != nil { + return "", err + } + return s.cdn.AssetURL(n.parent.pluginJSON.ID, n.parent.pluginJSON.Info.Version, path.Join(relPath, "module.js")) + } + } + return path.Join("public/plugins", n.pluginJSON.ID, "module.js"), nil } // RelativeURL returns the relative URL for an arbitrary plugin asset. func (s *Service) RelativeURL(n PluginInfo, pathStr string) (string, error) { + if n.class == plugins.ClassCDN { + return pluginscdn.JoinPath(n.fs.Base(), pathStr) + } + + if s.cdn.PluginSupported(n.pluginJSON.ID) { + return s.cdn.NewCDNURLConstructor(n.pluginJSON.ID, n.pluginJSON.Info.Version).StringPath(pathStr) + } + if n.parent != nil { + if s.cdn.PluginSupported(n.parent.pluginJSON.ID) { + relPath, err := n.parent.fs.Rel(n.fs.Base()) + if err != nil { + return "", err + } + return s.cdn.AssetURL(n.parent.pluginJSON.ID, n.parent.pluginJSON.Info.Version, path.Join(relPath, pathStr)) + } + } + if s.cdn.PluginSupported(n.pluginJSON.ID) { return s.cdn.NewCDNURLConstructor(n.pluginJSON.ID, n.pluginJSON.Info.Version).StringPath(pathStr) } diff --git a/pkg/plugins/manager/loader/assetpath/assetpath_test.go b/pkg/plugins/manager/loader/assetpath/assetpath_test.go index 9802dcfe00b..be8ce730b95 100644 --- a/pkg/plugins/manager/loader/assetpath/assetpath_test.go +++ b/pkg/plugins/manager/loader/assetpath/assetpath_test.go @@ -2,6 +2,7 @@ package assetpath import ( "net/url" + "path" "strings" "testing" @@ -13,8 +14,8 @@ import ( "github.com/grafana/grafana/pkg/plugins/pluginscdn" ) -func extPath(pluginID string) *fakes.FakePluginFiles { - return fakes.NewFakePluginFiles(pluginID) +func pluginFS(basePath string) *fakes.FakePluginFS { + return fakes.NewFakePluginFS(basePath) } func TestService(t *testing.T) { @@ -45,7 +46,7 @@ func TestService(t *testing.T) { } svc := ProvideService(cfg, pluginscdn.ProvideService(cfg)) - tableOldFS := fakes.NewFakePluginFiles("/grafana/public/app/plugins/panel/table-old") + tableOldFS := fakes.NewFakePluginFS("/grafana/public/app/plugins/panel/table-old") jsonData := map[string]plugins.JSONData{ "table-old": {ID: "table-old", Info: plugins.Info{Version: "1.0.0"}}, @@ -60,37 +61,75 @@ func TestService(t *testing.T) { }) t.Run("Base", func(t *testing.T) { - base, err := svc.Base(NewPluginInfo(jsonData["one"], plugins.ClassExternal, extPath("one"))) + base, err := svc.Base(NewPluginInfo(jsonData["one"], plugins.ClassExternal, pluginFS("one"), nil)) require.NoError(t, err) - u, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one") + oneCDNURL, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one") require.NoError(t, err) - require.Equal(t, u, base) + require.Equal(t, oneCDNURL, base) - base, err = svc.Base(NewPluginInfo(jsonData["two"], plugins.ClassExternal, extPath("two"))) + base, err = svc.Base(NewPluginInfo(jsonData["one"], plugins.ClassCDN, pluginFS(oneCDNURL), nil)) + require.NoError(t, err) + require.Equal(t, oneCDNURL, base) + + base, err = svc.Base(NewPluginInfo(jsonData["two"], plugins.ClassExternal, pluginFS("two"), nil)) require.NoError(t, err) require.Equal(t, "public/plugins/two", base) - base, err = svc.Base(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS)) + base, err = svc.Base(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS, nil)) require.NoError(t, err) require.Equal(t, "public/app/plugins/table-old", base) + + parentFS := pluginFS(oneCDNURL) + parentFS.RelFunc = func(_ string) (string, error) { + return "child-plugins/two", nil + } + parent := NewPluginInfo(jsonData["one"], plugins.ClassExternal, parentFS, nil) + child := NewPluginInfo(jsonData["two"], plugins.ClassExternal, fakes.NewFakePluginFS(""), &parent) + base, err = svc.Base(child) + require.NoError(t, err) + + childBase, err := url.JoinPath(oneCDNURL, "child-plugins/two") + require.NoError(t, err) + require.Equal(t, childBase, base) }) t.Run("Module", func(t *testing.T) { - module, err := svc.Module(NewPluginInfo(jsonData["one"], plugins.ClassExternal, extPath("one"))) + module, err := svc.Module(NewPluginInfo(jsonData["one"], plugins.ClassExternal, pluginFS("one"), nil)) require.NoError(t, err) - u, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one/module.js") + oneCDNURL, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one") require.NoError(t, err) - require.Equal(t, u, module) - module, err = svc.Module(NewPluginInfo(jsonData["two"], plugins.ClassExternal, extPath("two"))) + oneCDNModuleURL, err := url.JoinPath(oneCDNURL, "module.js") + require.NoError(t, err) + require.Equal(t, oneCDNModuleURL, module) + + fs := pluginFS("one") + module, err = svc.Module(NewPluginInfo(jsonData["one"], plugins.ClassCDN, fs, nil)) + require.NoError(t, err) + require.Equal(t, path.Join(fs.Base(), "module.js"), module) + + module, err = svc.Module(NewPluginInfo(jsonData["two"], plugins.ClassExternal, pluginFS("two"), nil)) require.NoError(t, err) require.Equal(t, "public/plugins/two/module.js", module) - module, err = svc.Module(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS)) + module, err = svc.Module(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS, nil)) require.NoError(t, err) require.Equal(t, "core:plugin/table-old", module) + + parentFS := pluginFS(oneCDNURL) + parentFS.RelFunc = func(_ string) (string, error) { + return "child-plugins/two", nil + } + parent := NewPluginInfo(jsonData["one"], plugins.ClassExternal, parentFS, nil) + child := NewPluginInfo(jsonData["two"], plugins.ClassExternal, fakes.NewFakePluginFS(""), &parent) + module, err = svc.Module(child) + require.NoError(t, err) + + childModule, err := url.JoinPath(oneCDNURL, "child-plugins/two/module.js") + require.NoError(t, err) + require.Equal(t, childModule, module) }) t.Run("RelativeURL", func(t *testing.T) { @@ -103,24 +142,47 @@ func TestService(t *testing.T) { }, } - u, err := svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, extPath("one")), "") + u, err := svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, pluginFS("one"), nil), "") require.NoError(t, err) // given an empty path, base URL will be returned - baseURL, err := svc.Base(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, extPath("one"))) + baseURL, err := svc.Base(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, pluginFS("one"), nil)) require.NoError(t, err) require.Equal(t, baseURL, u) - u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, extPath("one")), "path/to/file.txt") + u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, pluginFS("one"), nil), "path/to/file.txt") require.NoError(t, err) require.Equal(t, strings.TrimRight(tc.cdnBaseURL, "/")+"/one/1.0.0/public/plugins/one/path/to/file.txt", u) - u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, extPath("two")), "path/to/file.txt") + u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, pluginFS("two"), nil), "path/to/file.txt") require.NoError(t, err) require.Equal(t, "public/plugins/two/path/to/file.txt", u) - u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, extPath("two")), "default") + u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, pluginFS("two"), nil), "default") require.NoError(t, err) require.Equal(t, "public/plugins/two/default", u) + + oneCDNURL, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one") + require.NoError(t, err) + + u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassCDN, pluginFS(oneCDNURL), nil), "path/to/file.txt") + require.NoError(t, err) + + oneCDNRelativeURL, err := url.JoinPath(oneCDNURL, "path/to/file.txt") + require.NoError(t, err) + require.Equal(t, oneCDNRelativeURL, u) + + parentFS := pluginFS(oneCDNURL) + parentFS.RelFunc = func(_ string) (string, error) { + return "child-plugins/two", nil + } + parent := NewPluginInfo(jsonData["one"], plugins.ClassExternal, parentFS, nil) + child := NewPluginInfo(jsonData["two"], plugins.ClassExternal, fakes.NewFakePluginFS(""), &parent) + u, err = svc.RelativeURL(child, "path/to/file.txt") + require.NoError(t, err) + + oneCDNRelativeURL, err = url.JoinPath(oneCDNURL, "child-plugins/two/path/to/file.txt") + require.NoError(t, err) + require.Equal(t, oneCDNRelativeURL, u) }) }) } diff --git a/pkg/plugins/manager/pipeline/bootstrap/factory.go b/pkg/plugins/manager/pipeline/bootstrap/factory.go index c5f23865a67..9b6b5fd718b 100644 --- a/pkg/plugins/manager/pipeline/bootstrap/factory.go +++ b/pkg/plugins/manager/pipeline/bootstrap/factory.go @@ -25,7 +25,8 @@ func NewDefaultPluginFactory(assetPath *assetpath.Service) *DefaultPluginFactory func (f *DefaultPluginFactory) createPlugin(bundle *plugins.FoundBundle, class plugins.Class, sig plugins.Signature) (*plugins.Plugin, error) { - plugin, err := f.newPlugin(bundle.Primary, class, sig) + parentInfo := assetpath.NewPluginInfo(bundle.Primary.JSONData, class, bundle.Primary.FS, nil) + plugin, err := f.newPlugin(bundle.Primary, class, sig, parentInfo) if err != nil { return nil, err } @@ -36,7 +37,8 @@ func (f *DefaultPluginFactory) createPlugin(bundle *plugins.FoundBundle, class p plugin.Children = make([]*plugins.Plugin, 0, len(bundle.Children)) for _, child := range bundle.Children { - cp, err := f.newPlugin(*child, class, sig) + childInfo := assetpath.NewPluginInfo(child.JSONData, class, child.FS, &parentInfo) + cp, err := f.newPlugin(*child, class, sig, childInfo) if err != nil { return nil, err } @@ -47,8 +49,8 @@ func (f *DefaultPluginFactory) createPlugin(bundle *plugins.FoundBundle, class p return plugin, nil } -func (f *DefaultPluginFactory) newPlugin(p plugins.FoundPlugin, class plugins.Class, sig plugins.Signature) (*plugins.Plugin, error) { - info := assetpath.NewPluginInfo(p.JSONData, class, p.FS) +func (f *DefaultPluginFactory) newPlugin(p plugins.FoundPlugin, class plugins.Class, sig plugins.Signature, + info assetpath.PluginInfo) (*plugins.Plugin, error) { baseURL, err := f.assetPath.Base(info) if err != nil { return nil, fmt.Errorf("base url: %w", err) @@ -69,14 +71,13 @@ func (f *DefaultPluginFactory) newPlugin(p plugins.FoundPlugin, class plugins.Cl } plugin.SetLogger(log.New(fmt.Sprintf("plugin.%s", plugin.ID))) - if err = setImages(plugin, f.assetPath); err != nil { + if err = setImages(plugin, f.assetPath, info); err != nil { return nil, err } return plugin, nil } -func setImages(p *plugins.Plugin, assetPath *assetpath.Service) error { - info := assetpath.NewPluginInfo(p.JSONData, p.Class, p.FS) +func setImages(p *plugins.Plugin, assetPath *assetpath.Service, info assetpath.PluginInfo) error { var err error for _, dst := range []*string{&p.Info.Logos.Small, &p.Info.Logos.Large} { if len(*dst) == 0 { diff --git a/pkg/plugins/manager/pipeline/bootstrap/steps_test.go b/pkg/plugins/manager/pipeline/bootstrap/steps_test.go index 31eedd6ddc2..3bb8ca78e02 100644 --- a/pkg/plugins/manager/pipeline/bootstrap/steps_test.go +++ b/pkg/plugins/manager/pipeline/bootstrap/steps_test.go @@ -98,7 +98,7 @@ func TestTemplateDecorateFunc(t *testing.T) { func Test_configureAppChildPlugin(t *testing.T) { t.Run("Child plugin will inherit parent version information when version is empty", func(t *testing.T) { child := &plugins.Plugin{ - FS: fakes.NewFakePluginFiles("c:\\grafana\\public\\app\\plugins\\app\\testdata-app\\datasources\\datasource"), + FS: fakes.NewFakePluginFS("c:\\grafana\\public\\app\\plugins\\app\\testdata-app\\datasources\\datasource"), } parent := &plugins.Plugin{ JSONData: plugins.JSONData{ @@ -107,7 +107,7 @@ func Test_configureAppChildPlugin(t *testing.T) { Info: plugins.Info{Version: "1.0.0"}, }, Class: plugins.ClassCore, - FS: fakes.NewFakePluginFiles("c:\\grafana\\public\\app\\plugins\\app\\testdata-app"), + FS: fakes.NewFakePluginFS("c:\\grafana\\public\\app\\plugins\\app\\testdata-app"), BaseURL: "public/app/plugins/app/testdata-app", } @@ -119,7 +119,7 @@ func Test_configureAppChildPlugin(t *testing.T) { t.Run("Child plugin will not inherit parent version information when version is non-empty", func(t *testing.T) { child := &plugins.Plugin{ - FS: fakes.NewFakePluginFiles("/plugins/parent-app/child-panel"), + FS: fakes.NewFakePluginFS("/plugins/parent-app/child-panel"), JSONData: plugins.JSONData{ Info: plugins.Info{Version: "2.0.2"}, }, @@ -131,7 +131,7 @@ func Test_configureAppChildPlugin(t *testing.T) { Info: plugins.Info{Version: "2.0.0"}, }, Class: plugins.ClassExternal, - FS: fakes.NewFakePluginFiles("/plugins/parent-app"), + FS: fakes.NewFakePluginFS("/plugins/parent-app"), BaseURL: "plugins/parent-app", } diff --git a/pkg/plugins/manager/signature/manifest_test.go b/pkg/plugins/manager/signature/manifest_test.go index 1414f4d61b2..cb7364ed93a 100644 --- a/pkg/plugins/manager/signature/manifest_test.go +++ b/pkg/plugins/manager/signature/manifest_test.go @@ -351,6 +351,10 @@ func (f fsPathSeparatorFiles) Files() ([]string, error) { return files, nil } +func (f fsPathSeparatorFiles) Rel(base string) (string, error) { + return filepath.Rel(f.Base(), strings.ReplaceAll(base, f.separator, string(filepath.Separator))) +} + func (f fsPathSeparatorFiles) Open(name string) (fs.File, error) { return f.FS.Open(strings.ReplaceAll(name, f.separator, string(filepath.Separator))) } diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 1f2cc1aa513..b52585c46ab 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -505,6 +505,7 @@ const ( ClassCore Class = "core" ClassBundled Class = "bundled" ClassExternal Class = "external" + ClassCDN Class = "cdn" ) func (c Class) String() string { diff --git a/pkg/plugins/pluginscdn/pluginscdn.go b/pkg/plugins/pluginscdn/pluginscdn.go index 44445d449fd..4161954b981 100644 --- a/pkg/plugins/pluginscdn/pluginscdn.go +++ b/pkg/plugins/pluginscdn/pluginscdn.go @@ -2,6 +2,7 @@ package pluginscdn import ( "errors" + "net/url" "strings" "github.com/grafana/grafana/pkg/plugins/config" @@ -62,3 +63,7 @@ func (s *Service) AssetURL(pluginID, pluginVersion, assetPath string) (string, e } return s.NewCDNURLConstructor(pluginID, pluginVersion).StringPath(assetPath) } + +func JoinPath(base string, assetPath ...string) (string, error) { + return url.JoinPath(base, assetPath...) +} diff --git a/pkg/plugins/repo/errors.go b/pkg/plugins/repo/errors.go index 15c0db83068..c275ce43afc 100644 --- a/pkg/plugins/repo/errors.go +++ b/pkg/plugins/repo/errors.go @@ -67,6 +67,10 @@ var ( ErrCorePluginMsg = "plugin {{.Public.PluginID}} is a core plugin and cannot be installed separately" ErrCorePluginBase = errutil.Forbidden("plugin.forbiddenCorePluginInstall"). MustTemplate(ErrCorePluginMsg, errutil.WithPublic(ErrCorePluginMsg)) + + ErrNotCompatibledMsg = "{{.Public.PluginID}} is not compatible with your Grafana version: {{.Public.GrafanaVersion}}" + ErrNotCompatibleBase = errutil.NotFound("plugin.grafanaVersionNotCompatible"). + MustTemplate(ErrNotCompatibledMsg, errutil.WithPublic(ErrNotCompatibledMsg)) ) func ErrVersionUnsupported(pluginID, requestedVersion, systemInfo string) error { @@ -88,3 +92,7 @@ func ErrChecksumMismatch(archiveURL string) error { func ErrCorePlugin(pluginID string) error { return ErrCorePluginBase.Build(errutil.TemplateData{Public: map[string]any{"PluginID": pluginID}}) } + +func ErrNoCompatibleVersions(pluginID, grafanaVersion string) error { + return ErrNotCompatibleBase.Build(errutil.TemplateData{Public: map[string]any{"PluginID": pluginID, "GrafanaVersion": grafanaVersion}}) +} diff --git a/pkg/plugins/repo/models.go b/pkg/plugins/repo/models.go index 85c1519b5c8..73c06259810 100644 --- a/pkg/plugins/repo/models.go +++ b/pkg/plugins/repo/models.go @@ -18,11 +18,17 @@ type PluginVersions struct { } type Version struct { - Version string `json:"version"` - Arch map[string]ArchMeta `json:"packages"` - URL string `json:"url"` + Version string `json:"version"` + Arch map[string]ArchMeta `json:"packages"` + URL string `json:"url"` + CreatedAt string `json:"createdAt"` + IsCompatible *bool `json:"isCompatible,omitempty"` + GrafanaDependency string `json:"grafanaDependency"` } type ArchMeta struct { - SHA256 string `json:"sha256"` + SHA256 string `json:"sha256"` + MD5 string `json:"md5"` + PackageName string `json:"packageName"` + DownloadURL string `json:"downloadUrl"` } diff --git a/pkg/plugins/repo/service.go b/pkg/plugins/repo/service.go index dea206ef5af..59af8d95906 100644 --- a/pkg/plugins/repo/service.go +++ b/pkg/plugins/repo/service.go @@ -3,7 +3,6 @@ package repo import ( "context" "encoding/json" - "errors" "fmt" "net/http" "net/url" @@ -84,12 +83,7 @@ func (m *Manager) PluginVersion(pluginID, version string, compatOpts CompatOpts) return VersionData{}, err } - sysCompatOpts, exists := compatOpts.System() - if !exists { - return VersionData{}, errors.New("no system compatibility requirements set") - } - - compatibleVer, err := SelectSystemCompatibleVersion(m.log, versions, pluginID, version, sysCompatOpts) + compatibleVer, err := SelectSystemCompatibleVersion(m.log, versions, pluginID, version, compatOpts) if err != nil { return VersionData{}, err } diff --git a/pkg/plugins/repo/service_test.go b/pkg/plugins/repo/service_test.go index ba050893420..887fe42868f 100644 --- a/pkg/plugins/repo/service_test.go +++ b/pkg/plugins/repo/service_test.go @@ -174,7 +174,8 @@ func mockPluginVersionsAPI(t *testing.T, data srvData) *httptest.Server { "sha256": "%s" } }, - "url": "%s" + "url": "%s", + "isCompatible": true }] } `, data.version, platform, data.sha, data.url), @@ -192,15 +193,17 @@ func mockPluginVersionsAPI(t *testing.T, data srvData) *httptest.Server { } type versionArg struct { - version string - arch []string + version string + arch []string + isCompatible *bool } func createPluginVersions(versions ...versionArg) []Version { vs := make([]Version, len(versions)) for i, version := range versions { ver := Version{ - Version: version.version, + Version: version.version, + IsCompatible: version.isCompatible, } if version.arch != nil { ver.Arch = map[string]ArchMeta{} diff --git a/pkg/plugins/repo/version.go b/pkg/plugins/repo/version.go index ad3716d1c2f..b589288019b 100644 --- a/pkg/plugins/repo/version.go +++ b/pkg/plugins/repo/version.go @@ -1,6 +1,8 @@ package repo import ( + "errors" + "slices" "strings" "github.com/grafana/grafana/pkg/plugins/log" @@ -19,19 +21,24 @@ type VersionData struct { // returns error if the supplied version does not exist. // returns error if supplied version exists but is not supported. // NOTE: It expects plugin.Versions to be sorted so the newest version is first. -func SelectSystemCompatibleVersion(log log.PrettyLogger, versions []Version, pluginID, version string, compatOpts SystemCompatOpts) (VersionData, error) { +func SelectSystemCompatibleVersion(log log.PrettyLogger, versions []Version, pluginID, version string, compatOpts CompatOpts) (VersionData, error) { version = normalizeVersion(version) - var ver Version - latestForArch, exists := latestSupportedVersion(versions, compatOpts) + sysCompatOpts, exists := compatOpts.System() if !exists { - return VersionData{}, ErrArcNotFound(pluginID, compatOpts.OSAndArch()) + return VersionData{}, errors.New("no system compatibility requirements set") + } + + var ver Version + latestForArch, err := latestSupportedVersion(pluginID, versions, compatOpts) + if err != nil { + return VersionData{}, err } if version == "" { return VersionData{ Version: latestForArch.Version, - Checksum: checksum(latestForArch, compatOpts), + Checksum: checksum(latestForArch, sysCompatOpts), Arch: latestForArch.Arch, URL: latestForArch.URL, }, nil @@ -46,18 +53,18 @@ func SelectSystemCompatibleVersion(log log.PrettyLogger, versions []Version, plu if len(ver.Version) == 0 { log.Debugf("Requested plugin version %s v%s not found but potential fallback version '%s' was found", pluginID, version, latestForArch.Version) - return VersionData{}, ErrVersionNotFound(pluginID, version, compatOpts.OSAndArch()) + return VersionData{}, ErrVersionNotFound(pluginID, version, sysCompatOpts.OSAndArch()) } - if !supportsCurrentArch(ver, compatOpts) { + if !supportsCurrentArch(ver, sysCompatOpts) { log.Debugf("Requested plugin version %s v%s is not supported on your system but potential fallback version '%s' was found", pluginID, version, latestForArch.Version) - return VersionData{}, ErrVersionUnsupported(pluginID, version, compatOpts.OSAndArch()) + return VersionData{}, ErrVersionUnsupported(pluginID, version, sysCompatOpts.OSAndArch()) } return VersionData{ Version: ver.Version, - Checksum: checksum(ver, compatOpts), + Checksum: checksum(ver, sysCompatOpts), Arch: ver.Arch, URL: ver.URL, }, nil @@ -86,13 +93,22 @@ func supportsCurrentArch(version Version, compatOpts SystemCompatOpts) bool { return false } -func latestSupportedVersion(versions []Version, compatOpts SystemCompatOpts) (Version, bool) { +func latestSupportedVersion(pluginID string, versions []Version, compatOpts CompatOpts) (Version, error) { + // First check if the version are compatible with the current Grafana version + versions = slices.DeleteFunc(versions, func(v Version) bool { + return v.IsCompatible != nil && !*v.IsCompatible + }) + if len(versions) == 0 { + return Version{}, ErrNoCompatibleVersions(pluginID, compatOpts.grafanaVersion) + } + + // Then check if the version are compatible with the current system for _, v := range versions { - if supportsCurrentArch(v, compatOpts) { - return v, true + if supportsCurrentArch(v, compatOpts.system) { + return v, nil } } - return Version{}, false + return Version{}, ErrArcNotFound(pluginID, compatOpts.system.OSAndArch()) } func normalizeVersion(version string) string { diff --git a/pkg/plugins/repo/version_test.go b/pkg/plugins/repo/version_test.go index e3ee36ebaa0..d62671e3b88 100644 --- a/pkg/plugins/repo/version_test.go +++ b/pkg/plugins/repo/version_test.go @@ -8,15 +8,25 @@ import ( "github.com/grafana/grafana/pkg/plugins/log" ) +func fakeCompatOpts() CompatOpts { + return NewCompatOpts("7.0.0", "linux", "amd64") +} + func TestSelectSystemCompatibleVersion(t *testing.T) { logger := log.NewTestPrettyLogger() t.Run("Should return error when requested version does not exist", func(t *testing.T) { - _, err := SelectSystemCompatibleVersion(log.NewTestPrettyLogger(), createPluginVersions(versionArg{version: "version"}), "test", "1.1.1", SystemCompatOpts{}) + _, err := SelectSystemCompatibleVersion( + log.NewTestPrettyLogger(), + createPluginVersions(versionArg{version: "version"}), + "test", "1.1.1", fakeCompatOpts()) require.Error(t, err) }) t.Run("Should return error when no version supports current arch", func(t *testing.T) { - _, err := SelectSystemCompatibleVersion(logger, createPluginVersions(versionArg{version: "version", arch: []string{"non-existent"}}), "test", "", SystemCompatOpts{}) + _, err := SelectSystemCompatibleVersion( + logger, + createPluginVersions(versionArg{version: "version", arch: []string{"non-existent"}}), + "test", "", fakeCompatOpts()) require.Error(t, err) }) @@ -24,7 +34,7 @@ func TestSelectSystemCompatibleVersion(t *testing.T) { _, err := SelectSystemCompatibleVersion(logger, createPluginVersions( versionArg{version: "2.0.0"}, versionArg{version: "1.1.1", arch: []string{"non-existent"}}, - ), "test", "1.1.1", SystemCompatOpts{}) + ), "test", "1.1.1", fakeCompatOpts()) require.Error(t, err) }) @@ -32,20 +42,35 @@ func TestSelectSystemCompatibleVersion(t *testing.T) { ver, err := SelectSystemCompatibleVersion(logger, createPluginVersions( versionArg{version: "2.0.0", arch: []string{"non-existent"}}, versionArg{version: "1.0.0"}, - ), "test", "", SystemCompatOpts{}) + ), "test", "", fakeCompatOpts()) require.NoError(t, err) require.Equal(t, "1.0.0", ver.Version) }) t.Run("Should return latest version when no version specified", func(t *testing.T) { - ver, err := SelectSystemCompatibleVersion(logger, createPluginVersions(versionArg{version: "2.0.0"}, versionArg{version: "1.0.0"}), "test", "", SystemCompatOpts{}) + ver, err := SelectSystemCompatibleVersion(logger, createPluginVersions( + versionArg{version: "2.0.0"}, + versionArg{version: "1.0.0"}), + "test", "", fakeCompatOpts()) require.NoError(t, err) require.Equal(t, "2.0.0", ver.Version) }) t.Run("Should return requested version", func(t *testing.T) { - ver, err := SelectSystemCompatibleVersion(logger, createPluginVersions(versionArg{version: "2.0.0"}, versionArg{version: "1.0.0"}), "test", "1.0.0", SystemCompatOpts{}) + ver, err := SelectSystemCompatibleVersion(logger, createPluginVersions( + versionArg{version: "2.0.0"}, + versionArg{version: "1.0.0"}), + "test", "1.0.0", fakeCompatOpts()) require.NoError(t, err) require.Equal(t, "1.0.0", ver.Version) }) + + t.Run("Should return error when requested version is not compatible", func(t *testing.T) { + isCompatible := false + _, err := SelectSystemCompatibleVersion(logger, + createPluginVersions(versionArg{version: "2.0.0", isCompatible: &isCompatible}), + "test", "2.0.0", fakeCompatOpts(), + ) + require.ErrorContains(t, err, "not compatible") + }) } diff --git a/pkg/plugins/test_utils.go b/pkg/plugins/test_utils.go index 97f5f3d3d9a..bdf731855ec 100644 --- a/pkg/plugins/test_utils.go +++ b/pkg/plugins/test_utils.go @@ -36,6 +36,10 @@ func (f inMemoryFS) Files() ([]string, error) { return fps, nil } +func (f inMemoryFS) Rel(_ string) (string, error) { + return "", nil +} + func (f inMemoryFS) Open(fn string) (fs.File, error) { if _, ok := f.files[fn]; !ok { return nil, ErrFileNotExist diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 74315b2ab39..f3aea762a82 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,13 +1,13 @@ module github.com/grafana/grafana/pkg/promlib -go 1.22.4 +go 1.23.0 require ( github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3 - github.com/grafana/grafana-plugin-sdk-go v0.243.0 + github.com/grafana/grafana-plugin-sdk-go v0.244.0 github.com/json-iterator/go v1.1.12 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.0 github.com/prometheus/common v0.55.0 github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 github.com/stretchr/testify v1.9.0 @@ -22,7 +22,7 @@ require ( github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect github.com/apache/arrow/go/v15 v15.0.2 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go v1.51.31 // indirect + github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/buger/jsonparser v1.1.1 // indirect @@ -68,8 +68,9 @@ require ( github.com/invopop/yaml v0.3.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattetti/filebuffer v1.0.1 // indirect @@ -114,13 +115,13 @@ require ( golang.org/x/mod v0.18.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.22.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect diff --git a/pkg/promlib/go.sum b/pkg/promlib/go.sum index 79390bf3964..8a3cfef31d1 100644 --- a/pkg/promlib/go.sum +++ b/pkg/promlib/go.sum @@ -7,8 +7,8 @@ github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcy github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/aws/aws-sdk-go v1.51.31 h1:4TM+sNc+Dzs7wY1sJ0+J8i60c6rkgnKP1pvPx8ghsSY= -github.com/aws/aws-sdk-go v1.51.31/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -98,8 +98,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3 h1:as4PmrFoYI1byS5JjsgPC7uSGTMh+SgS0ePv6hOyDGU= github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3/go.mod h1:lcjGB6SuaZ2o44A9nD6p/tR4QXSPbzViRY520Gy6pTQ= -github.com/grafana/grafana-plugin-sdk-go v0.243.0 h1:Xrkv7rN0aL5AK7b8zVsuD0ryCJX4HlaXUGGKjMuHeL4= -github.com/grafana/grafana-plugin-sdk-go v0.243.0/go.mod h1:JDrwijH50ym2SxBd4zNoQ4K+sdC1VppH4kVS8B1Nh0U= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= @@ -139,14 +139,16 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -197,8 +199,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= @@ -329,8 +331,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= @@ -346,14 +348,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/pkg/promlib/querydata/request.go b/pkg/promlib/querydata/request.go index 7865c9afe2c..3ee3a0a14f1 100644 --- a/pkg/promlib/querydata/request.go +++ b/pkg/promlib/querydata/request.go @@ -2,6 +2,7 @@ package querydata import ( "context" + "errors" "fmt" "net/http" "regexp" @@ -14,12 +15,13 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend/tracing" "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana-plugin-sdk-go/data/utils/maputil" + "go.opentelemetry.io/otel/trace" + "github.com/grafana/grafana/pkg/promlib/client" "github.com/grafana/grafana/pkg/promlib/intervalv2" "github.com/grafana/grafana/pkg/promlib/models" "github.com/grafana/grafana/pkg/promlib/querydata/exemplar" "github.com/grafana/grafana/pkg/promlib/utils" - "go.opentelemetry.io/otel/trace" ) const legendFormatAuto = "__auto" @@ -240,7 +242,7 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models. } }() - return s.parseResponse(ctx, q, res, enablePrometheusDataplaneFlag) + return s.parseResponse(ctx, q, res) } func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse { @@ -255,7 +257,7 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model // This is only for health check fall back scenario if res.StatusCode != 200 && q.RefId == "__healthcheck__" { return backend.DataResponse{ - Error: fmt.Errorf(res.Status), + Error: errors.New(res.Status), } } @@ -266,7 +268,7 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model } }() - return s.parseResponse(ctx, q, res, enablePrometheusDataplaneFlag) + return s.parseResponse(ctx, q, res) } func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse { @@ -283,7 +285,7 @@ func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *mode s.log.Warn("Failed to close response body", "error", err) } }() - return s.parseResponse(ctx, q, res, enablePrometheusDataplaneFlag) + return s.parseResponse(ctx, q, res) } func addDataResponse(res *backend.DataResponse, dr *backend.DataResponse) { diff --git a/pkg/promlib/querydata/request_test.go b/pkg/promlib/querydata/request_test.go index 3a1ac8986f9..0977b9036d3 100644 --- a/pkg/promlib/querydata/request_test.go +++ b/pkg/promlib/querydata/request_test.go @@ -137,7 +137,7 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) { require.Equal(t, "Time", res[0].Fields[0].Name) require.Len(t, res[0].Fields[1].Labels, 2) require.Equal(t, "app=Application, tag2=tag2", res[0].Fields[1].Labels.String()) - require.Equal(t, "legend Application", res[0].Name) + require.Equal(t, "legend Application", res[0].Fields[1].Config.DisplayNameFromDS) // Ensure the timestamps are UTC zoned testValue := res[0].Fields[0].At(0) @@ -231,7 +231,7 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) { require.Equal(t, res[0].Fields[0].Name, "Time") require.Len(t, res[0].Fields[1].Labels, 2) require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2") - require.Equal(t, "{app=\"Application\", tag2=\"tag2\"}", res[0].Name) + require.Equal(t, `{app="Application", tag2="tag2"}`, res[0].Fields[1].Config.DisplayNameFromDS) }) t.Run("matrix response with NaN value should be changed to null", func(t *testing.T) { @@ -269,7 +269,7 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) { res, err := execute(tctx, query, result) require.NoError(t, err) - require.Equal(t, "{app=\"Application\"}", res[0].Name) + require.Equal(t, `{app="Application"}`, res[0].Fields[1].Config.DisplayNameFromDS) require.True(t, math.IsNaN(res[0].Fields[1].At(0).(float64))) }) @@ -308,7 +308,7 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) { require.Equal(t, res[0].Fields[0].Name, "Time") require.Len(t, res[0].Fields[1].Labels, 2) require.Equal(t, res[0].Fields[1].Labels.String(), "app=Application, tag2=tag2") - require.Equal(t, "legend Application", res[0].Name) + require.Equal(t, "legend Application", res[0].Fields[1].Config.DisplayNameFromDS) // Ensure the timestamps are UTC zoned testValue := res[0].Fields[0].At(0) diff --git a/pkg/promlib/querydata/response.go b/pkg/promlib/querydata/response.go index 7181400df16..b1cfec8e7fa 100644 --- a/pkg/promlib/querydata/response.go +++ b/pkg/promlib/querydata/response.go @@ -18,7 +18,7 @@ import ( "github.com/grafana/grafana/pkg/promlib/utils" ) -func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *http.Response, enablePrometheusDataplaneFlag bool) backend.DataResponse { +func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *http.Response) backend.DataResponse { defer func() { if err := res.Body.Close(); err != nil { s.log.FromContext(ctx).Error("Failed to close response body", "err", err) @@ -29,9 +29,7 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt defer endSpan() iter := jsoniter.Parse(jsoniter.ConfigDefault, res.Body, 1024) - r := converter.ReadPrometheusStyleResult(iter, converter.Options{ - Dataplane: enablePrometheusDataplaneFlag, - }) + r := converter.ReadPrometheusStyleResult(iter, converter.Options{Dataplane: true}) r.Status = backend.Status(res.StatusCode) // Add frame to attach metadata @@ -41,7 +39,7 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt // The ExecutedQueryString can be viewed in QueryInspector in UI for i, frame := range r.Frames { - addMetadataToMultiFrame(q, frame, enablePrometheusDataplaneFlag) + addMetadataToMultiFrame(q, frame) if i == 0 { frame.Meta.ExecutedQueryString = executedQueryString(q) } @@ -106,7 +104,7 @@ func (s *QueryData) processExemplars(ctx context.Context, q *models.Query, dr ba } } -func addMetadataToMultiFrame(q *models.Query, frame *data.Frame, enableDataplane bool) { +func addMetadataToMultiFrame(q *models.Query, frame *data.Frame) { if frame.Meta == nil { frame.Meta = &data.FrameMeta{} } @@ -120,13 +118,9 @@ func addMetadataToMultiFrame(q *models.Query, frame *data.Frame, enableDataplane frame.Fields[1].Config = &data.FieldConfig{DisplayNameFromDS: customName} } - if enableDataplane { - valueField := frame.Fields[1] - if n, ok := valueField.Labels["__name__"]; ok { - valueField.Name = n - } - } else { - frame.Name = customName + valueField := frame.Fields[1] + if n, ok := valueField.Labels["__name__"]; ok { + valueField.Name = n } } diff --git a/pkg/promlib/querydata/response_test.go b/pkg/promlib/querydata/response_test.go index 8cec7ba460a..5c7a2e6c555 100644 --- a/pkg/promlib/querydata/response_test.go +++ b/pkg/promlib/querydata/response_test.go @@ -19,7 +19,7 @@ func TestQueryData_parseResponse(t *testing.T) { t.Run("resultType is before result the field must parsed normally", func(t *testing.T) { resBody := `{"data":{"resultType":"vector", "result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}]},"status":"success"}` res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))} - result := qd.parseResponse(context.Background(), &models.Query{}, res, false) + result := qd.parseResponse(context.Background(), &models.Query{}, res) assert.Nil(t, result.Error) assert.Len(t, result.Frames, 1) }) @@ -27,7 +27,7 @@ func TestQueryData_parseResponse(t *testing.T) { t.Run("resultType is after the result field must parsed normally", func(t *testing.T) { resBody := `{"data":{"result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}],"resultType":"vector"},"status":"success"}` res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))} - result := qd.parseResponse(context.Background(), &models.Query{}, res, false) + result := qd.parseResponse(context.Background(), &models.Query{}, res) assert.Nil(t, result.Error) assert.Len(t, result.Frames, 1) }) @@ -35,7 +35,7 @@ func TestQueryData_parseResponse(t *testing.T) { t.Run("no resultType is existed in the data", func(t *testing.T) { resBody := `{"data":{"result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}]},"status":"success"}` res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))} - result := qd.parseResponse(context.Background(), &models.Query{}, res, false) + result := qd.parseResponse(context.Background(), &models.Query{}, res) assert.Error(t, result.Error) assert.Equal(t, result.Error.Error(), "no resultType found") }) @@ -43,7 +43,7 @@ func TestQueryData_parseResponse(t *testing.T) { t.Run("resultType is set as empty string before result", func(t *testing.T) { resBody := `{"data":{"resultType":"", "result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}]},"status":"success"}` res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))} - result := qd.parseResponse(context.Background(), &models.Query{}, res, false) + result := qd.parseResponse(context.Background(), &models.Query{}, res) assert.Error(t, result.Error) assert.Equal(t, result.Error.Error(), "unknown result type: ") }) @@ -51,7 +51,7 @@ func TestQueryData_parseResponse(t *testing.T) { t.Run("resultType is set as empty string after result", func(t *testing.T) { resBody := `{"data":{"result":[{"metric":{"__name__":"some_name","environment":"some_env","id":"some_id","instance":"some_instance:1234","job":"some_job","name":"another_name","region":"some_region"},"value":[1.1,"2"]}],"resultType":""},"status":"success"}` res := &http.Response{Body: io.NopCloser(bytes.NewBufferString(resBody))} - result := qd.parseResponse(context.Background(), &models.Query{}, res, false) + result := qd.parseResponse(context.Background(), &models.Query{}, res) assert.Error(t, result.Error) assert.Equal(t, result.Error.Error(), "unknown result type: ") }) diff --git a/pkg/promlib/testdata/range_auto.result.golden.jsonc b/pkg/promlib/testdata/range_auto.result.golden.jsonc index 13bc995348a..9bb659c7679 100644 --- a/pkg/promlib/testdata/range_auto.result.golden.jsonc +++ b/pkg/promlib/testdata/range_auto.result.golden.jsonc @@ -4,14 +4,14 @@ // "type": "timeseries-multi", // "typeVersion": [ // 0, -// 0 +// 1 // ], // "custom": { // "resultType": "matrix" // }, // "executedQueryString": "Expr: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))\nStep: 1s" // } -// Name: histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le)) +// Name: // Dimensions: 2 Fields by 301 Rows // +-----------------------------------+----------------------+ // | Name: Time | Name: Value | @@ -37,12 +37,11 @@ "frames": [ { "schema": { - "name": "histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[4s])) by (le))", "meta": { "type": "timeseries-multi", "typeVersion": [ 0, - 0 + 1 ], "custom": { "resultType": "matrix" diff --git a/pkg/promlib/testdata/range_infinity.result.golden.jsonc b/pkg/promlib/testdata/range_infinity.result.golden.jsonc index c3e837d79bd..db0f3edfbce 100644 --- a/pkg/promlib/testdata/range_infinity.result.golden.jsonc +++ b/pkg/promlib/testdata/range_infinity.result.golden.jsonc @@ -4,14 +4,14 @@ // "type": "timeseries-multi", // "typeVersion": [ // 0, -// 0 +// 1 // ], // "custom": { // "resultType": "matrix" // }, // "executedQueryString": "Expr: 1 / 0\nStep: 1s" // } -// Name: 1 / 0 +// Name: // Dimensions: 2 Fields by 3 Rows // +-------------------------------+-----------------+ // | Name: Time | Name: Value | @@ -30,12 +30,11 @@ "frames": [ { "schema": { - "name": "1 / 0", "meta": { "type": "timeseries-multi", "typeVersion": [ 0, - 0 + 1 ], "custom": { "resultType": "matrix" diff --git a/pkg/promlib/testdata/range_missing.result.golden.jsonc b/pkg/promlib/testdata/range_missing.result.golden.jsonc index bb0c635b1a1..4272beb9993 100644 --- a/pkg/promlib/testdata/range_missing.result.golden.jsonc +++ b/pkg/promlib/testdata/range_missing.result.golden.jsonc @@ -4,17 +4,17 @@ // "type": "timeseries-multi", // "typeVersion": [ // 0, -// 0 +// 1 // ], // "custom": { // "resultType": "matrix" // }, // "executedQueryString": "Expr: test1\nStep: 1s" // } -// Name: go_goroutines{job="prometheus"} +// Name: // Dimensions: 2 Fields by 3 Rows // +-------------------------------+------------------------------------------------+ -// | Name: Time | Name: Value | +// | Name: Time | Name: go_goroutines | // | Labels: | Labels: __name__=go_goroutines, job=prometheus | // | Type: []time.Time | Type: []float64 | // +-------------------------------+------------------------------------------------+ @@ -30,12 +30,11 @@ "frames": [ { "schema": { - "name": "go_goroutines{job=\"prometheus\"}", "meta": { "type": "timeseries-multi", "typeVersion": [ 0, - 0 + 1 ], "custom": { "resultType": "matrix" @@ -54,7 +53,7 @@ } }, { - "name": "Value", + "name": "go_goroutines", "type": "number", "typeInfo": { "frame": "float64" diff --git a/pkg/promlib/testdata/range_nan.result.golden.jsonc b/pkg/promlib/testdata/range_nan.result.golden.jsonc index f9f7bfedc5e..9da1ecfeca7 100644 --- a/pkg/promlib/testdata/range_nan.result.golden.jsonc +++ b/pkg/promlib/testdata/range_nan.result.golden.jsonc @@ -4,14 +4,14 @@ // "type": "timeseries-multi", // "typeVersion": [ // 0, -// 0 +// 1 // ], // "custom": { // "resultType": "matrix" // }, // "executedQueryString": "Expr: \nStep: 1s" // } -// Name: {handler="/api/v1/query_range", job="prometheus"} +// Name: // Dimensions: 2 Fields by 3 Rows // +-------------------------------+-----------------------------------------------------+ // | Name: Time | Name: Value | @@ -30,12 +30,11 @@ "frames": [ { "schema": { - "name": "{handler=\"/api/v1/query_range\", job=\"prometheus\"}", "meta": { "type": "timeseries-multi", "typeVersion": [ 0, - 0 + 1 ], "custom": { "resultType": "matrix" diff --git a/pkg/promlib/testdata/range_simple.result.golden.jsonc b/pkg/promlib/testdata/range_simple.result.golden.jsonc index cc64185db37..a0fe631e2e3 100644 --- a/pkg/promlib/testdata/range_simple.result.golden.jsonc +++ b/pkg/promlib/testdata/range_simple.result.golden.jsonc @@ -4,17 +4,17 @@ // "type": "timeseries-multi", // "typeVersion": [ // 0, -// 0 +// 1 // ], // "custom": { // "resultType": "matrix" // }, // "executedQueryString": "Expr: \nStep: 1s" // } -// Name: prometheus_http_requests_total{code="200", handler="/api/v1/query_range", job="prometheus"} +// Name: // Dimensions: 2 Fields by 3 Rows // +-----------------------------------+--------------------------------------------------------------------------------------------------------+ -// | Name: Time | Name: Value | +// | Name: Time | Name: prometheus_http_requests_total | // | Labels: | Labels: __name__=prometheus_http_requests_total, code=200, handler=/api/v1/query_range, job=prometheus | // | Type: []time.Time | Type: []float64 | // +-----------------------------------+--------------------------------------------------------------------------------------------------------+ @@ -29,16 +29,16 @@ // "type": "timeseries-multi", // "typeVersion": [ // 0, -// 0 +// 1 // ], // "custom": { // "resultType": "matrix" // } // } -// Name: prometheus_http_requests_total{code="400", handler="/api/v1/query_range", job="prometheus"} +// Name: // Dimensions: 2 Fields by 2 Rows // +-----------------------------------+--------------------------------------------------------------------------------------------------------+ -// | Name: Time | Name: Value | +// | Name: Time | Name: prometheus_http_requests_total | // | Labels: | Labels: __name__=prometheus_http_requests_total, code=400, handler=/api/v1/query_range, job=prometheus | // | Type: []time.Time | Type: []float64 | // +-----------------------------------+--------------------------------------------------------------------------------------------------------+ @@ -53,12 +53,11 @@ "frames": [ { "schema": { - "name": "prometheus_http_requests_total{code=\"200\", handler=\"/api/v1/query_range\", job=\"prometheus\"}", "meta": { "type": "timeseries-multi", "typeVersion": [ 0, - 0 + 1 ], "custom": { "resultType": "matrix" @@ -77,7 +76,7 @@ } }, { - "name": "Value", + "name": "prometheus_http_requests_total", "type": "number", "typeInfo": { "frame": "float64" @@ -111,12 +110,11 @@ }, { "schema": { - "name": "prometheus_http_requests_total{code=\"400\", handler=\"/api/v1/query_range\", job=\"prometheus\"}", "meta": { "type": "timeseries-multi", "typeVersion": [ 0, - 0 + 1 ], "custom": { "resultType": "matrix" @@ -134,7 +132,7 @@ } }, { - "name": "Value", + "name": "prometheus_http_requests_total", "type": "number", "typeInfo": { "frame": "float64" diff --git a/pkg/registry/apis/alerting/notifications/receiver/authorize.go b/pkg/registry/apis/alerting/notifications/receiver/authorize.go index 972ca506dfd..baf4bffd371 100644 --- a/pkg/registry/apis/alerting/notifications/receiver/authorize.go +++ b/pkg/registry/apis/alerting/notifications/receiver/authorize.go @@ -2,14 +2,26 @@ package receiver import ( "context" + "errors" + "fmt" "k8s.io/apiserver/pkg/authorization/authorizer" + "github.com/grafana/grafana/pkg/apimachinery/errutil" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/services/accesscontrol" + "github.com/grafana/grafana/pkg/services/ngalert/accesscontrol" ) -func Authorize(ctx context.Context, ac accesscontrol.AccessControl, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) { +// AccessControlService provides access control for receivers. +type AccessControlService interface { + AuthorizeReadSome(ctx context.Context, user identity.Requester) error + AuthorizeReadByUID(context.Context, identity.Requester, string) error + AuthorizeCreate(context.Context, identity.Requester) error + AuthorizeUpdateByUID(context.Context, identity.Requester, string) error + AuthorizeDeleteByUID(context.Context, identity.Requester, string) error +} + +func Authorize(ctx context.Context, ac AccessControlService, attr authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) { if attr.GetResource() != resourceInfo.GroupResource().Resource { return authorizer.DecisionNoOpinion, "", nil } @@ -18,36 +30,55 @@ func Authorize(ctx context.Context, ac accesscontrol.AccessControl, attr authori return authorizer.DecisionDeny, "valid user is required", err } - var action accesscontrol.Evaluator + uid := attr.GetName() + + deny := func(err error) (authorizer.Decision, string, error) { + var utilErr errutil.Error + if errors.As(err, &utilErr) && utilErr.Reason.Status() == errutil.StatusForbidden { + if errors.Is(err, accesscontrol.ErrAuthorizationBase) { + return authorizer.DecisionDeny, fmt.Sprintf("required permissions: %s", utilErr.PublicPayload["permissions"]), nil + } + return authorizer.DecisionDeny, utilErr.PublicMessage, nil + } + + return authorizer.DecisionDeny, "", err + } + switch attr.GetVerb() { + case "get": + if uid == "" { + return authorizer.DecisionDeny, "", nil + } + if err := ac.AuthorizeReadByUID(ctx, user, uid); err != nil { + return deny(err) + } + case "list": + if err := ac.AuthorizeReadSome(ctx, user); err != nil { // Preconditions, further checks are done downstream. + return deny(err) + } + case "create": + if err := ac.AuthorizeCreate(ctx, user); err != nil { + return deny(err) + } case "patch": fallthrough - case "create": - fallthrough // TODO: Add alert.notifications.receivers:create permission case "update": - action = accesscontrol.EvalAny( - accesscontrol.EvalPermission(accesscontrol.ActionAlertingNotificationsWrite), // TODO: Add alert.notifications.receivers:write permission - ) - case "deletecollection": - fallthrough + if uid == "" { + return deny(err) + } + if err := ac.AuthorizeUpdateByUID(ctx, user, uid); err != nil { + return deny(err) + } case "delete": - action = accesscontrol.EvalAny( - accesscontrol.EvalPermission(accesscontrol.ActionAlertingNotificationsWrite), // TODO: Add alert.notifications.receivers:delete permission - ) + if uid == "" { + return deny(err) + } + if err := ac.AuthorizeDeleteByUID(ctx, user, uid); err != nil { + return deny(err) + } + default: + return authorizer.DecisionNoOpinion, "", nil } - eval := accesscontrol.EvalAny( - accesscontrol.EvalPermission(accesscontrol.ActionAlertingReceiversRead), - accesscontrol.EvalPermission(accesscontrol.ActionAlertingReceiversReadSecrets), - accesscontrol.EvalPermission(accesscontrol.ActionAlertingNotificationsRead), - ) - if action != nil { - eval = accesscontrol.EvalAll(eval, action) - } - - ok, err := ac.Evaluate(ctx, user, eval) - if ok { - return authorizer.DecisionAllow, "", nil - } - return authorizer.DecisionDeny, "", err + return authorizer.DecisionAllow, "", nil } diff --git a/pkg/registry/apis/alerting/notifications/receiver/conversions.go b/pkg/registry/apis/alerting/notifications/receiver/conversions.go index 9bb8fd15920..bb628b47f03 100644 --- a/pkg/registry/apis/alerting/notifications/receiver/conversions.go +++ b/pkg/registry/apis/alerting/notifications/receiver/conversions.go @@ -1,26 +1,19 @@ package receiver import ( - "encoding/json" - "fmt" + "maps" - "github.com/prometheus/alertmanager/config" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" model "github.com/grafana/grafana/pkg/apis/alerting_notifications/v0alpha1" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" - "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" - "github.com/grafana/grafana/pkg/services/ngalert/models" + ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/services/ngalert/notifier/legacy_storage" ) -func getUID(t definitions.GettableApiReceiver) string { - return legacy_storage.NameToUid(t.Name) -} - -func convertToK8sResources(orgID int64, receivers []definitions.GettableApiReceiver, namespacer request.NamespaceMapper) (*model.ReceiverList, error) { +func convertToK8sResources(orgID int64, receivers []*ngmodels.Receiver, namespacer request.NamespaceMapper) (*model.ReceiverList, error) { result := &model.ReceiverList{ Items: make([]model.Receiver, 0, len(receivers)), } @@ -34,67 +27,54 @@ func convertToK8sResources(orgID int64, receivers []definitions.GettableApiRecei return result, nil } -func convertToK8sResource(orgID int64, receiver definitions.GettableApiReceiver, namespacer request.NamespaceMapper) (*model.Receiver, error) { +func convertToK8sResource(orgID int64, receiver *ngmodels.Receiver, namespacer request.NamespaceMapper) (*model.Receiver, error) { spec := model.ReceiverSpec{ - Title: receiver.Receiver.Name, + Title: receiver.Name, } - provenance := definitions.Provenance(models.ProvenanceNone) - for _, integration := range receiver.GrafanaManagedReceivers { - if integration.Provenance != receiver.GrafanaManagedReceivers[0].Provenance { - return nil, fmt.Errorf("all integrations must have the same provenance") - } - provenance = integration.Provenance - unstruct := common.Unstructured{} - err := json.Unmarshal(integration.Settings, &unstruct) - if err != nil { - return nil, fmt.Errorf("integration '%s' of receiver '%s' has settings that cannot be parsed as JSON: %w", integration.Type, receiver.Name, err) - } + for _, integration := range receiver.Integrations { spec.Integrations = append(spec.Integrations, model.Integration{ Uid: &integration.UID, - Type: integration.Type, + Type: integration.Config.Type, DisableResolveMessage: &integration.DisableResolveMessage, - Settings: unstruct, - SecureFields: integration.SecureFields, + Settings: common.Unstructured{Object: maps.Clone(integration.Settings)}, + SecureFields: integration.SecureFields(), }) } - uid := getUID(receiver) // TODO replace to stable UID when we switch to normal storage r := &model.Receiver{ TypeMeta: resourceInfo.TypeMeta(), ObjectMeta: metav1.ObjectMeta{ - UID: types.UID(uid), // This is needed to make PATCH work - Name: uid, // TODO replace to stable UID when we switch to normal storage + UID: types.UID(receiver.GetUID()), // This is needed to make PATCH work + Name: receiver.GetUID(), Namespace: namespacer(orgID), - ResourceVersion: "", // TODO: Implement optimistic concurrency. + ResourceVersion: receiver.Version, }, Spec: spec, } - r.SetProvenanceStatus(string(provenance)) + r.SetProvenanceStatus(string(receiver.Provenance)) return r, nil } -func convertToDomainModel(receiver *model.Receiver) (definitions.GettableApiReceiver, error) { - // TODO: Using GettableApiReceiver instead of PostableApiReceiver so that SecureFields type matches. - gettable := definitions.GettableApiReceiver{ - Receiver: config.Receiver{ - Name: receiver.Spec.Title, - }, - GettableGrafanaReceivers: definitions.GettableGrafanaReceivers{ - GrafanaManagedReceivers: []*definitions.GettableGrafanaReceiver{}, - }, +func convertToDomainModel(receiver *model.Receiver) (*ngmodels.Receiver, map[string][]string, error) { + domain := &ngmodels.Receiver{ + UID: legacy_storage.NameToUid(receiver.Spec.Title), + Name: receiver.Spec.Title, + Integrations: make([]*ngmodels.Integration, 0, len(receiver.Spec.Integrations)), + Version: receiver.ResourceVersion, + Provenance: ngmodels.ProvenanceNone, } + storedSecureFields := make(map[string][]string, len(receiver.Spec.Integrations)) for _, integration := range receiver.Spec.Integrations { - data, err := integration.Settings.MarshalJSON() + config, err := ngmodels.IntegrationConfigFromType(integration.Type) if err != nil { - return definitions.GettableApiReceiver{}, fmt.Errorf("integration '%s' of receiver '%s' is invalid: failed to convert unstructured data to bytes: %w", integration.Type, receiver.Name, err) + return nil, nil, err } - grafanaIntegration := definitions.GettableGrafanaReceiver{ - Name: receiver.Spec.Title, - Type: integration.Type, - Settings: definitions.RawMessage(data), - SecureFields: integration.SecureFields, - Provenance: definitions.Provenance(models.ProvenanceNone), + grafanaIntegration := ngmodels.Integration{ + Name: receiver.Spec.Title, + Config: config, + Settings: maps.Clone(integration.Settings.UnstructuredContent()), + SecureSettings: make(map[string]string), } if integration.Uid != nil { grafanaIntegration.UID = *integration.Uid @@ -102,8 +82,20 @@ func convertToDomainModel(receiver *model.Receiver) (definitions.GettableApiRece if integration.DisableResolveMessage != nil { grafanaIntegration.DisableResolveMessage = *integration.DisableResolveMessage } - gettable.GettableGrafanaReceivers.GrafanaManagedReceivers = append(gettable.GettableGrafanaReceivers.GrafanaManagedReceivers, &grafanaIntegration) + + domain.Integrations = append(domain.Integrations, &grafanaIntegration) + + if grafanaIntegration.UID != "" { + // This is an existing integration, so we track the secure fields being requested to copy over from existing values. + secureFields := make([]string, 0, len(integration.SecureFields)) + for k, isSecure := range integration.SecureFields { + if isSecure { + secureFields = append(secureFields, k) + } + } + storedSecureFields[grafanaIntegration.UID] = secureFields + } } - return gettable, nil + return domain, storedSecureFields, nil } diff --git a/pkg/registry/apis/alerting/notifications/receiver/legacy_storage.go b/pkg/registry/apis/alerting/notifications/receiver/legacy_storage.go index f103d8e5017..a43e4f2f1af 100644 --- a/pkg/registry/apis/alerting/notifications/receiver/legacy_storage.go +++ b/pkg/registry/apis/alerting/notifications/receiver/legacy_storage.go @@ -15,7 +15,8 @@ import ( grafanaRest "github.com/grafana/grafana/pkg/apiserver/rest" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" - "github.com/grafana/grafana/pkg/services/ngalert/models" + ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models" + "github.com/grafana/grafana/pkg/services/ngalert/notifier/legacy_storage" ) var ( @@ -25,11 +26,11 @@ var ( var resourceInfo = notifications.ReceiverResourceInfo type ReceiverService interface { - GetReceiver(ctx context.Context, q models.GetReceiverQuery, user identity.Requester) (definitions.GettableApiReceiver, error) - GetReceivers(ctx context.Context, q models.GetReceiversQuery, user identity.Requester) ([]definitions.GettableApiReceiver, error) - CreateReceiver(ctx context.Context, r definitions.GettableApiReceiver, orgID int64) (definitions.GettableApiReceiver, error) // TODO: Uses Gettable for Write, consider creating new struct. - UpdateReceiver(ctx context.Context, r definitions.GettableApiReceiver, orgID int64) (definitions.GettableApiReceiver, error) // TODO: Uses Gettable for Write, consider creating new struct. - DeleteReceiver(ctx context.Context, name string, orgID int64, provenance definitions.Provenance, version string) error + GetReceiver(ctx context.Context, q ngmodels.GetReceiverQuery, user identity.Requester) (*ngmodels.Receiver, error) + GetReceivers(ctx context.Context, q ngmodels.GetReceiversQuery, user identity.Requester) ([]*ngmodels.Receiver, error) + CreateReceiver(ctx context.Context, r *ngmodels.Receiver, orgID int64, user identity.Requester) (*ngmodels.Receiver, error) + UpdateReceiver(ctx context.Context, r *ngmodels.Receiver, storedSecureFields map[string][]string, orgID int64, user identity.Requester) (*ngmodels.Receiver, error) + DeleteReceiver(ctx context.Context, name string, provenance definitions.Provenance, version string, orgID int64, user identity.Requester) error } type legacyStorage struct { @@ -66,12 +67,12 @@ func (s *legacyStorage) List(ctx context.Context, _ *internalversion.ListOptions return nil, err } - q := models.GetReceiversQuery{ - OrgID: orgId, + q := ngmodels.GetReceiversQuery{ + OrgID: orgId, + Decrypt: false, //Names: ctx.QueryStrings("names"), // TODO: Query params. //Limit: ctx.QueryInt("limit"), //Offset: ctx.QueryInt("offset"), - //Decrypt: ctx.QueryBool("decrypt"), } user, err := identity.GetRequester(ctx) @@ -93,9 +94,14 @@ func (s *legacyStorage) Get(ctx context.Context, uid string, _ *metav1.GetOption return nil, err } - q := models.GetReceiversQuery{ - OrgID: info.OrgID, - //Decrypt: ctx.QueryBool("decrypt"), // TODO: Query params. + name, err := legacy_storage.UidToName(uid) + if err != nil { + return nil, errors.NewNotFound(resourceInfo.GroupResource(), uid) + } + q := ngmodels.GetReceiverQuery{ + OrgID: info.OrgID, + Name: name, + Decrypt: false, } user, err := identity.GetRequester(ctx) @@ -103,18 +109,11 @@ func (s *legacyStorage) Get(ctx context.Context, uid string, _ *metav1.GetOption return nil, err } - res, err := s.service.GetReceivers(ctx, q, user) + r, err := s.service.GetReceiver(ctx, q, user) if err != nil { return nil, err } - - for _, r := range res { - if getUID(r) == uid { - return convertToK8sResource(info.OrgID, r, s.namespacer) - } - } - - return nil, errors.NewNotFound(resourceInfo.GroupResource(), uid) + return convertToK8sResource(info.OrgID, r, s.namespacer) } func (s *legacyStorage) Create(ctx context.Context, @@ -138,11 +137,17 @@ func (s *legacyStorage) Create(ctx context.Context, if p.ObjectMeta.Name != "" { // TODO remove when metadata.name can be defined by user return nil, errors.NewBadRequest("object's metadata.name should be empty") } - model, err := convertToDomainModel(p) + model, _, err := convertToDomainModel(p) if err != nil { return nil, err } - out, err := s.service.CreateReceiver(ctx, model, info.OrgID) + + user, err := identity.GetRequester(ctx) + if err != nil { + return nil, err + } + + out, err := s.service.CreateReceiver(ctx, model, info.OrgID, user) if err != nil { return nil, err } @@ -162,6 +167,11 @@ func (s *legacyStorage) Update(ctx context.Context, return nil, false, err } + user, err := identity.GetRequester(ctx) + if err != nil { + return nil, false, err + } + old, err := s.Get(ctx, uid, nil) if err != nil { return old, false, err @@ -179,16 +189,16 @@ func (s *legacyStorage) Update(ctx context.Context, if !ok { return nil, false, fmt.Errorf("expected receiver but got %s", obj.GetObjectKind().GroupVersionKind()) } - model, err := convertToDomainModel(p) + model, storedSecureFields, err := convertToDomainModel(p) if err != nil { return old, false, err } - if p.ObjectMeta.Name != getUID(model) { + if p.ObjectMeta.Name != model.GetUID() { return nil, false, errors.NewBadRequest("title cannot be changed. Consider creating a new resource.") } - updated, err := s.service.UpdateReceiver(ctx, model, info.OrgID) + updated, err := s.service.UpdateReceiver(ctx, model, storedSecureFields, info.OrgID, user) if err != nil { return nil, false, err } @@ -203,6 +213,12 @@ func (s *legacyStorage) Delete(ctx context.Context, uid string, deleteValidation if err != nil { return nil, false, err } + + user, err := identity.GetRequester(ctx) + if err != nil { + return nil, false, err + } + old, err := s.Get(ctx, uid, nil) if err != nil { return old, false, err @@ -217,8 +233,8 @@ func (s *legacyStorage) Delete(ctx context.Context, uid string, deleteValidation version = *options.Preconditions.ResourceVersion } - err = s.service.DeleteReceiver(ctx, uid, info.OrgID, definitions.Provenance(models.ProvenanceNone), version) // TODO add support for dry-run option - return old, false, err // false - will be deleted async + err = s.service.DeleteReceiver(ctx, uid, definitions.Provenance(ngmodels.ProvenanceNone), version, info.OrgID, user) // TODO add support for dry-run option + return old, false, err // false - will be deleted async } func (s *legacyStorage) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *internalversion.ListOptions) (runtime.Object, error) { diff --git a/pkg/registry/apis/alerting/notifications/register.go b/pkg/registry/apis/alerting/notifications/register.go index 32c007b5a2a..aa588ff9a53 100644 --- a/pkg/registry/apis/alerting/notifications/register.go +++ b/pkg/registry/apis/alerting/notifications/register.go @@ -24,6 +24,8 @@ import ( "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/ngalert" + ac "github.com/grafana/grafana/pkg/services/ngalert/accesscontrol" + ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/setting" ) @@ -31,10 +33,11 @@ var _ builder.APIGroupBuilder = (*NotificationsAPIBuilder)(nil) // This is used just so wire has something unique to return type NotificationsAPIBuilder struct { - authz accesscontrol.AccessControl - ng *ngalert.AlertNG - namespacer request.NamespaceMapper - gv schema.GroupVersion + authz accesscontrol.AccessControl + receiverAuth receiver.AccessControlService + ng *ngalert.AlertNG + namespacer request.NamespaceMapper + gv schema.GroupVersion } func RegisterAPIService( @@ -47,10 +50,11 @@ func RegisterAPIService( return nil } builder := &NotificationsAPIBuilder{ - ng: ng, - namespacer: request.GetNamespaceMapper(cfg), - gv: notificationsModels.SchemeGroupVersion, - authz: ng.Api.AccessControl, + ng: ng, + namespacer: request.GetNamespaceMapper(cfg), + gv: notificationsModels.SchemeGroupVersion, + authz: ng.Api.AccessControl, + receiverAuth: ac.NewReceiverAccess[*ngmodels.Receiver](ng.Api.AccessControl, false), } apiregistration.RegisterAPI(builder) return builder @@ -128,7 +132,7 @@ func (t *NotificationsAPIBuilder) GetAuthorizer() authorizer.Authorizer { case notificationsModels.TimeIntervalResourceInfo.GroupResource().Resource: return timeInterval.Authorize(ctx, t.authz, a) case notificationsModels.ReceiverResourceInfo.GroupResource().Resource: - return receiver.Authorize(ctx, t.authz, a) + return receiver.Authorize(ctx, t.receiverAuth, a) } return authorizer.DecisionNoOpinion, "", nil }) diff --git a/pkg/registry/apis/alerting/notifications/timeinterval/conversions.go b/pkg/registry/apis/alerting/notifications/timeinterval/conversions.go index 7b0bc3ab703..64d08635b26 100644 --- a/pkg/registry/apis/alerting/notifications/timeinterval/conversions.go +++ b/pkg/registry/apis/alerting/notifications/timeinterval/conversions.go @@ -10,7 +10,7 @@ import ( model "github.com/grafana/grafana/pkg/apis/alerting_notifications/v0alpha1" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" - "github.com/grafana/grafana/pkg/services/ngalert/models" + ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models" ) func convertToK8sResources(orgID int64, intervals []definitions.MuteTimeInterval, namespacer request.NamespaceMapper, selector fields.Selector) (*model.TimeIntervalList, error) { @@ -78,7 +78,7 @@ func convertToDomainModel(interval *model.TimeInterval) (definitions.MuteTimeInt } result.Version = interval.ResourceVersion result.UID = interval.ObjectMeta.Name - result.Provenance = definitions.Provenance(models.ProvenanceNone) + result.Provenance = definitions.Provenance(ngmodels.ProvenanceNone) err = result.Validate() if err != nil { return definitions.MuteTimeInterval{}, err diff --git a/pkg/registry/apis/alerting/notifications/timeinterval/legacy_storage.go b/pkg/registry/apis/alerting/notifications/timeinterval/legacy_storage.go index ebfeb1a8f5b..c586c0b1c1b 100644 --- a/pkg/registry/apis/alerting/notifications/timeinterval/legacy_storage.go +++ b/pkg/registry/apis/alerting/notifications/timeinterval/legacy_storage.go @@ -14,7 +14,7 @@ import ( grafanaRest "github.com/grafana/grafana/pkg/apiserver/rest" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" - "github.com/grafana/grafana/pkg/services/ngalert/models" + ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models" ) var ( @@ -195,8 +195,8 @@ func (s *legacyStorage) Delete(ctx context.Context, uid string, deleteValidation return nil, false, fmt.Errorf("expected time-interval but got %s", old.GetObjectKind().GroupVersionKind()) } - err = s.service.DeleteMuteTiming(ctx, p.ObjectMeta.Name, info.OrgID, definitions.Provenance(models.ProvenanceNone), version) // TODO add support for dry-run option - return old, false, err // false - will be deleted async + err = s.service.DeleteMuteTiming(ctx, p.ObjectMeta.Name, info.OrgID, definitions.Provenance(ngmodels.ProvenanceNone), version) // TODO add support for dry-run option + return old, false, err // false - will be deleted async } func (s *legacyStorage) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *internalversion.ListOptions) (runtime.Object, error) { diff --git a/pkg/registry/apis/dashboard/legacy/queries.go b/pkg/registry/apis/dashboard/legacy/queries.go index 6032e791b90..9c4688202ba 100644 --- a/pkg/registry/apis/dashboard/legacy/queries.go +++ b/pkg/registry/apis/dashboard/legacy/queries.go @@ -27,6 +27,7 @@ func mustTemplate(filename string) *template.Template { // Templates. var ( sqlQueryDashboards = mustTemplate("query_dashboards.sql") + sqlQueryPanels = mustTemplate("query_panels.sql") ) type sqlQuery struct { @@ -54,3 +55,25 @@ func newQueryReq(sql *legacysql.LegacyDatabaseHelper, query *DashboardQuery) sql UserTable: sql.Table("user"), } } + +type sqlLibraryQuery struct { + sqltemplate.SQLTemplate + Query *LibraryPanelQuery + + LibraryElementTable string + UserTable string +} + +func (r sqlLibraryQuery) Validate() error { + return nil // TODO +} + +func newLibraryQueryReq(sql *legacysql.LegacyDatabaseHelper, query *LibraryPanelQuery) sqlLibraryQuery { + return sqlLibraryQuery{ + SQLTemplate: sqltemplate.New(sql.DialectForDriver()), + Query: query, + + LibraryElementTable: sql.Table("library_element"), + UserTable: sql.Table("user"), + } +} diff --git a/pkg/registry/apis/dashboard/legacy/queries_test.go b/pkg/registry/apis/dashboard/legacy/queries_test.go index 5560cc4dd94..325eadfdd9f 100644 --- a/pkg/registry/apis/dashboard/legacy/queries_test.go +++ b/pkg/registry/apis/dashboard/legacy/queries_test.go @@ -23,6 +23,12 @@ func TestQueries(t *testing.T) { return &v } + getLibraryQuery := func(q *LibraryPanelQuery) sqltemplate.SQLTemplate { + v := newLibraryQueryReq(nodb, q) + v.SQLTemplate = mocks.NewTestingSQLTemplate() + return &v + } + mocks.CheckQuerySnapshots(t, mocks.TemplateTestSetup{ RootDir: "testdata", Templates: map[*template.Template][]mocks.TemplateTestCase{ @@ -64,6 +70,29 @@ func TestQueries(t *testing.T) { }), }, }, + sqlQueryPanels: { + { + Name: "list", + Data: getLibraryQuery(&LibraryPanelQuery{ + OrgID: 1, + Limit: 5, + }), + }, + { + Name: "list_page_two", + Data: getLibraryQuery(&LibraryPanelQuery{ + OrgID: 1, + LastID: 4, + }), + }, + { + Name: "get_uid", + Data: getLibraryQuery(&LibraryPanelQuery{ + OrgID: 1, + UID: "xyz", + }), + }, + }, }, }) } diff --git a/pkg/registry/apis/dashboard/legacy/query_panels.sql b/pkg/registry/apis/dashboard/legacy/query_panels.sql new file mode 100644 index 00000000000..d106b17b6bf --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/query_panels.sql @@ -0,0 +1,18 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM {{ .Ident .LibraryElementTable }} as p + LEFT OUTER JOIN {{ .Ident .UserTable }} AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN {{ .Ident .UserTable }} AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = {{ .Arg .Query.OrgID }} + {{ if .Query.LastID }} + AND p.id > {{ .Arg .Query.LastID }} + {{ end }} + {{ if .Query.UID }} + AND p.uid = {{ .Arg .Query.UID }} + {{ end }} + ORDER BY p.id DESC + {{ if .Query.Limit }} + LIMIT {{ .Arg .Query.Limit }} + {{ end }} \ No newline at end of file diff --git a/pkg/registry/apis/dashboard/legacy/sql_dashboards.go b/pkg/registry/apis/dashboard/legacy/sql_dashboards.go index b47a952d0c4..0c3a2decddd 100644 --- a/pkg/registry/apis/dashboard/legacy/sql_dashboards.go +++ b/pkg/registry/apis/dashboard/legacy/sql_dashboards.go @@ -6,10 +6,12 @@ import ( "encoding/json" "fmt" "path/filepath" + "strconv" "sync" "time" "github.com/grafana/authlib/claims" + "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/apimachinery/utils" dashboardsV0 "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1" @@ -50,7 +52,8 @@ type dashboardSqlAccess struct { provisioning provisioning.ProvisioningService // Use for writing (not reading) - dashStore dashboards.Store + dashStore dashboards.Store + softDelete bool // Typically one... the server wrapper subscribers []chan *resource.WrittenEvent @@ -61,12 +64,14 @@ func NewDashboardAccess(sql legacysql.LegacyDatabaseProvider, namespacer request.NamespaceMapper, dashStore dashboards.Store, provisioning provisioning.ProvisioningService, + softDelete bool, ) DashboardAccess { return &dashboardSqlAccess{ sql: sql, namespacer: namespacer, dashStore: dashStore, provisioning: provisioning, + softDelete: softDelete, } } @@ -314,6 +319,16 @@ func (a *dashboardSqlAccess) DeleteDashboard(ctx context.Context, orgId int64, u return nil, false, err } + if a.softDelete { + err = a.dashStore.SoftDeleteDashboard(ctx, orgId, uid) + if err == nil && dash != nil { + now := metav1.NewTime(time.Now()) + dash.DeletionTimestamp = &now + return dash, true, err + } + return dash, false, err + } + id := dash.Spec.GetNestedInt64("id") if id == 0 { return nil, false, fmt.Errorf("could not find id in saved body") @@ -383,3 +398,128 @@ func (a *dashboardSqlAccess) SaveDashboard(ctx context.Context, orgId int64, das dash, _, err = a.GetDashboard(ctx, orgId, out.UID, 0) return dash, created, err } + +func (a *dashboardSqlAccess) GetLibraryPanels(ctx context.Context, query LibraryPanelQuery) (*dashboardsV0.LibraryPanelList, error) { + limit := int(query.Limit) + query.Limit += 1 // for continue + if query.OrgID == 0 { + return nil, fmt.Errorf("expected non zero orgID") + } + + sql, err := a.sql(ctx) + if err != nil { + return nil, err + } + + req := newLibraryQueryReq(sql, &query) + rawQuery, err := sqltemplate.Execute(sqlQueryPanels, req) + if err != nil { + return nil, fmt.Errorf("execute template %q: %w", sqlQueryPanels.Name(), err) + } + q := rawQuery + + res := &dashboardsV0.LibraryPanelList{} + rows, err := sql.DB.GetSqlxSession().Query(ctx, q, req.GetArgs()...) + defer func() { + if rows != nil { + _ = rows.Close() + } + }() + if err != nil { + return nil, err + } + + type panel struct { + ID int64 + UID string + FolderUID string + + Created time.Time + CreatedBy string + + Updated time.Time + UpdatedBy string + + Name string + Type string + Description string + Model []byte + } + + var lastID int64 + for rows.Next() { + p := panel{} + err = rows.Scan(&p.ID, &p.UID, &p.FolderUID, + &p.Created, &p.CreatedBy, + &p.Updated, &p.UpdatedBy, + &p.Name, &p.Type, &p.Description, &p.Model, + ) + if err != nil { + return res, err + } + lastID = p.ID + + item := dashboardsV0.LibraryPanel{ + ObjectMeta: metav1.ObjectMeta{ + Name: p.UID, + CreationTimestamp: metav1.NewTime(p.Created), + ResourceVersion: strconv.FormatInt(p.Updated.UnixMilli(), 10), + }, + Spec: dashboardsV0.LibraryPanelSpec{}, + } + + status := &dashboardsV0.LibraryPanelStatus{ + Missing: v0alpha1.Unstructured{}, + } + err = json.Unmarshal(p.Model, &item.Spec) + if err != nil { + return nil, err + } + err = json.Unmarshal(p.Model, &status.Missing.Object) + if err != nil { + return nil, err + } + + if item.Spec.Title != p.Name { + status.Warnings = append(item.Status.Warnings, fmt.Sprintf("title mismatch (expected: %s)", p.Name)) + } + if item.Spec.Description != p.Description { + status.Warnings = append(item.Status.Warnings, fmt.Sprintf("description mismatch (expected: %s)", p.Description)) + } + if item.Spec.Type != p.Type { + status.Warnings = append(item.Status.Warnings, fmt.Sprintf("type mismatch (expected: %s)", p.Type)) + } + item.Status = status + + // Remove the properties we are already showing + for _, k := range []string{"type", "pluginVersion", "title", "description", "options", "fieldConfig", "datasource", "targets", "libraryPanel"} { + delete(status.Missing.Object, k) + } + + meta, err := utils.MetaAccessor(&item) + if err != nil { + return nil, err + } + meta.SetFolder(p.FolderUID) + meta.SetCreatedBy(p.CreatedBy) + meta.SetUpdatedBy(p.UpdatedBy) + meta.SetUpdatedTimestamp(&p.Updated) + meta.SetOriginInfo(&utils.ResourceOriginInfo{ + Name: "SQL", + Path: strconv.FormatInt(p.ID, 10), + }) + + res.Items = append(res.Items, item) + if len(res.Items) > limit { + res.Continue = strconv.FormatInt(lastID, 10) + break + } + } + if query.UID == "" { + rv, err := sql.GetResourceVersion(ctx, "library_element", "updated") + if err == nil { + res.ResourceVersion = strconv.FormatInt(rv, 10) + } + } + return res, err +} diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-get_uid.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-get_uid.sql new file mode 100755 index 00000000000..20c1ca1da99 --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-get_uid.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + AND p.uid = 'xyz' + ORDER BY p.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-list.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-list.sql new file mode 100755 index 00000000000..910f37d4c3f --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-list.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + ORDER BY p.id DESC + LIMIT 5 diff --git a/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-list_page_two.sql b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-list_page_two.sql new file mode 100755 index 00000000000..59578f156a9 --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/mysql--query_panels-list_page_two.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + AND p.id > 4 + ORDER BY p.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-get_uid.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-get_uid.sql new file mode 100755 index 00000000000..20c1ca1da99 --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-get_uid.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + AND p.uid = 'xyz' + ORDER BY p.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-list.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-list.sql new file mode 100755 index 00000000000..910f37d4c3f --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-list.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + ORDER BY p.id DESC + LIMIT 5 diff --git a/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-list_page_two.sql b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-list_page_two.sql new file mode 100755 index 00000000000..59578f156a9 --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/postgres--query_panels-list_page_two.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + AND p.id > 4 + ORDER BY p.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-get_uid.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-get_uid.sql new file mode 100755 index 00000000000..20c1ca1da99 --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-get_uid.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + AND p.uid = 'xyz' + ORDER BY p.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-list.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-list.sql new file mode 100755 index 00000000000..910f37d4c3f --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-list.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + ORDER BY p.id DESC + LIMIT 5 diff --git a/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-list_page_two.sql b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-list_page_two.sql new file mode 100755 index 00000000000..59578f156a9 --- /dev/null +++ b/pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_panels-list_page_two.sql @@ -0,0 +1,10 @@ +SELECT p.id, p.uid, p.folder_uid, + p.created, created_user.uid as created_by, + p.updated, updated_user.uid as updated_by, + p.name, p.type, p.description, p.model + FROM "grafana.library_element" as p + LEFT OUTER JOIN "grafana.user" AS created_user ON p.created_by = created_user.id + LEFT OUTER JOIN "grafana.user" AS updated_user ON p.updated_by = updated_user.id + WHERE p.org_id = 1 + AND p.id > 4 + ORDER BY p.id DESC diff --git a/pkg/registry/apis/dashboard/legacy/types.go b/pkg/registry/apis/dashboard/legacy/types.go index ba3a0e61251..ad46cc87978 100644 --- a/pkg/registry/apis/dashboard/legacy/types.go +++ b/pkg/registry/apis/dashboard/legacy/types.go @@ -33,6 +33,16 @@ func (r *DashboardQuery) UseHistoryTable() bool { return r.GetHistory || r.Version > 0 } +type LibraryPanelQuery struct { + OrgID int64 + UID string // to select a single dashboard + Limit int64 + + // Included in the continue token + // This is the ID from the last dashboard sent in the previous page + LastID int64 +} + type DashboardAccess interface { resource.StorageBackend resource.ResourceIndexServer @@ -40,4 +50,7 @@ type DashboardAccess interface { GetDashboard(ctx context.Context, orgId int64, uid string, version int64) (*dashboardsV0.Dashboard, int64, error) SaveDashboard(ctx context.Context, orgId int64, dash *dashboardsV0.Dashboard) (*dashboardsV0.Dashboard, bool, error) DeleteDashboard(ctx context.Context, orgId int64, uid string) (*dashboardsV0.Dashboard, bool, error) + + // Get a typed list + GetLibraryPanels(ctx context.Context, query LibraryPanelQuery) (*dashboardsV0.LibraryPanelList, error) } diff --git a/pkg/registry/apis/dashboard/libary_panel.go b/pkg/registry/apis/dashboard/libary_panel.go new file mode 100644 index 00000000000..c00e21a2562 --- /dev/null +++ b/pkg/registry/apis/dashboard/libary_panel.go @@ -0,0 +1,94 @@ +package dashboard + +import ( + "context" + "fmt" + "strconv" + + "k8s.io/apimachinery/pkg/apis/meta/internalversion" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/rest" + + dashboard "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/dashboard/legacy" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" +) + +var ( + _ rest.Scoper = (*libraryPanelStore)(nil) + _ rest.SingularNameProvider = (*libraryPanelStore)(nil) + _ rest.Getter = (*libraryPanelStore)(nil) + _ rest.Lister = (*libraryPanelStore)(nil) + _ rest.Storage = (*libraryPanelStore)(nil) +) + +var lpr = dashboard.LibraryPanelResourceInfo + +type libraryPanelStore struct { + access legacy.DashboardAccess +} + +func (s *libraryPanelStore) New() runtime.Object { + return lpr.NewFunc() +} + +func (s *libraryPanelStore) Destroy() {} + +func (s *libraryPanelStore) NamespaceScoped() bool { + return true // namespace == org +} + +func (s *libraryPanelStore) GetSingularName() string { + return lpr.GetSingularName() +} + +func (s *libraryPanelStore) NewList() runtime.Object { + return lpr.NewListFunc() +} + +func (s *libraryPanelStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { + return lpr.TableConverter().ConvertToTable(ctx, object, tableOptions) +} + +func (s *libraryPanelStore) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { + ns, err := request.NamespaceInfoFrom(ctx, true) + if err != nil { + return nil, err + } + query := legacy.LibraryPanelQuery{ + OrgID: ns.OrgID, + Limit: options.Limit, + } + if options.Continue != "" { + query.LastID, err = strconv.ParseInt(options.Continue, 10, 64) + if err != nil { + return nil, fmt.Errorf("invalid continue token") + } + } + if query.Limit < 1 { + query.Limit = 25 + } + return s.access.GetLibraryPanels(ctx, query) +} + +func (s *libraryPanelStore) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + ns, err := request.NamespaceInfoFrom(ctx, true) + if err != nil { + return nil, err + } + + query := legacy.LibraryPanelQuery{ + OrgID: ns.OrgID, + UID: name, + Limit: 1, + } + found, err := s.access.GetLibraryPanels(ctx, query) + if err != nil { + return nil, err + } + if len(found.Items) == 1 { + return &found.Items[0], nil + } + return nil, lpr.NewNotFound(name) +} diff --git a/pkg/registry/apis/dashboard/register.go b/pkg/registry/apis/dashboard/register.go index 2c3c5f5621c..5f6178d410e 100644 --- a/pkg/registry/apis/dashboard/register.go +++ b/pkg/registry/apis/dashboard/register.go @@ -56,6 +56,7 @@ func RegisterAPIService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, return nil // skip registration unless opting into experimental apis } + softDelete := features.IsEnabledGlobally(featuremgmt.FlagDashboardRestore) dbp := legacysql.NewDatabaseProvider(sql) namespacer := request.GetNamespaceMapper(cfg) builder := &DashboardsAPIBuilder{ @@ -66,7 +67,7 @@ func RegisterAPIService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, legacy: &dashboardStorage{ resource: dashboard.DashboardResourceInfo, - access: legacy.NewDashboardAccess(dbp, namespacer, dashStore, provisioning), + access: legacy.NewDashboardAccess(dbp, namespacer, dashStore, provisioning, softDelete), tableConverter: dashboard.DashboardResourceInfo.TableConverter(), }, } @@ -90,6 +91,8 @@ func addKnownTypes(scheme *runtime.Scheme, gv schema.GroupVersion) { &dashboard.DashboardWithAccessInfo{}, &dashboard.DashboardVersionList{}, &dashboard.VersionsQueryOptions{}, + &dashboard.LibraryPanel{}, + &dashboard.LibraryPanelList{}, &metav1.PartialObjectMetadata{}, &metav1.PartialObjectMetadataList{}, ) @@ -156,6 +159,11 @@ func (b *DashboardsAPIBuilder) GetAPIGroupInfo( } } + // Expose read only library panels + storage[dashboard.LibraryPanelResourceInfo.StoragePath()] = &libraryPanelStore{ + access: b.legacy.access, + } + apiGroupInfo.VersionedResourcesStorageMap[dashboard.VERSION] = storage return &apiGroupInfo, nil } diff --git a/pkg/registry/apis/dashboard/storage.go b/pkg/registry/apis/dashboard/storage.go index 8995513eb6f..bc50691d5f0 100644 --- a/pkg/registry/apis/dashboard/storage.go +++ b/pkg/registry/apis/dashboard/storage.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" - "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1" + dashboard "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1" grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic" grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" ) @@ -17,7 +17,7 @@ type storage struct { func newStorage(scheme *runtime.Scheme) (*storage, error) { strategy := grafanaregistry.NewStrategy(scheme) - resourceInfo := v0alpha1.DashboardResourceInfo + resourceInfo := dashboard.DashboardResourceInfo store := &genericregistry.Store{ NewFunc: resourceInfo.NewFunc, NewListFunc: resourceInfo.NewListFunc, diff --git a/pkg/registry/apis/datasource/sub_proxy.go b/pkg/registry/apis/datasource/sub_proxy.go index 5c082fc4a92..7d04fc47285 100644 --- a/pkg/registry/apis/datasource/sub_proxy.go +++ b/pkg/registry/apis/datasource/sub_proxy.go @@ -43,6 +43,6 @@ func (r *subProxyREST) NewConnectOptions() (runtime.Object, bool, string) { func (r *subProxyREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) { return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { - responder.Error(fmt.Errorf("TODO, proxy: " + r.pluginJSON.ID)) + responder.Error(fmt.Errorf("TODO, proxy: %s", r.pluginJSON.ID)) }), nil } diff --git a/pkg/registry/apis/identity/common/common.go b/pkg/registry/apis/identity/common/common.go new file mode 100644 index 00000000000..25d7066db7e --- /dev/null +++ b/pkg/registry/apis/identity/common/common.go @@ -0,0 +1,30 @@ +package common + +import ( + "fmt" + "strconv" + + "k8s.io/apimachinery/pkg/apis/meta/internalversion" +) + +// GetContinueID is a helper to parse options.Continue as int64. +// If no continue token is provided 0 is returned. +func GetContinueID(options *internalversion.ListOptions) (int64, error) { + if options.Continue != "" { + continueID, err := strconv.ParseInt(options.Continue, 10, 64) + if err != nil { + return 0, fmt.Errorf("invalid continue token: %w", err) + } + return continueID, nil + } + return 0, nil +} + +// OptonalFormatInt formats num as a string. If num is less or equal than 0 +// an empty string is returned. +func OptionalFormatInt(num int64) string { + if num > 0 { + return strconv.FormatInt(num, 10) + } + return "" +} diff --git a/pkg/registry/apis/identity/legacy/legacy_sql.go b/pkg/registry/apis/identity/legacy/legacy_sql.go index b768b39b5a6..7380d0c4da9 100644 --- a/pkg/registry/apis/identity/legacy/legacy_sql.go +++ b/pkg/registry/apis/identity/legacy/legacy_sql.go @@ -16,16 +16,16 @@ var ( _ LegacyIdentityStore = (*legacySQLStore)(nil) ) -type legacySQLStore struct { - sql legacysql.LegacyDatabaseProvider -} - func NewLegacySQLStores(sql legacysql.LegacyDatabaseProvider) LegacyIdentityStore { return &legacySQLStore{ sql: sql, } } +type legacySQLStore struct { + sql legacysql.LegacyDatabaseProvider +} + // ListTeams implements LegacyIdentityStore. func (s *legacySQLStore) ListTeams(ctx context.Context, ns claims.NamespaceInfo, query ListTeamQuery) (*ListTeamResult, error) { if query.Limit < 1 { @@ -51,8 +51,6 @@ func (s *legacySQLStore) ListTeams(ctx context.Context, ns claims.NamespaceInfo, } q := rawQuery - // fmt.Printf("%s // %v\n", rawQuery, req.GetArgs()) - res := &ListTeamResult{} rows, err := sql.DB.GetSqlxSession().Query(ctx, q, req.GetArgs()...) defer func() { @@ -126,13 +124,10 @@ func (s *legacySQLStore) GetDisplay(ctx context.Context, ns claims.NamespaceInfo } func (s *legacySQLStore) queryUsers(ctx context.Context, sql *legacysql.LegacyDatabaseHelper, t *template.Template, req sqltemplate.Args, limit int) (*ListUserResult, error) { - rawQuery, err := sqltemplate.Execute(t, req) + q, err := sqltemplate.Execute(t, req) if err != nil { return nil, fmt.Errorf("execute template %q: %w", sqlQueryUsers.Name(), err) } - q := rawQuery - - // fmt.Printf("%s // %v\n", rawQuery, req.GetArgs()) res := &ListUserResult{} rows, err := sql.DB.GetSqlxSession().Query(ctx, q, req.GetArgs()...) @@ -163,6 +158,83 @@ func (s *legacySQLStore) queryUsers(ctx context.Context, sql *legacysql.LegacyDa return res, err } +// ListTeamsBindings implements LegacyIdentityStore. +func (s *legacySQLStore) ListTeamBindings(ctx context.Context, ns claims.NamespaceInfo, query ListTeamBindingsQuery) (*ListTeamBindingsResult, error) { + if query.Limit < 1 { + query.Limit = 50 + } + + limit := int(query.Limit) + query.Limit += 1 // for continue + query.OrgID = ns.OrgID + if query.OrgID == 0 { + return nil, fmt.Errorf("expected non zero orgID") + } + + sql, err := s.sql(ctx) + if err != nil { + return nil, err + } + + req := newListTeamBindings(sql, &query) + q, err := sqltemplate.Execute(sqlQueryTeamBindings, req) + if err != nil { + return nil, fmt.Errorf("execute template %q: %w", sqlQueryTeams.Name(), err) + } + + rows, err := sql.DB.GetSqlxSession().Query(ctx, q, req.GetArgs()...) + defer func() { + if rows != nil { + _ = rows.Close() + } + }() + + if err != nil { + return nil, err + } + + res := &ListTeamBindingsResult{} + grouped := map[string][]TeamMember{} + + var lastID int64 + var atTeamLimit bool + + for rows.Next() { + m := TeamMember{} + err = rows.Scan(&m.ID, &m.TeamUID, &m.TeamID, &m.UserUID, &m.Created, &m.Updated, &m.Permission) + if err != nil { + return res, err + } + + lastID = m.TeamID + members, ok := grouped[m.TeamUID] + if ok { + grouped[m.TeamUID] = append(members, m) + } else if !atTeamLimit { + grouped[m.TeamUID] = []TeamMember{m} + } + + if len(grouped) >= limit { + atTeamLimit = true + res.ContinueID = lastID + } + } + + if query.UID == "" { + res.RV, err = sql.GetResourceVersion(ctx, "team_member", "updated") + } + + res.Bindings = make([]TeamBinding, 0, len(grouped)) + for uid, members := range grouped { + res.Bindings = append(res.Bindings, TeamBinding{ + TeamUID: uid, + Members: members, + }) + } + + return res, err +} + // GetUserTeams implements LegacyIdentityStore. func (s *legacySQLStore) GetUserTeams(ctx context.Context, ns claims.NamespaceInfo, uid string) ([]team.Team, error) { panic("unimplemented") diff --git a/pkg/registry/apis/identity/legacy/queries.go b/pkg/registry/apis/identity/legacy/queries.go index 442e2a8b0f1..a1127b91dd3 100644 --- a/pkg/registry/apis/identity/legacy/queries.go +++ b/pkg/registry/apis/identity/legacy/queries.go @@ -26,9 +26,10 @@ func mustTemplate(filename string) *template.Template { // Templates. var ( - sqlQueryTeams = mustTemplate("query_teams.sql") - sqlQueryUsers = mustTemplate("query_users.sql") - sqlQueryDisplay = mustTemplate("query_display.sql") + sqlQueryTeams = mustTemplate("query_teams.sql") + sqlQueryUsers = mustTemplate("query_users.sql") + sqlQueryDisplay = mustTemplate("query_display.sql") + sqlQueryTeamBindings = mustTemplate("query_team_bindings.sql") ) type sqlQueryListUsers struct { @@ -88,3 +89,25 @@ func newGetDisplay(sql *legacysql.LegacyDatabaseHelper, q *GetUserDisplayQuery) func (r sqlQueryGetDisplay) Validate() error { return nil // TODO } + +type sqlQueryListTeamBindings struct { + sqltemplate.SQLTemplate + Query *ListTeamBindingsQuery + UserTable string + TeamTable string + TeamMemberTable string +} + +func (r sqlQueryListTeamBindings) Validate() error { + return nil // TODO +} + +func newListTeamBindings(sql *legacysql.LegacyDatabaseHelper, q *ListTeamBindingsQuery) sqlQueryListTeamBindings { + return sqlQueryListTeamBindings{ + SQLTemplate: sqltemplate.New(sql.DialectForDriver()), + UserTable: sql.Table("user"), + TeamTable: sql.Table("team"), + TeamMemberTable: sql.Table("team_member"), + Query: q, + } +} diff --git a/pkg/registry/apis/identity/legacy/queries_test.go b/pkg/registry/apis/identity/legacy/queries_test.go index 7cc0baf6e20..2df6e1f8e16 100644 --- a/pkg/registry/apis/identity/legacy/queries_test.go +++ b/pkg/registry/apis/identity/legacy/queries_test.go @@ -35,6 +35,12 @@ func TestQueries(t *testing.T) { return &v } + listTeamBindings := func(q *ListTeamBindingsQuery) sqltemplate.SQLTemplate { + v := newListTeamBindings(nodb, q) + v.SQLTemplate = mocks.NewTestingSQLTemplate() + return &v + } + mocks.CheckQuerySnapshots(t, mocks.TemplateTestSetup{ RootDir: "testdata", Templates: map[*template.Template][]mocks.TemplateTestCase{ @@ -104,6 +110,30 @@ func TestQueries(t *testing.T) { }), }, }, + sqlQueryTeamBindings: { + { + Name: "team_1_bindings", + Data: listTeamBindings(&ListTeamBindingsQuery{ + OrgID: 1, + UID: "team-1", + }), + }, + { + Name: "team_bindings_page_1", + Data: listTeamBindings(&ListTeamBindingsQuery{ + OrgID: 1, + Limit: 5, + }), + }, + { + Name: "team_bindings_page_2", + Data: listTeamBindings(&ListTeamBindingsQuery{ + OrgID: 1, + Limit: 5, + ContinueID: 5, + }), + }, + }, }, }) } diff --git a/pkg/registry/apis/identity/legacy/query_team_bindings.sql b/pkg/registry/apis/identity/legacy/query_team_bindings.sql new file mode 100644 index 00000000000..4176247a592 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/query_team_bindings.sql @@ -0,0 +1,18 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM {{ .Ident .TeamMemberTable }} tm +INNER JOIN {{ .Ident .TeamTable }} t ON tm.team_id = t.id +INNER JOIN {{ .Ident .UserTable }} u ON tm.user_id = u.id +WHERE +{{ if .Query.UID }} + t.uid = {{ .Arg .Query.UID }} +{{ else }} + t.uid IN( + SELECT uid + FROM {{ .Ident .TeamTable }} t + {{ if .Query.ContinueID }} + WHERE t.id >= {{ .Arg .Query.ContinueID }} + {{ end }} + ORDER BY t.id ASC LIMIT {{ .Arg .Query.Limit }} + ) +{{ end }} +AND tm.org_id = {{ .Arg .Query.OrgID}} +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_1_bindings.sql b/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_1_bindings.sql new file mode 100755 index 00000000000..5c0f06a1720 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_1_bindings.sql @@ -0,0 +1,7 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid = 'team-1' +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_bindings_page_1.sql b/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_bindings_page_1.sql new file mode 100755 index 00000000000..3cea257a936 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_bindings_page_1.sql @@ -0,0 +1,11 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid IN( + SELECT uid + FROM "grafana.team" t + ORDER BY t.id ASC LIMIT 5 + ) +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_bindings_page_2.sql b/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_bindings_page_2.sql new file mode 100755 index 00000000000..b9a4fc91939 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/mysql--query_team_bindings-team_bindings_page_2.sql @@ -0,0 +1,12 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid IN( + SELECT uid + FROM "grafana.team" t + WHERE t.id >= 5 + ORDER BY t.id ASC LIMIT 5 + ) +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_1_bindings.sql b/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_1_bindings.sql new file mode 100755 index 00000000000..5c0f06a1720 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_1_bindings.sql @@ -0,0 +1,7 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid = 'team-1' +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_bindings_page_1.sql b/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_bindings_page_1.sql new file mode 100755 index 00000000000..3cea257a936 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_bindings_page_1.sql @@ -0,0 +1,11 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid IN( + SELECT uid + FROM "grafana.team" t + ORDER BY t.id ASC LIMIT 5 + ) +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_bindings_page_2.sql b/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_bindings_page_2.sql new file mode 100755 index 00000000000..b9a4fc91939 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/postgres--query_team_bindings-team_bindings_page_2.sql @@ -0,0 +1,12 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid IN( + SELECT uid + FROM "grafana.team" t + WHERE t.id >= 5 + ORDER BY t.id ASC LIMIT 5 + ) +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_1_bindings.sql b/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_1_bindings.sql new file mode 100755 index 00000000000..5c0f06a1720 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_1_bindings.sql @@ -0,0 +1,7 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid = 'team-1' +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_bindings_page_1.sql b/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_bindings_page_1.sql new file mode 100755 index 00000000000..3cea257a936 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_bindings_page_1.sql @@ -0,0 +1,11 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid IN( + SELECT uid + FROM "grafana.team" t + ORDER BY t.id ASC LIMIT 5 + ) +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_bindings_page_2.sql b/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_bindings_page_2.sql new file mode 100755 index 00000000000..b9a4fc91939 --- /dev/null +++ b/pkg/registry/apis/identity/legacy/testdata/sqlite--query_team_bindings-team_bindings_page_2.sql @@ -0,0 +1,12 @@ +SELECT tm.id as id, t.uid as team_uid, t.id as team_id, u.uid as user_uid, tm.created, tm.updated, tm.permission FROM "grafana.team_member" tm +INNER JOIN "grafana.team" t ON tm.team_id = t.id +INNER JOIN "grafana.user" u ON tm.user_id = u.id +WHERE + t.uid IN( + SELECT uid + FROM "grafana.team" t + WHERE t.id >= 5 + ORDER BY t.id ASC LIMIT 5 + ) +AND tm.org_id = 1 +ORDER BY t.id ASC; diff --git a/pkg/registry/apis/identity/legacy/types.go b/pkg/registry/apis/identity/legacy/types.go index 289e5176363..08b42434c17 100644 --- a/pkg/registry/apis/identity/legacy/types.go +++ b/pkg/registry/apis/identity/legacy/types.go @@ -2,8 +2,10 @@ package legacy import ( "context" + "time" "github.com/grafana/authlib/claims" + "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/services/team" "github.com/grafana/grafana/pkg/services/user" ) @@ -22,6 +24,12 @@ type ListUserResult struct { RV int64 } +type GetUserDisplayQuery struct { + OrgID int64 + UIDs []string + IDs []int64 +} + type ListTeamQuery struct { OrgID int64 UID string @@ -35,16 +43,46 @@ type ListTeamResult struct { RV int64 } -type GetUserDisplayQuery struct { - OrgID int64 - UIDs []string - IDs []int64 +type TeamMember struct { + ID int64 + TeamID int64 + TeamUID string + UserUID string + Updated time.Time + Created time.Time + Permission team.PermissionType +} + +func (m TeamMember) MemberID() string { + return identity.NewTypedIDString(claims.TypeUser, m.UserUID) +} + +type TeamBinding struct { + TeamUID string + Members []TeamMember +} + +type ListTeamBindingsQuery struct { + // UID is team uid to list bindings for. If not set store should list bindings for all teams + UID string + OrgID int64 + ContinueID int64 // ContinueID + Limit int64 +} + +type ListTeamBindingsResult struct { + Bindings []TeamBinding + ContinueID int64 + RV int64 } // In every case, RBAC should be applied before calling, or before returning results to the requester type LegacyIdentityStore interface { ListUsers(ctx context.Context, ns claims.NamespaceInfo, query ListUserQuery) (*ListUserResult, error) - ListTeams(ctx context.Context, ns claims.NamespaceInfo, query ListTeamQuery) (*ListTeamResult, error) GetDisplay(ctx context.Context, ns claims.NamespaceInfo, query GetUserDisplayQuery) (*ListUserResult, error) + + ListTeams(ctx context.Context, ns claims.NamespaceInfo, query ListTeamQuery) (*ListTeamResult, error) + ListTeamBindings(ctx context.Context, ns claims.NamespaceInfo, query ListTeamBindingsQuery) (*ListTeamBindingsResult, error) + GetUserTeams(ctx context.Context, ns claims.NamespaceInfo, uid string) ([]team.Team, error) } diff --git a/pkg/registry/apis/identity/legacy_user_teams.go b/pkg/registry/apis/identity/legacy_user_teams.go deleted file mode 100644 index c164ba4dbce..00000000000 --- a/pkg/registry/apis/identity/legacy_user_teams.go +++ /dev/null @@ -1,87 +0,0 @@ -package identity - -import ( - "context" - "net/http" - - identity "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" - "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/registry/rest" -) - -type userTeamsREST struct { - logger log.Logger - store legacy.LegacyIdentityStore -} - -var ( - _ rest.Storage = (*userTeamsREST)(nil) - _ rest.SingularNameProvider = (*userTeamsREST)(nil) - _ rest.Connecter = (*userTeamsREST)(nil) - _ rest.Scoper = (*userTeamsREST)(nil) - _ rest.StorageMetadata = (*userTeamsREST)(nil) -) - -func newUserTeamsREST(store legacy.LegacyIdentityStore) *userTeamsREST { - return &userTeamsREST{ - logger: log.New("user teams"), - store: store, - } -} - -func (r *userTeamsREST) New() runtime.Object { - return &identity.TeamList{} -} - -func (r *userTeamsREST) Destroy() {} - -func (r *userTeamsREST) NamespaceScoped() bool { - return true -} - -func (r *userTeamsREST) GetSingularName() string { - return "TeamList" // Used for the -} - -func (r *userTeamsREST) ProducesMIMETypes(verb string) []string { - return []string{"application/json"} // and parquet! -} - -func (r *userTeamsREST) ProducesObject(verb string) interface{} { - return &identity.TeamList{} -} - -func (r *userTeamsREST) ConnectMethods() []string { - return []string{"GET"} -} - -func (r *userTeamsREST) NewConnectOptions() (runtime.Object, bool, string) { - return nil, false, "" // true means you can use the trailing path as a variable -} - -func (r *userTeamsREST) Connect(ctx context.Context, name string, _ runtime.Object, responder rest.Responder) (http.Handler, error) { - ns, err := request.NamespaceInfoFrom(ctx, true) - if err != nil { - return nil, err - } - teams, err := r.store.GetUserTeams(ctx, ns, name) - if err != nil { - return nil, err - } - - return http.HandlerFunc(func(_ http.ResponseWriter, _ *http.Request) { - list := &identity.TeamList{} - for _, team := range teams { - t, err := asTeam(&team, ns.Value) - if err != nil { - responder.Error(err) - return - } - list.Items = append(list.Items, *t) - } - responder.Object(200, list) - }), nil -} diff --git a/pkg/registry/apis/identity/register.go b/pkg/registry/apis/identity/register.go index 778602f35a7..22079582c7b 100644 --- a/pkg/registry/apis/identity/register.go +++ b/pkg/registry/apis/identity/register.go @@ -13,13 +13,18 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" common "k8s.io/kube-openapi/pkg/common" - identity "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1" - identityapi "github.com/grafana/grafana/pkg/apimachinery/identity" + "github.com/grafana/grafana/pkg/apimachinery/identity" + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + "github.com/grafana/grafana/pkg/registry/apis/identity/serviceaccount" + "github.com/grafana/grafana/pkg/registry/apis/identity/sso" + "github.com/grafana/grafana/pkg/registry/apis/identity/team" + "github.com/grafana/grafana/pkg/registry/apis/identity/user" "github.com/grafana/grafana/pkg/services/apiserver/builder" "github.com/grafana/grafana/pkg/services/featuremgmt" + "github.com/grafana/grafana/pkg/services/ssosettings" "github.com/grafana/grafana/pkg/storage/legacysql" ) @@ -27,14 +32,14 @@ var _ builder.APIGroupBuilder = (*IdentityAPIBuilder)(nil) // This is used just so wire has something unique to return type IdentityAPIBuilder struct { - Store legacy.LegacyIdentityStore + Store legacy.LegacyIdentityStore + SSOService ssosettings.Service } func RegisterAPIService( features featuremgmt.FeatureToggles, apiregistration builder.APIRegistrar, - // svcTeam team.Service, - // svcUser user.Service, + ssoService ssosettings.Service, sql db.DB, ) (*IdentityAPIBuilder, error) { if !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) { @@ -42,34 +47,28 @@ func RegisterAPIService( } builder := &IdentityAPIBuilder{ - Store: legacy.NewLegacySQLStores(legacysql.NewDatabaseProvider(sql)), + Store: legacy.NewLegacySQLStores(legacysql.NewDatabaseProvider(sql)), + SSOService: ssoService, } apiregistration.RegisterAPI(builder) + return builder, nil } func (b *IdentityAPIBuilder) GetGroupVersion() schema.GroupVersion { - return identity.SchemeGroupVersion + return identityv0.SchemeGroupVersion } func (b *IdentityAPIBuilder) InstallSchema(scheme *runtime.Scheme) error { - if err := identity.AddKnownTypes(scheme, identity.VERSION); err != nil { - return err - } + identityv0.AddKnownTypes(scheme, identityv0.VERSION) // Link this version to the internal representation. // This is used for server-side-apply (PATCH), and avoids the error: - // "no kind is registered for the type" - if err := identity.AddKnownTypes(scheme, runtime.APIVersionInternal); err != nil { - return err - } + // "no kind is registered for the type" + identityv0.AddKnownTypes(scheme, runtime.APIVersionInternal) - // If multiple versions exist, then register conversions from zz_generated.conversion.go - // if err := playlist.RegisterConversions(scheme); err != nil { - // return err - // } - metav1.AddToGroupVersion(scheme, identity.SchemeGroupVersion) - return scheme.SetVersionPriority(identity.SchemeGroupVersion) + metav1.AddToGroupVersion(scheme, identityv0.SchemeGroupVersion) + return scheme.SetVersionPriority(identityv0.SchemeGroupVersion) } func (b *IdentityAPIBuilder) GetAPIGroupInfo( @@ -78,53 +77,48 @@ func (b *IdentityAPIBuilder) GetAPIGroupInfo( optsGetter generic.RESTOptionsGetter, dualWriteBuilder grafanarest.DualWriteBuilder, ) (*genericapiserver.APIGroupInfo, error) { - apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(identity.GROUP, scheme, metav1.ParameterCodec, codecs) + apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(identityv0.GROUP, scheme, metav1.ParameterCodec, codecs) storage := map[string]rest.Storage{} - team := identity.TeamResourceInfo - teamStore := &legacyTeamStorage{ - service: b.Store, - resourceInfo: team, - tableConverter: team.TableConverter(), - } - storage[team.StoragePath()] = teamStore + teamResource := identityv0.TeamResourceInfo + storage[teamResource.StoragePath()] = team.NewLegacyStore(b.Store) - user := identity.UserResourceInfo - userStore := &legacyUserStorage{ - service: b.Store, - resourceInfo: user, - tableConverter: user.TableConverter(), - } - storage[user.StoragePath()] = userStore - storage[user.StoragePath("teams")] = newUserTeamsREST(b.Store) + teamBindingResource := identityv0.TeamBindingResourceInfo + storage[teamBindingResource.StoragePath()] = team.NewLegacyBindingStore(b.Store) - sa := identity.ServiceAccountResourceInfo - saStore := &legacyServiceAccountStorage{ - service: b.Store, - resourceInfo: sa, - tableConverter: sa.TableConverter(), + userResource := identityv0.UserResourceInfo + storage[userResource.StoragePath()] = user.NewLegacyStore(b.Store) + storage[userResource.StoragePath("teams")] = team.NewLegacyUserTeamsStore(b.Store) + + serviceaccountResource := identityv0.ServiceAccountResourceInfo + storage[serviceaccountResource.StoragePath()] = serviceaccount.NewLegacyStore(b.Store) + + if b.SSOService != nil { + ssoResource := identityv0.SSOSettingResourceInfo + storage[ssoResource.StoragePath()] = sso.NewLegacyStore(b.SSOService) } - storage[sa.StoragePath()] = saStore // The display endpoint -- NOTE, this uses a rewrite hack to allow requests without a name parameter - storage["display"] = newDisplayREST(b.Store) + storage["display"] = user.NewLegacyDisplayStore(b.Store) - apiGroupInfo.VersionedResourcesStorageMap[identity.VERSION] = storage + apiGroupInfo.VersionedResourcesStorageMap[identityv0.VERSION] = storage return &apiGroupInfo, nil } func (b *IdentityAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions { - return identity.GetOpenAPIDefinitions + return identityv0.GetOpenAPIDefinitions } func (b *IdentityAPIBuilder) GetAPIRoutes() *builder.APIRoutes { - return nil // no custom API routes + // no custom API routes + return nil } func (b *IdentityAPIBuilder) GetAuthorizer() authorizer.Authorizer { + // TODO: handle authorization based in entity. return authorizer.AuthorizerFunc( func(ctx context.Context, a authorizer.Attributes) (authorizer.Decision, string, error) { - user, err := identityapi.GetRequester(ctx) + user, err := identity.GetRequester(ctx) if err != nil { return authorizer.DecisionDeny, "no identity found", err } diff --git a/pkg/registry/apis/identity/legacy_sa.go b/pkg/registry/apis/identity/serviceaccount/store.go similarity index 52% rename from pkg/registry/apis/identity/legacy_sa.go rename to pkg/registry/apis/identity/serviceaccount/store.go index 606b3a6b6a5..2d963c17248 100644 --- a/pkg/registry/apis/identity/legacy_sa.go +++ b/pkg/registry/apis/identity/serviceaccount/store.go @@ -1,59 +1,63 @@ -package identity +package serviceaccount import ( "context" "fmt" "strconv" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - identity "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/apimachinery/utils" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" - "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" - "github.com/grafana/grafana/pkg/services/user" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" + + "github.com/grafana/grafana/pkg/apimachinery/utils" + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/grafana/pkg/services/user" ) var ( - _ rest.Scoper = (*legacyServiceAccountStorage)(nil) - _ rest.SingularNameProvider = (*legacyServiceAccountStorage)(nil) - _ rest.Getter = (*legacyServiceAccountStorage)(nil) - _ rest.Lister = (*legacyServiceAccountStorage)(nil) - _ rest.Storage = (*legacyServiceAccountStorage)(nil) + _ rest.Scoper = (*LegacyStore)(nil) + _ rest.SingularNameProvider = (*LegacyStore)(nil) + _ rest.Getter = (*LegacyStore)(nil) + _ rest.Lister = (*LegacyStore)(nil) + _ rest.Storage = (*LegacyStore)(nil) ) -type legacyServiceAccountStorage struct { - service legacy.LegacyIdentityStore - tableConverter rest.TableConvertor - resourceInfo common.ResourceInfo +var resource = identityv0.ServiceAccountResourceInfo + +func NewLegacyStore(store legacy.LegacyIdentityStore) *LegacyStore { + return &LegacyStore{store} } -func (s *legacyServiceAccountStorage) New() runtime.Object { - return s.resourceInfo.NewFunc() +type LegacyStore struct { + store legacy.LegacyIdentityStore } -func (s *legacyServiceAccountStorage) Destroy() {} +func (s *LegacyStore) New() runtime.Object { + return resource.NewFunc() +} -func (s *legacyServiceAccountStorage) NamespaceScoped() bool { +func (s *LegacyStore) Destroy() {} + +func (s *LegacyStore) NamespaceScoped() bool { return true // namespace == org } -func (s *legacyServiceAccountStorage) GetSingularName() string { - return s.resourceInfo.GetSingularName() +func (s *LegacyStore) GetSingularName() string { + return resource.GetSingularName() } -func (s *legacyServiceAccountStorage) NewList() runtime.Object { - return s.resourceInfo.NewListFunc() +func (s *LegacyStore) NewList() runtime.Object { + return resource.NewListFunc() } -func (s *legacyServiceAccountStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { - return s.tableConverter.ConvertToTable(ctx, object, tableOptions) +func (s *LegacyStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { + return resource.TableConverter().ConvertToTable(ctx, object, tableOptions) } -func (s *legacyServiceAccountStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { +func (s *LegacyStore) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { ns, err := request.NamespaceInfoFrom(ctx, true) if err != nil { return nil, err @@ -70,12 +74,12 @@ func (s *legacyServiceAccountStorage) List(ctx context.Context, options *interna } } - found, err := s.service.ListUsers(ctx, ns, query) + found, err := s.store.ListUsers(ctx, ns, query) if err != nil { return nil, err } - list := &identity.ServiceAccountList{} + list := &identityv0.ServiceAccountList{} for _, item := range found.Users { list.Items = append(list.Items, *toSAItem(&item, ns.Value)) } @@ -88,15 +92,15 @@ func (s *legacyServiceAccountStorage) List(ctx context.Context, options *interna return list, err } -func toSAItem(u *user.User, ns string) *identity.ServiceAccount { - item := &identity.ServiceAccount{ +func toSAItem(u *user.User, ns string) *identityv0.ServiceAccount { + item := &identityv0.ServiceAccount{ ObjectMeta: metav1.ObjectMeta{ Name: u.UID, Namespace: ns, ResourceVersion: fmt.Sprintf("%d", u.Updated.UnixMilli()), CreationTimestamp: metav1.NewTime(u.Created), }, - Spec: identity.ServiceAccountSpec{ + Spec: identityv0.ServiceAccountSpec{ Name: u.Name, Email: u.Email, EmailVerified: u.EmailVerified, @@ -112,7 +116,7 @@ func toSAItem(u *user.User, ns string) *identity.ServiceAccount { return item } -func (s *legacyServiceAccountStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { +func (s *LegacyStore) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { ns, err := request.NamespaceInfoFrom(ctx, true) if err != nil { return nil, err @@ -123,12 +127,12 @@ func (s *legacyServiceAccountStorage) Get(ctx context.Context, name string, opti IsServiceAccount: true, } - found, err := s.service.ListUsers(ctx, ns, query) + found, err := s.store.ListUsers(ctx, ns, query) if found == nil || err != nil { - return nil, s.resourceInfo.NewNotFound(name) + return nil, resource.NewNotFound(name) } if len(found.Users) < 1 { - return nil, s.resourceInfo.NewNotFound(name) + return nil, resource.NewNotFound(name) } return toSAItem(&found.Users[0], ns.Value), nil } diff --git a/pkg/registry/apis/identity/sso/store.go b/pkg/registry/apis/identity/sso/store.go new file mode 100644 index 00000000000..0e1fdf5f277 --- /dev/null +++ b/pkg/registry/apis/identity/sso/store.go @@ -0,0 +1,218 @@ +package sso + +import ( + "context" + "errors" + "fmt" + + commonv1 "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" + "github.com/grafana/grafana/pkg/apimachinery/identity" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/apis/meta/internalversion" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apiserver/pkg/registry/rest" + + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/grafana/pkg/services/ssosettings" + ssomodels "github.com/grafana/grafana/pkg/services/ssosettings/models" +) + +var ( + _ rest.Storage = (*LegacyStore)(nil) + _ rest.Scoper = (*LegacyStore)(nil) + _ rest.Getter = (*LegacyStore)(nil) + _ rest.Lister = (*LegacyStore)(nil) + _ rest.Updater = (*LegacyStore)(nil) + _ rest.SingularNameProvider = (*LegacyStore)(nil) + _ rest.GracefulDeleter = (*LegacyStore)(nil) +) + +var resource = identityv0.SSOSettingResourceInfo + +func NewLegacyStore(service ssosettings.Service) *LegacyStore { + return &LegacyStore{service} +} + +type LegacyStore struct { + service ssosettings.Service +} + +// Destroy implements rest.Storage. +func (s *LegacyStore) Destroy() {} + +// NamespaceScoped implements rest.Scoper. +func (s *LegacyStore) NamespaceScoped() bool { + // this is maybe incorrect + return true +} + +// GetSingularName implements rest.SingularNameProvider. +func (s *LegacyStore) GetSingularName() string { + return resource.GetSingularName() +} + +// New implements rest.Storage. +func (s *LegacyStore) New() runtime.Object { + return resource.NewFunc() +} + +// ConvertToTable implements rest.Lister. +func (s *LegacyStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { + return resource.TableConverter().ConvertToTable(ctx, object, tableOptions) +} + +// NewList implements rest.Lister. +func (s *LegacyStore) NewList() runtime.Object { + return resource.NewListFunc() +} + +// List implements rest.Lister. +func (s *LegacyStore) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { + ns, _ := request.NamespaceInfoFrom(ctx, false) + + settings, err := s.service.List(ctx) + if err != nil { + return nil, fmt.Errorf("failed to list sso settings: %w", err) + } + + list := &identityv0.SSOSettingList{} + for _, s := range settings { + list.Items = append(list.Items, mapToObject(ns.Value, s)) + } + + return list, nil +} + +// Get implements rest.Getter. +func (s *LegacyStore) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + ns, _ := request.NamespaceInfoFrom(ctx, false) + + setting, err := s.service.GetForProviderWithRedactedSecrets(ctx, name) + if err != nil { + if errors.Is(err, ssosettings.ErrNotFound) { + return nil, resource.NewNotFound(name) + } + return nil, err + } + + object := mapToObject(ns.Value, setting) + return &object, nil +} + +// Update implements rest.Updater. +func (s *LegacyStore) Update( + ctx context.Context, + name string, + objInfo rest.UpdatedObjectInfo, + _ rest.ValidateObjectFunc, + _ rest.ValidateObjectUpdateFunc, + _ bool, + _ *metav1.UpdateOptions, +) (runtime.Object, bool, error) { + const created = false + ident, err := identity.GetRequester(ctx) + if err != nil { + return nil, created, err + } + + old, err := s.Get(ctx, name, nil) + if err != nil { + return old, created, err + } + + obj, err := objInfo.UpdatedObject(ctx, old) + if err != nil { + return old, created, err + } + + setting, ok := obj.(*identityv0.SSOSetting) + if !ok { + return old, created, errors.New("expected ssosetting after update") + } + + if err := s.service.Upsert(ctx, mapToModel(setting), ident); err != nil { + return old, created, err + } + + updated, err := s.Get(ctx, name, nil) + return updated, created, err +} + +// Delete implements rest.GracefulDeleter. +func (s *LegacyStore) Delete( + ctx context.Context, + name string, + _ rest.ValidateObjectFunc, + options *metav1.DeleteOptions, +) (runtime.Object, bool, error) { + obj, err := s.Get(ctx, name, nil) + if err != nil { + return obj, false, err + } + + old, ok := obj.(*identityv0.SSOSetting) + if !ok { + return obj, false, errors.New("expected ssosetting") + } + + // FIXME(kalleep): this should probably be validated in transaction + if options.Preconditions != nil && options.Preconditions.ResourceVersion != nil { + if *options.Preconditions.ResourceVersion != old.GetResourceVersion() { + return old, false, apierrors.NewConflict( + resource.GroupResource(), + name, + fmt.Errorf( + "the ResourceVersion in the precondition (%s) does not match the ResourceVersion in record (%s). The object might have been modified", + *options.Preconditions.ResourceVersion, + old.GetResourceVersion(), + ), + ) + } + } + + if err := s.service.Delete(ctx, name); err != nil { + return old, false, err + } + + // If settings for a provider is deleted from db they will fallback to settings from config file, env or arguments. + afterDelete, err := s.Get(ctx, name, nil) + return afterDelete, false, err +} + +func mapToObject(ns string, s *ssomodels.SSOSettings) identityv0.SSOSetting { + source := identityv0.SourceDB + if s.Source == ssomodels.System { + source = identityv0.SourceSystem + } + + version := "0" + if !s.Updated.IsZero() { + version = fmt.Sprintf("%d", s.Updated.UnixMilli()) + } + + object := identityv0.SSOSetting{ + ObjectMeta: metav1.ObjectMeta{ + Name: s.Provider, + Namespace: ns, + UID: types.UID(s.Provider), + ResourceVersion: version, + CreationTimestamp: metav1.NewTime(s.Updated), + }, + Spec: identityv0.SSOSettingSpec{ + Source: source, + Settings: commonv1.Unstructured{Object: s.Settings}, + }, + } + + return object +} + +func mapToModel(obj *identityv0.SSOSetting) *ssomodels.SSOSettings { + return &ssomodels.SSOSettings{ + Provider: obj.Name, + Settings: obj.Spec.Settings.Object, + } +} diff --git a/pkg/registry/apis/identity/legacy_teams.go b/pkg/registry/apis/identity/team/store.go similarity index 57% rename from pkg/registry/apis/identity/legacy_teams.go rename to pkg/registry/apis/identity/team/store.go index bdcb84550fd..7bfde79ad35 100644 --- a/pkg/registry/apis/identity/legacy_teams.go +++ b/pkg/registry/apis/identity/team/store.go @@ -1,81 +1,86 @@ -package identity +package team import ( "context" "strconv" - "github.com/grafana/authlib/claims" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - identity "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/apimachinery/utils" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" - "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" - "github.com/grafana/grafana/pkg/services/team" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" + + "github.com/grafana/authlib/claims" + "github.com/grafana/grafana/pkg/apimachinery/utils" + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/grafana/pkg/services/team" ) var ( - _ rest.Scoper = (*legacyTeamStorage)(nil) - _ rest.SingularNameProvider = (*legacyTeamStorage)(nil) - _ rest.Getter = (*legacyTeamStorage)(nil) - _ rest.Lister = (*legacyTeamStorage)(nil) - _ rest.Storage = (*legacyTeamStorage)(nil) + _ rest.Scoper = (*LegacyStore)(nil) + _ rest.SingularNameProvider = (*LegacyStore)(nil) + _ rest.Getter = (*LegacyStore)(nil) + _ rest.Lister = (*LegacyStore)(nil) + _ rest.Storage = (*LegacyStore)(nil) ) -type legacyTeamStorage struct { - service legacy.LegacyIdentityStore - tableConverter rest.TableConvertor - resourceInfo common.ResourceInfo +var resource = identityv0.TeamResourceInfo + +func NewLegacyStore(store legacy.LegacyIdentityStore) *LegacyStore { + return &LegacyStore{store} } -func (s *legacyTeamStorage) New() runtime.Object { - return s.resourceInfo.NewFunc() +type LegacyStore struct { + store legacy.LegacyIdentityStore } -func (s *legacyTeamStorage) Destroy() {} - -func (s *legacyTeamStorage) NamespaceScoped() bool { - return true // namespace == org +func (s *LegacyStore) New() runtime.Object { + return resource.NewFunc() } -func (s *legacyTeamStorage) GetSingularName() string { - return s.resourceInfo.GetSingularName() +func (s *LegacyStore) Destroy() {} + +func (s *LegacyStore) NamespaceScoped() bool { + // namespace == org + return true } -func (s *legacyTeamStorage) NewList() runtime.Object { - return s.resourceInfo.NewListFunc() +func (s *LegacyStore) GetSingularName() string { + return resource.GetSingularName() } -func (s *legacyTeamStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { - return s.tableConverter.ConvertToTable(ctx, object, tableOptions) +func (s *LegacyStore) NewList() runtime.Object { + return resource.NewListFunc() } -func (s *legacyTeamStorage) doList(ctx context.Context, ns claims.NamespaceInfo, query legacy.ListTeamQuery) (*identity.TeamList, error) { +func (s *LegacyStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { + return resource.TableConverter().ConvertToTable(ctx, object, tableOptions) +} + +func (s *LegacyStore) doList(ctx context.Context, ns claims.NamespaceInfo, query legacy.ListTeamQuery) (*identityv0.TeamList, error) { if query.Limit < 1 { query.Limit = 100 } - rsp, err := s.service.ListTeams(ctx, ns, query) + rsp, err := s.store.ListTeams(ctx, ns, query) if err != nil { return nil, err } - list := &identity.TeamList{ + list := &identityv0.TeamList{ ListMeta: metav1.ListMeta{ ResourceVersion: strconv.FormatInt(rsp.RV, 10), }, } for _, team := range rsp.Teams { - item := identity.Team{ + item := identityv0.Team{ ObjectMeta: metav1.ObjectMeta{ Name: team.UID, Namespace: ns.Value, CreationTimestamp: metav1.NewTime(team.Created), ResourceVersion: strconv.FormatInt(team.Updated.UnixMilli(), 10), }, - Spec: identity.TeamSpec{ + Spec: identityv0.TeamSpec{ Title: team.Name, Email: team.Email, }, @@ -97,7 +102,7 @@ func (s *legacyTeamStorage) doList(ctx context.Context, ns claims.NamespaceInfo, return list, nil } -func (s *legacyTeamStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { +func (s *LegacyStore) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { ns, err := request.NamespaceInfoFrom(ctx, true) if err != nil { return nil, err @@ -115,7 +120,7 @@ func (s *legacyTeamStorage) List(ctx context.Context, options *internalversion.L return s.doList(ctx, ns, query) } -func (s *legacyTeamStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { +func (s *LegacyStore) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { ns, err := request.NamespaceInfoFrom(ctx, true) if err != nil { return nil, err @@ -131,18 +136,18 @@ func (s *legacyTeamStorage) Get(ctx context.Context, name string, options *metav if len(rsp.Items) > 0 { return &rsp.Items[0], nil } - return nil, s.resourceInfo.NewNotFound(name) + return nil, resource.NewNotFound(name) } -func asTeam(team *team.Team, ns string) (*identity.Team, error) { - item := &identity.Team{ +func asTeam(team *team.Team, ns string) (*identityv0.Team, error) { + item := &identityv0.Team{ ObjectMeta: metav1.ObjectMeta{ Name: team.UID, Namespace: ns, CreationTimestamp: metav1.NewTime(team.Created), ResourceVersion: strconv.FormatInt(team.Updated.UnixMilli(), 10), }, - Spec: identity.TeamSpec{ + Spec: identityv0.TeamSpec{ Title: team.Name, Email: team.Email, }, diff --git a/pkg/registry/apis/identity/team/store_binding.go b/pkg/registry/apis/identity/team/store_binding.go new file mode 100644 index 00000000000..480cbe90c8e --- /dev/null +++ b/pkg/registry/apis/identity/team/store_binding.go @@ -0,0 +1,171 @@ +package team + +import ( + "context" + "strconv" + "time" + + "k8s.io/apimachinery/pkg/apis/meta/internalversion" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/rest" + + "github.com/grafana/authlib/claims" + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/identity/common" + "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/grafana/pkg/services/team" +) + +var bindingResource = identityv0.TeamBindingResourceInfo + +var ( + _ rest.Storage = (*LegacyBindingStore)(nil) + _ rest.Scoper = (*LegacyBindingStore)(nil) + _ rest.SingularNameProvider = (*LegacyBindingStore)(nil) + _ rest.Getter = (*LegacyBindingStore)(nil) + _ rest.Lister = (*LegacyBindingStore)(nil) +) + +func NewLegacyBindingStore(store legacy.LegacyIdentityStore) *LegacyBindingStore { + return &LegacyBindingStore{store} +} + +type LegacyBindingStore struct { + store legacy.LegacyIdentityStore +} + +// Destroy implements rest.Storage. +func (l *LegacyBindingStore) Destroy() {} + +// New implements rest.Storage. +func (l *LegacyBindingStore) New() runtime.Object { + return bindingResource.NewFunc() +} + +// NewList implements rest.Lister. +func (l *LegacyBindingStore) NewList() runtime.Object { + return bindingResource.NewListFunc() +} + +// NamespaceScoped implements rest.Scoper. +func (l *LegacyBindingStore) NamespaceScoped() bool { + return true +} + +// GetSingularName implements rest.SingularNameProvider. +func (l *LegacyBindingStore) GetSingularName() string { + return bindingResource.GetSingularName() +} + +// ConvertToTable implements rest.Lister. +func (l *LegacyBindingStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { + return bindingResource.TableConverter().ConvertToTable(ctx, object, tableOptions) +} + +// Get implements rest.Getter. +func (l *LegacyBindingStore) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + ns, err := request.NamespaceInfoFrom(ctx, true) + if err != nil { + return nil, err + } + + res, err := l.store.ListTeamBindings(ctx, ns, legacy.ListTeamBindingsQuery{ + UID: name, + Limit: 1, + }) + if err != nil { + return nil, err + } + + if len(res.Bindings) != 1 { + // FIXME: maybe empty result? + return nil, resource.NewNotFound(name) + } + + obj := mapToBindingObject(ns, res.Bindings[0]) + return &obj, nil +} + +// List implements rest.Lister. +func (l *LegacyBindingStore) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { + ns, err := request.NamespaceInfoFrom(ctx, true) + if err != nil { + return nil, err + } + + continueID, err := common.GetContinueID(options) + if err != nil { + return nil, err + } + + res, err := l.store.ListTeamBindings(ctx, ns, legacy.ListTeamBindingsQuery{ + ContinueID: continueID, + Limit: options.Limit, + }) + if err != nil { + return nil, err + } + + list := identityv0.TeamBindingList{ + Items: make([]identityv0.TeamBinding, 0, len(res.Bindings)), + } + + for _, b := range res.Bindings { + list.Items = append(list.Items, mapToBindingObject(ns, b)) + } + + list.ListMeta.Continue = common.OptionalFormatInt(res.ContinueID) + list.ListMeta.ResourceVersion = common.OptionalFormatInt(res.RV) + + return &list, nil +} + +func mapToBindingObject(ns claims.NamespaceInfo, b legacy.TeamBinding) identityv0.TeamBinding { + rv := time.Time{} + ct := time.Now() + + for _, m := range b.Members { + if m.Updated.After(rv) { + rv = m.Updated + } + if m.Created.Before(ct) { + ct = m.Created + } + } + + return identityv0.TeamBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: b.TeamUID, + Namespace: ns.Value, + ResourceVersion: strconv.FormatInt(rv.UnixMilli(), 10), + CreationTimestamp: metav1.NewTime(ct), + }, + Spec: identityv0.TeamBindingSpec{ + TeamRef: identityv0.TeamRef{ + Name: b.TeamUID, + }, + Subjects: mapToSubjects(b.Members), + }, + } +} + +func mapToSubjects(members []legacy.TeamMember) []identityv0.TeamSubject { + out := make([]identityv0.TeamSubject, 0, len(members)) + for _, m := range members { + out = append(out, identityv0.TeamSubject{ + Name: m.MemberID(), + Permission: mapPermisson(m.Permission), + }) + } + return out +} + +func mapPermisson(p team.PermissionType) identityv0.TeamPermission { + if p == team.PermissionTypeAdmin { + return identityv0.TeamPermissionAdmin + } else { + return identityv0.TeamPermissionMember + } +} diff --git a/pkg/registry/apis/identity/team/store_user_team.go b/pkg/registry/apis/identity/team/store_user_team.go new file mode 100644 index 00000000000..2d9128a5e33 --- /dev/null +++ b/pkg/registry/apis/identity/team/store_user_team.go @@ -0,0 +1,88 @@ +package team + +import ( + "context" + "net/http" + + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/rest" + + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + "github.com/grafana/grafana/pkg/infra/log" + "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" +) + +var ( + _ rest.Storage = (*LegacyUserTeamsStore)(nil) + _ rest.SingularNameProvider = (*LegacyUserTeamsStore)(nil) + _ rest.Connecter = (*LegacyUserTeamsStore)(nil) + _ rest.Scoper = (*LegacyUserTeamsStore)(nil) + _ rest.StorageMetadata = (*LegacyUserTeamsStore)(nil) +) + +func NewLegacyUserTeamsStore(store legacy.LegacyIdentityStore) *LegacyUserTeamsStore { + return &LegacyUserTeamsStore{ + logger: log.New("user teams"), + store: store, + } +} + +type LegacyUserTeamsStore struct { + logger log.Logger + store legacy.LegacyIdentityStore +} + +func (r *LegacyUserTeamsStore) New() runtime.Object { + return &identityv0.TeamList{} +} + +func (r *LegacyUserTeamsStore) Destroy() {} + +func (r *LegacyUserTeamsStore) NamespaceScoped() bool { + return true +} + +func (r *LegacyUserTeamsStore) GetSingularName() string { + return "TeamList" +} + +func (r *LegacyUserTeamsStore) ProducesMIMETypes(verb string) []string { + return []string{"application/json"} +} + +func (r *LegacyUserTeamsStore) ProducesObject(verb string) interface{} { + return &identityv0.TeamList{} +} + +func (r *LegacyUserTeamsStore) ConnectMethods() []string { + return []string{"GET"} +} + +func (r *LegacyUserTeamsStore) NewConnectOptions() (runtime.Object, bool, string) { + return nil, false, "" // true means you can use the trailing path as a variable +} + +func (r *LegacyUserTeamsStore) Connect(ctx context.Context, name string, _ runtime.Object, responder rest.Responder) (http.Handler, error) { + ns, err := request.NamespaceInfoFrom(ctx, true) + if err != nil { + return nil, err + } + teams, err := r.store.GetUserTeams(ctx, ns, name) + if err != nil { + return nil, err + } + + return http.HandlerFunc(func(_ http.ResponseWriter, _ *http.Request) { + list := &identityv0.TeamList{} + for _, team := range teams { + t, err := asTeam(&team, ns.Value) + if err != nil { + responder.Error(err) + return + } + list.Items = append(list.Items, *t) + } + responder.Object(200, list) + }), nil +} diff --git a/pkg/registry/apis/identity/display.go b/pkg/registry/apis/identity/user/display_store.go similarity index 76% rename from pkg/registry/apis/identity/display.go rename to pkg/registry/apis/identity/user/display_store.go index 16527fbdaa2..6d399968520 100644 --- a/pkg/registry/apis/identity/display.go +++ b/pkg/registry/apis/identity/user/display_store.go @@ -1,4 +1,4 @@ -package identity +package user import ( "context" @@ -8,7 +8,7 @@ import ( "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/api/dtos" - identity "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1" + identity "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/setting" @@ -18,56 +18,57 @@ import ( "k8s.io/apiserver/pkg/registry/rest" ) -type displayREST struct { +type LegacyDisplayStore struct { store legacy.LegacyIdentityStore } var ( - _ rest.Storage = (*displayREST)(nil) - _ rest.SingularNameProvider = (*displayREST)(nil) - _ rest.Connecter = (*displayREST)(nil) - _ rest.Scoper = (*displayREST)(nil) - _ rest.StorageMetadata = (*displayREST)(nil) + _ rest.Storage = (*LegacyDisplayStore)(nil) + _ rest.SingularNameProvider = (*LegacyDisplayStore)(nil) + _ rest.Connecter = (*LegacyDisplayStore)(nil) + _ rest.Scoper = (*LegacyDisplayStore)(nil) + _ rest.StorageMetadata = (*LegacyDisplayStore)(nil) ) -func newDisplayREST(store legacy.LegacyIdentityStore) *displayREST { - return &displayREST{store} +func NewLegacyDisplayStore(store legacy.LegacyIdentityStore) *LegacyDisplayStore { + return &LegacyDisplayStore{store} } -func (r *displayREST) New() runtime.Object { +func (r *LegacyDisplayStore) New() runtime.Object { return &identity.IdentityDisplayResults{} } -func (r *displayREST) Destroy() {} +func (r *LegacyDisplayStore) Destroy() {} -func (r *displayREST) NamespaceScoped() bool { +func (r *LegacyDisplayStore) NamespaceScoped() bool { return true } -func (r *displayREST) GetSingularName() string { - return "IdentityDisplay" // not actually used anywhere, but required by SingularNameProvider +func (r *LegacyDisplayStore) GetSingularName() string { + // not actually used anywhere, but required by SingularNameProvider + return "IdentityDisplay" } -func (r *displayREST) ProducesMIMETypes(verb string) []string { +func (r *LegacyDisplayStore) ProducesMIMETypes(verb string) []string { return []string{"application/json"} } -func (r *displayREST) ProducesObject(verb string) any { +func (r *LegacyDisplayStore) ProducesObject(verb string) any { return &identity.IdentityDisplayResults{} } -func (r *displayREST) ConnectMethods() []string { +func (r *LegacyDisplayStore) ConnectMethods() []string { return []string{"GET"} } -func (r *displayREST) NewConnectOptions() (runtime.Object, bool, string) { +func (r *LegacyDisplayStore) NewConnectOptions() (runtime.Object, bool, string) { return nil, false, "" // true means you can use the trailing path as a variable } // This will always have an empty app url var fakeCfgForGravatar = &setting.Cfg{} -func (r *displayREST) Connect(ctx context.Context, name string, _ runtime.Object, responder rest.Responder) (http.Handler, error) { +func (r *LegacyDisplayStore) Connect(ctx context.Context, name string, _ runtime.Object, responder rest.Responder) (http.Handler, error) { // See: /pkg/services/apiserver/builder/helper.go#L34 // The name is set with a rewriter hack if name != "name" { diff --git a/pkg/registry/apis/identity/legacy_users.go b/pkg/registry/apis/identity/user/store.go similarity index 54% rename from pkg/registry/apis/identity/legacy_users.go rename to pkg/registry/apis/identity/user/store.go index 321e755c8fa..80066c20efc 100644 --- a/pkg/registry/apis/identity/legacy_users.go +++ b/pkg/registry/apis/identity/user/store.go @@ -1,59 +1,63 @@ -package identity +package user import ( "context" "fmt" "strconv" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - identity "github.com/grafana/grafana/pkg/apimachinery/apis/identity/v0alpha1" - "github.com/grafana/grafana/pkg/apimachinery/utils" - "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" - "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" - "github.com/grafana/grafana/pkg/services/user" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" + + "github.com/grafana/grafana/pkg/apimachinery/utils" + identityv0 "github.com/grafana/grafana/pkg/apis/identity/v0alpha1" + "github.com/grafana/grafana/pkg/registry/apis/identity/legacy" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/grafana/pkg/services/user" ) var ( - _ rest.Scoper = (*legacyUserStorage)(nil) - _ rest.SingularNameProvider = (*legacyUserStorage)(nil) - _ rest.Getter = (*legacyUserStorage)(nil) - _ rest.Lister = (*legacyUserStorage)(nil) - _ rest.Storage = (*legacyUserStorage)(nil) + _ rest.Scoper = (*LegacyStore)(nil) + _ rest.SingularNameProvider = (*LegacyStore)(nil) + _ rest.Getter = (*LegacyStore)(nil) + _ rest.Lister = (*LegacyStore)(nil) + _ rest.Storage = (*LegacyStore)(nil) ) -type legacyUserStorage struct { - service legacy.LegacyIdentityStore - tableConverter rest.TableConvertor - resourceInfo common.ResourceInfo +var resource = identityv0.UserResourceInfo + +func NewLegacyStore(store legacy.LegacyIdentityStore) *LegacyStore { + return &LegacyStore{store} } -func (s *legacyUserStorage) New() runtime.Object { - return s.resourceInfo.NewFunc() +type LegacyStore struct { + store legacy.LegacyIdentityStore } -func (s *legacyUserStorage) Destroy() {} +func (s *LegacyStore) New() runtime.Object { + return resource.NewFunc() +} -func (s *legacyUserStorage) NamespaceScoped() bool { +func (s *LegacyStore) Destroy() {} + +func (s *LegacyStore) NamespaceScoped() bool { return true // namespace == org } -func (s *legacyUserStorage) GetSingularName() string { - return s.resourceInfo.GetSingularName() +func (s *LegacyStore) GetSingularName() string { + return resource.GetSingularName() } -func (s *legacyUserStorage) NewList() runtime.Object { - return s.resourceInfo.NewListFunc() +func (s *LegacyStore) NewList() runtime.Object { + return resource.NewListFunc() } -func (s *legacyUserStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { - return s.tableConverter.ConvertToTable(ctx, object, tableOptions) +func (s *LegacyStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) { + return resource.TableConverter().ConvertToTable(ctx, object, tableOptions) } -func (s *legacyUserStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { +func (s *LegacyStore) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { ns, err := request.NamespaceInfoFrom(ctx, true) if err != nil { return nil, err @@ -70,12 +74,12 @@ func (s *legacyUserStorage) List(ctx context.Context, options *internalversion.L } } - found, err := s.service.ListUsers(ctx, ns, query) + found, err := s.store.ListUsers(ctx, ns, query) if err != nil { return nil, err } - list := &identity.UserList{} + list := &identityv0.UserList{} for _, item := range found.Users { list.Items = append(list.Items, *toUserItem(&item, ns.Value)) } @@ -88,15 +92,36 @@ func (s *legacyUserStorage) List(ctx context.Context, options *internalversion.L return list, err } -func toUserItem(u *user.User, ns string) *identity.User { - item := &identity.User{ +func (s *LegacyStore) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + ns, err := request.NamespaceInfoFrom(ctx, true) + if err != nil { + return nil, err + } + query := legacy.ListUserQuery{ + OrgID: ns.OrgID, + Limit: 1, + IsServiceAccount: false, + } + + found, err := s.store.ListUsers(ctx, ns, query) + if found == nil || err != nil { + return nil, resource.NewNotFound(name) + } + if len(found.Users) < 1 { + return nil, resource.NewNotFound(name) + } + return toUserItem(&found.Users[0], ns.Value), nil +} + +func toUserItem(u *user.User, ns string) *identityv0.User { + item := &identityv0.User{ ObjectMeta: metav1.ObjectMeta{ Name: u.UID, Namespace: ns, ResourceVersion: fmt.Sprintf("%d", u.Updated.UnixMilli()), CreationTimestamp: metav1.NewTime(u.Created), }, - Spec: identity.UserSpec{ + Spec: identityv0.UserSpec{ Name: u.Name, Login: u.Login, Email: u.Email, @@ -112,24 +137,3 @@ func toUserItem(u *user.User, ns string) *identity.User { }) return item } - -func (s *legacyUserStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { - ns, err := request.NamespaceInfoFrom(ctx, true) - if err != nil { - return nil, err - } - query := legacy.ListUserQuery{ - OrgID: ns.OrgID, - Limit: 1, - IsServiceAccount: false, - } - - found, err := s.service.ListUsers(ctx, ns, query) - if found == nil || err != nil { - return nil, s.resourceInfo.NewNotFound(name) - } - if len(found.Users) < 1 { - return nil, s.resourceInfo.NewNotFound(name) - } - return toUserItem(&found.Users[0], ns.Value), nil -} diff --git a/pkg/registry/apis/query/client/plugin.go b/pkg/registry/apis/query/client/plugin.go index dd0e3d2960f..ab1f85dd5c6 100644 --- a/pkg/registry/apis/query/client/plugin.go +++ b/pkg/registry/apis/query/client/plugin.go @@ -102,7 +102,7 @@ func (d *pluginRegistry) GetDatasourceGroupVersion(pluginId string) (schema.Grou var err error gv, ok := d.apis[pluginId] if !ok { - err = fmt.Errorf("no API found for id: " + pluginId) + err = fmt.Errorf("no API found for id: %s", pluginId) } return gv, err } diff --git a/pkg/registry/apis/query/query.go b/pkg/registry/apis/query/query.go index 637de66d152..ec50d046215 100644 --- a/pkg/registry/apis/query/query.go +++ b/pkg/registry/apis/query/query.go @@ -259,7 +259,7 @@ func (b *QueryAPIBuilder) executeConcurrentQueries(ctx context.Context, requests if theErr, ok := r.(error); ok { err = theErr } else if theErrString, ok := r.(string); ok { - err = fmt.Errorf(theErrString) + err = errors.New(theErrString) } else { err = fmt.Errorf("unexpected error - %s", b.userFacingDefaultError) } diff --git a/pkg/registry/apis/wireset.go b/pkg/registry/apis/wireset.go index f7eb37f3064..f6ceafac35e 100644 --- a/pkg/registry/apis/wireset.go +++ b/pkg/registry/apis/wireset.go @@ -39,4 +39,5 @@ var WireSet = wire.NewSet( query.RegisterAPIService, scope.RegisterAPIService, notifications.RegisterAPIService, + //sso.RegisterAPIService, ) diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 52890761c48..1217b154a55 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.22.4 +go 1.23.0 require go.opentelemetry.io/otel v1.28.0 diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go index 77e44244bf0..877fdaa1abc 100644 --- a/pkg/services/accesscontrol/acimpl/service.go +++ b/pkg/services/accesscontrol/acimpl/service.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/otel/attribute" "github.com/grafana/authlib/claims" + "github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/infra/db" @@ -242,6 +243,11 @@ func (s *Service) getCachedUserPermissions(ctx context.Context, user identity.Re defer span.End() permissions := []accesscontrol.Permission{} + cacheKey := accesscontrol.GetUserPermissionCacheKey(user) + if cachedPermissions, ok := s.cache.Get(cacheKey); ok { + return cachedPermissions.([]accesscontrol.Permission), nil + } + permissions, err := s.getCachedBasicRolesPermissions(ctx, user, options, permissions) if err != nil { return nil, err @@ -258,6 +264,7 @@ func (s *Service) getCachedUserPermissions(ctx context.Context, user identity.Re } permissions = append(permissions, userPermissions...) + s.cache.Set(cacheKey, permissions, cacheTTL) span.SetAttributes(attribute.Int("num_permissions", len(permissions))) return permissions, nil @@ -337,8 +344,14 @@ func (s *Service) getCachedTeamsPermissions(ctx context.Context, user identity.R teams := user.GetTeams() orgID := user.GetOrgID() miss := teams + compositeKey := accesscontrol.GetTeamPermissionCompositeCacheKey(teams, orgID) if !options.ReloadCache { + teamsPermissions, ok := s.cache.Get(compositeKey) + if ok { + return teamsPermissions.([]accesscontrol.Permission), nil + } + miss = make([]int64, 0) for _, teamID := range teams { key := accesscontrol.GetTeamPermissionCacheKey(teamID, orgID) @@ -368,12 +381,13 @@ func (s *Service) getCachedTeamsPermissions(ctx context.Context, user identity.R permissions = append(permissions, teamPermissions...) } } + s.cache.Set(compositeKey, permissions, cacheTTL) return permissions, nil } func (s *Service) ClearUserPermissionCache(user identity.Requester) { - s.cache.Delete(accesscontrol.GetPermissionCacheKey(user)) + s.cache.Delete(accesscontrol.GetUserPermissionCacheKey(user)) s.cache.Delete(accesscontrol.GetUserDirectPermissionCacheKey(user)) } diff --git a/pkg/services/accesscontrol/authorize_in_org_test.go b/pkg/services/accesscontrol/authorize_in_org_test.go index 5c5819b1b26..8eb3082e1cc 100644 --- a/pkg/services/accesscontrol/authorize_in_org_test.go +++ b/pkg/services/accesscontrol/authorize_in_org_test.go @@ -1,7 +1,6 @@ package accesscontrol_test import ( - "context" "fmt" "net/http" "net/http/httptest" @@ -13,7 +12,6 @@ import ( "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/acimpl" - "github.com/grafana/grafana/pkg/services/accesscontrol/actest" "github.com/grafana/grafana/pkg/services/authn" "github.com/grafana/grafana/pkg/services/authn/authntest" "github.com/grafana/grafana/pkg/services/authz/zanzana" @@ -22,7 +20,6 @@ import ( "github.com/grafana/grafana/pkg/services/team" "github.com/grafana/grafana/pkg/services/team/teamtest" "github.com/grafana/grafana/pkg/services/user" - "github.com/grafana/grafana/pkg/services/user/usertest" "github.com/grafana/grafana/pkg/web" ) @@ -37,8 +34,8 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { orgIDGetter accesscontrol.OrgIDGetter evaluator accesscontrol.Evaluator accessControl accesscontrol.AccessControl - acService accesscontrol.Service - userCache user.Service + userIdentities []*authn.Identity + authnErrors []error ctxSignedInUser *user.SignedInUser teamService team.Service expectedStatus int @@ -48,7 +45,6 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { targetOrgId: accesscontrol.GlobalOrgID, evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, - userCache: &usertest.FakeUserService{}, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, targerOrgPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}}, teamService: &teamtest.FakeService{}, @@ -60,7 +56,6 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { targerOrgPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}}, evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, - userCache: &usertest.FakeUserService{}, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, teamService: &teamtest.FakeService{}, expectedStatus: http.StatusOK, @@ -71,7 +66,6 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { targerOrgPermissions: []accesscontrol.Permission{}, evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, - userCache: &usertest.FakeUserService{}, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{}}, teamService: &teamtest.FakeService{}, expectedStatus: http.StatusForbidden, @@ -82,7 +76,6 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { targerOrgPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}}, evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, - userCache: &usertest.FakeUserService{}, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, teamService: &teamtest.FakeService{}, expectedStatus: http.StatusOK, @@ -93,33 +86,10 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { targerOrgPermissions: []accesscontrol.Permission{}, evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, - userCache: &usertest.FakeUserService{}, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, teamService: &teamtest.FakeService{}, expectedStatus: http.StatusForbidden, }, - { - name: "should return 403 when user org ID doesn't match and user does not exist in org 2", - targetOrgId: 2, - targerOrgPermissions: []accesscontrol.Permission{}, - evaluator: accesscontrol.EvalPermission("users:read", "users:*"), - accessControl: ac, - userCache: &usertest.FakeUserService{ExpectedError: fmt.Errorf("user not found")}, - ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, - teamService: &teamtest.FakeService{}, - expectedStatus: http.StatusForbidden, - }, - { - name: "should return 403 early when api key org ID doesn't match", - targetOrgId: 2, - targerOrgPermissions: []accesscontrol.Permission{}, - evaluator: accesscontrol.EvalPermission("users:read", "users:*"), - accessControl: ac, - userCache: &usertest.FakeUserService{}, - ctxSignedInUser: &user.SignedInUser{ApiKeyID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, - teamService: &teamtest.FakeService{}, - expectedStatus: http.StatusForbidden, - }, { name: "should fetch user permissions when org ID doesn't match", targetOrgId: 2, @@ -127,13 +97,8 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, teamService: &teamtest.FakeService{}, - userCache: &usertest.FakeUserService{ - GetSignedInUserFn: func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) { - return &user.SignedInUser{UserID: 1, OrgID: 2, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, nil - }, - }, - ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:write": {"users:*"}}}}, - expectedStatus: http.StatusOK, + ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:write": {"users:*"}}}}, + expectedStatus: http.StatusOK, }, { name: "fails to fetch user permissions when org ID doesn't match", @@ -142,16 +107,9 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, teamService: &teamtest.FakeService{}, - acService: &actest.FakeService{ - ExpectedErr: fmt.Errorf("failed to get user permissions"), - }, - userCache: &usertest.FakeUserService{ - GetSignedInUserFn: func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) { - return &user.SignedInUser{UserID: 1, OrgID: 2, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, nil - }, - }, - ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, - expectedStatus: http.StatusForbidden, + authnErrors: []error{fmt.Errorf("failed to get user permissions")}, + ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, + expectedStatus: http.StatusForbidden, }, { name: "unable to get target org", @@ -160,24 +118,35 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { }, evaluator: accesscontrol.EvalPermission("users:read", "users:*"), accessControl: ac, - userCache: &usertest.FakeUserService{}, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}}, teamService: &teamtest.FakeService{}, expectedStatus: http.StatusForbidden, }, { - name: "should fetch global user permissions when user is not a member of the target org", - targetOrgId: 2, - targerOrgPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}}, - evaluator: accesscontrol.EvalPermission("users:read", "users:*"), - accessControl: ac, - userCache: &usertest.FakeUserService{ - GetSignedInUserFn: func(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) { - return &user.SignedInUser{UserID: 1, OrgID: -1, Permissions: map[int64]map[string][]string{}}, nil - }, - }, + name: "should fetch global user permissions when user is not a member of the target org", + targetOrgId: 2, + evaluator: accesscontrol.EvalPermission("users:read", "users:*"), + accessControl: ac, ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:write": {"users:*"}}}}, - expectedStatus: http.StatusOK, + userIdentities: []*authn.Identity{ + {ID: "1", OrgID: -1, Permissions: map[int64]map[string][]string{}}, + {ID: "1", OrgID: accesscontrol.GlobalOrgID, Permissions: map[int64]map[string][]string{accesscontrol.GlobalOrgID: {"users:read": {"users:*"}}}}, + }, + authnErrors: []error{nil, nil}, + expectedStatus: http.StatusOK, + }, + { + name: "should fail if user is not a member of the target org and doesn't have the right permissions globally", + targetOrgId: 2, + evaluator: accesscontrol.EvalPermission("users:read", "users:*"), + accessControl: ac, + ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:write": {"users:*"}}}}, + userIdentities: []*authn.Identity{ + {ID: "1", OrgID: -1, Permissions: map[int64]map[string][]string{}}, + {ID: "1", OrgID: accesscontrol.GlobalOrgID, Permissions: map[int64]map[string][]string{accesscontrol.GlobalOrgID: {"folders:read": {"folders:*"}}}}, + }, + authnErrors: []error{nil, nil}, + expectedStatus: http.StatusForbidden, }, } @@ -194,9 +163,16 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) { Permissions: map[int64]map[string][]string{}, } expectedIdentity.Permissions[tc.targetOrgId] = accesscontrol.GroupScopesByAction(tc.targerOrgPermissions) + var expectedErr error + if len(tc.authnErrors) > 0 { + expectedErr = tc.authnErrors[0] + } authnService := &authntest.FakeService{ - ExpectedIdentity: expectedIdentity, + ExpectedIdentity: expectedIdentity, + ExpectedIdentities: tc.userIdentities, + ExpectedErr: expectedErr, + ExpectedErrs: tc.authnErrors, } var orgIDGetter accesscontrol.OrgIDGetter diff --git a/pkg/services/accesscontrol/cacheutils.go b/pkg/services/accesscontrol/cacheutils.go index 9326d9d88c8..fe139662d95 100644 --- a/pkg/services/accesscontrol/cacheutils.go +++ b/pkg/services/accesscontrol/cacheutils.go @@ -2,12 +2,14 @@ package accesscontrol import ( "fmt" + "slices" + "strconv" "strings" "github.com/grafana/grafana/pkg/apimachinery/identity" ) -func GetPermissionCacheKey(user identity.Requester) string { +func GetUserPermissionCacheKey(user identity.Requester) string { return fmt.Sprintf("rbac-permissions-%s", user.GetCacheKey()) } @@ -41,3 +43,12 @@ func GetBasicRolePermissionCacheKey(role string, orgID int64) string { func GetTeamPermissionCacheKey(teamID int64, orgID int64) string { return fmt.Sprintf("rbac-permissions-team-%d-%d", orgID, teamID) } + +func GetTeamPermissionCompositeCacheKey(teamIds []int64, orgID int64) string { + teams := make([]string, 0) + for _, id := range teamIds { + teams = append(teams, strconv.FormatInt(id, 10)) + } + slices.Sort(teams) + return fmt.Sprintf("rbac-permissions-team-%d-%s", orgID, strings.Join(teams, "-")) +} diff --git a/pkg/services/accesscontrol/cacheutils_test.go b/pkg/services/accesscontrol/cacheutils_test.go index 7aff7941586..c5bf747b60b 100644 --- a/pkg/services/accesscontrol/cacheutils_test.go +++ b/pkg/services/accesscontrol/cacheutils_test.go @@ -6,6 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/grafana/authlib/claims" + "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/user" ) @@ -68,7 +69,7 @@ func TestPermissionCacheKey(t *testing.T) { for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { - assert.Equal(t, tc.expected, GetPermissionCacheKey(tc.signedInUser)) + assert.Equal(t, tc.expected, GetUserPermissionCacheKey(tc.signedInUser)) }) } } diff --git a/pkg/services/accesscontrol/database/database_test.go b/pkg/services/accesscontrol/database/database_test.go index 3ec2950d088..e1d4f4c694b 100644 --- a/pkg/services/accesscontrol/database/database_test.go +++ b/pkg/services/accesscontrol/database/database_test.go @@ -17,7 +17,6 @@ import ( "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/database" rs "github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/org/orgimpl" @@ -403,15 +402,15 @@ func createUserAndTeam(t *testing.T, store db.DB, userSrv user.Service, teamSvc }) require.NoError(t, err) - team, err := teamSvc.CreateTeam(context.Background(), "team", "", orgID) + createdTeam, err := teamSvc.CreateTeam(context.Background(), "team", "", orgID) require.NoError(t, err) err = store.WithDbSession(context.Background(), func(sess *db.Session) error { - return teamimpl.AddOrUpdateTeamMemberHook(sess, user.ID, orgID, team.ID, false, dashboardaccess.PERMISSION_VIEW) + return teamimpl.AddOrUpdateTeamMemberHook(sess, user.ID, orgID, createdTeam.ID, false, team.PermissionTypeMember) }) require.NoError(t, err) - return user, team + return user, createdTeam } type helperServices struct { @@ -453,11 +452,11 @@ func createUsersAndTeams(t *testing.T, store db.DB, svcs helperServices, orgID i continue } - team, err := svcs.teamSvc.CreateTeam(context.Background(), fmt.Sprintf("team%v", i+1), "", orgID) + createdTeam, err := svcs.teamSvc.CreateTeam(context.Background(), fmt.Sprintf("team%v", i+1), "", orgID) require.NoError(t, err) err = store.WithDbSession(context.Background(), func(sess *db.Session) error { - return teamimpl.AddOrUpdateTeamMemberHook(sess, user.ID, orgID, team.ID, false, dashboardaccess.PERMISSION_VIEW) + return teamimpl.AddOrUpdateTeamMemberHook(sess, user.ID, orgID, createdTeam.ID, false, team.PermissionTypeMember) }) require.NoError(t, err) @@ -465,7 +464,7 @@ func createUsersAndTeams(t *testing.T, store db.DB, svcs helperServices, orgID i &org.UpdateOrgUserCommand{Role: users[i].orgRole, OrgID: orgID, UserID: user.ID}) require.NoError(t, err) - res = append(res, dbUser{userID: user.ID, teamID: team.ID}) + res = append(res, dbUser{userID: user.ID, teamID: createdTeam.ID}) } return res diff --git a/pkg/services/accesscontrol/middleware.go b/pkg/services/accesscontrol/middleware.go index 5a2aaf024d4..3b3b05b0d5a 100644 --- a/pkg/services/accesscontrol/middleware.go +++ b/pkg/services/accesscontrol/middleware.go @@ -205,6 +205,10 @@ func AuthorizeInOrgMiddleware(ac AccessControl, authnService authn.Service) func var orgUser identity.Requester = c.SignedInUser if targetOrgID != c.SignedInUser.GetOrgID() { orgUser, err = authnService.ResolveIdentity(c.Req.Context(), targetOrgID, c.SignedInUser.GetID()) + if err == nil && orgUser.GetOrgID() == NoOrgID { + // User is not a member of the target org, so only their global permissions are relevant + orgUser, err = authnService.ResolveIdentity(c.Req.Context(), GlobalOrgID, c.SignedInUser.GetID()) + } if err != nil { deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err)) return diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go index 87c30e1abbb..94e39d71300 100644 --- a/pkg/services/accesscontrol/models.go +++ b/pkg/services/accesscontrol/models.go @@ -293,7 +293,7 @@ func (cmd *SaveExternalServiceRoleCommand) Validate() error { cmd.ExternalServiceID = slugify.Slugify(cmd.ExternalServiceID) // Check and deduplicate permissions - if cmd.Permissions == nil || len(cmd.Permissions) == 0 { + if len(cmd.Permissions) == 0 { return errors.New("no permissions provided") } dedupMap := map[Permission]bool{} @@ -447,6 +447,9 @@ const ( ActionAlertingReceiversList = "alert.notifications.receivers:list" ActionAlertingReceiversRead = "alert.notifications.receivers:read" ActionAlertingReceiversReadSecrets = "alert.notifications.receivers.secrets:read" + ActionAlertingReceiversCreate = "alert.notifications.receivers:create" + ActionAlertingReceiversUpdate = "alert.notifications.receivers:write" + ActionAlertingReceiversDelete = "alert.notifications.receivers:delete" // External alerting rule actions. We can only narrow it down to writes or reads, as we don't control the atomicity in the external system. ActionAlertingRuleExternalWrite = "alert.rules.external:write" diff --git a/pkg/services/accesscontrol/ossaccesscontrol/team.go b/pkg/services/accesscontrol/ossaccesscontrol/team.go index 27a2914ecd8..619465e5569 100644 --- a/pkg/services/accesscontrol/ossaccesscontrol/team.go +++ b/pkg/services/accesscontrol/ossaccesscontrol/team.go @@ -9,7 +9,6 @@ import ( "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/licensing" "github.com/grafana/grafana/pkg/services/team" @@ -83,9 +82,9 @@ func ProvideTeamPermissions( } switch permission { case "Member": - return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, 0) + return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, team.PermissionTypeMember) case "Admin": - return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, dashboardaccess.PERMISSION_ADMIN) + return teamimpl.AddOrUpdateTeamMemberHook(session, user.ID, orgID, teamId, user.IsExternal, team.PermissionTypeAdmin) case "": return teamimpl.RemoveTeamMemberHook(session, &team.RemoveTeamMemberCommand{ OrgID: orgID, diff --git a/pkg/services/annotations/annotationsimpl/composite_store.go b/pkg/services/annotations/annotationsimpl/composite_store.go index 3bcf0724b52..bc59855c61c 100644 --- a/pkg/services/annotations/annotationsimpl/composite_store.go +++ b/pkg/services/annotations/annotationsimpl/composite_store.go @@ -2,12 +2,13 @@ package annotationsimpl import ( "context" + "errors" "fmt" "sort" - "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/dskit/concurrency" + + "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/annotations" "github.com/grafana/grafana/pkg/services/annotations/accesscontrol" ) @@ -88,7 +89,7 @@ func handleJobPanic(logger log.Logger, storeType string, jobErr *error) { errMsg := "concurrent job panic" if jobErr != nil { - err := fmt.Errorf(errMsg) + err := errors.New(errMsg) if panicErr, ok := r.(error); ok { err = fmt.Errorf("%s: %w", errMsg, panicErr) } diff --git a/pkg/services/apiserver/builder/openapi.go b/pkg/services/apiserver/builder/openapi.go index 0790ba733aa..98bd88fca7c 100644 --- a/pkg/services/apiserver/builder/openapi.go +++ b/pkg/services/apiserver/builder/openapi.go @@ -17,6 +17,17 @@ func GetOpenAPIDefinitions(builders []APIGroupBuilder) common.GetOpenAPIDefiniti return func(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { defs := v0alpha1.GetOpenAPIDefinitions(ref) // common grafana apis maps.Copy(defs, data.GetOpenAPIDefinitions(ref)) + // TODO: remove when https://github.com/grafana/grafana-plugin-sdk-go/pull/1062 is merged + maps.Copy(defs, map[string]common.OpenAPIDefinition{ + "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1.DataSourceRef": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"object"}, + AdditionalProperties: &spec.SchemaOrBool{Allows: true}, + }, + }, + }, + }) for _, b := range builders { g := b.GetOpenAPIDefinitions() if g != nil { diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go index 98361c1c1c9..b8472f83ba7 100644 --- a/pkg/services/apiserver/service.go +++ b/pkg/services/apiserver/service.go @@ -285,10 +285,6 @@ func (s *service) start(ctx context.Context) error { } case grafanaapiserveroptions.StorageTypeUnified: - if !s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorage) { - return fmt.Errorf("unified storage requires the unifiedStorage feature flag") - } - server, err := sql.ProvideResourceServer(s.db, s.cfg, s.features, s.tracing) if err != nil { return err @@ -298,10 +294,6 @@ func (s *service) start(ctx context.Context) error { o.RecommendedOptions.Etcd.StorageConfig) case grafanaapiserveroptions.StorageTypeUnifiedGrpc: - if !s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorage) { - return fmt.Errorf("unified storage requires the unifiedStorage feature flag") - } - opts := []grpc.DialOption{ grpc.WithStatsHandler(otelgrpc.NewClientHandler()), grpc.WithTransportCredentials(insecure.NewCredentials()), diff --git a/pkg/services/auth/idimpl/service.go b/pkg/services/auth/idimpl/service.go index 7c75c86dc7f..3a9baa8b22d 100644 --- a/pkg/services/auth/idimpl/service.go +++ b/pkg/services/auth/idimpl/service.go @@ -18,7 +18,6 @@ import ( "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/auth" "github.com/grafana/grafana/pkg/services/authn" - "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/setting" ) @@ -31,8 +30,9 @@ const ( var _ auth.IDService = (*Service)(nil) func ProvideService( - cfg *setting.Cfg, signer auth.IDSigner, cache remotecache.CacheStorage, - features featuremgmt.FeatureToggles, authnService authn.Service, + cfg *setting.Cfg, signer auth.IDSigner, + cache remotecache.CacheStorage, + authnService authn.Service, reg prometheus.Registerer, ) *Service { s := &Service{ @@ -42,9 +42,7 @@ func ProvideService( nsMapper: request.GetNamespaceMapper(cfg), } - if features.IsEnabledGlobally(featuremgmt.FlagIdForwarding) { - authnService.RegisterPostAuthHook(s.hook, 140) - } + authnService.RegisterPostAuthHook(s.hook, 140) return s } diff --git a/pkg/services/auth/idimpl/service_test.go b/pkg/services/auth/idimpl/service_test.go index 61f5dbf6d66..20b1e1c0832 100644 --- a/pkg/services/auth/idimpl/service_test.go +++ b/pkg/services/auth/idimpl/service_test.go @@ -15,15 +15,12 @@ import ( "github.com/grafana/grafana/pkg/services/auth/idtest" "github.com/grafana/grafana/pkg/services/authn" "github.com/grafana/grafana/pkg/services/authn/authntest" - "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/login" "github.com/grafana/grafana/pkg/setting" ) func Test_ProvideService(t *testing.T) { - t.Run("should register post auth hook when feature flag is enabled", func(t *testing.T) { - features := featuremgmt.WithFeatures(featuremgmt.FlagIdForwarding) - + t.Run("should register post auth hook", func(t *testing.T) { var hookRegistered bool authnService := &authntest.MockService{ RegisterPostAuthHookFunc: func(_ authn.PostAuthHookFn, _ uint) { @@ -31,23 +28,9 @@ func Test_ProvideService(t *testing.T) { }, } - _ = ProvideService(setting.NewCfg(), nil, nil, features, authnService, nil) + _ = ProvideService(setting.NewCfg(), nil, nil, authnService, nil) assert.True(t, hookRegistered) }) - - t.Run("should not register post auth hook when feature flag is disabled", func(t *testing.T) { - features := featuremgmt.WithFeatures() - - var hookRegistered bool - authnService := &authntest.MockService{ - RegisterPostAuthHookFunc: func(_ authn.PostAuthHookFn, _ uint) { - hookRegistered = true - }, - } - - _ = ProvideService(setting.NewCfg(), nil, nil, features, authnService, nil) - assert.False(t, hookRegistered) - }) } func TestService_SignIdentity(t *testing.T) { @@ -67,7 +50,6 @@ func TestService_SignIdentity(t *testing.T) { t.Run("should sign identity", func(t *testing.T) { s := ProvideService( setting.NewCfg(), signer, remotecache.NewFakeCacheStorage(), - featuremgmt.WithFeatures(featuremgmt.FlagIdForwarding), &authntest.FakeService{}, nil, ) token, _, err := s.SignIdentity(context.Background(), &authn.Identity{ID: "1", Type: claims.TypeUser}) @@ -78,7 +60,6 @@ func TestService_SignIdentity(t *testing.T) { t.Run("should sign identity with authenticated by if user is externally authenticated", func(t *testing.T) { s := ProvideService( setting.NewCfg(), signer, remotecache.NewFakeCacheStorage(), - featuremgmt.WithFeatures(featuremgmt.FlagIdForwarding), &authntest.FakeService{}, nil, ) token, _, err := s.SignIdentity(context.Background(), &authn.Identity{ @@ -104,7 +85,6 @@ func TestService_SignIdentity(t *testing.T) { t.Run("should sign identity with authenticated by if user is externally authenticated", func(t *testing.T) { s := ProvideService( setting.NewCfg(), signer, remotecache.NewFakeCacheStorage(), - featuremgmt.WithFeatures(featuremgmt.FlagIdForwarding), &authntest.FakeService{}, nil, ) _, gotClaims, err := s.SignIdentity(context.Background(), &authn.Identity{ diff --git a/pkg/services/auth/idimpl/signer.go b/pkg/services/auth/idimpl/signer.go index 29d664e99b2..0a37b263f45 100644 --- a/pkg/services/auth/idimpl/signer.go +++ b/pkg/services/auth/idimpl/signer.go @@ -28,10 +28,6 @@ type LocalSigner struct { } func (s *LocalSigner) SignIDToken(ctx context.Context, claims *auth.IDClaims) (string, error) { - if !s.features.IsEnabled(ctx, featuremgmt.FlagIdForwarding) { - return "", nil - } - signer, err := s.getSigner(ctx) if err != nil { return "", err diff --git a/pkg/services/authn/identity.go b/pkg/services/authn/identity.go index e2afc31647a..4a0da892d8d 100644 --- a/pkg/services/authn/identity.go +++ b/pkg/services/authn/identity.go @@ -72,7 +72,6 @@ type Identity struct { // Permissions is the list of permissions the entity has. Permissions map[int64]map[string][]string // IDToken is a signed token representing the identity that can be forwarded to plugins and external services. - // Will only be set when featuremgmt.FlagIdForwarding is enabled. IDToken string IDTokenClaims *authn.Claims[authn.IDTokenClaims] } diff --git a/pkg/services/authz/zanzana/client/client.go b/pkg/services/authz/zanzana/client/client.go index 670ef845da1..6bd77f8afe8 100644 --- a/pkg/services/authz/zanzana/client/client.go +++ b/pkg/services/authz/zanzana/client/client.go @@ -5,11 +5,10 @@ import ( "errors" "fmt" - "google.golang.org/grpc" - "google.golang.org/protobuf/types/known/wrapperspb" - openfgav1 "github.com/openfga/api/proto/openfga/v1" "github.com/openfga/language/pkg/go/transformer" + "google.golang.org/grpc" + "google.golang.org/protobuf/types/known/wrapperspb" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/authz/zanzana/schema" @@ -61,7 +60,7 @@ func New(ctx context.Context, cc grpc.ClientConnInterface, opts ...ClientOption) c.tenantID = "stack-default" } - if c.modules == nil || len(c.modules) == 0 { + if len(c.modules) == 0 { c.modules = schema.SchemaModules } diff --git a/pkg/services/correlations/database.go b/pkg/services/correlations/database.go index be873f8ed98..47e54d5361f 100644 --- a/pkg/services/correlations/database.go +++ b/pkg/services/correlations/database.go @@ -22,6 +22,7 @@ func (s CorrelationsService) createCorrelation(ctx context.Context, cmd CreateCo Description: cmd.Description, Config: cmd.Config, Provisioned: cmd.Provisioned, + Type: cmd.Type, } err := s.SQLStore.WithTransactionalDbSession(ctx, func(session *db.Session) error { @@ -131,14 +132,14 @@ func (s CorrelationsService) updateCorrelation(ctx context.Context, cmd UpdateCo correlation.Description = *cmd.Description session.MustCols("description") } + if cmd.Type != nil { + correlation.Type = *cmd.Type + } if cmd.Config != nil { session.MustCols("config") if cmd.Config.Field != nil { correlation.Config.Field = *cmd.Config.Field } - if cmd.Config.Type != nil { - correlation.Config.Type = *cmd.Config.Type - } if cmd.Config.Target != nil { correlation.Config.Target = *cmd.Config.Target } diff --git a/pkg/services/correlations/models.go b/pkg/services/correlations/models.go index 5c744fa1826..1b83b0b3042 100644 --- a/pkg/services/correlations/models.go +++ b/pkg/services/correlations/models.go @@ -27,7 +27,7 @@ const ( QuotaTarget quota.Target = "correlations" ) -type CorrelationConfigType string +type CorrelationType string type Transformation struct { //Enum: regex,logfmt @@ -38,11 +38,11 @@ type Transformation struct { } const ( - ConfigTypeQuery CorrelationConfigType = "query" + TypeQuery CorrelationType = "query" ) -func (t CorrelationConfigType) Validate() error { - if t != ConfigTypeQuery { +func (t CorrelationType) Validate() error { + if t != TypeQuery { return fmt.Errorf("%s: \"%s\"", ErrInvalidConfigType, t) } return nil @@ -68,8 +68,9 @@ type CorrelationConfig struct { // example: message Field string `json:"field" binding:"Required"` // Target type - // required:true - Type CorrelationConfigType `json:"type" binding:"Required"` + // This is deprecated: use the type property outside of config + // deprecated:true + Type CorrelationType `json:"type"` // Target data query // required:true // example: {"prop1":"value1","prop2":"value"} @@ -87,12 +88,10 @@ func (c CorrelationConfig) MarshalJSON() ([]byte, error) { target = map[string]any{} } return json.Marshal(struct { - Type CorrelationConfigType `json:"type"` - Field string `json:"field"` - Target map[string]any `json:"target"` - Transformations Transformations `json:"transformations,omitempty"` + Field string `json:"field"` + Target map[string]any `json:"target"` + Transformations Transformations `json:"transformations,omitempty"` }{ - Type: ConfigTypeQuery, Field: c.Field, Target: target, Transformations: transformations, @@ -124,6 +123,8 @@ type Correlation struct { Config CorrelationConfig `json:"config" xorm:"jsonb config"` // Provisioned True if the correlation was created during provisioning Provisioned bool `json:"provisioned"` + // The type of correlation. Currently, only valid value is "query" + Type CorrelationType `json:"type" binding:"Required"` } type GetCorrelationsResponseBody struct { @@ -147,7 +148,7 @@ type CreateCorrelationCommand struct { // UID of the data source for which correlation is created. SourceUID string `json:"-"` OrgId int64 `json:"-"` - // Target data source UID to which the correlation is created. required if config.type = query + // Target data source UID to which the correlation is created. required if type = query // example: PE1C5CBDA0504A6A3 TargetUID *string `json:"targetUID"` // Optional label identifying the correlation @@ -160,14 +161,16 @@ type CreateCorrelationCommand struct { Config CorrelationConfig `json:"config" binding:"Required"` // True if correlation was created with provisioning. This makes it read-only. Provisioned bool `json:"provisioned"` + // correlation type, currently only valid value is "query" + Type CorrelationType `json:"type" binding:"Required"` } func (c CreateCorrelationCommand) Validate() error { - if err := c.Config.Type.Validate(); err != nil { + if err := c.Type.Validate(); err != nil { return err } - if c.TargetUID == nil && c.Config.Type == ConfigTypeQuery { - return fmt.Errorf("correlations of type \"%s\" must have a targetUID", ConfigTypeQuery) + if c.TargetUID == nil && c.Type == TypeQuery { + return fmt.Errorf("correlations of type \"%s\" must have a targetUID", TypeQuery) } if err := c.Config.Transformations.Validate(); err != nil { @@ -202,8 +205,6 @@ type CorrelationConfigUpdateDTO struct { // Field used to attach the correlation link // example: message Field *string `json:"field"` - // Target type - Type *CorrelationConfigType `json:"type"` // Target data query // example: {"prop1":"value1","prop2":"value"} Target *map[string]any `json:"target"` @@ -212,16 +213,6 @@ type CorrelationConfigUpdateDTO struct { Transformations []Transformation `json:"transformations"` } -func (c CorrelationConfigUpdateDTO) Validate() error { - if c.Type != nil { - if err := c.Type.Validate(); err != nil { - return err - } - } - - return nil -} - // UpdateCorrelationCommand is the command for updating a correlation // swagger:model type UpdateCorrelationCommand struct { @@ -238,16 +229,12 @@ type UpdateCorrelationCommand struct { Description *string `json:"description"` // Correlation Configuration Config *CorrelationConfigUpdateDTO `json:"config"` + // correlation type + Type *CorrelationType `json:"type"` } func (c UpdateCorrelationCommand) Validate() error { - if c.Config != nil { - if err := c.Config.Validate(); err != nil { - return err - } - } - - if c.Label == nil && c.Description == nil && (c.Config == nil || (c.Config.Field == nil && c.Config.Type == nil && c.Config.Target == nil)) { + if c.Label == nil && c.Description == nil && c.Type == nil && (c.Config == nil || (c.Config.Field == nil && c.Config.Target == nil)) { return ErrUpdateCorrelationEmptyParams } diff --git a/pkg/services/correlations/models_test.go b/pkg/services/correlations/models_test.go index efb46deaf41..4583339812c 100644 --- a/pkg/services/correlations/models_test.go +++ b/pkg/services/correlations/models_test.go @@ -14,13 +14,13 @@ func TestCorrelationModels(t *testing.T) { config := &CorrelationConfig{ Field: "field", Target: map[string]any{}, - Type: ConfigTypeQuery, } cmd := &CreateCorrelationCommand{ SourceUID: "some-uid", OrgId: 1, TargetUID: &targetUid, Config: *config, + Type: TypeQuery, } require.NoError(t, cmd.Validate()) @@ -30,7 +30,7 @@ func TestCorrelationModels(t *testing.T) { config := &CorrelationConfig{ Field: "field", Target: map[string]any{}, - Type: ConfigTypeQuery, + Type: TypeQuery, } cmd := &CreateCorrelationCommand{ SourceUID: "some-uid", @@ -60,7 +60,7 @@ func TestCorrelationModels(t *testing.T) { t.Run("CorrelationConfigType Validate", func(t *testing.T) { t.Run("Successfully validates a correct type", func(t *testing.T) { type test struct { - input CorrelationConfigType + input CorrelationType assertion require.ErrorAssertionFunc } @@ -79,13 +79,12 @@ func TestCorrelationModels(t *testing.T) { t.Run("Applies a default empty object if target is not defined", func(t *testing.T) { config := CorrelationConfig{ Field: "field", - Type: ConfigTypeQuery, } data, err := json.Marshal(config) require.NoError(t, err) - require.Equal(t, `{"type":"query","field":"field","target":{}}`, string(data)) + require.Equal(t, `{"field":"field","target":{}}`, string(data)) }) }) } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index d240573d451..f760aa302da 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -45,7 +45,7 @@ var ( Name: "panelTitleSearch", Description: "Search for dashboards using panel title", Stage: FeatureStagePublicPreview, - Owner: grafanaAppPlatformSquad, + Owner: grafanaSearchAndStorageSquad, HideFromAdminPage: true, }, { @@ -89,7 +89,7 @@ var ( Name: "storage", Description: "Configurable storage for dashboards, datasources, and resources", Stage: FeatureStageExperimental, - Owner: grafanaAppPlatformSquad, + Owner: grafanaSearchAndStorageSquad, }, { Name: "correlations", @@ -191,17 +191,9 @@ var ( Name: "grpcServer", Description: "Run the GRPC server", Stage: FeatureStagePublicPreview, - Owner: grafanaAppPlatformSquad, + Owner: grafanaSearchAndStorageSquad, HideFromAdminPage: true, }, - { - Name: "unifiedStorage", - Description: "SQL-based k8s storage", - Stage: FeatureStageExperimental, - RequiresDevMode: false, - RequiresRestart: true, // new SQL tables created - Owner: grafanaAppPlatformSquad, - }, { Name: "cloudWatchCrossAccountQuerying", Description: "Enables cross-account querying in CloudWatch datasources", @@ -326,14 +318,6 @@ var ( FrontendOnly: false, Owner: grafanaObservabilityMetricsSquad, }, - { - Name: "prometheusDataplane", - Description: "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label.", - Expression: "true", - Stage: FeatureStageGeneralAvailability, - Owner: grafanaObservabilityMetricsSquad, - AllowSelfServe: true, - }, { Name: "lokiMetricDataplane", Description: "Changes metric responses from Loki to be compliant with the dataplane specification.", @@ -664,12 +648,6 @@ var ( Stage: FeatureStageExperimental, Owner: grafanaPluginsPlatformSquad, }, - { - Name: "idForwarding", - Description: "Generate signed id token for identity that can be forwarded to plugins and external services", - Stage: FeatureStageExperimental, - Owner: identityAccessTeam, - }, { Name: "externalServiceAccounts", Description: "Automatic service account and token setup for plugins", @@ -1297,8 +1275,9 @@ var ( { Name: "openSearchBackendFlowEnabled", Description: "Enables the backend query flow for Open Search datasource plugin", - Stage: FeatureStagePublicPreview, + Stage: FeatureStageGeneralAvailability, Owner: awsDatasourcesSquad, + Expression: "true", }, { Name: "ssoSettingsLDAP", @@ -1406,6 +1385,12 @@ var ( Stage: FeatureStageExperimental, Owner: grafanaDashboardsSquad, }, + { + Name: "lokiSendDashboardPanelNames", + Description: "Send dashboard and panel names to Loki when querying", + Stage: FeatureStageExperimental, + Owner: grafanaObservabilityLogsSquad, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index b4e658c3b06..37eeb2bb3bc 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -2,13 +2,13 @@ Name,Stage,Owner,requiresDevMode,RequiresRestart,FrontendOnly disableEnvelopeEncryption,GA,@grafana/grafana-as-code,false,false,false live-service-web-worker,experimental,@grafana/grafana-app-platform-squad,false,false,true queryOverLive,experimental,@grafana/grafana-app-platform-squad,false,false,true -panelTitleSearch,preview,@grafana/grafana-app-platform-squad,false,false,false +panelTitleSearch,preview,@grafana/search-and-storage,false,false,false publicDashboards,GA,@grafana/sharing-squad,false,false,false publicDashboardsEmailSharing,preview,@grafana/sharing-squad,false,false,false publicDashboardsScene,experimental,@grafana/sharing-squad,false,false,true lokiExperimentalStreaming,experimental,@grafana/observability-logs,false,false,false featureHighlights,GA,@grafana/grafana-as-code,false,false,false -storage,experimental,@grafana/grafana-app-platform-squad,false,false,false +storage,experimental,@grafana/search-and-storage,false,false,false correlations,GA,@grafana/explore-squad,false,false,false autoMigrateOldPanels,preview,@grafana/dataviz-squad,false,false,true autoMigrateGraphPanel,preview,@grafana/dataviz-squad,false,false,true @@ -22,8 +22,7 @@ canvasPanelNesting,experimental,@grafana/dataviz-squad,false,false,true disableSecretsCompatibility,experimental,@grafana/hosted-grafana-team,false,true,false logRequestsInstrumentedAsUnknown,experimental,@grafana/hosted-grafana-team,false,false,false topnav,deprecated,@grafana/grafana-frontend-platform,false,false,false -grpcServer,preview,@grafana/grafana-app-platform-squad,false,false,false -unifiedStorage,experimental,@grafana/grafana-app-platform-squad,false,true,false +grpcServer,preview,@grafana/search-and-storage,false,false,false cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false mysqlAnsiQuotes,experimental,@grafana/search-and-storage,false,false,false @@ -41,7 +40,6 @@ influxdbBackendMigration,GA,@grafana/observability-metrics,false,false,true influxqlStreamingParser,experimental,@grafana/observability-metrics,false,false,false influxdbRunQueriesInParallel,privatePreview,@grafana/observability-metrics,false,false,false prometheusRunQueriesInParallel,privatePreview,@grafana/observability-metrics,false,false,false -prometheusDataplane,GA,@grafana/observability-metrics,false,false,false lokiMetricDataplane,GA,@grafana/observability-logs,false,false,false lokiLogsDataplane,experimental,@grafana/observability-logs,false,false,false dataplaneFrontendFallback,GA,@grafana/observability-metrics,false,false,true @@ -87,7 +85,6 @@ wargamesTesting,experimental,@grafana/hosted-grafana-team,false,false,false alertingInsights,GA,@grafana/alerting-squad,false,false,true externalCorePlugins,experimental,@grafana/plugins-platform-backend,false,false,false pluginsAPIMetrics,experimental,@grafana/plugins-platform-backend,false,false,true -idForwarding,experimental,@grafana/identity-access-team,false,false,false externalServiceAccounts,preview,@grafana/identity-access-team,false,false,false panelMonitoring,GA,@grafana/dataviz-squad,false,false,true enableNativeHTTPHistogram,experimental,@grafana/grafana-backend-services-squad,false,true,false @@ -170,7 +167,7 @@ pluginProxyPreserveTrailingSlash,GA,@grafana/plugins-platform-backend,false,fals azureMonitorPrometheusExemplars,preview,@grafana/partner-datasources,false,false,false pinNavItems,experimental,@grafana/grafana-frontend-platform,false,false,false authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false -openSearchBackendFlowEnabled,preview,@grafana/aws-datasources,false,false,false +openSearchBackendFlowEnabled,GA,@grafana/aws-datasources,false,false,false ssoSettingsLDAP,experimental,@grafana/identity-access-team,false,false,false failWrongDSUID,experimental,@grafana/plugins-platform-backend,false,false,false databaseReadReplica,experimental,@grafana/grafana-backend-services-squad,false,false,false @@ -185,3 +182,4 @@ prometheusAzureOverrideAudience,deprecated,@grafana/partner-datasources,false,fa backgroundPluginInstaller,experimental,@grafana/plugins-platform-backend,false,true,false dataplaneAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false adhocFilterOneOf,experimental,@grafana/dashboards-squad,false,false,false +lokiSendDashboardPanelNames,experimental,@grafana/observability-logs,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index bd81612d795..29b3def626e 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -103,10 +103,6 @@ const ( // Run the GRPC server FlagGrpcServer = "grpcServer" - // FlagUnifiedStorage - // SQL-based k8s storage - FlagUnifiedStorage = "unifiedStorage" - // FlagCloudWatchCrossAccountQuerying // Enables cross-account querying in CloudWatch datasources FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying" @@ -175,10 +171,6 @@ const ( // Enables running Prometheus queries in parallel FlagPrometheusRunQueriesInParallel = "prometheusRunQueriesInParallel" - // FlagPrometheusDataplane - // Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label. - FlagPrometheusDataplane = "prometheusDataplane" - // FlagLokiMetricDataplane // Changes metric responses from Loki to be compliant with the dataplane specification. FlagLokiMetricDataplane = "lokiMetricDataplane" @@ -359,10 +351,6 @@ const ( // Sends metrics of public grafana packages usage by plugins FlagPluginsAPIMetrics = "pluginsAPIMetrics" - // FlagIdForwarding - // Generate signed id token for identity that can be forwarded to plugins and external services - FlagIdForwarding = "idForwarding" - // FlagExternalServiceAccounts // Automatic service account and token setup for plugins FlagExternalServiceAccounts = "externalServiceAccounts" @@ -750,4 +738,8 @@ const ( // FlagAdhocFilterOneOf // Exposes a new 'one of' operator for ad-hoc filters. This operator allows users to filter by multiple values in a single filter. FlagAdhocFilterOneOf = "adhocFilterOneOf" + + // FlagLokiSendDashboardPanelNames + // Send dashboard and panel names to Loki when querying + FlagLokiSendDashboardPanelNames = "lokiSendDashboardPanelNames" ) diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index bbee7f72edc..533293c469b 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1303,13 +1303,16 @@ { "metadata": { "name": "grpcServer", - "resourceVersion": "1718727528075", - "creationTimestamp": "2022-09-26T20:25:34Z" + "resourceVersion": "1724096690370", + "creationTimestamp": "2022-09-26T20:25:34Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-19 19:44:50.370023815 +0000 UTC" + } }, "spec": { "description": "Run the GRPC server", "stage": "preview", - "codeowner": "@grafana/grafana-app-platform-squad", + "codeowner": "@grafana/search-and-storage", "hideFromAdminPage": true } }, @@ -1317,7 +1320,8 @@ "metadata": { "name": "idForwarding", "resourceVersion": "1718727528075", - "creationTimestamp": "2023-09-25T15:21:28Z" + "creationTimestamp": "2023-09-25T15:21:28Z", + "deletionTimestamp": "2024-08-21T11:35:56Z" }, "spec": { "description": "Generate signed id token for identity that can be forwarded to plugins and external services", @@ -1615,6 +1619,7 @@ "name": "lokiMetricDataplane", "resourceVersion": "1720021873452", "creationTimestamp": "2023-04-13T13:07:08Z", + "deletionTimestamp": "2024-08-21T13:49:48Z", "annotations": { "grafana.app/updatedTimestamp": "2024-07-03 15:51:13.452477 +0000 UTC" } @@ -1700,6 +1705,21 @@ "codeowner": "@grafana/observability-logs" } }, + { + "metadata": { + "name": "lokiSendDashboardPanelNames", + "resourceVersion": "1724089497989", + "creationTimestamp": "2024-08-19T17:44:18Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-19 17:44:57.989565 +0000 UTC" + } + }, + "spec": { + "description": "Send dashboard and panel names to Loki when querying", + "stage": "experimental", + "codeowner": "@grafana/observability-logs" + } + }, { "metadata": { "name": "lokiStructuredMetadata", @@ -1895,13 +1915,17 @@ { "metadata": { "name": "openSearchBackendFlowEnabled", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-06-17T09:41:50Z" + "resourceVersion": "1724141158995", + "creationTimestamp": "2024-06-17T09:41:50Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-20 08:05:58.995762 +0000 UTC" + } }, "spec": { "description": "Enables the backend query flow for Open Search datasource plugin", - "stage": "preview", - "codeowner": "@grafana/aws-datasources" + "stage": "GA", + "codeowner": "@grafana/aws-datasources", + "expression": "true" } }, { @@ -1938,13 +1962,16 @@ { "metadata": { "name": "panelTitleSearch", - "resourceVersion": "1718727528075", - "creationTimestamp": "2022-02-15T18:26:03Z" + "resourceVersion": "1724096690370", + "creationTimestamp": "2022-02-15T18:26:03Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-19 19:44:50.370023815 +0000 UTC" + } }, "spec": { "description": "Search for dashboards using panel title", "stage": "preview", - "codeowner": "@grafana/grafana-app-platform-squad", + "codeowner": "@grafana/search-and-storage", "hideFromAdminPage": true } }, @@ -2158,6 +2185,7 @@ "name": "prometheusDataplane", "resourceVersion": "1720021873452", "creationTimestamp": "2023-03-29T15:26:32Z", + "deletionTimestamp": "2024-08-21T13:35:19Z", "annotations": { "grafana.app/updatedTimestamp": "2024-07-03 15:51:13.452477 +0000 UTC" } @@ -2546,13 +2574,16 @@ { "metadata": { "name": "storage", - "resourceVersion": "1718727528075", - "creationTimestamp": "2022-03-17T17:19:23Z" + "resourceVersion": "1724096690370", + "creationTimestamp": "2022-03-17T17:19:23Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-19 19:44:50.370023815 +0000 UTC" + } }, "spec": { "description": "Configurable storage for dashboards, datasources, and resources", "stage": "experimental", - "codeowner": "@grafana/grafana-app-platform-squad" + "codeowner": "@grafana/search-and-storage" } }, { @@ -2679,13 +2710,17 @@ { "metadata": { "name": "unifiedStorage", - "resourceVersion": "1718727528075", - "creationTimestamp": "2023-12-06T20:21:21Z" + "resourceVersion": "1724096690370", + "creationTimestamp": "2023-12-06T20:21:21Z", + "deletionTimestamp": "2024-08-21T09:30:06Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-19 19:44:50.370023815 +0000 UTC" + } }, "spec": { "description": "SQL-based k8s storage", "stage": "experimental", - "codeowner": "@grafana/grafana-app-platform-squad", + "codeowner": "@grafana/search-and-storage", "requiresRestart": true } }, diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go index 32e8357768c..a96b1b5359b 100644 --- a/pkg/services/featuremgmt/toggles_gen_test.go +++ b/pkg/services/featuremgmt/toggles_gen_test.go @@ -248,8 +248,7 @@ func verifyAndGenerateFile(t *testing.T, fpath string, gen string) { body, err := os.ReadFile(fpath) if err == nil { if diff := cmp.Diff(gen, string(body)); diff != "" { - str := fmt.Sprintf("body mismatch (-want +got):\n%s\n", diff) - err = fmt.Errorf(str) + err = fmt.Errorf("body mismatch (-want +got):\n%s\n", diff) } } diff --git a/pkg/services/ldap/settings.go b/pkg/services/ldap/settings.go index 66c943bddce..f3c38d266a7 100644 --- a/pkg/services/ldap/settings.go +++ b/pkg/services/ldap/settings.go @@ -114,11 +114,7 @@ func GetLDAPConfig(cfg *setting.Cfg) *Config { // GetConfig returns the LDAP config if LDAP is enabled otherwise it returns nil. It returns either cached value of // the config or it reads it and caches it first. func GetConfig(cfg *Config) (*ServersConfig, error) { - if cfg != nil { - if !cfg.Enabled { - return nil, nil - } - } else if !cfg.Enabled { + if cfg == nil || !cfg.Enabled { return nil, nil } diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index c6268905661..6bbc3277383 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -164,7 +164,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere } // remove user access if empty. Happens if grafana-auth-app is not injected - if sec := treeRoot.FindById(navtree.NavIDCfgAccess); sec != nil && (sec.Children == nil || len(sec.Children) == 0) { + if sec := treeRoot.FindById(navtree.NavIDCfgAccess); sec != nil && len(sec.Children) == 0 { treeRoot.RemoveSectionByID(navtree.NavIDCfgAccess) } diff --git a/pkg/services/ngalert/accesscontrol.go b/pkg/services/ngalert/accesscontrol.go index 84b981fd2ab..a14f41e564f 100644 --- a/pkg/services/ngalert/accesscontrol.go +++ b/pkg/services/ngalert/accesscontrol.go @@ -4,6 +4,7 @@ import ( "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/dashboards" "github.com/grafana/grafana/pkg/services/datasources" + ac "github.com/grafana/grafana/pkg/services/ngalert/accesscontrol" "github.com/grafana/grafana/pkg/services/org" ) @@ -133,6 +134,7 @@ var ( }, { Action: accesscontrol.ActionAlertingReceiversRead, + Scope: ac.ScopeReceiversAll, }, }, }, @@ -152,6 +154,18 @@ var ( Action: accesscontrol.ActionAlertingNotificationsExternalWrite, Scope: datasources.ScopeAll, }, + { + Action: accesscontrol.ActionAlertingReceiversCreate, + Scope: ac.ScopeReceiversAll, + }, + { + Action: accesscontrol.ActionAlertingReceiversUpdate, + Scope: ac.ScopeReceiversAll, + }, + { + Action: accesscontrol.ActionAlertingReceiversDelete, + Scope: ac.ScopeReceiversAll, + }, }), }, } diff --git a/pkg/services/ngalert/accesscontrol/models.go b/pkg/services/ngalert/accesscontrol/models.go index 8bad1a0906f..1b0e1c81ec5 100644 --- a/pkg/services/ngalert/accesscontrol/models.go +++ b/pkg/services/ngalert/accesscontrol/models.go @@ -7,6 +7,7 @@ import ( "github.com/grafana/grafana/pkg/apimachinery/errutil" "github.com/grafana/grafana/pkg/apimachinery/identity" ac "github.com/grafana/grafana/pkg/services/accesscontrol" + "github.com/grafana/grafana/pkg/services/ngalert/models" ) var ( @@ -14,9 +15,9 @@ var ( ) func NewAuthorizationErrorWithPermissions(action string, eval ac.Evaluator) error { - msg := fmt.Sprintf("user is not authorized to %s", action) - err := ErrAuthorizationBase.Errorf(msg) - err.PublicMessage = msg + msg := "user is not authorized to %s" + err := ErrAuthorizationBase.Errorf(msg, action) + err.PublicMessage = fmt.Sprintf(msg, action) if eval != nil { err.PublicPayload = map[string]any{ "permissions": eval.GoString(), @@ -30,7 +31,7 @@ func NewAuthorizationErrorGeneric(action string) error { } // actionAccess is a helper struct that provides common access control methods for a specific resource type and action. -type actionAccess[T any] struct { +type actionAccess[T models.Identified] struct { genericService // authorizeSome evaluates to true if user has access to some (any) resources. @@ -41,7 +42,7 @@ type actionAccess[T any] struct { authorizeAll ac.Evaluator // authorizeOne returns an evaluator that checks if user has access to a specific resource. - authorizeOne func(T) ac.Evaluator + authorizeOne func(models.Identified) ac.Evaluator // action is the action that user is trying to perform on the resource. Used in error messages. action string @@ -53,7 +54,10 @@ type actionAccess[T any] struct { // Filter filters the given list of resources based on access control permissions of the user. // This method is preferred when many resources need to be checked. func (s actionAccess[T]) Filter(ctx context.Context, user identity.Requester, resources ...T) ([]T, error) { - canAll, err := s.authorizePreConditions(ctx, user) + if err := s.AuthorizePreConditions(ctx, user); err != nil { + return nil, err + } + canAll, err := s.HasAccess(ctx, user, s.authorizeAll) if err != nil { return nil, err } @@ -70,8 +74,11 @@ func (s actionAccess[T]) Filter(ctx context.Context, user identity.Requester, re } // Authorize checks if user has access to a resource. Returns an error if user does not have access. -func (s actionAccess[T]) Authorize(ctx context.Context, user identity.Requester, resource T) error { - canAll, err := s.authorizePreConditions(ctx, user) +func (s actionAccess[T]) Authorize(ctx context.Context, user identity.Requester, resource models.Identified) error { + if err := s.AuthorizePreConditions(ctx, user); err != nil { + return err + } + canAll, err := s.HasAccess(ctx, user, s.authorizeAll) if canAll || err != nil { // Return early if user can either access all or there is an error. return err } @@ -80,8 +87,11 @@ func (s actionAccess[T]) Authorize(ctx context.Context, user identity.Requester, } // Has checks if user has access to a resource. Returns false if user does not have access. -func (s actionAccess[T]) Has(ctx context.Context, user identity.Requester, resource T) (bool, error) { - canAll, err := s.authorizePreConditions(ctx, user) +func (s actionAccess[T]) Has(ctx context.Context, user identity.Requester, resource models.Identified) (bool, error) { + if err := s.AuthorizePreConditions(ctx, user); err != nil { + return false, err + } + canAll, err := s.HasAccess(ctx, user, s.authorizeAll) if canAll || err != nil { // Return early if user can either access all or there is an error. return canAll, err } @@ -89,32 +99,28 @@ func (s actionAccess[T]) Has(ctx context.Context, user identity.Requester, resou return s.has(ctx, user, resource) } -// authorizePreConditions checks necessary preconditions for resources. Returns true if user has access for all -// resources. Returns error if user does not have access to on any resources. -func (s actionAccess[T]) authorizePreConditions(ctx context.Context, user identity.Requester) (bool, error) { - canAll, err := s.HasAccess(ctx, user, s.authorizeAll) - if canAll || err != nil { // Return early if user can either access all or there is an error. - return canAll, err - } +// AuthorizeAll checks if user has access to all resources. Returns error if user does not have access to all resources. +func (s actionAccess[T]) AuthorizeAll(ctx context.Context, user identity.Requester) error { + return s.HasAccessOrError(ctx, user, s.authorizeAll, func() string { + return fmt.Sprintf("%s all %ss", s.action, s.resource) + }) +} - can, err := s.HasAccess(ctx, user, s.authorizeSome) - if err != nil { - return false, err - } - if !can { // User does not have any resource permissions at all. - return false, NewAuthorizationErrorWithPermissions(fmt.Sprintf("%s any %s", s.action, s.resource), s.authorizeSome) - } - return false, nil +// AuthorizePreConditions checks necessary preconditions for resources. Returns error if user does not have access to any resources. +func (s actionAccess[T]) AuthorizePreConditions(ctx context.Context, user identity.Requester) error { + return s.HasAccessOrError(ctx, user, s.authorizeSome, func() string { + return fmt.Sprintf("%s any %s", s.action, s.resource) + }) } // authorize checks if user has access to a specific resource given precondition checks have already passed. Returns an error if user does not have access. -func (s actionAccess[T]) authorize(ctx context.Context, user identity.Requester, resource T) error { +func (s actionAccess[T]) authorize(ctx context.Context, user identity.Requester, resource models.Identified) error { return s.HasAccessOrError(ctx, user, s.authorizeOne(resource), func() string { return fmt.Sprintf("%s %s", s.action, s.resource) }) } // has checks if user has access to a specific resource given precondition checks have already passed. Returns false if user does not have access. -func (s actionAccess[T]) has(ctx context.Context, user identity.Requester, resource T) (bool, error) { +func (s actionAccess[T]) has(ctx context.Context, user identity.Requester, resource models.Identified) (bool, error) { return s.HasAccess(ctx, user, s.authorizeOne(resource)) } diff --git a/pkg/services/ngalert/accesscontrol/receivers.go b/pkg/services/ngalert/accesscontrol/receivers.go index 66338f9846d..8629cf55a09 100644 --- a/pkg/services/ngalert/accesscontrol/receivers.go +++ b/pkg/services/ngalert/accesscontrol/receivers.go @@ -2,13 +2,21 @@ package accesscontrol import ( "context" - "fmt" "github.com/grafana/grafana/pkg/apimachinery/identity" ac "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/ngalert/models" ) +const ( + ScopeReceiversRoot = "receivers" +) + +var ( + ScopeReceiversProvider = ac.NewScopeProvider(ScopeReceiversRoot) + ScopeReceiversAll = ScopeReceiversProvider.GetResourceAllScope() +) + var ( // Asserts pre-conditions for read access to redacted receivers. If this evaluates to false, the user cannot read any redacted receivers. readRedactedReceiversPreConditionsEval = ac.EvalAny( @@ -24,23 +32,19 @@ var ( // Asserts read-only access to all redacted receivers. readRedactedAllReceiversEval = ac.EvalAny( ac.EvalPermission(ac.ActionAlertingNotificationsRead), - - // TODO: The following should be scoped, but are currently interpreted as global. Needs a db migration when scope is added. - ac.EvalPermission(ac.ActionAlertingReceiversRead), // TODO: Add global scope with fgac. + ac.EvalPermission(ac.ActionAlertingReceiversRead, ScopeReceiversAll), readDecryptedAllReceiversEval, ) // Asserts read-only access to all decrypted receivers. readDecryptedAllReceiversEval = ac.EvalAny( - ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets), // TODO: Add global scope with fgac. + ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets, ScopeReceiversAll), ) // Asserts read-only access to a specific redacted receiver. readRedactedReceiverEval = func(uid string) ac.Evaluator { return ac.EvalAny( ac.EvalPermission(ac.ActionAlertingNotificationsRead), - - // TODO: The following should be scoped, but are currently interpreted as global. Needs a db migration when scope is added. - ac.EvalPermission(ac.ActionAlertingReceiversRead), // TODO: Add uid scope with fgac. + ac.EvalPermission(ac.ActionAlertingReceiversRead, ScopeReceiversProvider.GetResourceScopeUID(uid)), readDecryptedReceiverEval(uid), ) } @@ -48,7 +52,7 @@ var ( // Asserts read-only access to a specific decrypted receiver. readDecryptedReceiverEval = func(uid string) ac.Evaluator { return ac.EvalAny( - ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets), // TODO: Add uid scope with fgac. + ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets, ScopeReceiversProvider.GetResourceScopeUID(uid)), ) } @@ -68,16 +72,95 @@ var ( provisioningExtraReadDecryptedPermissions = ac.EvalAny( ac.EvalPermission(ac.ActionAlertingProvisioningReadSecrets), // Global provisioning action for all AM config + secrets. Org scope. ) + + // Create + + // Asserts pre-conditions for create access to receivers. If this evaluates to false, the user cannot create any receivers. + // Create has no scope, so these permissions are both necessary and sufficient to create any and all receivers. + createReceiversEval = ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), // Global action for all AM config. Org scope. + ac.EvalPermission(ac.ActionAlertingReceiversCreate), // Action for receivers. Org scope. + ) + + // Update + + // Asserts pre-conditions for update access to receivers. If this evaluates to false, the user cannot update any receivers. + updateReceiversPreConditionsEval = ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), // Global action for all AM config. Org scope. + ac.EvalPermission(ac.ActionAlertingReceiversUpdate), // Action for receivers. UID scope. + ) + + // Asserts update access to all receivers. + updateAllReceiversEval = ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), + ac.EvalPermission(ac.ActionAlertingReceiversUpdate, ScopeReceiversAll), + ) + + // Asserts update access to a specific receiver. + updateReceiverEval = func(uid string) ac.Evaluator { + return ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), + ac.EvalPermission(ac.ActionAlertingReceiversUpdate, ScopeReceiversProvider.GetResourceScopeUID(uid)), + ) + } + + // Delete + + // Asserts pre-conditions for delete access to receivers. If this evaluates to false, the user cannot delete any receivers. + deleteReceiversPreConditionsEval = ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), // Global action for all AM config. Org scope. + ac.EvalPermission(ac.ActionAlertingReceiversDelete), // Action for receivers. UID scope. + ) + + // Asserts delete access to all receivers. + deleteAllReceiversEval = ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), + ac.EvalPermission(ac.ActionAlertingReceiversDelete, ScopeReceiversAll), + ) + + // Asserts delete access to a specific receiver. + deleteReceiverEval = func(uid string) ac.Evaluator { + return ac.EvalAny( + ac.EvalPermission(ac.ActionAlertingNotificationsWrite), + ac.EvalPermission(ac.ActionAlertingReceiversDelete, ScopeReceiversProvider.GetResourceScopeUID(uid)), + ) + } ) type ReceiverAccess[T models.Identified] struct { read actionAccess[T] readDecrypted actionAccess[T] + create actionAccess[T] + update actionAccess[T] + delete actionAccess[models.Identified] } // NewReceiverAccess creates a new ReceiverAccess service. If includeProvisioningActions is true, the service will include // permissions specific to the provisioning API. func NewReceiverAccess[T models.Identified](a ac.AccessControl, includeProvisioningActions bool) *ReceiverAccess[T] { + // If this service is meant for the provisioning API, we include the provisioning actions as possible permissions. + // TODO: Improve this monkey patching. + readRedactedReceiversPreConditionsEval := readRedactedReceiversPreConditionsEval + readDecryptedReceiversPreConditionsEval := readDecryptedReceiversPreConditionsEval + readRedactedReceiverEval := readRedactedReceiverEval + readDecryptedReceiverEval := readDecryptedReceiverEval + readRedactedAllReceiversEval := readRedactedAllReceiversEval + readDecryptedAllReceiversEval := readDecryptedAllReceiversEval + if includeProvisioningActions { + readRedactedReceiversPreConditionsEval = ac.EvalAny(provisioningExtraReadRedactedPermissions, readRedactedReceiversPreConditionsEval) + readDecryptedReceiversPreConditionsEval = ac.EvalAny(provisioningExtraReadDecryptedPermissions, readDecryptedReceiversPreConditionsEval) + + readRedactedReceiverEval = func(uid string) ac.Evaluator { + return ac.EvalAny(provisioningExtraReadRedactedPermissions, readRedactedReceiverEval(uid)) + } + readDecryptedReceiverEval = func(uid string) ac.Evaluator { + return ac.EvalAny(provisioningExtraReadDecryptedPermissions, readDecryptedReceiverEval(uid)) + } + + readRedactedAllReceiversEval = ac.EvalAny(provisioningExtraReadRedactedPermissions, readRedactedAllReceiversEval) + readDecryptedAllReceiversEval = ac.EvalAny(provisioningExtraReadDecryptedPermissions, readDecryptedAllReceiversEval) + } + rcvAccess := &ReceiverAccess[T]{ read: actionAccess[T]{ genericService: genericService{ @@ -86,7 +169,7 @@ func NewReceiverAccess[T models.Identified](a ac.AccessControl, includeProvision resource: "receiver", action: "read", authorizeSome: readRedactedReceiversPreConditionsEval, - authorizeOne: func(receiver T) ac.Evaluator { + authorizeOne: func(receiver models.Identified) ac.Evaluator { return readRedactedReceiverEval(receiver.GetUID()) }, authorizeAll: readRedactedAllReceiversEval, @@ -98,27 +181,47 @@ func NewReceiverAccess[T models.Identified](a ac.AccessControl, includeProvision resource: "decrypted receiver", action: "read", authorizeSome: readDecryptedReceiversPreConditionsEval, - authorizeOne: func(receiver T) ac.Evaluator { + authorizeOne: func(receiver models.Identified) ac.Evaluator { return readDecryptedReceiverEval(receiver.GetUID()) }, authorizeAll: readDecryptedAllReceiversEval, }, - } - - // If this service is meant for the provisioning API, we include the provisioning actions as possible permissions. - if includeProvisioningActions { - rcvAccess.read.authorizeSome = ac.EvalAny(provisioningExtraReadRedactedPermissions, rcvAccess.read.authorizeSome) - rcvAccess.readDecrypted.authorizeSome = ac.EvalAny(provisioningExtraReadDecryptedPermissions, rcvAccess.readDecrypted.authorizeSome) - - rcvAccess.read.authorizeOne = func(receiver T) ac.Evaluator { - return ac.EvalAny(provisioningExtraReadRedactedPermissions, rcvAccess.read.authorizeOne(receiver)) - } - rcvAccess.readDecrypted.authorizeOne = func(receiver T) ac.Evaluator { - return ac.EvalAny(provisioningExtraReadDecryptedPermissions, rcvAccess.readDecrypted.authorizeOne(receiver)) - } - - rcvAccess.read.authorizeAll = ac.EvalAny(provisioningExtraReadRedactedPermissions, rcvAccess.read.authorizeAll) - rcvAccess.readDecrypted.authorizeAll = ac.EvalAny(provisioningExtraReadDecryptedPermissions, rcvAccess.readDecrypted.authorizeAll) + create: actionAccess[T]{ + genericService: genericService{ + ac: a, + }, + resource: "receiver", + action: "create", + authorizeSome: ac.EvalAll(readRedactedReceiversPreConditionsEval, createReceiversEval), + authorizeOne: func(receiver models.Identified) ac.Evaluator { + return ac.EvalAll(readRedactedReceiversPreConditionsEval, createReceiversEval) + }, + authorizeAll: ac.EvalAll(readRedactedReceiversPreConditionsEval, createReceiversEval), + }, + update: actionAccess[T]{ + genericService: genericService{ + ac: a, + }, + resource: "receiver", + action: "update", + authorizeSome: ac.EvalAll(readRedactedReceiversPreConditionsEval, updateReceiversPreConditionsEval), + authorizeOne: func(receiver models.Identified) ac.Evaluator { + return ac.EvalAll(readRedactedReceiverEval(receiver.GetUID()), updateReceiverEval(receiver.GetUID())) + }, + authorizeAll: ac.EvalAll(readRedactedAllReceiversEval, updateAllReceiversEval), + }, + delete: actionAccess[models.Identified]{ + genericService: genericService{ + ac: a, + }, + resource: "receiver", + action: "delete", + authorizeSome: ac.EvalAll(readRedactedReceiversPreConditionsEval, deleteReceiversPreConditionsEval), + authorizeOne: func(receiver models.Identified) ac.Evaluator { + return ac.EvalAll(readRedactedReceiverEval(receiver.GetUID()), deleteReceiverEval(receiver.GetUID())) + }, + authorizeAll: ac.EvalAll(readRedactedAllReceiversEval, deleteAllReceiversEval), + }, } return rcvAccess @@ -145,11 +248,6 @@ func (s ReceiverAccess[T]) HasRead(ctx context.Context, user identity.Requester, return s.read.Has(ctx, user, receiver) } -// HasReadAll checks if user has access to read all redacted receivers. Returns false if user does not have access. -func (s ReceiverAccess[T]) HasReadAll(ctx context.Context, user identity.Requester) (bool, error) { // TODO: Temporary for legacy compatibility. - return s.read.HasAccess(ctx, user, s.read.authorizeAll) -} - // FilterReadDecrypted filters the given list of receivers based on the read decrypted access control permissions of the user. // This method is preferred when many receivers need to be checked. func (s ReceiverAccess[T]) FilterReadDecrypted(ctx context.Context, user identity.Requester, receivers ...T) ([]T, error) { @@ -166,9 +264,46 @@ func (s ReceiverAccess[T]) HasReadDecrypted(ctx context.Context, user identity.R return s.readDecrypted.Has(ctx, user, receiver) } -// AuthorizeReadDecryptedAll checks if user has access to read all decrypted receiver. Returns an error if user does not have access. -func (s ReceiverAccess[T]) AuthorizeReadDecryptedAll(ctx context.Context, user identity.Requester) error { // TODO: Temporary for legacy compatibility. - return s.readDecrypted.HasAccessOrError(ctx, user, s.readDecrypted.authorizeAll, func() string { - return fmt.Sprintf("%s %s", s.readDecrypted.action, s.readDecrypted.resource) - }) +// AuthorizeUpdate checks if user has access to update a receiver. Returns an error if user does not have access. +func (s ReceiverAccess[T]) AuthorizeUpdate(ctx context.Context, user identity.Requester, receiver T) error { + return s.update.Authorize(ctx, user, receiver) +} + +// Global + +// AuthorizeCreate checks if user has access to create receivers. Returns an error if user does not have access. +func (s ReceiverAccess[T]) AuthorizeCreate(ctx context.Context, user identity.Requester) error { + return s.create.AuthorizeAll(ctx, user) +} + +// By UID + +type identified struct { + uid string +} + +func (i identified) GetUID() string { + return i.uid +} + +// AuthorizeDeleteByUID checks if user has access to delete a receiver by uid. Returns an error if user does not have access. +func (s ReceiverAccess[T]) AuthorizeDeleteByUID(ctx context.Context, user identity.Requester, uid string) error { + return s.delete.Authorize(ctx, user, identified{uid: uid}) +} + +// AuthorizeReadByUID checks if user has access to read a redacted receiver by uid. Returns an error if user does not have access. +func (s ReceiverAccess[T]) AuthorizeReadByUID(ctx context.Context, user identity.Requester, uid string) error { + return s.read.Authorize(ctx, user, identified{uid: uid}) +} + +// AuthorizeUpdateByUID checks if user has access to update a receiver by uid. Returns an error if user does not have access. +func (s ReceiverAccess[T]) AuthorizeUpdateByUID(ctx context.Context, user identity.Requester, uid string) error { + return s.update.Authorize(ctx, user, identified{uid: uid}) +} + +// Preconditions + +// AuthorizeReadSome checks if user has access to read some redacted receivers. Returns an error if user does not have access. +func (s ReceiverAccess[T]) AuthorizeReadSome(ctx context.Context, user identity.Requester) error { + return s.read.AuthorizePreConditions(ctx, user) } diff --git a/pkg/services/ngalert/api/api_notifications.go b/pkg/services/ngalert/api/api_notifications.go index 70accedad4e..c828895c1bf 100644 --- a/pkg/services/ngalert/api/api_notifications.go +++ b/pkg/services/ngalert/api/api_notifications.go @@ -8,7 +8,6 @@ import ( "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/infra/log" contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model" - "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" "github.com/grafana/grafana/pkg/services/ngalert/models" ) @@ -19,8 +18,8 @@ type NotificationSrv struct { } type ReceiverService interface { - GetReceiver(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) - ListReceivers(ctx context.Context, q models.ListReceiversQuery, user identity.Requester) ([]definitions.GettableApiReceiver, error) + GetReceiver(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) + ListReceivers(ctx context.Context, q models.ListReceiversQuery, user identity.Requester) ([]*models.Receiver, error) } func (srv *NotificationSrv) RouteGetTimeInterval(c *contextmodel.ReqContext, name string) response.Response { @@ -51,7 +50,12 @@ func (srv *NotificationSrv) RouteGetReceiver(c *contextmodel.ReqContext, name st return response.ErrOrFallback(http.StatusInternalServerError, "failed to get receiver", err) } - return response.JSON(http.StatusOK, receiver) + gettable, err := GettableApiReceiverFromReceiver(receiver) + if err != nil { + return response.ErrOrFallback(http.StatusInternalServerError, "failed to convert receiver", err) + } + + return response.JSON(http.StatusOK, gettable) } func (srv *NotificationSrv) RouteGetReceivers(c *contextmodel.ReqContext) response.Response { @@ -67,5 +71,10 @@ func (srv *NotificationSrv) RouteGetReceivers(c *contextmodel.ReqContext) respon return response.ErrOrFallback(http.StatusInternalServerError, "failed to get receiver groups", err) } - return response.JSON(http.StatusOK, receivers) + gettables, err := GettableApiReceiversFromReceivers(receivers) + if err != nil { + return response.ErrOrFallback(http.StatusInternalServerError, "failed to convert receivers", err) + } + + return response.JSON(http.StatusOK, gettables) } diff --git a/pkg/services/ngalert/api/api_notifications_test.go b/pkg/services/ngalert/api/api_notifications_test.go index 23eee4e38e1..c7f4bf542e4 100644 --- a/pkg/services/ngalert/api/api_notifications_test.go +++ b/pkg/services/ngalert/api/api_notifications_test.go @@ -25,7 +25,6 @@ import ( "github.com/grafana/grafana/pkg/services/user" "github.com/grafana/grafana/pkg/web" - am_config "github.com/prometheus/alertmanager/config" "github.com/stretchr/testify/require" ) @@ -33,35 +32,33 @@ func TestRouteGetReceiver(t *testing.T) { fakeReceiverSvc := fakes.NewFakeReceiverService() t.Run("returns expected model", func(t *testing.T) { - expected := definitions.GettableApiReceiver{ - Receiver: am_config.Receiver{ - Name: "receiver1", - }, - GettableGrafanaReceivers: definitions.GettableGrafanaReceivers{ - GrafanaManagedReceivers: []*definitions.GettableGrafanaReceiver{ - { - UID: "uid1", - Name: "receiver1", - Type: "slack", - }, + expected := &models.Receiver{ + Name: "receiver1", + Integrations: []*models.Integration{ + { + UID: "uid1", + Name: "receiver1", + Config: models.IntegrationConfig{Type: "slack"}, }, }, } - fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) { + fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) { return expected, nil } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) rc := testReqCtx("GET") resp := handler.handleRouteGetReceiver(&rc, "receiver1") require.Equal(t, http.StatusOK, resp.Status()) - json, err := json.Marshal(expected) + gettables, err := GettableApiReceiverFromReceiver(expected) + require.NoError(t, err) + json, err := json.Marshal(gettables) require.NoError(t, err) require.Equal(t, json, resp.Body()) }) t.Run("builds query from request context and url param", func(t *testing.T) { - fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) { - return definitions.GettableApiReceiver{}, nil + fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) { + return &models.Receiver{}, nil } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) rc := testReqCtx("GET") @@ -80,8 +77,8 @@ func TestRouteGetReceiver(t *testing.T) { }) t.Run("should pass along not found response", func(t *testing.T) { - fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) { - return definitions.GettableApiReceiver{}, notifier.ErrReceiverNotFound.Errorf("") + fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) { + return nil, legacy_storage.ErrReceiverNotFound.Errorf("") } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) rc := testReqCtx("GET") @@ -90,8 +87,8 @@ func TestRouteGetReceiver(t *testing.T) { }) t.Run("should pass along permission denied response", func(t *testing.T) { - fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) { - return definitions.GettableApiReceiver{}, ac.ErrAuthorizationBase.Errorf("") + fakeReceiverSvc.GetReceiverFn = func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) { + return nil, ac.ErrAuthorizationBase.Errorf("") } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) rc := testReqCtx("GET") @@ -104,23 +101,19 @@ func TestRouteGetReceivers(t *testing.T) { fakeReceiverSvc := fakes.NewFakeReceiverService() t.Run("returns expected model", func(t *testing.T) { - expected := []definitions.GettableApiReceiver{ + expected := []*models.Receiver{ { - Receiver: am_config.Receiver{ - Name: "receiver1", - }, - GettableGrafanaReceivers: definitions.GettableGrafanaReceivers{ - GrafanaManagedReceivers: []*definitions.GettableGrafanaReceiver{ - { - UID: "uid1", - Name: "receiver1", - Type: "slack", - }, + Name: "receiver1", + Integrations: []*models.Integration{ + { + UID: "uid1", + Name: "receiver1", + Config: models.IntegrationConfig{Type: "slack"}, }, }, }, } - fakeReceiverSvc.ListReceiversFn = func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) { + fakeReceiverSvc.ListReceiversFn = func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]*models.Receiver, error) { return expected, nil } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) @@ -128,14 +121,16 @@ func TestRouteGetReceivers(t *testing.T) { rc.Context.Req.Form.Set("names", "receiver1") resp := handler.handleRouteGetReceivers(&rc) require.Equal(t, http.StatusOK, resp.Status()) - json, err := json.Marshal(expected) + gettables, err := GettableApiReceiversFromReceivers(expected) require.NoError(t, err) - require.Equal(t, json, resp.Body()) + jsonBody, err := json.Marshal(gettables) + require.NoError(t, err) + require.JSONEq(t, string(jsonBody), string(resp.Body())) }) t.Run("builds query from request context", func(t *testing.T) { - fakeReceiverSvc.ListReceiversFn = func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) { - return []definitions.GettableApiReceiver{}, nil + fakeReceiverSvc.ListReceiversFn = func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]*models.Receiver, error) { + return nil, nil } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) rc := testReqCtx("GET") @@ -159,7 +154,7 @@ func TestRouteGetReceivers(t *testing.T) { }) t.Run("should pass along permission denied response", func(t *testing.T) { - fakeReceiverSvc.ListReceiversFn = func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) { + fakeReceiverSvc.ListReceiversFn = func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]*models.Receiver, error) { return nil, ac.ErrAuthorizationBase.Errorf("") } handler := NewNotificationsApi(newNotificationSrv(fakeReceiverSvc)) @@ -221,7 +216,7 @@ func TestRouteGetReceiversResponses(t *testing.T) { {limit: 4, offset: 0, expected: expected[:4]}, {limit: 1, offset: 1, expected: expected[1:2]}, {limit: 2, offset: 2, expected: expected[2:4]}, - {limit: 2, offset: 99, expected: nil}, + {limit: 2, offset: 99, expected: []definitions.GettableApiReceiver{}}, {limit: 0, offset: 0, expected: expected}, {limit: 0, offset: 1, expected: expected[1:]}, } @@ -237,7 +232,7 @@ func TestRouteGetReceiversResponses(t *testing.T) { err := json.Unmarshal(response.Body(), &configs) require.NoError(t, err) - require.Equal(t, configs, tc.expected) + require.Equal(t, tc.expected, configs) }) } }) @@ -331,8 +326,8 @@ func TestRouteGetReceiversResponses(t *testing.T) { }) t.Run("json body content is as expected", func(t *testing.T) { - expectedRedactedResponse := `{"name":"multiple integrations","grafana_managed_receiver_configs":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","name":"multiple integrations","type":"prometheus-alertmanager","disableResolveMessage":true,"settings":{"basicAuthPassword":"[REDACTED]","basicAuthUser":"test","url":"http://localhost:9093"},"secureFields":{"basicAuthPassword":true}},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","name":"multiple integrations","type":"discord","disableResolveMessage":false,"settings":{"avatar_url":"some avatar","url":"some url","use_discord_username":true},"secureFields":{}}]}` - expectedDecryptedResponse := `{"name":"multiple integrations","grafana_managed_receiver_configs":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","name":"multiple integrations","type":"prometheus-alertmanager","disableResolveMessage":true,"settings":{"basicAuthPassword":"testpass","basicAuthUser":"test","url":"http://localhost:9093"},"secureFields":{"basicAuthPassword":true}},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","name":"multiple integrations","type":"discord","disableResolveMessage":false,"settings":{"avatar_url":"some avatar","url":"some url","use_discord_username":true},"secureFields":{}}]}` + expectedRedactedResponse := `{"name":"multiple integrations","grafana_managed_receiver_configs":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","name":"multiple integrations","type":"prometheus-alertmanager","disableResolveMessage":true,"settings":{"basicAuthPassword":"[REDACTED]","basicAuthUser":"test","url":"http://localhost:9093"},"secureFields":{"basicAuthPassword":true}},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","name":"multiple integrations","type":"discord","disableResolveMessage":false,"settings":{"avatar_url":"some avatar","url":"[REDACTED]","use_discord_username":true},"secureFields":{"url":true}}]}` + expectedDecryptedResponse := `{"name":"multiple integrations","grafana_managed_receiver_configs":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","name":"multiple integrations","type":"prometheus-alertmanager","disableResolveMessage":true,"settings":{"basicAuthPassword":"testpass","basicAuthUser":"test","url":"http://localhost:9093"},"secureFields":{"basicAuthPassword":true}},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","name":"multiple integrations","type":"discord","disableResolveMessage":false,"settings":{"avatar_url":"some avatar","url":"some url","use_discord_username":true},"secureFields":{"url":true}}]}` t.Run("decrypt false", func(t *testing.T) { env := createTestEnv(t, testContactPointConfig) sut := createNotificationSrvSutFromEnv(t, &env) @@ -375,6 +370,7 @@ func createNotificationSrvSutFromEnv(t *testing.T, env *testEnvironment) Notific ac.NewReceiverAccess[*models.Receiver](env.ac, false), legacy_storage.NewAlertmanagerConfigStore(env.configs), env.prov, + env.store, env.secrets, env.xact, env.log, diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go index 262c8a05753..dc2131ebbdd 100644 --- a/pkg/services/ngalert/api/api_provisioning.go +++ b/pkg/services/ngalert/api/api_provisioning.go @@ -45,9 +45,9 @@ type ContactPointService interface { type TemplateService interface { GetTemplates(ctx context.Context, orgID int64) ([]definitions.NotificationTemplate, error) - GetTemplate(ctx context.Context, orgID int64, name string) (definitions.NotificationTemplate, error) - SetTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) - DeleteTemplate(ctx context.Context, orgID int64, name string, provenance definitions.Provenance, version string) error + GetTemplate(ctx context.Context, orgID int64, nameOrUid string) (definitions.NotificationTemplate, error) + UpsertTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) + DeleteTemplate(ctx context.Context, orgID int64, nameOrUid string, provenance definitions.Provenance, version string) error } type NotificationPolicyService interface { @@ -207,17 +207,12 @@ func (srv *ProvisioningSrv) RouteGetTemplates(c *contextmodel.ReqContext) respon return response.JSON(http.StatusOK, templates) } -func (srv *ProvisioningSrv) RouteGetTemplate(c *contextmodel.ReqContext, name string) response.Response { - templates, err := srv.templates.GetTemplates(c.Req.Context(), c.SignedInUser.GetOrgID()) +func (srv *ProvisioningSrv) RouteGetTemplate(c *contextmodel.ReqContext, nameOrUid string) response.Response { + template, err := srv.templates.GetTemplate(c.Req.Context(), c.SignedInUser.GetOrgID(), nameOrUid) if err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "", err) } - for _, tmpl := range templates { - if tmpl.Name == name { - return response.JSON(http.StatusOK, tmpl) - } - } - return response.Err(provisioning.ErrTemplateNotFound) + return response.JSON(http.StatusOK, template) } func (srv *ProvisioningSrv) RoutePutTemplate(c *contextmodel.ReqContext, body definitions.NotificationTemplateContent, name string) response.Response { @@ -227,16 +222,16 @@ func (srv *ProvisioningSrv) RoutePutTemplate(c *contextmodel.ReqContext, body de Provenance: determineProvenance(c), ResourceVersion: body.ResourceVersion, } - modified, err := srv.templates.SetTemplate(c.Req.Context(), c.SignedInUser.GetOrgID(), tmpl) + modified, err := srv.templates.UpsertTemplate(c.Req.Context(), c.SignedInUser.GetOrgID(), tmpl) if err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "", err) } return response.JSON(http.StatusAccepted, modified) } -func (srv *ProvisioningSrv) RouteDeleteTemplate(c *contextmodel.ReqContext, name string) response.Response { +func (srv *ProvisioningSrv) RouteDeleteTemplate(c *contextmodel.ReqContext, nameOrUid string) response.Response { version := c.Query("version") - err := srv.templates.DeleteTemplate(c.Req.Context(), c.SignedInUser.GetOrgID(), name, determineProvenance(c), version) + err := srv.templates.DeleteTemplate(c.Req.Context(), c.SignedInUser.GetOrgID(), nameOrUid, determineProvenance(c), version) if err != nil { return response.ErrOrFallback(http.StatusInternalServerError, "", err) } diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go index 44e695a38c6..8c6cf2ccc60 100644 --- a/pkg/services/ngalert/api/api_provisioning_test.go +++ b/pkg/services/ngalert/api/api_provisioning_test.go @@ -99,8 +99,10 @@ func TestProvisioningApi(t *testing.T) { response := sut.RoutePutPolicyTree(&rc, tree) require.Equal(t, 400, response.Status()) - expBody := `{"message":"invalid object specification: invalid policy tree"}` - require.Equal(t, expBody, string(response.Body())) + expBody := definitions.ValidationError{Message: "invalid object specification: invalid policy tree"} + expBodyJSON, marshalErr := json.Marshal(expBody) + require.NoError(t, marshalErr) + require.Equal(t, string(expBodyJSON), string(response.Body())) }) }) @@ -1630,7 +1632,7 @@ func TestProvisioningApiContactPointExport(t *testing.T) { }) t.Run("json body content is as expected", func(t *testing.T) { - expectedRedactedResponse := `{"apiVersion":1,"contactPoints":[{"orgId":1,"name":"grafana-default-email","receivers":[{"uid":"ad95bd8a-49ed-4adc-bf89-1b444fa1aa5b","type":"email","settings":{"addresses":"\u003cexample@email.com\u003e"},"disableResolveMessage":false}]},{"orgId":1,"name":"multiple integrations","receivers":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","type":"prometheus-alertmanager","settings":{"basicAuthPassword":"[REDACTED]","basicAuthUser":"test","url":"http://localhost:9093"},"disableResolveMessage":true},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","type":"discord","settings":{"avatar_url":"some avatar","url":"some url","use_discord_username":true},"disableResolveMessage":false}]},{"orgId":1,"name":"pagerduty test","receivers":[{"uid":"b9bf06f8-bde2-4438-9d4a-bba0522dcd4d","type":"pagerduty","settings":{"client":"some client","integrationKey":"[REDACTED]","severity":"criticalish"},"disableResolveMessage":false}]},{"orgId":1,"name":"slack test","receivers":[{"uid":"cbfd0976-8228-4126-b672-4419f30a9e50","type":"slack","settings":{"text":"title body test","title":"title test","url":"[REDACTED]"},"disableResolveMessage":true}]}]}` + expectedRedactedResponse := `{"apiVersion":1,"contactPoints":[{"orgId":1,"name":"grafana-default-email","receivers":[{"uid":"ad95bd8a-49ed-4adc-bf89-1b444fa1aa5b","type":"email","settings":{"addresses":"\u003cexample@email.com\u003e"},"disableResolveMessage":false}]},{"orgId":1,"name":"multiple integrations","receivers":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","type":"prometheus-alertmanager","settings":{"basicAuthPassword":"[REDACTED]","basicAuthUser":"test","url":"http://localhost:9093"},"disableResolveMessage":true},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","type":"discord","settings":{"avatar_url":"some avatar","url":"[REDACTED]","use_discord_username":true},"disableResolveMessage":false}]},{"orgId":1,"name":"pagerduty test","receivers":[{"uid":"b9bf06f8-bde2-4438-9d4a-bba0522dcd4d","type":"pagerduty","settings":{"client":"some client","integrationKey":"[REDACTED]","severity":"criticalish"},"disableResolveMessage":false}]},{"orgId":1,"name":"slack test","receivers":[{"uid":"cbfd0976-8228-4126-b672-4419f30a9e50","type":"slack","settings":{"text":"title body test","title":"title test","url":"[REDACTED]"},"disableResolveMessage":true}]}]}` t.Run("decrypt false", func(t *testing.T) { env := createTestEnv(t, testContactPointConfig) sut := createProvisioningSrvSutFromEnv(t, &env) @@ -1683,14 +1685,14 @@ func TestProvisioningApiContactPointExport(t *testing.T) { response := sut.RouteGetContactPointsExport(&rc) - expectedResponse := `{"apiVersion":1,"contactPoints":[{"orgId":1,"name":"multiple integrations","receivers":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","type":"prometheus-alertmanager","settings":{"basicAuthPassword":"[REDACTED]","basicAuthUser":"test","url":"http://localhost:9093"},"disableResolveMessage":true},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","type":"discord","settings":{"avatar_url":"some avatar","url":"some url","use_discord_username":true},"disableResolveMessage":false}]}]}` + expectedResponse := `{"apiVersion":1,"contactPoints":[{"orgId":1,"name":"multiple integrations","receivers":[{"uid":"c2090fda-f824-4add-b545-5a4d5c2ef082","type":"prometheus-alertmanager","settings":{"basicAuthPassword":"[REDACTED]","basicAuthUser":"test","url":"http://localhost:9093"},"disableResolveMessage":true},{"uid":"c84539ec-f87e-4fc5-9a91-7a687d34bbd1","type":"discord","settings":{"avatar_url":"some avatar","url":"[REDACTED]","use_discord_username":true},"disableResolveMessage":false}]}]}` require.Equal(t, 200, response.Status()) require.Equal(t, expectedResponse, string(response.Body())) }) }) t.Run("yaml body content is as expected", func(t *testing.T) { - expectedRedactedResponse := "apiVersion: 1\ncontactPoints:\n - orgId: 1\n name: grafana-default-email\n receivers:\n - uid: ad95bd8a-49ed-4adc-bf89-1b444fa1aa5b\n type: email\n settings:\n addresses: \n disableResolveMessage: false\n - orgId: 1\n name: multiple integrations\n receivers:\n - uid: c2090fda-f824-4add-b545-5a4d5c2ef082\n type: prometheus-alertmanager\n settings:\n basicAuthPassword: '[REDACTED]'\n basicAuthUser: test\n url: http://localhost:9093\n disableResolveMessage: true\n - uid: c84539ec-f87e-4fc5-9a91-7a687d34bbd1\n type: discord\n settings:\n avatar_url: some avatar\n url: some url\n use_discord_username: true\n disableResolveMessage: false\n - orgId: 1\n name: pagerduty test\n receivers:\n - uid: b9bf06f8-bde2-4438-9d4a-bba0522dcd4d\n type: pagerduty\n settings:\n client: some client\n integrationKey: '[REDACTED]'\n severity: criticalish\n disableResolveMessage: false\n - orgId: 1\n name: slack test\n receivers:\n - uid: cbfd0976-8228-4126-b672-4419f30a9e50\n type: slack\n settings:\n text: title body test\n title: title test\n url: '[REDACTED]'\n disableResolveMessage: true\n" + expectedRedactedResponse := "apiVersion: 1\ncontactPoints:\n - orgId: 1\n name: grafana-default-email\n receivers:\n - uid: ad95bd8a-49ed-4adc-bf89-1b444fa1aa5b\n type: email\n settings:\n addresses: \n disableResolveMessage: false\n - orgId: 1\n name: multiple integrations\n receivers:\n - uid: c2090fda-f824-4add-b545-5a4d5c2ef082\n type: prometheus-alertmanager\n settings:\n basicAuthPassword: '[REDACTED]'\n basicAuthUser: test\n url: http://localhost:9093\n disableResolveMessage: true\n - uid: c84539ec-f87e-4fc5-9a91-7a687d34bbd1\n type: discord\n settings:\n avatar_url: some avatar\n url: '[REDACTED]'\n use_discord_username: true\n disableResolveMessage: false\n - orgId: 1\n name: pagerduty test\n receivers:\n - uid: b9bf06f8-bde2-4438-9d4a-bba0522dcd4d\n type: pagerduty\n settings:\n client: some client\n integrationKey: '[REDACTED]'\n severity: criticalish\n disableResolveMessage: false\n - orgId: 1\n name: slack test\n receivers:\n - uid: cbfd0976-8228-4126-b672-4419f30a9e50\n type: slack\n settings:\n text: title body test\n title: title test\n url: '[REDACTED]'\n disableResolveMessage: true\n" t.Run("decrypt false", func(t *testing.T) { env := createTestEnv(t, testContactPointConfig) sut := createProvisioningSrvSutFromEnv(t, &env) @@ -1743,7 +1745,7 @@ func TestProvisioningApiContactPointExport(t *testing.T) { response := sut.RouteGetContactPointsExport(&rc) - expectedResponse := "apiVersion: 1\ncontactPoints:\n - orgId: 1\n name: multiple integrations\n receivers:\n - uid: c2090fda-f824-4add-b545-5a4d5c2ef082\n type: prometheus-alertmanager\n settings:\n basicAuthPassword: '[REDACTED]'\n basicAuthUser: test\n url: http://localhost:9093\n disableResolveMessage: true\n - uid: c84539ec-f87e-4fc5-9a91-7a687d34bbd1\n type: discord\n settings:\n avatar_url: some avatar\n url: some url\n use_discord_username: true\n disableResolveMessage: false\n" + expectedResponse := "apiVersion: 1\ncontactPoints:\n - orgId: 1\n name: multiple integrations\n receivers:\n - uid: c2090fda-f824-4add-b545-5a4d5c2ef082\n type: prometheus-alertmanager\n settings:\n basicAuthPassword: '[REDACTED]'\n basicAuthUser: test\n url: http://localhost:9093\n disableResolveMessage: true\n - uid: c84539ec-f87e-4fc5-9a91-7a687d34bbd1\n type: discord\n settings:\n avatar_url: some avatar\n url: '[REDACTED]'\n use_discord_username: true\n disableResolveMessage: false\n" require.Equal(t, 200, response.Status()) require.Equal(t, expectedResponse, string(response.Body())) }) @@ -1895,6 +1897,7 @@ func createProvisioningSrvSutFromEnv(t *testing.T, env *testEnvironment) Provisi ac.NewReceiverAccess[*models.Receiver](env.ac, true), configStore, env.prov, + env.store, env.secrets, env.xact, env.log, @@ -2299,10 +2302,11 @@ var testContactPointConfig = ` "disableResolveMessage":false, "settings":{ "avatar_url":"some avatar", - "url":"some url", "use_discord_username":true }, - "secureSettings":{} + "secureSettings":{ + "url":"some url" + } } ] }, diff --git a/pkg/services/ngalert/api/api_ruler_test.go b/pkg/services/ngalert/api/api_ruler_test.go index e1ae7815bb2..be5c677c0ff 100644 --- a/pkg/services/ngalert/api/api_ruler_test.go +++ b/pkg/services/ngalert/api/api_ruler_test.go @@ -653,7 +653,7 @@ func createService(store *fakes.RuleStore) *RulerSrv { authz: accesscontrol.NewRuleService(acimpl.ProvideAccessControl(featuremgmt.WithFeatures(), zanzana.NewNoopClient())), amConfigStore: &fakeAMRefresher{}, amRefresher: &fakeAMRefresher{}, - featureManager: featuremgmt.WithFeatures(), + featureManager: featuremgmt.WithFeatures(featuremgmt.FlagGrafanaManagedRecordingRules), } } diff --git a/pkg/services/ngalert/api/authorization.go b/pkg/services/ngalert/api/authorization.go index dd03da7ca4c..08b48544c65 100644 --- a/pkg/services/ngalert/api/authorization.go +++ b/pkg/services/ngalert/api/authorization.go @@ -78,7 +78,6 @@ func (api *API) authorize(method, path string) web.Handler { ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets), ) case http.MethodGet + "/api/v1/notifications/receivers/{Name}": - // TODO: scope to :Name eval = ac.EvalAny( ac.EvalPermission(ac.ActionAlertingReceiversRead), ac.EvalPermission(ac.ActionAlertingReceiversReadSecrets), diff --git a/pkg/services/ngalert/api/compat.go b/pkg/services/ngalert/api/compat.go index 20a3fb3fcfe..a0515c02b08 100644 --- a/pkg/services/ngalert/api/compat.go +++ b/pkg/services/ngalert/api/compat.go @@ -6,6 +6,7 @@ import ( "time" jsoniter "github.com/json-iterator/go" + amConfig "github.com/prometheus/alertmanager/config" "github.com/prometheus/common/model" "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" @@ -179,16 +180,32 @@ func AlertRuleExportFromAlertRule(rule models.AlertRule) (definitions.AlertRuleE data = append(data, query) } + cPtr := &rule.Condition + if rule.Condition == "" { + cPtr = nil + } + + noDataState := definitions.NoDataState(rule.NoDataState) + ndsPtr := &noDataState + if noDataState == "" { + ndsPtr = nil + } + execErrorState := definitions.ExecutionErrorState(rule.ExecErrState) + eesPtr := &execErrorState + if execErrorState == "" { + eesPtr = nil + } + result := definitions.AlertRuleExport{ UID: rule.UID, Title: rule.Title, For: model.Duration(rule.For), - Condition: rule.Condition, + Condition: cPtr, Data: data, DashboardUID: rule.DashboardUID, PanelID: rule.PanelID, - NoDataState: definitions.NoDataState(rule.NoDataState), - ExecErrState: definitions.ExecutionErrorState(rule.ExecErrState), + NoDataState: ndsPtr, + ExecErrState: eesPtr, IsPaused: rule.IsPaused, NotificationSettings: AlertRuleNotificationSettingsExportFromNotificationSettings(rule.NotificationSettings), Record: AlertRuleRecordExportFromRecord(rule.Record), @@ -485,3 +502,56 @@ func ApiRecordFromModelRecord(r *models.Record) *definitions.Record { From: r.From, } } + +func GettableGrafanaReceiverFromReceiver(r *models.Integration, provenance models.Provenance) (definitions.GettableGrafanaReceiver, error) { + out := definitions.GettableGrafanaReceiver{ + UID: r.UID, + Name: r.Name, + Type: r.Config.Type, + Provenance: definitions.Provenance(provenance), + DisableResolveMessage: r.DisableResolveMessage, + SecureFields: r.SecureFields(), + } + + if len(r.Settings) > 0 { + jsonBytes, err := json.Marshal(r.Settings) + if err != nil { + return definitions.GettableGrafanaReceiver{}, err + } + out.Settings = jsonBytes + } + + return out, nil +} + +func GettableApiReceiverFromReceiver(r *models.Receiver) (*definitions.GettableApiReceiver, error) { + out := definitions.GettableApiReceiver{ + Receiver: amConfig.Receiver{ + Name: r.Name, + }, + GettableGrafanaReceivers: definitions.GettableGrafanaReceivers{ + GrafanaManagedReceivers: make([]*definitions.GettableGrafanaReceiver, 0, len(r.Integrations)), + }, + } + + for _, integration := range r.Integrations { + gettable, err := GettableGrafanaReceiverFromReceiver(integration, r.Provenance) + if err != nil { + return nil, err + } + out.GrafanaManagedReceivers = append(out.GrafanaManagedReceivers, &gettable) + } + return &out, nil +} + +func GettableApiReceiversFromReceivers(recvs []*models.Receiver) ([]*definitions.GettableApiReceiver, error) { + out := make([]*definitions.GettableApiReceiver, 0, len(recvs)) + for _, r := range recvs { + gettables, err := GettableApiReceiverFromReceiver(r) + if err != nil { + return nil, err + } + out = append(out, gettables) + } + return out, nil +} diff --git a/pkg/services/ngalert/api/compat_contact_points.go b/pkg/services/ngalert/api/compat_contact_points.go index 60ff5f2902f..e0fa3b777dc 100644 --- a/pkg/services/ngalert/api/compat_contact_points.go +++ b/pkg/services/ngalert/api/compat_contact_points.go @@ -51,7 +51,7 @@ func ContactPointToContactPointExport(cp definitions.ContactPoint) (notify.APIRe len(cp.Pagerduty) + len(cp.OnCall) + len(cp.Pushover) + len(cp.Sensugo) + len(cp.Sns) + len(cp.Slack) + len(cp.Teams) + len(cp.Telegram) + len(cp.Threema) + len(cp.Victorops) + len(cp.Webhook) + len(cp.Wecom) + - len(cp.Webex) + len(cp.Webex) + len(cp.Mqtt) integration := make([]*notify.GrafanaIntegrationConfig, 0, contactPointsLength) @@ -105,6 +105,13 @@ func ContactPointToContactPointExport(cp definitions.ContactPoint) (notify.APIRe } integration = append(integration, el) } + for _, i := range cp.Mqtt { + el, err := marshallIntegration(j, "mqtt", i, i.DisableResolveMessage) + if err != nil { + errs = append(errs, err) + } + integration = append(integration, el) + } for _, i := range cp.Opsgenie { el, err := marshallIntegration(j, "opsgenie", i, i.DisableResolveMessage) if err != nil { @@ -274,6 +281,11 @@ func parseIntegration(json jsoniter.API, result *definitions.ContactPoint, recei if err = json.Unmarshal(data, &integration); err == nil { result.Line = append(result.Line, integration) } + case "mqtt": + integration := definitions.MqttIntegration{DisableResolveMessage: disable} + if err = json.Unmarshal(data, &integration); err == nil { + result.Mqtt = append(result.Mqtt, integration) + } case "opsgenie": integration := definitions.OpsgenieIntegration{DisableResolveMessage: disable} if err = json.Unmarshal(data, &integration); err == nil { diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl index 025d519cd50..b50b0d3dde7 100644 --- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl +++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl @@ -87,4 +87,48 @@ resource "grafana_rule_group" "rule_group_d3e8424bfbf66bc3" { mute_timings = ["test-mute"] } } + rule { + name = "recording rule" + + data { + ref_id = "query" + + relative_time_range { + from = 18000 + to = 10800 + } + + datasource_uid = "000000002" + model = "{\"expr\":\"http_request_duration_microseconds_count\",\"hide\":false,\"interval\":\"\",\"intervalMs\":1000,\"legendFormat\":\"\",\"maxDataPoints\":100,\"refId\":\"query\"}" + } + data { + ref_id = "reduced" + + relative_time_range { + from = 18000 + to = 10800 + } + + datasource_uid = "__expr__" + model = "{\"expression\":\"query\",\"hide\":false,\"intervalMs\":1000,\"maxDataPoints\":100,\"reducer\":\"mean\",\"refId\":\"reduced\",\"type\":\"reduce\"}" + } + data { + ref_id = "condition" + + relative_time_range { + from = 18000 + to = 10800 + } + + datasource_uid = "__expr__" + model = "{\"expression\":\"$reduced > 10\",\"hide\":false,\"intervalMs\":1000,\"maxDataPoints\":100,\"refId\":\"condition\",\"type\":\"math\"}" + } + + is_paused = false + + record { + metric = "test_metric" + from = "condition" + } + } } diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json index 6af0194cb8a..9c814c758d7 100644 --- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json +++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json @@ -108,7 +108,6 @@ ], "noDataState": "NoData", "execErrState": "Alerting", - "for": "0s", "isPaused": false, "notification_settings":{ "receiver":"Test-Receiver", @@ -118,6 +117,66 @@ "repeat_interval":"5m", "mute_time_intervals":["test-mute"] } + }, + { + "title": "recording rule", + "data": [ + { + "refId": "query", + "relativeTimeRange": { + "from": 18000, + "to": 10800 + }, + "datasourceUid": "000000002", + "model": { + "expr": "http_request_duration_microseconds_count", + "hide": false, + "interval": "", + "intervalMs": 1000, + "legendFormat": "", + "maxDataPoints": 100, + "refId": "query" + } + }, + { + "refId": "reduced", + "relativeTimeRange": { + "from": 18000, + "to": 10800 + }, + "datasourceUid": "__expr__", + "model": { + "expression": "query", + "hide": false, + "intervalMs": 1000, + "maxDataPoints": 100, + "reducer": "mean", + "refId": "reduced", + "type": "reduce" + } + }, + { + "refId": "condition", + "relativeTimeRange": { + "from": 18000, + "to": 10800 + }, + "datasourceUid": "__expr__", + "model": { + "expression": "$reduced \u003e 10", + "hide": false, + "intervalMs": 1000, + "maxDataPoints": 100, + "refId": "condition", + "type": "math" + } + } + ], + "isPaused": false, + "record": { + "metric": "test_metric", + "from": "condition" + } } ] } diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml index f91d13ec635..c4a1f9edf12 100644 --- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml +++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml @@ -81,7 +81,6 @@ groups: type: reduce noDataState: NoData execErrState: Alerting - for: 0s isPaused: false notification_settings: receiver: Test-Receiver @@ -94,3 +93,47 @@ groups: repeat_interval: 5m mute_time_intervals: - test-mute + - title: recording rule + data: + - refId: query + relativeTimeRange: + from: 18000 + to: 10800 + datasourceUid: "000000002" + model: + expr: http_request_duration_microseconds_count + hide: false + interval: "" + intervalMs: 1000 + legendFormat: "" + maxDataPoints: 100 + refId: query + - refId: reduced + relativeTimeRange: + from: 18000 + to: 10800 + datasourceUid: __expr__ + model: + expression: query + hide: false + intervalMs: 1000 + maxDataPoints: 100 + reducer: mean + refId: reduced + type: reduce + - refId: condition + relativeTimeRange: + from: 18000 + to: 10800 + datasourceUid: __expr__ + model: + expression: $reduced > 10 + hide: false + intervalMs: 1000 + maxDataPoints: 100 + refId: condition + type: math + isPaused: false + record: + metric: test_metric + from: condition diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101.json b/pkg/services/ngalert/api/test-data/post-rulegroup-101.json index 2871b1f5787..a340dbd189c 100644 --- a/pkg/services/ngalert/api/test-data/post-rulegroup-101.json +++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101.json @@ -119,6 +119,70 @@ "mute_time_intervals":["test-mute"] } } + }, + { + "grafana_alert": { + "title": "recording rule", + "data": [ + { + "refId": "query", + "queryType": "", + "relativeTimeRange": { + "from": 18000, + "to": 10800 + }, + "datasourceUid": "000000002", + "model": { + "expr": "http_request_duration_microseconds_count", + "hide": false, + "interval": "", + "intervalMs": 1000, + "legendFormat": "", + "maxDataPoints": 100, + "refId": "query" + } + }, + { + "refId": "reduced", + "queryType": "", + "relativeTimeRange": { + "from": 18000, + "to": 10800 + }, + "datasourceUid": "__expr__", + "model": { + "expression": "query", + "hide": false, + "intervalMs": 1000, + "maxDataPoints": 100, + "reducer": "mean", + "refId": "reduced", + "type": "reduce" + } + }, + { + "refId": "condition", + "queryType": "", + "relativeTimeRange": { + "from": 18000, + "to": 10800 + }, + "datasourceUid": "__expr__", + "model": { + "expression": "$reduced > 10", + "hide": false, + "intervalMs": 1000, + "maxDataPoints": 100, + "refId": "condition", + "type": "math" + } + } + ], + "record": { + "metric": "test_metric", + "from": "condition" + } + } } ] } diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json index b0f8e6b32fb..6539d39c71e 100644 --- a/pkg/services/ngalert/api/tooling/api.json +++ b/pkg/services/ngalert/api/tooling/api.json @@ -1315,14 +1315,6 @@ "title": "Frames is a slice of Frame pointers.", "type": "array" }, - "GenericPublicError": { - "properties": { - "body": { - "$ref": "#/definitions/PublicError" - } - }, - "type": "object" - }, "GettableAlertmanagers": { "properties": { "data": { @@ -2960,7 +2952,8 @@ "type": "string" }, "for": { - "$ref": "#/definitions/Duration" + "format": "duration", + "type": "string" }, "id": { "format": "int64", @@ -4316,6 +4309,7 @@ "type": "object" }, "URL": { + "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nThe Host field contains the host and port subcomponents of the URL.\nWhen the port is present, it is separated from the host with a colon.\nWhen the host is an IPv6 address, it must be enclosed in square brackets:\n\"[fe80::1]:80\". The [net.JoinHostPort] function combines a host and port\ninto a string suitable for the Host field, adding square brackets to\nthe host when necessary.\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the [URL.EscapedPath] method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.", "properties": { "ForceQuery": { "type": "boolean" @@ -4351,7 +4345,7 @@ "$ref": "#/definitions/Userinfo" } }, - "title": "URL is a custom URL type that allows validation at configuration load time.", + "title": "A URL represents a parsed URL (technically, a URI reference).", "type": "object" }, "UpdateRuleGroupResponse": { @@ -4386,7 +4380,7 @@ }, "ValidationError": { "properties": { - "msg": { + "message": { "example": "error message", "type": "string" } @@ -4581,7 +4575,6 @@ "type": "object" }, "alertGroups": { - "description": "AlertGroups alert groups", "items": { "$ref": "#/definitions/alertGroup", "type": "object" @@ -4743,7 +4736,6 @@ "type": "object" }, "gettableAlerts": { - "description": "GettableAlerts gettable alerts", "items": { "$ref": "#/definitions/gettableAlert", "type": "object" @@ -4868,7 +4860,6 @@ "type": "object" }, "gettableSilences": { - "description": "GettableSilences gettable silences", "items": { "$ref": "#/definitions/gettableSilence", "type": "object" @@ -5919,9 +5910,9 @@ "description": " The mute timing was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -5997,9 +5988,9 @@ } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -6211,9 +6202,9 @@ "description": " The template was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -6241,9 +6232,9 @@ } }, "404": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -6286,15 +6277,15 @@ } }, "400": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, diff --git a/pkg/services/ngalert/api/tooling/definitions/contact_points.go b/pkg/services/ngalert/api/tooling/definitions/contact_points.go index 238e65bce61..6fecda18fe5 100644 --- a/pkg/services/ngalert/api/tooling/definitions/contact_points.go +++ b/pkg/services/ngalert/api/tooling/definitions/contact_points.go @@ -85,6 +85,19 @@ type LineIntegration struct { Description *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"` } +type MqttIntegration struct { + DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"` + + BrokerURL *string `json:"brokerUrl,omitempty" yaml:"brokerUrl,omitempty" hcl:"broker_url"` + ClientID *string `json:"clientId,omitempty" yaml:"clientId,omitempty" hcl:"client_id"` + Topic *string `json:"topic,omitempty" yaml:"topic,omitempty" hcl:"topic"` + Message *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"` + MessageFormat *string `json:"messageFormat,omitempty" yaml:"messageFormat,omitempty" hcl:"message_format"` + Username *string `json:"username,omitempty" yaml:"username,omitempty" hcl:"username"` + Password *Secret `json:"password,omitempty" yaml:"password,omitempty" hcl:"password"` + InsecureSkipVerify *bool `json:"insecureSkipVerify,omitempty" yaml:"insecureSkipVerify,omitempty" hcl:"insecure_skip_verify"` +} + type OnCallIntegration struct { DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"` @@ -299,6 +312,7 @@ type ContactPoint struct { Googlechat []GooglechatIntegration `json:"googlechat" yaml:"googlechat" hcl:"googlechat,block"` Kafka []KafkaIntegration `json:"kafka" yaml:"kafka" hcl:"kafka,block"` Line []LineIntegration `json:"line" yaml:"line" hcl:"line,block"` + Mqtt []MqttIntegration `json:"mqtt" yaml:"mqtt" hcl:"mqtt,block"` Opsgenie []OpsgenieIntegration `json:"opsgenie" yaml:"opsgenie" hcl:"opsgenie,block"` Pagerduty []PagerdutyIntegration `json:"pagerduty" yaml:"pagerduty" hcl:"pagerduty,block"` OnCall []OnCallIntegration `json:"oncall" yaml:"oncall" hcl:"oncall,block"` diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go index 5681a376cef..d38cb17e2e7 100644 --- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go +++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go @@ -156,6 +156,7 @@ type ProvisionedAlertRule struct { // required: true ExecErrState ExecutionErrorState `json:"execErrState"` // required: true + // swagger:strfmt duration For model.Duration `json:"for"` // example: {"runbook_url": "https://supercoolrunbook.com/page/13"} Annotations map[string]string `json:"annotations,omitempty"` @@ -258,15 +259,15 @@ type AlertRuleGroupExport struct { // AlertRuleExport is the provisioned file export of models.AlertRule. type AlertRuleExport struct { - UID string `json:"uid,omitempty" yaml:"uid,omitempty"` - Title string `json:"title" yaml:"title" hcl:"name"` - Condition string `json:"condition" yaml:"condition" hcl:"condition"` - Data []AlertQueryExport `json:"data" yaml:"data" hcl:"data,block"` - DashboardUID *string `json:"dashboardUid,omitempty" yaml:"dashboardUid,omitempty"` - PanelID *int64 `json:"panelId,omitempty" yaml:"panelId,omitempty"` - NoDataState NoDataState `json:"noDataState" yaml:"noDataState" hcl:"no_data_state"` - ExecErrState ExecutionErrorState `json:"execErrState" yaml:"execErrState" hcl:"exec_err_state"` - For model.Duration `json:"for" yaml:"for"` + UID string `json:"uid,omitempty" yaml:"uid,omitempty"` + Title string `json:"title" yaml:"title" hcl:"name"` + Condition *string `json:"condition,omitempty" yaml:"condition,omitempty" hcl:"condition"` + Data []AlertQueryExport `json:"data" yaml:"data" hcl:"data,block"` + DashboardUID *string `json:"dashboardUid,omitempty" yaml:"dashboardUid,omitempty"` + PanelID *int64 `json:"panelId,omitempty" yaml:"panelId,omitempty"` + NoDataState *NoDataState `json:"noDataState,omitempty" yaml:"noDataState,omitempty" hcl:"no_data_state"` + ExecErrState *ExecutionErrorState `json:"execErrState,omitempty" yaml:"execErrState,omitempty" hcl:"exec_err_state"` + For model.Duration `json:"for,omitempty" yaml:"for,omitempty"` // ForString is used to: // - Only export the for field for HCL if it is non-zero. // - Format the Prometheus model.Duration type properly for HCL. @@ -275,7 +276,7 @@ type AlertRuleExport struct { Labels *map[string]string `json:"labels,omitempty" yaml:"labels,omitempty" hcl:"labels"` IsPaused bool `json:"isPaused" yaml:"isPaused" hcl:"is_paused"` NotificationSettings *AlertRuleNotificationSettingsExport `json:"notification_settings,omitempty" yaml:"notification_settings,omitempty" hcl:"notification_settings,block"` - Record *AlertRuleRecordExport `json:"record,omitempty" yaml:"record,omitempty" hcl:"record"` + Record *AlertRuleRecordExport `json:"record,omitempty" yaml:"record,omitempty" hcl:"record,block"` } // AlertQueryExport is the provisioned export of models.AlertQuery. diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go index 3aa945af048..4710d3b3a92 100644 --- a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go +++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go @@ -70,7 +70,7 @@ import ( // Responses: // 202: MuteTimeInterval // 400: ValidationError -// 409: GenericPublicError +// 409: PublicError // swagger:route DELETE /v1/provisioning/mute-timings/{name} provisioning stable RouteDeleteMuteTiming // @@ -78,7 +78,7 @@ import ( // // Responses: // 204: description: The mute timing was deleted successfully. -// 409: GenericPublicError +// 409: PublicError // swagger:route diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go index b854a1132c6..f83817f7d90 100644 --- a/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go +++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go @@ -13,7 +13,7 @@ package definitions // // Responses: // 200: NotificationTemplate -// 404: GenericPublicError +// 404: PublicError // swagger:route PUT /v1/provisioning/templates/{name} provisioning stable RoutePutTemplate // @@ -24,8 +24,8 @@ package definitions // // Responses: // 202: NotificationTemplate -// 400: GenericPublicError -// 409: GenericPublicError +// 400: PublicError +// 409: PublicError // swagger:route DELETE /v1/provisioning/templates/{name} provisioning stable RouteDeleteTemplate // @@ -33,7 +33,7 @@ package definitions // // Responses: // 204: description: The template was deleted successfully. -// 409: GenericPublicError +// 409: PublicError // swagger:parameters RouteGetTemplate RoutePutTemplate RouteDeleteTemplate type RouteGetTemplateParam struct { @@ -55,6 +55,7 @@ type RouteDeleteTemplateParam struct { // swagger:model type NotificationTemplate struct { + UID string `json:"-" yaml:"-"` Name string `json:"name"` Template string `json:"template"` Provenance Provenance `json:"provenance,omitempty"` diff --git a/pkg/services/ngalert/api/tooling/definitions/shared.go b/pkg/services/ngalert/api/tooling/definitions/shared.go index 2f0e3ddf803..9948ed83168 100644 --- a/pkg/services/ngalert/api/tooling/definitions/shared.go +++ b/pkg/services/ngalert/api/tooling/definitions/shared.go @@ -11,7 +11,7 @@ type Ack struct{} // swagger:model type ValidationError struct { // example: error message - Msg string `json:"msg"` + Message string `json:"message"` } // swagger:model @@ -20,10 +20,3 @@ type ForbiddenError struct { // in: body Body errutil.PublicError `json:"body"` } - -// swagger:model -type GenericPublicError struct { - // The response message - // in: body - Body errutil.PublicError `json:"body"` -} diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json index 91d33d799c2..4371f639744 100644 --- a/pkg/services/ngalert/api/tooling/post.json +++ b/pkg/services/ngalert/api/tooling/post.json @@ -1315,14 +1315,6 @@ "title": "Frames is a slice of Frame pointers.", "type": "array" }, - "GenericPublicError": { - "properties": { - "body": { - "$ref": "#/definitions/PublicError" - } - }, - "type": "object" - }, "GettableAlertmanagers": { "properties": { "data": { @@ -2960,7 +2952,8 @@ "type": "string" }, "for": { - "$ref": "#/definitions/Duration" + "format": "duration", + "type": "string" }, "id": { "format": "int64", @@ -4316,7 +4309,6 @@ "type": "object" }, "URL": { - "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nThe Host field contains the host and port subcomponents of the URL.\nWhen the port is present, it is separated from the host with a colon.\nWhen the host is an IPv6 address, it must be enclosed in square brackets:\n\"[fe80::1]:80\". The [net.JoinHostPort] function combines a host and port\ninto a string suitable for the Host field, adding square brackets to\nthe host when necessary.\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the [URL.EscapedPath] method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.", "properties": { "ForceQuery": { "type": "boolean" @@ -4352,7 +4344,7 @@ "$ref": "#/definitions/Userinfo" } }, - "title": "A URL represents a parsed URL (technically, a URI reference).", + "title": "URL is a custom URL type that allows validation at configuration load time.", "type": "object" }, "UpdateRuleGroupResponse": { @@ -4387,7 +4379,7 @@ }, "ValidationError": { "properties": { - "msg": { + "message": { "example": "error message", "type": "string" } @@ -8130,9 +8122,9 @@ "description": " The mute timing was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -8208,9 +8200,9 @@ } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -8422,9 +8414,9 @@ "description": " The template was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -8452,9 +8444,9 @@ } }, "404": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, @@ -8497,15 +8489,15 @@ } }, "400": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } }, diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json index 45a9fe74bb5..61e5ec742aa 100644 --- a/pkg/services/ngalert/api/tooling/spec.json +++ b/pkg/services/ngalert/api/tooling/spec.json @@ -3086,9 +3086,9 @@ } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -3125,9 +3125,9 @@ "description": " The mute timing was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -3343,9 +3343,9 @@ } }, "404": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -3389,15 +3389,15 @@ } }, "400": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -3429,9 +3429,9 @@ "description": " The template was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -4947,14 +4947,6 @@ "$ref": "#/definitions/Frame" } }, - "GenericPublicError": { - "type": "object", - "properties": { - "body": { - "$ref": "#/definitions/PublicError" - } - } - }, "GettableAlertmanagers": { "type": "object", "properties": { @@ -6605,7 +6597,8 @@ "example": "project_x" }, "for": { - "$ref": "#/definitions/Duration" + "type": "string", + "format": "duration" }, "id": { "type": "integer", @@ -7949,9 +7942,8 @@ } }, "URL": { - "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nThe Host field contains the host and port subcomponents of the URL.\nWhen the port is present, it is separated from the host with a colon.\nWhen the host is an IPv6 address, it must be enclosed in square brackets:\n\"[fe80::1]:80\". The [net.JoinHostPort] function combines a host and port\ninto a string suitable for the Host field, adding square brackets to\nthe host when necessary.\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the [URL.EscapedPath] method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.", "type": "object", - "title": "A URL represents a parsed URL (technically, a URI reference).", + "title": "URL is a custom URL type that allows validation at configuration load time.", "properties": { "ForceQuery": { "type": "boolean" @@ -8021,7 +8013,7 @@ "ValidationError": { "type": "object", "properties": { - "msg": { + "message": { "type": "string", "example": "error message" } diff --git a/pkg/services/ngalert/api/util.go b/pkg/services/ngalert/api/util.go index 6c320715d19..e62582b4b65 100644 --- a/pkg/services/ngalert/api/util.go +++ b/pkg/services/ngalert/api/util.go @@ -212,8 +212,9 @@ func messageExtractor(resp *response.NormalResponse) (any, error) { // ErrorResp creates a response with a visible error func ErrResp(status int, err error, msg string, args ...any) *response.NormalResponse { if msg != "" { - formattedMsg := fmt.Sprintf(msg, args...) - err = fmt.Errorf("%s: %w", formattedMsg, err) + msg += ": %w" + args = append(args, err) + err = fmt.Errorf(msg, args...) } return response.Error(status, err.Error(), err) } diff --git a/pkg/services/ngalert/models/receivers.go b/pkg/services/ngalert/models/receivers.go index ec6b11d1363..239eec4bc4f 100644 --- a/pkg/services/ngalert/models/receivers.go +++ b/pkg/services/ngalert/models/receivers.go @@ -1,6 +1,21 @@ package models -import "github.com/grafana/alerting/notify" +import ( + "context" + "encoding/binary" + "encoding/json" + "errors" + "fmt" + "hash/fnv" + "maps" + "math" + "sort" + "unsafe" + + alertingNotify "github.com/grafana/alerting/notify" + + "github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config" +) // GetReceiverQuery represents a query for a single receiver. type GetReceiverQuery struct { @@ -30,15 +45,430 @@ type ListReceiversQuery struct { type Receiver struct { UID string Name string - Integrations []*notify.GrafanaIntegrationConfig + Integrations []*Integration Provenance Provenance + Version string } +func (r *Receiver) Clone() Receiver { + clone := Receiver{ + UID: r.UID, + Name: r.Name, + Provenance: r.Provenance, + Version: r.Version, + } + + if r.Integrations != nil { + clone.Integrations = make([]*Integration, len(r.Integrations)) + for i, integration := range r.Integrations { + cloneIntegration := integration.Clone() + clone.Integrations[i] = &cloneIntegration + } + } + return clone +} + +// Encrypt encrypts all integrations. +func (r *Receiver) Encrypt(encryptFn EncryptFn) error { + for _, integration := range r.Integrations { + if err := integration.Encrypt(encryptFn); err != nil { + return err + } + } + return nil +} + +// Decrypt decrypts all integrations. +func (r *Receiver) Decrypt(decryptFn DecryptFn) error { + var errs []error + for _, integration := range r.Integrations { + if err := integration.Decrypt(decryptFn); err != nil { + errs = append(errs, fmt.Errorf("failed to decrypt integration %s: %w", integration.UID, err)) + } + } + return errors.Join(errs...) +} + +// Redact redacts all integrations. +func (r *Receiver) Redact(redactFn RedactFn) { + for _, integration := range r.Integrations { + integration.Redact(redactFn) + } +} + +// WithExistingSecureFields copies secure settings from an existing receivers for each integration. Which fields to copy +// is determined by the integrationSecureFields map, which contains a list of secure fields for each integration UID. +func (r *Receiver) WithExistingSecureFields(existing *Receiver, integrationSecureFields map[string][]string) { + existingIntegrations := make(map[string]*Integration, len(existing.Integrations)) + for _, integration := range existing.Integrations { + existingIntegrations[integration.UID] = integration + } + + for _, integration := range r.Integrations { + if integration.UID == "" { + // This is a new integration, so we don't need to copy any secure fields. + continue + } + fields := integrationSecureFields[integration.UID] + if len(fields) > 0 { + integration.WithExistingSecureFields(existingIntegrations[integration.UID], fields) + } + } +} + +// Validate validates all integration settings, ensuring that the integrations are correctly configured. +func (r *Receiver) Validate(decryptFn DecryptFn) error { + var errs []error + for _, integration := range r.Integrations { + if err := integration.Validate(decryptFn); err != nil { + errs = append(errs, err) + } + } + return errors.Join(errs...) +} + +// Integration is the domain model representation of an integration. +type Integration struct { + UID string + Name string + Config IntegrationConfig + DisableResolveMessage bool + // Settings can contain both secure and non-secure settings either unencrypted or redacted. + Settings map[string]any + // SecureSettings can contain only secure settings either encrypted or redacted. + SecureSettings map[string]string +} + +// IntegrationConfig represents the configuration of an integration. It contains the type and information about the fields. +type IntegrationConfig struct { + Type string + Fields map[string]IntegrationField +} + +// IntegrationField represents a field in an integration configuration. +type IntegrationField struct { + Name string + Secure bool +} + +// IntegrationConfigFromType returns an integration configuration for a given integration type. If the integration type is +// not found an error is returned. +func IntegrationConfigFromType(integrationType string) (IntegrationConfig, error) { + config, err := channels_config.ConfigForIntegrationType(integrationType) + if err != nil { + return IntegrationConfig{}, err + } + + integrationConfig := IntegrationConfig{Type: config.Type, Fields: make(map[string]IntegrationField, len(config.Options))} + for _, option := range config.Options { + integrationConfig.Fields[option.PropertyName] = IntegrationField{ + Name: option.PropertyName, + Secure: option.Secure, + } + } + return integrationConfig, nil +} + +// IsSecureField returns true if the field is both known and marked as secure in the integration configuration. +func (config *IntegrationConfig) IsSecureField(field string) bool { + if config.Fields != nil { + if f, ok := config.Fields[field]; ok { + return f.Secure + } + } + return false +} + +func (config *IntegrationConfig) Clone() IntegrationConfig { + clone := IntegrationConfig{ + Type: config.Type, + } + + if len(config.Fields) > 0 { + clone.Fields = make(map[string]IntegrationField, len(config.Fields)) + for key, field := range config.Fields { + clone.Fields[key] = field.Clone() + } + } + return clone +} + +func (field *IntegrationField) Clone() IntegrationField { + return IntegrationField{ + Name: field.Name, + Secure: field.Secure, + } +} + +func (integration *Integration) Clone() Integration { + return Integration{ + UID: integration.UID, + Name: integration.Name, + Config: integration.Config.Clone(), + DisableResolveMessage: integration.DisableResolveMessage, + Settings: maps.Clone(integration.Settings), + SecureSettings: maps.Clone(integration.SecureSettings), + } +} + +// Encrypt encrypts all fields in Settings that are marked as secure in the integration configuration. The encrypted values +// are stored in SecureSettings and the original values are removed from Settings. +// If a field is already in SecureSettings it is not encrypted again. +func (integration *Integration) Encrypt(encryptFn EncryptFn) error { + var errs []error + for key, val := range integration.Settings { + if isSecureField := integration.Config.IsSecureField(key); !isSecureField { + continue + } + + delete(integration.Settings, key) + unencryptedSecureValue, isString := val.(string) + if !isString { + continue + } + + if _, exists := integration.SecureSettings[key]; exists { + continue + } + + encrypted, err := encryptFn(unencryptedSecureValue) + if err != nil { + errs = append(errs, fmt.Errorf("failed to encrypt secure setting '%s': %w", key, err)) + } + + integration.SecureSettings[key] = encrypted + } + + return errors.Join(errs...) +} + +// Decrypt decrypts all fields in SecureSettings and moves them to Settings. +// The original values are removed from SecureSettings. +func (integration *Integration) Decrypt(decryptFn DecryptFn) error { + var errs []error + for key, secureVal := range integration.SecureSettings { + decrypted, err := decryptFn(secureVal) + if err != nil { + errs = append(errs, fmt.Errorf("failed to decrypt secure setting '%s': %w", key, err)) + } + delete(integration.SecureSettings, key) + integration.Settings[key] = decrypted + } + + return errors.Join(errs...) +} + +// Redact redacts all fields in SecureSettings and moves them to Settings. +// The original values are removed from SecureSettings. +func (integration *Integration) Redact(redactFn RedactFn) { + for key, secureVal := range integration.SecureSettings { // TODO: Should we trust that the receiver is stored correctly or use known secure settings? + integration.Settings[key] = redactFn(secureVal) + delete(integration.SecureSettings, key) + } + + // We don't trust that the receiver is stored correctly, so we redact secure fields in the settings as well. + for key, val := range integration.Settings { + if val != "" && integration.Config.IsSecureField(key) { + s, isString := val.(string) + if !isString { + continue + } + integration.Settings[key] = redactFn(s) + delete(integration.SecureSettings, key) + } + } +} + +// WithExistingSecureFields copies secure settings from an existing integration. Which fields to copy is determined by the +// fields slice. +// Any fields found in Settings or SecureSettings are removed, even if they don't appear in the existing integration. +func (integration *Integration) WithExistingSecureFields(existing *Integration, fields []string) { + // Now for each field marked as secure, we copy the value from the existing receiver. + for _, secureField := range fields { + delete(integration.Settings, secureField) // Ensure secure fields are removed from new settings and secure settings. + delete(integration.SecureSettings, secureField) + if existing != nil { + if existingVal, ok := existing.SecureSettings[secureField]; ok { + integration.SecureSettings[secureField] = existingVal + } + } + } +} + +// SecureFields returns a map of all secure fields in the integration. This includes fields in SecureSettings and fields +// in Settings that are marked as secure in the integration configuration. +func (integration *Integration) SecureFields() map[string]bool { + secureFields := make(map[string]bool, len(integration.SecureSettings)) + if len(integration.SecureSettings) > 0 { + for key := range integration.SecureSettings { + secureFields[key] = true + } + } + + // We mark secure fields in the settings as well. This is to ensure legacy behaviour for redacted secure settings. + for key, val := range integration.Settings { + if val != "" && integration.Config.IsSecureField(key) { + secureFields[key] = true + } + } + + return secureFields +} + +// Validate validates the integration settings, ensuring that the integration is correctly configured. +func (integration *Integration) Validate(decryptFn DecryptFn) error { + decrypted := integration.Clone() + if err := decrypted.Decrypt(decryptFn); err != nil { + return err + } + jsonBytes, err := json.Marshal(decrypted.Settings) + if err != nil { + return err + } + + return ValidateIntegration(context.Background(), alertingNotify.GrafanaIntegrationConfig{ + UID: decrypted.UID, + Name: decrypted.Name, + Type: decrypted.Config.Type, + DisableResolveMessage: decrypted.DisableResolveMessage, + Settings: jsonBytes, + SecureSettings: decrypted.SecureSettings, + }, alertingNotify.NoopDecrypt) +} + +func ValidateIntegration(ctx context.Context, integration alertingNotify.GrafanaIntegrationConfig, decryptFunc alertingNotify.GetDecryptedValueFn) error { + if integration.Type == "" { + return fmt.Errorf("type should not be an empty string") + } + if integration.Settings == nil { + return fmt.Errorf("settings should not be empty") + } + + _, err := alertingNotify.BuildReceiverConfiguration(ctx, &alertingNotify.APIReceiver{ + GrafanaIntegrations: alertingNotify.GrafanaIntegrations{ + Integrations: []*alertingNotify.GrafanaIntegrationConfig{&integration}, + }, + }, decryptFunc) + if err != nil { + return err + } + return nil +} + +type EncryptFn = func(string) (string, error) +type DecryptFn = func(string) (string, error) +type RedactFn = func(string) string + // Identified describes a class of resources that have a UID. Created to abstract required fields for authorization. type Identified interface { GetUID() string } -func (r Receiver) GetUID() string { +func (r *Receiver) GetUID() string { return r.UID } + +func (r *Receiver) Fingerprint() string { + sum := fnv.New64() + + writeBytes := func(b []byte) { + _, _ = sum.Write(b) + // add a byte sequence that cannot happen in UTF-8 strings. + _, _ = sum.Write([]byte{255}) + } + writeString := func(s string) { + if len(s) == 0 { + writeBytes(nil) + return + } + // #nosec G103 + // avoid allocation when converting string to byte slice + writeBytes(unsafe.Slice(unsafe.StringData(s), len(s))) + } + // this temp slice is used to convert ints to bytes. + tmp := make([]byte, 8) + writeInt := func(u int) { + binary.LittleEndian.PutUint64(tmp, uint64(u)) + writeBytes(tmp) + } + + writeIntegration := func(in *Integration) { + writeString(in.UID) + writeString(in.Name) + + // Do not include fields in fingerprint as these are not part of the receiver definition. + writeString(in.Config.Type) + + if in.DisableResolveMessage { + writeInt(1) + } else { + writeInt(0) + } + + // allocate a slice that will be used for sorting keys, so we allocate it only once + var keys []string + maxLen := int(math.Max(float64(len(in.Settings)), float64(len(in.SecureSettings)))) + if maxLen > 0 { + keys = make([]string, maxLen) + } + + writeSecureSettings := func(secureSettings map[string]string) { + // maps do not guarantee predictable sequence of keys. + // Therefore, to make hash stable, we need to sort keys + if len(secureSettings) == 0 { + return + } + idx := 0 + for k := range secureSettings { + keys[idx] = k + idx++ + } + sub := keys[:idx] + sort.Strings(sub) + for _, name := range sub { + writeString(name) + writeString(secureSettings[name]) + } + } + writeSecureSettings(in.SecureSettings) + + writeSettings := func(settings map[string]any) { + // maps do not guarantee predictable sequence of keys. + // Therefore, to make hash stable, we need to sort keys + if len(settings) == 0 { + return + } + idx := 0 + for k := range settings { + keys[idx] = k + idx++ + } + sub := keys[:idx] + sort.Strings(sub) + for _, name := range sub { + writeString(name) + + // TODO: Improve this. + v := settings[name] + bytes, err := json.Marshal(v) + if err != nil { + writeString(fmt.Sprintf("%+v", v)) + } else { + writeBytes(bytes) + } + } + } + writeSettings(in.Settings) + } + + // fields that determine the rule state + writeString(r.UID) + writeString(r.Name) + writeString(string(r.Provenance)) + + for _, integration := range r.Integrations { + writeIntegration(integration) + } + + return fmt.Sprintf("%016x", sum.Sum64()) +} diff --git a/pkg/services/ngalert/models/receivers_test.go b/pkg/services/ngalert/models/receivers_test.go new file mode 100644 index 00000000000..8f99166e2aa --- /dev/null +++ b/pkg/services/ngalert/models/receivers_test.go @@ -0,0 +1,399 @@ +package models + +import ( + "reflect" + "testing" + + alertingNotify "github.com/grafana/alerting/notify" + "github.com/stretchr/testify/assert" + + "github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config" +) + +func TestReceiver_Clone(t *testing.T) { + testCases := []struct { + name string + receiver Receiver + }{ + {name: "empty receiver", receiver: Receiver{}}, + {name: "empty integration", receiver: Receiver{Integrations: []*Integration{{Config: IntegrationConfig{}}}}}, + {name: "random receiver", receiver: ReceiverGen()()}, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + receiverClone := tc.receiver.Clone() + assert.Equal(t, tc.receiver, receiverClone) + + for _, integration := range tc.receiver.Integrations { + integrationClone := integration.Clone() + assert.Equal(t, *integration, integrationClone) + } + }) + } +} + +func TestReceiver_EncryptDecrypt(t *testing.T) { + encryptFn := Base64Enrypt + decryptnFn := Base64Decrypt + // Test that all known integration types encrypt and decrypt their secrets. + for integrationType := range alertingNotify.AllKnownConfigsForTesting { + t.Run(integrationType, func(t *testing.T) { + decrypedIntegration := IntegrationGen(IntegrationMuts.WithValidConfig(integrationType))() + + encrypted := decrypedIntegration.Clone() + secrets, err := channels_config.GetSecretKeysForContactPointType(integrationType) + assert.NoError(t, err) + for _, key := range secrets { + if val, ok := encrypted.Settings[key]; ok { + if s, isString := val.(string); isString { + encryptedVal, err := encryptFn(s) + assert.NoError(t, err) + encrypted.SecureSettings[key] = encryptedVal + delete(encrypted.Settings, key) + } + } + } + + testIntegration := decrypedIntegration.Clone() + err = testIntegration.Encrypt(encryptFn) + assert.NoError(t, err) + assert.Equal(t, encrypted, testIntegration) + + err = testIntegration.Decrypt(decryptnFn) + assert.NoError(t, err) + assert.Equal(t, decrypedIntegration, testIntegration) + }) + } +} + +func TestIntegration_Redact(t *testing.T) { + redactFn := func(key string) string { + return "TESTREDACTED" + } + // Test that all known integration types redact their secrets. + for integrationType := range alertingNotify.AllKnownConfigsForTesting { + t.Run(integrationType, func(t *testing.T) { + validIntegration := IntegrationGen(IntegrationMuts.WithValidConfig(integrationType))() + + expected := validIntegration.Clone() + secrets, err := channels_config.GetSecretKeysForContactPointType(integrationType) + assert.NoError(t, err) + for _, key := range secrets { + if val, ok := expected.Settings[key]; ok { + if s, isString := val.(string); isString && s != "" { + expected.Settings[key] = redactFn(s) + delete(expected.SecureSettings, key) + } + } + } + + validIntegration.Redact(redactFn) + + assert.Equal(t, expected, validIntegration) + }) + } +} + +func TestIntegration_Validate(t *testing.T) { + // Test that all known integration types are valid. + for integrationType := range alertingNotify.AllKnownConfigsForTesting { + t.Run(integrationType, func(t *testing.T) { + validIntegration := IntegrationGen(IntegrationMuts.WithValidConfig(integrationType))() + assert.NoError(t, validIntegration.Encrypt(Base64Enrypt)) + assert.NoErrorf(t, validIntegration.Validate(Base64Decrypt), "integration should be valid") + + invalidIntegration := IntegrationGen(IntegrationMuts.WithInvalidConfig(integrationType))() + assert.NoError(t, invalidIntegration.Encrypt(Base64Enrypt)) + assert.Errorf(t, invalidIntegration.Validate(Base64Decrypt), "integration should be invalid") + }) + } +} + +func TestIntegration_WithExistingSecureFields(t *testing.T) { + // Test that WithExistingSecureFields will copy over the secure fields from the existing integration. + testCases := []struct { + name string + integration Integration + secureFields []string + existing Integration + expected Integration + }{ + { + name: "test receiver", + integration: Integration{ + SecureSettings: map[string]string{ + "f1": "newVal1", + "f2": "newVal2", + "f3": "newVal3", + "f5": "newVal5", + }, + }, + secureFields: []string{"f2", "f4", "f5"}, + existing: Integration{ + SecureSettings: map[string]string{ + "f1": "oldVal1", + "f2": "oldVal2", + "f3": "oldVal3", + "f4": "oldVal4", + }, + }, + expected: Integration{ + SecureSettings: map[string]string{ + "f1": "newVal1", + "f2": "oldVal2", + "f3": "newVal3", + "f4": "oldVal4", + }, + }, + }, + { + name: "Integration[exists], SecureFields[true], Existing[exists]: old value", + integration: Integration{ + SecureSettings: map[string]string{"f1": "newVal1"}, + }, + secureFields: []string{"f1"}, + existing: Integration{SecureSettings: map[string]string{"f1": "oldVal1"}}, + expected: Integration{SecureSettings: map[string]string{"f1": "oldVal1"}}, + }, + { + name: "Integration[exists], SecureFields[true], Existing[missing]: no value", + integration: Integration{ + SecureSettings: map[string]string{"f1": "newVal1"}, + }, + secureFields: []string{"f1"}, + existing: Integration{SecureSettings: map[string]string{}}, + expected: Integration{SecureSettings: map[string]string{}}, + }, + + { + name: "Integration[exists], SecureFields[false], Existing[exists]: new value", + integration: Integration{ + SecureSettings: map[string]string{"f1": "newVal1"}, + }, + existing: Integration{SecureSettings: map[string]string{"f1": "oldVal1"}}, + expected: Integration{SecureSettings: map[string]string{"f1": "newVal1"}}, + }, + { + name: "Integration[exists], SecureFields[false], Existing[missing]: new value", + integration: Integration{ + SecureSettings: map[string]string{"f1": "newVal1"}, + }, + existing: Integration{SecureSettings: map[string]string{}}, + expected: Integration{SecureSettings: map[string]string{"f1": "newVal1"}}, + }, + + { + name: "Integration[missing], SecureFields[true], Existing[exists]: old value", + integration: Integration{ + SecureSettings: map[string]string{}, + }, + secureFields: []string{"f1"}, + existing: Integration{SecureSettings: map[string]string{"f1": "oldVal1"}}, + expected: Integration{SecureSettings: map[string]string{"f1": "oldVal1"}}, + }, + { + name: "Integration[missing], SecureFields[true], Existing[missing]: no value", + integration: Integration{ + SecureSettings: map[string]string{}, + }, + secureFields: []string{"f1"}, + existing: Integration{SecureSettings: map[string]string{}}, + expected: Integration{SecureSettings: map[string]string{}}, + }, + + { + name: "Integration[missing], SecureFields[false], Existing[exists]: no value", + integration: Integration{ + SecureSettings: map[string]string{}, + }, + existing: Integration{SecureSettings: map[string]string{"f1": "oldVal1"}}, + expected: Integration{SecureSettings: map[string]string{}}, + }, + { + name: "Integration[missing], SecureFields[false], Existing[missing]: no value", + integration: Integration{ + SecureSettings: map[string]string{}, + }, + existing: Integration{SecureSettings: map[string]string{}}, + expected: Integration{SecureSettings: map[string]string{}}, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + tc.integration.WithExistingSecureFields(&tc.existing, tc.secureFields) + assert.Equal(t, tc.expected, tc.integration) + }) + } +} + +func TestIntegrationConfig(t *testing.T) { + // Test that all known integration types have a config and correctly mark their secrets as secure. + for integrationType := range alertingNotify.AllKnownConfigsForTesting { + t.Run(integrationType, func(t *testing.T) { + config, err := IntegrationConfigFromType(integrationType) + assert.NoError(t, err) + + secrets, err := channels_config.GetSecretKeysForContactPointType(integrationType) + assert.NoError(t, err) + allSecrets := make(map[string]struct{}, len(secrets)) + for _, key := range secrets { + allSecrets[key] = struct{}{} + } + + for field := range config.Fields { + _, isSecret := allSecrets[field] + assert.Equal(t, isSecret, config.IsSecureField(field)) + } + assert.False(t, config.IsSecureField("__--**unknown_field**--__")) + }) + } + + t.Run("Unknown type returns error", func(t *testing.T) { + _, err := IntegrationConfigFromType("__--**unknown_type**--__") + assert.Error(t, err) + }) +} + +func TestIntegration_SecureFields(t *testing.T) { + // Test that all known integration types have a config and correctly mark their secrets as secure. + for integrationType := range alertingNotify.AllKnownConfigsForTesting { + t.Run(integrationType, func(t *testing.T) { + t.Run("contains SecureSettings", func(t *testing.T) { + validIntegration := IntegrationGen(IntegrationMuts.WithValidConfig(integrationType))() + expected := make(map[string]bool, len(validIntegration.SecureSettings)) + for field := range validIntegration.Config.Fields { + if validIntegration.Config.IsSecureField(field) { + expected[field] = true + validIntegration.SecureSettings[field] = "test" + delete(validIntegration.Settings, field) + } + } + assert.Equal(t, expected, validIntegration.SecureFields()) + }) + + t.Run("contains secret Settings not in SecureSettings", func(t *testing.T) { + validIntegration := IntegrationGen(IntegrationMuts.WithValidConfig(integrationType))() + expected := make(map[string]bool, len(validIntegration.SecureSettings)) + for field := range validIntegration.Config.Fields { + if validIntegration.Config.IsSecureField(field) { + expected[field] = true + validIntegration.Settings[field] = "test" + delete(validIntegration.SecureSettings, field) + } + } + assert.Equal(t, expected, validIntegration.SecureFields()) + }) + }) + } +} + +// This is a broken type that will error if marshalled. +type broken struct { + f1 string +} + +func (b broken) MarshalJSON() ([]byte, error) { + return nil, assert.AnError +} + +func TestReceiver_Fingerprint(t *testing.T) { + // Test that the fingerprint is stable. + im := IntegrationMuts + baseReceiver := ReceiverGen(ReceiverMuts.WithName("test receiver"), ReceiverMuts.WithIntegrations( + IntegrationGen(im.WithName("test receiver"), im.WithValidConfig("slack"))(), + ))() + baseReceiver.Integrations[0].UID = "stable UID" + baseReceiver.Integrations[0].DisableResolveMessage = true + baseReceiver.Integrations[0].SecureSettings = map[string]string{"test2": "test2"} + baseReceiver.Integrations[0].Settings["broken"] = broken{f1: "this"} // Add a broken type to ensure it is stable in the fingerprint. + baseReceiver.Integrations[0].Config = IntegrationConfig{Type: baseReceiver.Integrations[0].Config.Type} // Remove all fields except Type. + + completelyDifferentReceiver := ReceiverGen(ReceiverMuts.WithName("test receiver2"), ReceiverMuts.WithIntegrations( + IntegrationGen(im.WithName("test receiver2"), im.WithValidConfig("discord"))(), + ))() + completelyDifferentReceiver.Integrations[0].UID = "stable UID2" + completelyDifferentReceiver.Integrations[0].DisableResolveMessage = false + completelyDifferentReceiver.Integrations[0].SecureSettings = map[string]string{"test": "test"} + completelyDifferentReceiver.Provenance = ProvenanceAPI + completelyDifferentReceiver.Integrations[0].Config = IntegrationConfig{Type: completelyDifferentReceiver.Integrations[0].Config.Type} // Remove all fields except Type. + + t.Run("stable across code changes", func(t *testing.T) { + expectedFingerprint := "ae141b582965f4f5" // If this is a valid fingerprint generation change, update the expected value. + assert.Equal(t, expectedFingerprint, baseReceiver.Fingerprint()) + }) + t.Run("stable across clones", func(t *testing.T) { + fingerprint := baseReceiver.Fingerprint() + receiverClone := baseReceiver.Clone() + assert.Equal(t, fingerprint, receiverClone.Fingerprint()) + }) + t.Run("stable across Version field modification", func(t *testing.T) { + fingerprint := baseReceiver.Fingerprint() + receiverClone := baseReceiver.Clone() + receiverClone.Version = "new version" + assert.Equal(t, fingerprint, receiverClone.Fingerprint()) + }) + t.Run("unstable across field modification", func(t *testing.T) { + fingerprint := baseReceiver.Fingerprint() + excludedFields := map[string]struct{}{ + "Version": {}, + } + + reflectVal := reflect.ValueOf(&completelyDifferentReceiver).Elem() + + receiverType := reflect.TypeOf((*Receiver)(nil)).Elem() + for i := 0; i < receiverType.NumField(); i++ { + field := receiverType.Field(i).Name + if _, ok := excludedFields[field]; ok { + continue + } + cp := baseReceiver.Clone() + + // Get the current field being modified. + v := reflect.ValueOf(&cp).Elem() + vf := v.Field(i) + + otherField := reflectVal.Field(i) + if reflect.DeepEqual(otherField.Interface(), vf.Interface()) { + assert.Failf(t, "filds are identical", "Receiver field %s is the same as the original, test does not ensure instability across the field", field) + continue + } + + // Set the field to the value of the completelyDifferentReceiver. + vf.Set(otherField) + + f2 := cp.Fingerprint() + assert.NotEqualf(t, fingerprint, f2, "Receiver field %s does not seem to be used in fingerprint", field) + } + + excludedFields = map[string]struct{}{} + + reflectVal = reflect.ValueOf(completelyDifferentReceiver.Integrations[0]).Elem() + integrationType := reflect.TypeOf((*Integration)(nil)).Elem() + for i := 0; i < integrationType.NumField(); i++ { + field := integrationType.Field(i).Name + if _, ok := excludedFields[field]; ok { + continue + } + cp := baseReceiver.Clone() + integrationCp := cp.Integrations[0] + + // Get the current field being modified. + v := reflect.ValueOf(integrationCp).Elem() + vf := v.Field(i) + + otherField := reflectVal.Field(i) + if reflect.DeepEqual(otherField.Interface(), vf.Interface()) { + assert.Failf(t, "filds are identical", "Integration field %s is the same as the original, test does not ensure instability across the field", field) + continue + } + + // Set the field to the value of the completelyDifferentReceiver. + vf.Set(otherField) + + f2 := cp.Fingerprint() + assert.NotEqualf(t, fingerprint, f2, "Integration field %s does not seem to be used in fingerprint", field) + } + }) +} diff --git a/pkg/services/ngalert/models/testing.go b/pkg/services/ngalert/models/testing.go index f3281f83af8..32763c06891 100644 --- a/pkg/services/ngalert/models/testing.go +++ b/pkg/services/ngalert/models/testing.go @@ -1,6 +1,7 @@ package models import ( + "encoding/base64" "encoding/json" "fmt" "math/rand" @@ -10,11 +11,13 @@ import ( "time" "github.com/go-openapi/strfmt" + alertingNotify "github.com/grafana/alerting/notify" "github.com/grafana/grafana-plugin-sdk-go/data" amv2 "github.com/prometheus/alertmanager/api/v2/models" "github.com/prometheus/alertmanager/pkg/labels" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" + "golang.org/x/exp/maps" alertingModels "github.com/grafana/alerting/models" @@ -1092,6 +1095,220 @@ func (n SilenceMutators) WithEmptyId() Mutator[Silence] { } } +// Receivers + +// CopyReceiverWith creates a deep copy of Receiver and then applies mutators to it. +func CopyReceiverWith(r Receiver, mutators ...Mutator[Receiver]) Receiver { + c := r.Clone() + for _, mutator := range mutators { + mutator(&c) + } + c.Version = c.Fingerprint() + return c +} + +// ReceiverGen generates Receiver using a base and mutators. +func ReceiverGen(mutators ...Mutator[Receiver]) func() Receiver { + return func() Receiver { + name := util.GenerateShortUID() + integration := IntegrationGen(IntegrationMuts.WithName(name))() + c := Receiver{ + UID: nameToUid(name), + Name: name, + Integrations: []*Integration{&integration}, + Provenance: ProvenanceNone, + } + for _, mutator := range mutators { + mutator(&c) + } + c.Version = c.Fingerprint() + return c + } +} + +var ( + ReceiverMuts = ReceiverMutators{} +) + +type ReceiverMutators struct{} + +func (n ReceiverMutators) WithName(name string) Mutator[Receiver] { + return func(r *Receiver) { + r.Name = name + r.UID = nameToUid(name) + } +} + +func (n ReceiverMutators) WithProvenance(provenance Provenance) Mutator[Receiver] { + return func(r *Receiver) { + r.Provenance = provenance + } +} + +func (n ReceiverMutators) WithValidIntegration(integrationType string) Mutator[Receiver] { + return func(r *Receiver) { + integration := IntegrationGen(IntegrationMuts.WithValidConfig(integrationType))() + r.Integrations = []*Integration{&integration} + } +} + +func (n ReceiverMutators) WithInvalidIntegration(integrationType string) Mutator[Receiver] { + return func(r *Receiver) { + integration := IntegrationGen(IntegrationMuts.WithInvalidConfig(integrationType))() + r.Integrations = []*Integration{&integration} + } +} + +func (n ReceiverMutators) WithIntegrations(integration ...Integration) Mutator[Receiver] { + return func(r *Receiver) { + integrations := make([]*Integration, len(integration)) + for i, v := range integration { + clone := v.Clone() + integrations[i] = &clone + } + r.Integrations = integrations + } +} + +func (n ReceiverMutators) Encrypted(fn EncryptFn) Mutator[Receiver] { + return func(r *Receiver) { + _ = r.Encrypt(fn) + } +} +func (n ReceiverMutators) Decrypted(fn DecryptFn) Mutator[Receiver] { + return func(r *Receiver) { + _ = r.Decrypt(fn) + } +} + +// Integrations + +// CopyIntegrationWith creates a deep copy of Integration and then applies mutators to it. +func CopyIntegrationWith(r Integration, mutators ...Mutator[Integration]) Integration { + c := r.Clone() + for _, mutator := range mutators { + mutator(&c) + } + return c +} + +// IntegrationGen generates Integration using a base and mutators. +func IntegrationGen(mutators ...Mutator[Integration]) func() Integration { + return func() Integration { + name := util.GenerateShortUID() + randomIntegrationType, _ := randomMapKey(alertingNotify.AllKnownConfigsForTesting) + + c := Integration{ + UID: util.GenerateShortUID(), + Name: name, + DisableResolveMessage: rand.Intn(2) == 1, + Settings: make(map[string]any), + SecureSettings: make(map[string]string), + } + + IntegrationMuts.WithValidConfig(randomIntegrationType)(&c) + + for _, mutator := range mutators { + mutator(&c) + } + return c + } +} + +var ( + IntegrationMuts = IntegrationMutators{} + Base64Enrypt = func(s string) (string, error) { + return base64.StdEncoding.EncodeToString([]byte(s)), nil + } + Base64Decrypt = func(s string) (string, error) { + b, err := base64.StdEncoding.DecodeString(s) + return string(b), err + } +) + +type IntegrationMutators struct{} + +func (n IntegrationMutators) WithUID(uid string) Mutator[Integration] { + return func(s *Integration) { + s.UID = uid + } +} + +func (n IntegrationMutators) WithName(name string) Mutator[Integration] { + return func(s *Integration) { + s.Name = name + } +} + +func (n IntegrationMutators) WithValidConfig(integrationType string) Mutator[Integration] { + return func(c *Integration) { + config := alertingNotify.AllKnownConfigsForTesting[integrationType].GetRawNotifierConfig(c.Name) + integrationConfig, _ := IntegrationConfigFromType(integrationType) + c.Config = integrationConfig + + var settings map[string]any + _ = json.Unmarshal(config.Settings, &settings) + + c.Settings = settings + + // Decrypt secure settings over to normal settings. + for k, v := range c.SecureSettings { + decodeValue, _ := base64.StdEncoding.DecodeString(v) + settings[k] = string(decodeValue) + } + } +} + +func (n IntegrationMutators) WithInvalidConfig(integrationType string) Mutator[Integration] { + return func(c *Integration) { + integrationConfig, _ := IntegrationConfigFromType(integrationType) + c.Config = integrationConfig + c.Settings = map[string]interface{}{} + c.SecureSettings = map[string]string{} + if integrationType == "webex" { + // Webex passes validation without any settings but should fail with an unparsable URL. + c.Settings["api_url"] = "(*^$*^%!@#$*()" + } + } +} + +func (n IntegrationMutators) WithSettings(settings map[string]any) Mutator[Integration] { + return func(c *Integration) { + c.Settings = maps.Clone(settings) + } +} + +func (n IntegrationMutators) AddSetting(key string, val any) Mutator[Integration] { + return func(c *Integration) { + c.Settings[key] = val + } +} + +func (n IntegrationMutators) WithSecureSettings(secureSettings map[string]string) Mutator[Integration] { + return func(r *Integration) { + r.SecureSettings = maps.Clone(secureSettings) + } +} + +func (n IntegrationMutators) AddSecureSetting(key, val string) Mutator[Integration] { + return func(r *Integration) { + r.SecureSettings[key] = val + } +} + +func randomMapKey[K comparable, V any](m map[K]V) (K, V) { + randIdx := rand.Intn(len(m)) + i := 0 + + for key, val := range m { + if i == randIdx { + return key, val + } + i++ + } + return *new(K), *new(V) +} + func ConvertToRecordingRule(rule *AlertRule) { if rule.Record == nil { rule.Record = &Record{} @@ -1108,3 +1325,7 @@ func ConvertToRecordingRule(rule *AlertRule) { rule.For = 0 rule.NotificationSettings = nil } + +func nameToUid(name string) string { // Avoid legacy_storage.NameToUid import cycle. + return base64.RawURLEncoding.EncodeToString([]byte(name)) +} diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go index e0b83552e7c..6bf152a96a0 100644 --- a/pkg/services/ngalert/ngalert.go +++ b/pkg/services/ngalert/ngalert.go @@ -419,6 +419,7 @@ func (ng *AlertNG) init() error { ac.NewReceiverAccess[*models.Receiver](ng.accesscontrol, false), configStore, ng.store, + ng.store, ng.SecretsService, ng.store, ng.Log, @@ -427,6 +428,7 @@ func (ng *AlertNG) init() error { ac.NewReceiverAccess[*models.Receiver](ng.accesscontrol, true), configStore, ng.store, + ng.store, ng.SecretsService, ng.store, ng.Log, diff --git a/pkg/services/ngalert/notifier/channels_config/available_channels.go b/pkg/services/ngalert/notifier/channels_config/available_channels.go index 5fc42b809aa..b9a900b2df7 100644 --- a/pkg/services/ngalert/notifier/channels_config/available_channels.go +++ b/pkg/services/ngalert/notifier/channels_config/available_channels.go @@ -5,6 +5,7 @@ import ( "os" "strings" + alertingMqtt "github.com/grafana/alerting/receivers/mqtt" alertingOpsgenie "github.com/grafana/alerting/receivers/opsgenie" alertingPagerduty "github.com/grafana/alerting/receivers/pagerduty" alertingTemplates "github.com/grafana/alerting/templates" @@ -557,7 +558,7 @@ func GetAvailableNotifiers() []*NotifierPlugin { Label: "Expire (Only used for Emergency Priority)", Element: ElementTypeInput, InputType: InputTypeText, - Placeholder: "maximum 86400 seconds", + Placeholder: "maximum 10800 seconds", PropertyName: "expire", }, { @@ -1245,6 +1246,93 @@ func GetAvailableNotifiers() []*NotifierPlugin { }, }, }, + { + Type: "mqtt", + Name: "MQTT", + Description: "Sends notifications to an MQTT broker", + Heading: "MQTT settings", + Info: "The MQTT notifier sends messages to an MQTT broker. The message is sent to the topic specified in the configuration. ", + Options: []NotifierOption{ + { + Label: "Broker URL", + Element: ElementTypeInput, + InputType: InputTypeText, + Placeholder: "tcp://localhost:1883", + Description: "The URL of the MQTT broker.", + PropertyName: "brokerUrl", + Required: true, + }, + { + Label: "Topic", + Element: ElementTypeInput, + InputType: InputTypeText, + Placeholder: "grafana/alerts", + Description: "The topic to which the message will be sent.", + PropertyName: "topic", + Required: true, + }, + { + Label: "Message format", + Element: ElementTypeSelect, + SelectOptions: []SelectOption{ + { + Value: alertingMqtt.MessageFormatJSON, + Label: "json", + }, + { + Value: alertingMqtt.MessageFormatText, + Label: "text", + }, + }, + InputType: InputTypeText, + Placeholder: "json", + Description: "The format of the message to be sent. If set to 'json', the message will be sent as a JSON object. If set to 'text', the message will be sent as a plain text string. By default json is used.", + PropertyName: "messageFormat", + Required: false, + }, + { + Label: "Client ID", + Element: ElementTypeInput, + InputType: InputTypeText, + Placeholder: "", + Description: "The client ID to use when connecting to the MQTT broker. If blank, a random client ID is used.", + PropertyName: "clientId", + Required: false, + }, + { + Label: "Message", + Element: ElementTypeTextArea, + Placeholder: alertingTemplates.DefaultMessageEmbed, + PropertyName: "message", + }, + { + Label: "Username", + Description: "The username to use when connecting to the MQTT broker.", + Element: ElementTypeInput, + InputType: InputTypeText, + Placeholder: "", + PropertyName: "username", + Required: false, + }, + { + Label: "Password", + Description: "The password to use when connecting to the MQTT broker.", + Element: ElementTypeInput, + InputType: InputTypeText, + Placeholder: "", + PropertyName: "password", + Required: false, + Secure: true, + }, + { + Label: "Disable certificate verification", + Element: ElementTypeCheckbox, + Description: "Do not verify the broker's certificate chain and host name.", + PropertyName: "insecureSkipVerify", + Required: false, + }, + }, + }, { Type: "opsgenie", Name: "OpsGenie", @@ -1513,7 +1601,7 @@ func GetAvailableNotifiers() []*NotifierPlugin { func GetSecretKeysForContactPointType(contactPointType string) ([]string, error) { notifiers := GetAvailableNotifiers() for _, n := range notifiers { - if n.Type == contactPointType { + if strings.EqualFold(n.Type, contactPointType) { var secureFields []string for _, field := range n.Options { if field.Secure { @@ -1525,3 +1613,14 @@ func GetSecretKeysForContactPointType(contactPointType string) ([]string, error) } return nil, fmt.Errorf("no secrets configured for type '%s'", contactPointType) } + +// ConfigForIntegrationType returns the config for the given integration type. Returns error is integration type is not known. +func ConfigForIntegrationType(contactPointType string) (*NotifierPlugin, error) { + notifiers := GetAvailableNotifiers() + for _, n := range notifiers { + if strings.EqualFold(n.Type, contactPointType) { + return n, nil + } + } + return nil, fmt.Errorf("unknown integration type '%s'", contactPointType) +} diff --git a/pkg/services/ngalert/notifier/compat.go b/pkg/services/ngalert/notifier/compat.go index 29db26528e6..8ba1aaae66c 100644 --- a/pkg/services/ngalert/notifier/compat.go +++ b/pkg/services/ngalert/notifier/compat.go @@ -2,17 +2,103 @@ package notifier import ( "encoding/json" - - "github.com/prometheus/alertmanager/config" + "fmt" alertingNotify "github.com/grafana/alerting/notify" alertingTemplates "github.com/grafana/alerting/templates" - "github.com/grafana/grafana/pkg/components/simplejson" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" "github.com/grafana/grafana/pkg/services/ngalert/models" + "github.com/grafana/grafana/pkg/services/ngalert/notifier/legacy_storage" ) +func PostableApiReceiversToReceivers(postables []*apimodels.PostableApiReceiver, storedProvenances map[string]models.Provenance) ([]*models.Receiver, error) { + receivers := make([]*models.Receiver, 0, len(postables)) + for _, postable := range postables { + r, err := PostableApiReceiverToReceiver(postable, getReceiverProvenance(storedProvenances, postable)) + if err != nil { + return nil, err + } + receivers = append(receivers, r) + } + return receivers, nil +} + +func PostableApiReceiverToReceiver(postable *apimodels.PostableApiReceiver, provenance models.Provenance) (*models.Receiver, error) { + integrations, err := PostableGrafanaReceiversToIntegrations(postable.GrafanaManagedReceivers) + if err != nil { + return nil, err + } + r := &models.Receiver{ + UID: legacy_storage.NameToUid(postable.GetName()), // TODO replace with stable UID. + Name: postable.GetName(), + Integrations: integrations, + Provenance: provenance, + } + r.Version = r.Fingerprint() + return r, nil +} + +func PostableGrafanaReceiversToIntegrations(postables []*apimodels.PostableGrafanaReceiver) ([]*models.Integration, error) { + integrations := make([]*models.Integration, 0, len(postables)) + for _, cfg := range postables { + integration, err := PostableGrafanaReceiverToIntegration(cfg) + if err != nil { + return nil, err + } + integrations = append(integrations, integration) + } + + return integrations, nil +} + +func PostableGrafanaReceiverToIntegration(p *apimodels.PostableGrafanaReceiver) (*models.Integration, error) { + config, err := models.IntegrationConfigFromType(p.Type) + if err != nil { + return nil, err + } + integration := &models.Integration{ + UID: p.UID, + Name: p.Name, + Config: config, + DisableResolveMessage: p.DisableResolveMessage, + Settings: make(map[string]any, len(p.Settings)), + SecureSettings: make(map[string]string, len(p.SecureSettings)), + } + + if p.Settings != nil { + if err := json.Unmarshal(p.Settings, &integration.Settings); err != nil { + return nil, fmt.Errorf("integration '%s' of receiver '%s' has settings that cannot be parsed as JSON: %w", integration.Config.Type, p.Name, err) + } + } + + for k, v := range p.SecureSettings { + if v != "" { + integration.SecureSettings[k] = v + } + } + + return integration, nil +} + +// getReceiverProvenance determines the provenance of a definitions.PostableApiReceiver based on the provenance of its integrations. +func getReceiverProvenance(storedProvenances map[string]models.Provenance, r *apimodels.PostableApiReceiver) models.Provenance { + if len(r.GrafanaManagedReceivers) == 0 { + return models.ProvenanceNone + } + + // Current provisioning works on the integration level, so we need some way to determine the provenance of the + // entire receiver. All integrations in a receiver should have the same provenance, but we don't want to rely on + // this assumption in case the first provenance is None and a later one is not. To this end, we return the first + // non-zero provenance we find. + for _, contactPoint := range r.GrafanaManagedReceivers { + if p, exists := storedProvenances[contactPoint.UID]; exists && p != models.ProvenanceNone { + return p + } + } + return models.ProvenanceNone +} + func PostableGrafanaReceiverToGrafanaIntegrationConfig(p *apimodels.PostableGrafanaReceiver) *alertingNotify.GrafanaIntegrationConfig { return &alertingNotify.GrafanaIntegrationConfig{ UID: p.UID, @@ -46,76 +132,6 @@ func PostableApiAlertingConfigToApiReceivers(c apimodels.PostableApiAlertingConf return apiReceivers } -type DecryptFn = func(value string) string - -func PostableToGettableGrafanaReceiver(r *apimodels.PostableGrafanaReceiver, provenance *models.Provenance, decryptFn DecryptFn) (apimodels.GettableGrafanaReceiver, error) { - out := apimodels.GettableGrafanaReceiver{ - UID: r.UID, - Name: r.Name, - Type: r.Type, - DisableResolveMessage: r.DisableResolveMessage, - SecureFields: make(map[string]bool, len(r.SecureSettings)), - } - if provenance != nil { - out.Provenance = apimodels.Provenance(*provenance) - } - - if r.Settings == nil && r.SecureSettings == nil { - return out, nil - } - - settings := simplejson.New() - if r.Settings != nil { - var err error - settings, err = simplejson.NewJson(r.Settings) - if err != nil { - return apimodels.GettableGrafanaReceiver{}, err - } - } - - for k, v := range r.SecureSettings { - decryptedValue := decryptFn(v) - if decryptedValue == "" { - continue - } else { - settings.Set(k, decryptedValue) - } - out.SecureFields[k] = true - } - - jsonBytes, err := settings.MarshalJSON() - if err != nil { - return apimodels.GettableGrafanaReceiver{}, err - } - - out.Settings = jsonBytes - - return out, nil -} - -func PostableToGettableApiReceiver(r *apimodels.PostableApiReceiver, provenances map[string]models.Provenance, decryptFn DecryptFn) (apimodels.GettableApiReceiver, error) { - out := apimodels.GettableApiReceiver{ - Receiver: config.Receiver{ - Name: r.Receiver.Name, - }, - } - - for _, gr := range r.GrafanaManagedReceivers { - var prov *models.Provenance - if p, ok := provenances[gr.UID]; ok { - prov = &p - } - - gettable, err := PostableToGettableGrafanaReceiver(gr, prov, decryptFn) - if err != nil { - return apimodels.GettableApiReceiver{}, err - } - out.GrafanaManagedReceivers = append(out.GrafanaManagedReceivers, &gettable) - } - - return out, nil -} - // ToTemplateDefinitions converts the given PostableUserConfig's TemplateFiles to a slice of TemplateDefinitions. func ToTemplateDefinitions(cfg *apimodels.PostableUserConfig) []alertingTemplates.TemplateDefinition { out := make([]alertingTemplates.TemplateDefinition, 0, len(cfg.TemplateFiles)) diff --git a/pkg/services/ngalert/notifier/legacy_storage/compat.go b/pkg/services/ngalert/notifier/legacy_storage/compat.go index ef77ad30888..38cef8552b7 100644 --- a/pkg/services/ngalert/notifier/legacy_storage/compat.go +++ b/pkg/services/ngalert/notifier/legacy_storage/compat.go @@ -2,6 +2,13 @@ package legacy_storage import ( "encoding/base64" + "encoding/json" + "maps" + + alertingNotify "github.com/grafana/alerting/notify" + + apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" + "github.com/grafana/grafana/pkg/services/ngalert/models" ) func NameToUid(name string) string { @@ -15,3 +22,42 @@ func UidToName(uid string) (string, error) { } return string(data), nil } + +func IntegrationToPostableGrafanaReceiver(integration *models.Integration) (*apimodels.PostableGrafanaReceiver, error) { + postable := &apimodels.PostableGrafanaReceiver{ + UID: integration.UID, + Name: integration.Name, + Type: integration.Config.Type, + DisableResolveMessage: integration.DisableResolveMessage, + SecureSettings: maps.Clone(integration.SecureSettings), + } + + if len(integration.Settings) > 0 { + jsonBytes, err := json.Marshal(integration.Settings) + if err != nil { + return nil, err + } + postable.Settings = jsonBytes + } + return postable, nil +} + +func ReceiverToPostableApiReceiver(r *models.Receiver) (*apimodels.PostableApiReceiver, error) { + integrations := apimodels.PostableGrafanaReceivers{ + GrafanaManagedReceivers: make([]*apimodels.PostableGrafanaReceiver, 0, len(r.Integrations)), + } + for _, cfg := range r.Integrations { + postable, err := IntegrationToPostableGrafanaReceiver(cfg) + if err != nil { + return nil, err + } + integrations.GrafanaManagedReceivers = append(integrations.GrafanaManagedReceivers, postable) + } + + return &apimodels.PostableApiReceiver{ + Receiver: alertingNotify.ConfigReceiver{ + Name: r.Name, + }, + PostableGrafanaReceivers: integrations, + }, nil +} diff --git a/pkg/services/ngalert/notifier/legacy_storage/errors.go b/pkg/services/ngalert/notifier/legacy_storage/errors.go index e6c1487d48c..73cbe59ce0a 100644 --- a/pkg/services/ngalert/notifier/legacy_storage/errors.go +++ b/pkg/services/ngalert/notifier/legacy_storage/errors.go @@ -5,6 +5,13 @@ import "github.com/grafana/grafana/pkg/apimachinery/errutil" var ( ErrNoAlertmanagerConfiguration = errutil.Internal("alerting.notification.configMissing", errutil.WithPublicMessage("No alertmanager configuration present in this organization")) ErrBadAlertmanagerConfiguration = errutil.Internal("alerting.notification.configCorrupted").MustTemplate("Failed to unmarshal the Alertmanager configuration", errutil.WithPublic("Current Alertmanager configuration in the storage is corrupted. Reset the configuration or rollback to a recent valid one.")) + + ErrReceiverNotFound = errutil.NotFound("alerting.notifications.receivers.notFound", errutil.WithPublicMessage("Receiver not found")) + ErrReceiverExists = errutil.BadRequest("alerting.notifications.receivers.exists", errutil.WithPublicMessage("Receiver with this name already exists. Use a different name or update an existing one.")) + ErrReceiverInvalid = errutil.Conflict("alerting.notifications.receivers.invalid").MustTemplate( + "Invalid receiver: '{{ .Public.Reason }}'", + errutil.WithPublic("Invalid receiver: '{{ .Public.Reason }}'"), + ) ) func makeErrBadAlertmanagerConfiguration(err error) error { @@ -16,3 +23,13 @@ func makeErrBadAlertmanagerConfiguration(err error) error { } return ErrBadAlertmanagerConfiguration.Build(data) } + +func MakeErrReceiverInvalid(err error) error { + data := errutil.TemplateData{ + Public: map[string]interface{}{ + "Reason": err.Error(), + }, + Error: err, + } + return ErrReceiverInvalid.Build(data) +} diff --git a/pkg/services/ngalert/notifier/legacy_storage/receivers.go b/pkg/services/ngalert/notifier/legacy_storage/receivers.go index 01268a1e8ed..e54f2b3acd4 100644 --- a/pkg/services/ngalert/notifier/legacy_storage/receivers.go +++ b/pkg/services/ngalert/notifier/legacy_storage/receivers.go @@ -1,9 +1,13 @@ package legacy_storage import ( + "errors" + "fmt" "slices" "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" + "github.com/grafana/grafana/pkg/services/ngalert/models" + "github.com/grafana/grafana/pkg/util" ) func (rev *ConfigRevision) DeleteReceiver(uid string) { @@ -13,17 +17,70 @@ func (rev *ConfigRevision) DeleteReceiver(uid string) { }) } +func (rev *ConfigRevision) CreateReceiver(receiver *models.Receiver) error { + // Check if the receiver already exists. + _, err := rev.GetReceiver(receiver.GetUID()) + if err == nil { + return ErrReceiverExists.Errorf("") + } + if !errors.Is(err, ErrReceiverNotFound) { + return err + } + + if err := validateAndSetIntegrationUIDs(receiver); err != nil { + return err + } + + postable, err := ReceiverToPostableApiReceiver(receiver) + if err != nil { + return err + } + + rev.Config.AlertmanagerConfig.Receivers = append(rev.Config.AlertmanagerConfig.Receivers, postable) + + if err := rev.ValidateReceiver(postable); err != nil { + return err + } + + return nil +} + +func (rev *ConfigRevision) UpdateReceiver(receiver *models.Receiver) error { + existing, err := rev.GetReceiver(receiver.GetUID()) + if err != nil { + return err + } + + if err := validateAndSetIntegrationUIDs(receiver); err != nil { + return err + } + + postable, err := ReceiverToPostableApiReceiver(receiver) + if err != nil { + return err + } + + // Update receiver in the configuration. + *existing = *postable + + if err := rev.ValidateReceiver(existing); err != nil { + return err + } + + return nil +} + func (rev *ConfigRevision) ReceiverNameUsedByRoutes(name string) bool { return isReceiverInUse(name, []*definitions.Route{rev.Config.AlertmanagerConfig.Route}) } -func (rev *ConfigRevision) GetReceiver(uid string) *definitions.PostableApiReceiver { +func (rev *ConfigRevision) GetReceiver(uid string) (*definitions.PostableApiReceiver, error) { for _, r := range rev.Config.AlertmanagerConfig.Receivers { if NameToUid(r.GetName()) == uid { - return r + return r, nil } } - return nil + return nil, ErrReceiverNotFound.Errorf("") } func (rev *ConfigRevision) GetReceivers(uids []string) []*definitions.PostableApiReceiver { @@ -36,6 +93,52 @@ func (rev *ConfigRevision) GetReceivers(uids []string) []*definitions.PostableAp return receivers } +// RenameReceiverInRoutes renames all references to a receiver in routes. +func (rev *ConfigRevision) RenameReceiverInRoutes(oldName, newName string) { + RenameReceiverInRoute(oldName, newName, rev.Config.AlertmanagerConfig.Route) +} + +// ValidateReceiver checks if the given receiver conflicts in name or integration UID with existing receivers. +// We only check the receiver being modified to prevent existing issues from other receivers being reported. +func (rev *ConfigRevision) ValidateReceiver(p *definitions.PostableApiReceiver) error { + uids := make(map[string]struct{}, len(rev.Config.AlertmanagerConfig.Receivers)) + for _, integrations := range p.GrafanaManagedReceivers { + if _, exists := uids[integrations.UID]; exists { + return MakeErrReceiverInvalid(fmt.Errorf("integration with UID %q already exists", integrations.UID)) + } + uids[integrations.UID] = struct{}{} + } + + for _, r := range rev.Config.AlertmanagerConfig.Receivers { + if p == r { + // Skip the receiver itself. + continue + } + if r.GetName() == p.GetName() { + return MakeErrReceiverInvalid(fmt.Errorf("name %q already exists", r.GetName())) + } + + for _, gr := range r.GrafanaManagedReceivers { + if _, exists := uids[gr.UID]; exists { + return MakeErrReceiverInvalid(fmt.Errorf("integration with UID %q already exists", gr.UID)) + } + } + } + return nil +} + +func RenameReceiverInRoute(oldName, newName string, routes ...*definitions.Route) { + if len(routes) == 0 { + return + } + for _, route := range routes { + if route.Receiver == oldName { + route.Receiver = newName + } + RenameReceiverInRoute(oldName, newName, route.Routes...) + } +} + // isReceiverInUse checks if a receiver is used in a route or any of its sub-routes. func isReceiverInUse(name string, routes []*definitions.Route) bool { if len(routes) == 0 { @@ -51,3 +154,15 @@ func isReceiverInUse(name string, routes []*definitions.Route) bool { } return false } + +// validateAndSetIntegrationUIDs validates existing integration UIDs and generates them if they are empty. +func validateAndSetIntegrationUIDs(receiver *models.Receiver) error { + for _, integration := range receiver.Integrations { + if integration.UID == "" { + integration.UID = util.GenerateShortUID() + } else if err := util.ValidateUID(integration.UID); err != nil { + return MakeErrReceiverInvalid(fmt.Errorf("integration UID %q is invalid: %w", integration.UID, err)) + } + } + return nil +} diff --git a/pkg/services/ngalert/notifier/receiver_svc.go b/pkg/services/ngalert/notifier/receiver_svc.go index 37542553251..edc07fa78ca 100644 --- a/pkg/services/ngalert/notifier/receiver_svc.go +++ b/pkg/services/ngalert/notifier/receiver_svc.go @@ -3,8 +3,11 @@ package notifier import ( "context" "encoding/base64" + "errors" + "fmt" + "strings" - "github.com/grafana/alerting/definition" + "golang.org/x/exp/maps" "github.com/grafana/grafana/pkg/apimachinery/errutil" "github.com/grafana/grafana/pkg/apimachinery/identity" @@ -17,26 +20,49 @@ import ( ) var ( - ErrReceiverNotFound = errutil.NotFound("alerting.notifications.receiver.notFound") - ErrReceiverInUse = errutil.Conflict("alerting.notifications.receiver.used").MustTemplate("Receiver is used by notification policies or alert rules") + ErrReceiverInUse = errutil.Conflict("alerting.notifications.receivers.used").MustTemplate( + "Receiver is used by '{{ .Public.UsedBy }}'", + errutil.WithPublic("Receiver is used by {{ .Public.UsedBy }}"), + ) + ErrReceiverVersionConflict = errutil.Conflict("alerting.notifications.receivers.conflict").MustTemplate( + "Provided version '{{ .Public.Version }}' of receiver '{{ .Public.Name }}' does not match current version '{{ .Public.CurrentVersion }}'", + errutil.WithPublic("Provided version '{{ .Public.Version }}' of receiver '{{ .Public.Name }}' does not match current version '{{ .Public.CurrentVersion }}'"), + ) ) // ReceiverService is the service for managing alertmanager receivers. type ReceiverService struct { - authz receiverAccessControlService - provisioningStore provisoningStore - cfgStore alertmanagerConfigStore - encryptionService secrets.Service - xact transactionManager - log log.Logger - validator validation.ProvenanceStatusTransitionValidator + authz receiverAccessControlService + provisioningStore provisoningStore + cfgStore alertmanagerConfigStore + ruleNotificationsStore alertRuleNotificationSettingsStore + encryptionService secretService + xact transactionManager + log log.Logger + provenanceValidator validation.ProvenanceStatusTransitionValidator +} + +type alertRuleNotificationSettingsStore interface { + RenameReceiverInNotificationSettings(ctx context.Context, orgID int64, oldReceiver, newReceiver string) (int, error) + ListNotificationSettings(ctx context.Context, q models.ListNotificationSettingsQuery) (map[models.AlertRuleKey][]models.NotificationSettings, error) +} + +type secretService interface { + Encrypt(ctx context.Context, payload []byte, opt secrets.EncryptionOptions) ([]byte, error) + Decrypt(ctx context.Context, payload []byte) ([]byte, error) } // receiverAccessControlService provides access control for receivers. type receiverAccessControlService interface { + FilterRead(context.Context, identity.Requester, ...*models.Receiver) ([]*models.Receiver, error) + AuthorizeRead(context.Context, identity.Requester, *models.Receiver) error + FilterReadDecrypted(context.Context, identity.Requester, ...*models.Receiver) ([]*models.Receiver, error) + AuthorizeReadDecrypted(context.Context, identity.Requester, *models.Receiver) error HasList(ctx context.Context, user identity.Requester) (bool, error) - HasReadAll(ctx context.Context, user identity.Requester) (bool, error) - AuthorizeReadDecryptedAll(ctx context.Context, user identity.Requester) error + + AuthorizeCreate(context.Context, identity.Requester) error + AuthorizeUpdate(context.Context, identity.Requester, *models.Receiver) error + AuthorizeDeleteByUID(context.Context, identity.Requester, string) error } type alertmanagerConfigStore interface { @@ -58,61 +84,60 @@ func NewReceiverService( authz receiverAccessControlService, cfgStore alertmanagerConfigStore, provisioningStore provisoningStore, - encryptionService secrets.Service, + ruleNotificationsStore alertRuleNotificationSettingsStore, + encryptionService secretService, xact transactionManager, log log.Logger, ) *ReceiverService { return &ReceiverService{ - authz: authz, - provisioningStore: provisioningStore, - cfgStore: cfgStore, - encryptionService: encryptionService, - xact: xact, - log: log, - validator: validation.ValidateProvenanceRelaxed, + authz: authz, + provisioningStore: provisioningStore, + cfgStore: cfgStore, + ruleNotificationsStore: ruleNotificationsStore, + encryptionService: encryptionService, + xact: xact, + log: log, + provenanceValidator: validation.ValidateProvenanceRelaxed, } } -func (rs *ReceiverService) shouldDecrypt(ctx context.Context, user identity.Requester, reqDecrypt bool) (bool, error) { - if !reqDecrypt { - return false, nil - } - if err := rs.authz.AuthorizeReadDecryptedAll(ctx, user); err != nil { - return false, err - } - - return true, nil -} - // GetReceiver returns a receiver by name. // The receiver's secure settings are decrypted if requested and the user has access to do so. -func (rs *ReceiverService) GetReceiver(ctx context.Context, q models.GetReceiverQuery, user identity.Requester) (definitions.GettableApiReceiver, error) { +func (rs *ReceiverService) GetReceiver(ctx context.Context, q models.GetReceiverQuery, user identity.Requester) (*models.Receiver, error) { revision, err := rs.cfgStore.Get(ctx, q.OrgID) if err != nil { - return definitions.GettableApiReceiver{}, err + return nil, err } - postable := revision.GetReceiver(legacy_storage.NameToUid(q.Name)) - if postable == nil { - return definitions.GettableApiReceiver{}, ErrReceiverNotFound.Errorf("") - } - - decrypt, err := rs.shouldDecrypt(ctx, user, q.Decrypt) + postable, err := revision.GetReceiver(legacy_storage.NameToUid(q.Name)) if err != nil { - return definitions.GettableApiReceiver{}, err + return nil, err } - decryptFn := rs.decryptOrRedact(ctx, decrypt, q.Name, "") storedProvenances, err := rs.provisioningStore.GetProvenances(ctx, q.OrgID, (&definitions.EmbeddedContactPoint{}).ResourceType()) if err != nil { - return definitions.GettableApiReceiver{}, err + return nil, err + } + rcv, err := PostableApiReceiverToReceiver(postable, getReceiverProvenance(storedProvenances, postable)) + if err != nil { + return nil, err } - return PostableToGettableApiReceiver(postable, storedProvenances, decryptFn) + auth := rs.authz.AuthorizeReadDecrypted + if !q.Decrypt { + auth = rs.authz.AuthorizeRead + } + if err := auth(ctx, user, rcv); err != nil { + return nil, err + } + + rs.decryptOrRedactSecureSettings(ctx, rcv, q.Decrypt) + + return rcv, nil } // GetReceivers returns a list of receivers a user has access to. // Receivers can be filtered by name, and secure settings are decrypted if requested and the user has access to do so. -func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceiversQuery, user identity.Requester) ([]definitions.GettableApiReceiver, error) { +func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceiversQuery, user identity.Requester) ([]*models.Receiver, error) { uids := make([]string, 0, len(q.Names)) for _, name := range q.Names { uids = append(uids, legacy_storage.NameToUid(name)) @@ -128,41 +153,25 @@ func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceive if err != nil { return nil, err } - - decrypt, err := rs.shouldDecrypt(ctx, user, q.Decrypt) + receivers, err := PostableApiReceiversToReceivers(postables, storedProvenances) if err != nil { return nil, err } - readRedactedAccess, err := rs.authz.HasReadAll(ctx, user) + filterFn := rs.authz.FilterReadDecrypted + if !q.Decrypt { + filterFn = rs.authz.FilterRead + } + filtered, err := filterFn(ctx, user, receivers...) if err != nil { return nil, err } - // User doesn't have any permissions on the receivers. - // This is mostly a safeguard as it should not be possible with current API endpoints + middleware authentication. - if !readRedactedAccess { - return nil, nil + for _, r := range filtered { + rs.decryptOrRedactSecureSettings(ctx, r, q.Decrypt) } - var output []definitions.GettableApiReceiver - for i := q.Offset; i < len(postables); i++ { - r := postables[i] - - decryptFn := rs.decryptOrRedact(ctx, decrypt, r.Name, "") - res, err := PostableToGettableApiReceiver(r, storedProvenances, decryptFn) - if err != nil { - return nil, err - } - - output = append(output, res) - // stop if we have reached the limit or we have found all the requested receivers - if (len(output) == q.Limit && q.Limit > 0) || (len(output) == len(q.Names)) { - break - } - } - - return output, nil + return limitOffset(filtered, q.Offset, q.Limit), nil } // ListReceivers returns a list of receivers a user has access to. @@ -170,17 +179,12 @@ func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceive // This offers an looser permissions compared to GetReceivers. When a user doesn't have read access it will check for list access instead of returning an empty list. // If the users has list access, all receiver settings will be removed from the response. This option is for backwards compatibility with the v1/receivers endpoint // and should be removed when FGAC is fully implemented. -func (rs *ReceiverService) ListReceivers(ctx context.Context, q models.ListReceiversQuery, user identity.Requester) ([]definitions.GettableApiReceiver, error) { // TODO: Remove this method with FGAC. +func (rs *ReceiverService) ListReceivers(ctx context.Context, q models.ListReceiversQuery, user identity.Requester) ([]*models.Receiver, error) { // TODO: Remove this method with FGAC. listAccess, err := rs.authz.HasList(ctx, user) if err != nil { return nil, err } - readRedactedAccess, err := rs.authz.HasReadAll(ctx, user) - if err != nil { - return nil, err - } - uids := make([]string, 0, len(q.Names)) for _, name := range q.Names { uids = append(uids, legacy_storage.NameToUid(name)) @@ -196,66 +200,75 @@ func (rs *ReceiverService) ListReceivers(ctx context.Context, q models.ListRecei if err != nil { return nil, err } - - // User doesn't have any permissions on the receivers. - // This is mostly a safeguard as it should not be possible with current API endpoints + middleware authentication. - if !listAccess && !readRedactedAccess { - return nil, nil + receivers, err := PostableApiReceiversToReceivers(postables, storedProvenances) + if err != nil { + return nil, err } - var output []definitions.GettableApiReceiver - for i := q.Offset; i < len(postables); i++ { - r := postables[i] + if !listAccess { + var err error + receivers, err = rs.authz.FilterRead(ctx, user, receivers...) + if err != nil { + return nil, err + } + } - // Remove settings. - for _, integration := range r.GrafanaManagedReceivers { + // Remove settings. + for _, r := range receivers { + for _, integration := range r.Integrations { integration.Settings = nil integration.SecureSettings = nil integration.DisableResolveMessage = false } - - decryptFn := rs.decryptOrRedact(ctx, false, r.Name, "") - res, err := PostableToGettableApiReceiver(r, storedProvenances, decryptFn) - if err != nil { - return nil, err - } - - output = append(output, res) - // stop if we have reached the limit or we have found all the requested receivers - if (len(output) == q.Limit && q.Limit > 0) || (len(output) == len(q.Names)) { - break - } } - return output, nil + return limitOffset(receivers, q.Offset, q.Limit), nil } // DeleteReceiver deletes a receiver by uid. // UID field currently does not exist, we assume the uid is a particular hashed value of the receiver name. -func (rs *ReceiverService) DeleteReceiver(ctx context.Context, uid string, orgID int64, callerProvenance definitions.Provenance, version string) error { - //TODO: Check delete permissions. +func (rs *ReceiverService) DeleteReceiver(ctx context.Context, uid string, callerProvenance definitions.Provenance, version string, orgID int64, user identity.Requester) error { + if err := rs.authz.AuthorizeDeleteByUID(ctx, user, uid); err != nil { + return err + } revision, err := rs.cfgStore.Get(ctx, orgID) if err != nil { return err } - postable := revision.GetReceiver(uid) - if postable == nil { - return ErrReceiverNotFound.Errorf("") + postable, err := revision.GetReceiver(uid) + if err != nil { + if errors.Is(err, legacy_storage.ErrReceiverNotFound) { + return nil + } + return err } - // TODO: Implement + check optimistic concurrency. - - storedProvenance, err := rs.getContactPointProvenance(ctx, postable, orgID) + storedProvenances, err := rs.provisioningStore.GetProvenances(ctx, orgID, (&definitions.EmbeddedContactPoint{}).ResourceType()) + if err != nil { + return err + } + existing, err := PostableApiReceiverToReceiver(postable, getReceiverProvenance(storedProvenances, postable)) if err != nil { return err } - if err := rs.validator(storedProvenance, models.Provenance(callerProvenance)); err != nil { + // Check optimistic concurrency. + // Optimistic concurrency is optional for delete operations, but we still check it if a version is provided. + if version != "" { + err = rs.checkOptimisticConcurrency(existing, version) + if err != nil { + return err + } + } else { + rs.log.Debug("ignoring optimistic concurrency check because version was not provided", "receiver", existing.Name, "operation", "delete") + } + + if err := rs.provenanceValidator(existing.Provenance, models.Provenance(callerProvenance)); err != nil { return err } - usedByRoutes := revision.ReceiverNameUsedByRoutes(postable.GetName()) - usedByRules, err := rs.UsedByRules(ctx, orgID, uid) + usedByRoutes := revision.ReceiverNameUsedByRoutes(existing.Name) + usedByRules, err := rs.UsedByRules(ctx, orgID, existing.Name) if err != nil { return err } @@ -271,26 +284,172 @@ func (rs *ReceiverService) DeleteReceiver(ctx context.Context, uid string, orgID if err != nil { return err } - return rs.deleteProvenances(ctx, orgID, postable.GrafanaManagedReceivers) + return rs.deleteProvenances(ctx, orgID, existing.Integrations) }) } -func (rs *ReceiverService) CreateReceiver(ctx context.Context, r definitions.GettableApiReceiver, orgID int64) (definitions.GettableApiReceiver, error) { - // TODO: Stub - panic("not implemented") +func (rs *ReceiverService) CreateReceiver(ctx context.Context, r *models.Receiver, orgID int64, user identity.Requester) (*models.Receiver, error) { + if err := rs.authz.AuthorizeCreate(ctx, user); err != nil { + return nil, err + } + + revision, err := rs.cfgStore.Get(ctx, orgID) + if err != nil { + return nil, err + } + + createdReceiver := r.Clone() + err = createdReceiver.Encrypt(rs.encryptor(ctx)) + if err != nil { + return nil, err + } + + if err := createdReceiver.Validate(rs.decryptor(ctx)); err != nil { + return nil, legacy_storage.MakeErrReceiverInvalid(err) + } + + err = revision.CreateReceiver(&createdReceiver) + if err != nil { + return nil, err + } + createdReceiver.Version = createdReceiver.Fingerprint() + + err = rs.xact.InTransaction(ctx, func(ctx context.Context) error { + err = rs.cfgStore.Save(ctx, revision, orgID) + if err != nil { + return err + } + return rs.setReceiverProvenance(ctx, orgID, &createdReceiver) + }) + if err != nil { + return nil, err + } + return &createdReceiver, nil } -func (rs *ReceiverService) UpdateReceiver(ctx context.Context, r definitions.GettableApiReceiver, orgID int64) (definitions.GettableApiReceiver, error) { - // TODO: Stub - panic("not implemented") +func (rs *ReceiverService) UpdateReceiver(ctx context.Context, r *models.Receiver, storedSecureFields map[string][]string, orgID int64, user identity.Requester) (*models.Receiver, error) { + // TODO: To support receiver renaming, we need to consider permissions on old and new UID since UIDs are tied to names. + if err := rs.authz.AuthorizeUpdate(ctx, user, r); err != nil { + return nil, err + } + + revision, err := rs.cfgStore.Get(ctx, orgID) + if err != nil { + return nil, err + } + postable, err := revision.GetReceiver(r.GetUID()) + if err != nil { + return nil, err + } + + storedProvenances, err := rs.provisioningStore.GetProvenances(ctx, orgID, (&definitions.EmbeddedContactPoint{}).ResourceType()) + if err != nil { + return nil, err + } + existing, err := PostableApiReceiverToReceiver(postable, getReceiverProvenance(storedProvenances, postable)) + if err != nil { + return nil, err + } + + // Check optimistic concurrency. + err = rs.checkOptimisticConcurrency(existing, r.Version) + if err != nil { + return nil, err + } + + if err := rs.provenanceValidator(existing.Provenance, r.Provenance); err != nil { + return nil, err + } + + // We need to perform two important steps to process settings on an updated integration: + // 1. Encrypt new or updated secret fields as they will arrive in plain text. + // 2. For updates, callers do not re-send unchanged secure settings and instead mark them in SecureFields. We need + // to load these secure settings from the existing integration. + updatedReceiver := r.Clone() + err = updatedReceiver.Encrypt(rs.encryptor(ctx)) + if err != nil { + return nil, err + } + if len(storedSecureFields) > 0 { + updatedReceiver.WithExistingSecureFields(existing, storedSecureFields) + } + + if err := updatedReceiver.Validate(rs.decryptor(ctx)); err != nil { + return nil, legacy_storage.MakeErrReceiverInvalid(err) + } + + err = revision.UpdateReceiver(&updatedReceiver) + if err != nil { + return nil, err + } + updatedReceiver.Version = updatedReceiver.Fingerprint() + + err = rs.xact.InTransaction(ctx, func(ctx context.Context) error { + // If the name of the receiver changed, we must update references to it in both routes and notification settings. + // TODO: Needs to check provenance status compatibility: For example, if we rename a receiver via UI but rules are provisioned, this call should be rejected. + if existing.Name != r.Name { + affected, err := rs.ruleNotificationsStore.RenameReceiverInNotificationSettings(ctx, orgID, existing.Name, r.Name) + if err != nil { + return err + } + if affected > 0 { + rs.log.Info("Renamed receiver in notification settings", "oldName", existing.Name, "newName", r.Name, "affectedSettings", affected) + } + revision.RenameReceiverInRoutes(existing.Name, r.Name) + } + + err = rs.cfgStore.Save(ctx, revision, orgID) + if err != nil { + return err + } + err = rs.deleteProvenances(ctx, orgID, removedIntegrations(existing, &updatedReceiver)) + if err != nil { + return err + } + + return rs.setReceiverProvenance(ctx, orgID, &updatedReceiver) + }) + if err != nil { + return nil, err + } + return &updatedReceiver, nil } -func (rs *ReceiverService) UsedByRules(ctx context.Context, orgID int64, uid string) ([]models.AlertRuleKey, error) { - //TODO: Implement - return []models.AlertRuleKey{}, nil +func (rs *ReceiverService) UsedByRules(ctx context.Context, orgID int64, name string) ([]models.AlertRuleKey, error) { + keys, err := rs.ruleNotificationsStore.ListNotificationSettings(ctx, models.ListNotificationSettingsQuery{OrgID: orgID, ReceiverName: name}) + if err != nil { + return nil, err + } + + return maps.Keys(keys), nil } -func (rs *ReceiverService) deleteProvenances(ctx context.Context, orgID int64, integrations []*definition.PostableGrafanaReceiver) error { +func removedIntegrations(old, new *models.Receiver) []*models.Integration { + updatedUIDs := make(map[string]struct{}, len(new.Integrations)) + for _, integration := range new.Integrations { + updatedUIDs[integration.UID] = struct{}{} + } + removed := make([]*models.Integration, 0) + for _, existingIntegration := range old.Integrations { + if _, ok := updatedUIDs[existingIntegration.UID]; !ok { + removed = append(removed, existingIntegration) + } + } + return removed +} + +func (rs *ReceiverService) setReceiverProvenance(ctx context.Context, orgID int64, receiver *models.Receiver) error { + // Add provenance for all integrations in the receiver. + for _, integration := range receiver.Integrations { + target := definitions.EmbeddedContactPoint{UID: integration.UID} + if err := rs.provisioningStore.SetProvenance(ctx, &target, orgID, receiver.Provenance); err != nil { // TODO: Should we set ProvenanceNone? + return err + } + } + return nil +} + +func (rs *ReceiverService) deleteProvenances(ctx context.Context, orgID int64, integrations []*models.Integration) error { // Delete provenance for all integrations. for _, integration := range integrations { target := definitions.EmbeddedContactPoint{UID: integration.UID} @@ -301,47 +460,73 @@ func (rs *ReceiverService) deleteProvenances(ctx context.Context, orgID int64, i return nil } -func (rs *ReceiverService) decryptOrRedact(ctx context.Context, decrypt bool, name, fallback string) func(value string) string { - return func(value string) string { - if !decrypt { - return definitions.RedactedValue - } - - decoded, err := base64.StdEncoding.DecodeString(value) +func (rs *ReceiverService) decryptOrRedactSecureSettings(ctx context.Context, recv *models.Receiver, decrypt bool) { + if decrypt { + err := recv.Decrypt(rs.decryptor(ctx)) if err != nil { - rs.log.Warn("failed to decode secure setting", "name", name, "error", err) - return fallback + rs.log.Warn("failed to decrypt secure settings", "name", recv.Name, "error", err) } - decrypted, err := rs.encryptionService.Decrypt(ctx, decoded) - if err != nil { - rs.log.Warn("failed to decrypt secure setting", "name", name, "error", err) - return fallback - } - return string(decrypted) + } else { + recv.Redact(rs.redactor()) } } -// getContactPointProvenance determines the provenance of a definitions.PostableApiReceiver based on the provenance of its integrations. -func (rs *ReceiverService) getContactPointProvenance(ctx context.Context, r *definitions.PostableApiReceiver, orgID int64) (models.Provenance, error) { - if len(r.GrafanaManagedReceivers) == 0 { - return models.ProvenanceNone, nil - } - - storedProvenances, err := rs.provisioningStore.GetProvenances(ctx, orgID, (&definitions.EmbeddedContactPoint{}).ResourceType()) - if err != nil { - return "", err - } - - // Current provisioning works on the integration level, so we need some way to determine the provenance of the - // entire receiver. All integrations in a receiver should have the same provenance, but we don't want to rely on - // this assumption in case the first provenance is None and a later one is not. To this end, we return the first - // non-zero provenance we find. - for _, contactPoint := range r.GrafanaManagedReceivers { - if p, exists := storedProvenances[contactPoint.UID]; exists && p != models.ProvenanceNone { - return p, nil +// decryptor returns a models.DecryptFn that decrypts a secure setting. If decryption fails, the fallback value is used. +func (rs *ReceiverService) decryptor(ctx context.Context) models.DecryptFn { + return func(value string) (string, error) { + decoded, err := base64.StdEncoding.DecodeString(value) + if err != nil { + return "", err } + decrypted, err := rs.encryptionService.Decrypt(ctx, decoded) + if err != nil { + return "", err + } + return string(decrypted), nil } - return models.ProvenanceNone, nil +} + +// redactor returns a models.RedactFn that redacts a secure setting. +func (rs *ReceiverService) redactor() models.RedactFn { + return func(value string) string { + return definitions.RedactedValue + } +} + +// encryptor creates an encrypt function that delegates to secrets.Service and returns the base64 encoded result. +func (rs *ReceiverService) encryptor(ctx context.Context) models.EncryptFn { + return func(payload string) (string, error) { + s, err := rs.encryptionService.Encrypt(ctx, []byte(payload), secrets.WithoutScope()) + if err != nil { + return "", err + } + return base64.StdEncoding.EncodeToString(s), nil + } +} + +// checkOptimisticConcurrency checks if the existing receiver's version matches the desired version. +func (rs *ReceiverService) checkOptimisticConcurrency(receiver *models.Receiver, desiredVersion string) error { + if receiver.Version != desiredVersion { + return makeErrReceiverVersionConflict(receiver, desiredVersion) + } + return nil +} + +// limitOffset returns a subslice of items with the given offset and limit. Returns the same underlying array, not a copy. +func limitOffset[T any](items []T, offset, limit int) []T { + if limit == 0 && offset == 0 { + return items + } + if offset >= len(items) { + return nil + } + if offset+limit >= len(items) { + return items[offset:] + } + if limit == 0 { + limit = len(items) - offset + } + return items[offset : offset+limit] } func makeReceiverInUseErr(usedByRoutes bool, rules []models.AlertRuleKey) error { @@ -349,16 +534,34 @@ func makeReceiverInUseErr(usedByRoutes bool, rules []models.AlertRuleKey) error for _, key := range rules { uids = append(uids, key.UID) } - data := make(map[string]any, 2) + + var usedBy []string + data := make(map[string]any) if len(uids) > 0 { + usedBy = append(usedBy, fmt.Sprintf("%d rule(s)", len(uids))) data["UsedByRules"] = uids } if usedByRoutes { + usedBy = append(usedBy, "one or more routes") data["UsedByRoutes"] = true } + if len(usedBy) > 0 { + data["UsedBy"] = strings.Join(usedBy, ", ") + } return ErrReceiverInUse.Build(errutil.TemplateData{ Public: data, Error: nil, }) } + +func makeErrReceiverVersionConflict(current *models.Receiver, desiredVersion string) error { + data := errutil.TemplateData{ + Public: map[string]interface{}{ + "Version": desiredVersion, + "CurrentVersion": current.Version, + "Name": current.Name, + }, + } + return ErrReceiverVersionConflict.Build(data) +} diff --git a/pkg/services/ngalert/notifier/receiver_svc_test.go b/pkg/services/ngalert/notifier/receiver_svc_test.go index 38099b4355b..0592bdd0d9a 100644 --- a/pkg/services/ngalert/notifier/receiver_svc_test.go +++ b/pkg/services/ngalert/notifier/receiver_svc_test.go @@ -4,12 +4,13 @@ import ( "context" "encoding/json" "fmt" + "strings" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/accesscontrol" @@ -20,11 +21,15 @@ import ( "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" "github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/services/ngalert/notifier/legacy_storage" + "github.com/grafana/grafana/pkg/services/ngalert/provisioning/validation" "github.com/grafana/grafana/pkg/services/ngalert/tests/fakes" + "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/secrets" "github.com/grafana/grafana/pkg/services/secrets/database" + fake_secrets "github.com/grafana/grafana/pkg/services/secrets/fakes" "github.com/grafana/grafana/pkg/services/secrets/manager" "github.com/grafana/grafana/pkg/services/user" + "github.com/grafana/grafana/pkg/util" ) func TestReceiverService_GetReceiver(t *testing.T) { @@ -43,15 +48,15 @@ func TestReceiverService_GetReceiver(t *testing.T) { Receiver, err := sut.GetReceiver(context.Background(), singleQ(1, "slack receiver"), redactedUser) require.NoError(t, err) require.Equal(t, "slack receiver", Receiver.Name) - require.Len(t, Receiver.GrafanaManagedReceivers, 1) - require.Equal(t, "UID2", Receiver.GrafanaManagedReceivers[0].UID) + require.Len(t, Receiver.Integrations, 1) + require.Equal(t, "UID2", Receiver.Integrations[0].UID) }) t.Run("service returns error when receiver does not exist", func(t *testing.T) { sut := createReceiverServiceSut(t, secretsService) _, err := sut.GetReceiver(context.Background(), singleQ(1, "nonexistent"), redactedUser) - require.ErrorIs(t, err, ErrReceiverNotFound.Errorf("")) + require.ErrorIs(t, err, legacy_storage.ErrReceiverNotFound) }) } @@ -103,7 +108,7 @@ func TestReceiverService_DecryptRedact(t *testing.T) { Permissions: map[int64]map[string][]string{ 1: { accesscontrol.ActionAlertingNotificationsRead: nil, - accesscontrol.ActionAlertingReceiversReadSecrets: nil, + accesscontrol.ActionAlertingReceiversReadSecrets: {ac.ScopeReceiversAll}, }, }, } @@ -124,13 +129,13 @@ func TestReceiverService_DecryptRedact(t *testing.T) { name: "service returns error when trying to decrypt without permission", decrypt: true, user: readUser, - err: "[alerting.unauthorized] user is not authorized to read decrypted receiver", + err: "[alerting.unauthorized] user is not authorized to read any decrypted receiver", }, { name: "service returns error if user is nil and decrypt is true", decrypt: true, user: nil, - err: "[alerting.unauthorized] user is not authorized to read decrypted receiver", + err: "[alerting.unauthorized] user is not authorized to read any decrypted receiver", }, { name: "service decrypts receivers with permission", @@ -143,7 +148,7 @@ func TestReceiverService_DecryptRedact(t *testing.T) { t.Run(fmt.Sprintf("%s %s", tc.name, method), func(t *testing.T) { sut := createReceiverServiceSut(t, secretsService) - var res definitions.GettableApiReceiver + var res *models.Receiver var err error if method == "single" { q := singleQ(1, "slack receiver") @@ -152,7 +157,7 @@ func TestReceiverService_DecryptRedact(t *testing.T) { } else { q := multiQ(1, "slack receiver") q.Decrypt = tc.decrypt - var multiRes []definitions.GettableApiReceiver + var multiRes []*models.Receiver multiRes, err = sut.GetReceivers(context.Background(), q, tc.user) if tc.err == "" { require.Len(t, multiRes, 1) @@ -167,15 +172,14 @@ func TestReceiverService_DecryptRedact(t *testing.T) { if tc.err == "" { require.Equal(t, "slack receiver", res.Name) - require.Len(t, res.GrafanaManagedReceivers, 1) - require.Equal(t, "UID2", res.GrafanaManagedReceivers[0].UID) + require.Len(t, res.Integrations, 1) + require.Equal(t, "UID2", res.Integrations[0].UID) - testedSettings, err := simplejson.NewJson([]byte(res.GrafanaManagedReceivers[0].Settings)) require.NoError(t, err) if tc.decrypt { - require.Equal(t, "secure url", testedSettings.Get("url").MustString()) + require.Equal(t, "secure url", res.Integrations[0].Settings["url"]) } else { - require.Equal(t, definitions.RedactedValue, testedSettings.Get("url").MustString()) + require.Equal(t, definitions.RedactedValue, res.Integrations[0].Settings["url"]) } } }) @@ -183,7 +187,1050 @@ func TestReceiverService_DecryptRedact(t *testing.T) { } } -func createReceiverServiceSut(t *testing.T, encryptSvc secrets.Service) *ReceiverService { +func TestReceiverService_Delete(t *testing.T) { + secretsService := fake_secrets.NewFakeSecretsService() + + writer := &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{ + 1: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack"))() + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email"))() + baseReceiver := models.ReceiverGen(models.ReceiverMuts.WithName("test receiver"), models.ReceiverMuts.WithIntegrations(slackIntegration))() + + for _, tc := range []struct { + name string + user identity.Requester + deleteUID string + callerProvenance definitions.Provenance + version string + storeSettings map[models.AlertRuleKey][]models.NotificationSettings + existing *models.Receiver + expectedErr error + }{ + { + name: "service deletes receiver", + user: writer, + deleteUID: baseReceiver.UID, + existing: util.Pointer(baseReceiver.Clone()), + }, + { + name: "service deletes receiver with multiple integrations", + user: writer, + deleteUID: baseReceiver.UID, + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations(slackIntegration, emailIntegration))), + }, + { + name: "service deletes receiver with provenance", + user: writer, + deleteUID: baseReceiver.UID, + callerProvenance: definitions.Provenance(models.ProvenanceAPI), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceAPI), models.ReceiverMuts.WithIntegrations(slackIntegration, emailIntegration))), + }, + { + name: "non-existing receiver doesn't fail", + user: writer, + deleteUID: "non-existent", + }, + { + name: "delete receiver used by route fails", + user: writer, + deleteUID: legacy_storage.NameToUid("grafana-default-email"), + version: "1fd7897966a2adc5", // Correct version for grafana-default-email. + expectedErr: makeReceiverInUseErr(true, nil), + }, + { + name: "delete receiver used by rule fails", + user: writer, + deleteUID: baseReceiver.UID, + existing: util.Pointer(baseReceiver.Clone()), + storeSettings: map[models.AlertRuleKey][]models.NotificationSettings{ + models.AlertRuleKey{OrgID: 1, UID: "rule1"}: { + models.NotificationSettingsGen(models.NSMuts.WithReceiver(baseReceiver.Name))(), + }, + }, + expectedErr: makeReceiverInUseErr(false, []models.AlertRuleKey{{OrgID: 1, UID: "rule1"}}), + }, + { + name: "delete provisioning provenance fails when caller is ProvenanceNone", + user: writer, + deleteUID: baseReceiver.UID, + callerProvenance: definitions.Provenance(models.ProvenanceNone), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceFile))), + expectedErr: validation.MakeErrProvenanceChangeNotAllowed(models.ProvenanceFile, models.ProvenanceNone), + }, + { + name: "delete provisioning provenance fails when caller is a different type", // TODO: This should fail once we move from lenient to strict validation. + user: writer, + deleteUID: baseReceiver.UID, + callerProvenance: definitions.Provenance(models.ProvenanceFile), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceAPI))), + //expectedErr: validation.MakeErrProvenanceChangeNotAllowed(models.ProvenanceAPI, models.ProvenanceFile), + }, + { + name: "delete receiver with optimistic version mismatch fails", + user: writer, + deleteUID: baseReceiver.UID, + existing: util.Pointer(baseReceiver.Clone()), + version: "wrong version", + expectedErr: ErrReceiverVersionConflict, + }, + } { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + store := sut.ruleNotificationsStore.(*fakeConfigStore) + store.notificationSettings = map[int64]map[models.AlertRuleKey][]models.NotificationSettings{ + 1: make(map[models.AlertRuleKey][]models.NotificationSettings), + } + + for key, settings := range tc.storeSettings { + store.notificationSettings[tc.user.GetOrgID()][key] = settings + } + + if tc.existing != nil { + created, err := sut.CreateReceiver(context.Background(), tc.existing, tc.user.GetOrgID(), tc.user) + require.NoError(t, err) + + if tc.version == "" { + tc.version = created.Version + } + } + + err := sut.DeleteReceiver(context.Background(), tc.deleteUID, tc.callerProvenance, tc.version, tc.user.GetOrgID(), tc.user) + if tc.expectedErr == nil { + require.NoError(t, err) + } else { + assert.ErrorIs(t, err, tc.expectedErr) + return + } + // Ensure receiver saved to store is correct. + name, err := legacy_storage.UidToName(tc.deleteUID) + require.NoError(t, err) + q := models.GetReceiverQuery{OrgID: tc.user.GetOrgID(), Name: name} + _, err = sut.GetReceiver(context.Background(), q, writer) + assert.ErrorIs(t, err, legacy_storage.ErrReceiverNotFound) + + provenances, err := sut.provisioningStore.GetProvenances(context.Background(), tc.user.GetOrgID(), (&definitions.EmbeddedContactPoint{}).ResourceType()) + require.NoError(t, err) + assert.Len(t, provenances, 0) + }) + } +} + +func TestReceiverService_Create(t *testing.T) { + secretsService := fake_secrets.NewFakeSecretsService() + + writer := &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{ + 1: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + decryptUser := &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{ + 1: { + accesscontrol.ActionAlertingReceiversReadSecrets: {ac.ScopeReceiversAll}, + }, + }} + + // Used to mark generated fields to replace during test runtime. + generated := func(n int) string { return fmt.Sprintf("[GENERATED]%d", n) } + isGenerated := func(s string) bool { return strings.HasPrefix(s, "[GENERATED]") } + + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack"))() + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email"))() + baseReceiver := models.ReceiverGen(models.ReceiverMuts.WithName("test receiver"), models.ReceiverMuts.WithIntegrations(slackIntegration))() + + for _, tc := range []struct { + name string + user identity.Requester + receiver models.Receiver + expectedCreate models.Receiver + expectedErr error + expectedProvenances map[string]models.Provenance + }{ + { + name: "service creates receiver", + user: writer, + receiver: baseReceiver.Clone(), + expectedCreate: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceNone}, + }, + { + name: "service creates receiver with multiple integrations", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations(slackIntegration, emailIntegration)), + expectedCreate: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations(slackIntegration, emailIntegration), models.ReceiverMuts.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceNone, emailIntegration.UID: models.ProvenanceNone}, + }, + { + name: "service creates receiver with provenance", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceAPI), models.ReceiverMuts.WithIntegrations(slackIntegration, emailIntegration)), + expectedCreate: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceAPI), models.ReceiverMuts.WithIntegrations(slackIntegration, emailIntegration), models.ReceiverMuts.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceAPI, emailIntegration.UID: models.ProvenanceAPI}, + }, + { + name: "existing receiver fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithName("grafana-default-email")), + expectedErr: legacy_storage.ErrReceiverExists, + }, + { + name: "create integration with empty UID generates a new UID", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, models.IntegrationMuts.WithUID("")), + models.CopyIntegrationWith(emailIntegration, models.IntegrationMuts.WithUID("")), + )), + expectedCreate: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, models.IntegrationMuts.WithUID(generated(0))), // Mark UIDs as generated so that test will insert generated UID. + models.CopyIntegrationWith(emailIntegration, models.IntegrationMuts.WithUID(generated(1))), + ), models.ReceiverMuts.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{generated(0): models.ProvenanceNone, generated(1): models.ProvenanceNone}, // Mark UIDs as generated so that test will insert generated UID. + }, + { + name: "create integration with invalid UID fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, models.IntegrationMuts.WithUID("///@#$%^&*(")), + )), + expectedErr: legacy_storage.ErrReceiverInvalid, + }, + { + name: "create integration with existing UID fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, models.IntegrationMuts.WithUID("UID1")), // UID of grafana-default-email. + )), + expectedErr: legacy_storage.ErrReceiverInvalid, + }, + { + name: "create with invalid integration fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithInvalidIntegration("slack")), + expectedErr: legacy_storage.ErrReceiverInvalid, + }, + } { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + created, err := sut.CreateReceiver(context.Background(), &tc.receiver, tc.user.GetOrgID(), tc.user) + if tc.expectedErr == nil { + require.NoError(t, err) + } else { + assert.ErrorIs(t, err, tc.expectedErr) + return + } + + // First verify generated UIDs. We can't compare set them directly in expected because they are generated, + // so we ensure that all empty UIDs in expectedUpdate are not empty in updated. + generatedUIDs := make(map[string]string) + for i, integration := range tc.expectedCreate.Integrations { + if isGenerated(integration.UID) { + // Check that the UID was, in fact, generated. + if created.Integrations[i].UID != "" { + generatedUIDs[integration.UID] = created.Integrations[i].UID + // This ensures the following assert.Equal will pass for this generated field. + integration.UID = created.Integrations[i].UID + } + } + } + if len(generatedUIDs) > 0 { + // Version was calculated without generated UIDs. + tc.expectedCreate.Version = tc.expectedCreate.Fingerprint() + + // Set UIDs in expected provenance. + for k, v := range tc.expectedProvenances { + if gen, ok := generatedUIDs[k]; ok { + tc.expectedProvenances[gen] = v + delete(tc.expectedProvenances, k) + } + } + } + + assert.Equal(t, tc.expectedCreate, *created) + + // Ensure receiver saved to store is correct. + q := models.GetReceiverQuery{OrgID: tc.user.GetOrgID(), Name: tc.receiver.Name, Decrypt: true} + stored, err := sut.GetReceiver(context.Background(), q, decryptUser) + require.NoError(t, err) + decrypted := models.CopyReceiverWith(tc.expectedCreate, models.ReceiverMuts.Decrypted(models.Base64Decrypt)) + decrypted.Version = tc.expectedCreate.Version // Version is calculated before decryption. + assert.Equal(t, decrypted, *stored) + + provenances, err := sut.provisioningStore.GetProvenances(context.Background(), tc.user.GetOrgID(), (&definitions.EmbeddedContactPoint{}).ResourceType()) + require.NoError(t, err) + assert.Equal(t, tc.expectedProvenances, provenances) + }) + } +} + +func TestReceiverService_Update(t *testing.T) { + secretsService := fake_secrets.NewFakeSecretsService() + + writer := &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{ + 1: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + decryptUser := &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{ + 1: { + accesscontrol.ActionAlertingReceiversReadSecrets: {ac.ScopeReceiversAll}, + }, + }} + + // Used to mark generated fields to replace during test runtime. + generated := func(n int) string { return fmt.Sprintf("[GENERATED]%d", n) } + isGenerated := func(s string) bool { return strings.HasPrefix(s, "[GENERATED]") } + + rm := models.ReceiverMuts + im := models.IntegrationMuts + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack"))() + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email"))() + baseReceiver := models.ReceiverGen(models.ReceiverMuts.WithName("test receiver"), models.ReceiverMuts.WithIntegrations(slackIntegration))() + + for _, tc := range []struct { + name string + user identity.Requester + receiver models.Receiver + version string + secureFields map[string][]string + existing *models.Receiver + expectedUpdate models.Receiver + expectedProvenances map[string]models.Provenance + expectedErr error + }{ + { + name: "copies existing secure fields", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, im.AddSetting("newField", "newValue"))), + ), + secureFields: map[string][]string{slackIntegration.UID: {"token"}}, + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, rm.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, + im.AddSecureSetting("token", "ZXhpc3RpbmdUb2tlbg=="), // This will get copied. + im.AddSecureSetting("url", "ZXhpc3RpbmdVcmw="), // This won't get copied. + ), + ))), + expectedUpdate: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, + im.AddSetting("newField", "newValue"), + im.AddSecureSetting("token", "ZXhpc3RpbmdUb2tlbg==")), + ), rm.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceNone}, + }, + { + name: "doesn't copy existing unsecure fields", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, im.AddSetting("newField", "newValue"))), + ), + secureFields: map[string][]string{slackIntegration.UID: {"somefield"}}, + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, rm.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, + im.AddSetting("somefield", "somevalue"), // This won't get copied. + ), + ))), + expectedUpdate: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations( + models.CopyIntegrationWith(slackIntegration, + im.AddSetting("newField", "newValue")), + ), rm.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceNone}, + }, + { + name: "creates new provenance when integration is added", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations(slackIntegration, emailIntegration), models.ReceiverMuts.WithProvenance(models.ProvenanceFile)), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, rm.WithIntegrations(slackIntegration), models.ReceiverMuts.WithProvenance(models.ProvenanceFile))), + expectedUpdate: models.CopyReceiverWith(baseReceiver, + rm.WithIntegrations(slackIntegration, emailIntegration), + models.ReceiverMuts.WithProvenance(models.ProvenanceFile), + rm.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceFile, emailIntegration.UID: models.ProvenanceFile}, + }, + { + name: "deletes old provenance when integration is removed", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations(slackIntegration), models.ReceiverMuts.WithProvenance(models.ProvenanceFile)), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, rm.WithIntegrations(slackIntegration, emailIntegration), models.ReceiverMuts.WithProvenance(models.ProvenanceFile))), + expectedUpdate: models.CopyReceiverWith(baseReceiver, + rm.WithIntegrations(slackIntegration), + models.ReceiverMuts.WithProvenance(models.ProvenanceFile), + rm.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceFile}, + }, + { + name: "changing provenance from something to None fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceNone)), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceFile))), + expectedErr: validation.MakeErrProvenanceChangeNotAllowed(models.ProvenanceFile, models.ProvenanceNone), + }, + { + name: "changing provenance from one type to another fails", // TODO: This should fail once we move from lenient to strict validation. + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceAPI)), + existing: util.Pointer(models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithProvenance(models.ProvenanceFile))), + //expectedErr: validation.MakeErrProvenanceChangeNotAllowed(models.ProvenanceFile, models.ProvenanceAPI), + expectedUpdate: models.CopyReceiverWith(baseReceiver, + models.ReceiverMuts.WithProvenance(models.ProvenanceAPI), + rm.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceAPI}, + }, + { + name: "update receiver with optimistic version mismatch fails", + user: writer, + receiver: baseReceiver.Clone(), + version: "wrong version", + existing: util.Pointer(baseReceiver.Clone()), + expectedErr: ErrReceiverVersionConflict, + }, + { + name: "update receiver that doesn't exist fails", + user: writer, + receiver: baseReceiver.Clone(), + expectedErr: legacy_storage.ErrReceiverNotFound, + }, + { + name: "update that adds new integration generates a new UID", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations(slackIntegration, models.CopyIntegrationWith(emailIntegration, im.WithUID("")))), + existing: util.Pointer(baseReceiver.Clone()), + expectedUpdate: models.CopyReceiverWith(baseReceiver, + rm.WithIntegrations(slackIntegration, models.CopyIntegrationWith(emailIntegration, im.WithUID(generated(0)))), // Mark UID as generated so that test will insert generated UID. + rm.Encrypted(models.Base64Enrypt)), + expectedProvenances: map[string]models.Provenance{slackIntegration.UID: models.ProvenanceNone, generated(0): models.ProvenanceNone}, // Mark UID as generated so that test will insert generated UID. + }, + { + name: "update with integration that has a UID that already exists fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, rm.WithIntegrations(slackIntegration, models.CopyIntegrationWith(emailIntegration, im.WithUID(slackIntegration.UID)))), + existing: util.Pointer(baseReceiver.Clone()), + expectedErr: legacy_storage.ErrReceiverInvalid, + }, + { + name: "update with invalid integration fails", + user: writer, + receiver: models.CopyReceiverWith(baseReceiver, models.ReceiverMuts.WithInvalidIntegration("slack")), + existing: util.Pointer(baseReceiver.Clone()), + expectedErr: legacy_storage.ErrReceiverInvalid, + }, + } { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + if tc.existing != nil { + created, err := sut.CreateReceiver(context.Background(), tc.existing, tc.user.GetOrgID(), tc.user) + require.NoError(t, err) + + if tc.version == "" { + tc.version = created.Version + } + } + + tc.receiver.Version = tc.version + updated, err := sut.UpdateReceiver(context.Background(), &tc.receiver, tc.secureFields, tc.user.GetOrgID(), tc.user) + if tc.expectedErr == nil { + require.NoError(t, err) + } else { + assert.ErrorIs(t, err, tc.expectedErr) + return + } + + // First verify generated UIDs. We can't compare set them directly in expected because they are generated, + // so we ensure that all empty UIDs in expectedUpdate are not empty in updated. + generatedUIDs := make(map[string]string) + for i, integration := range tc.expectedUpdate.Integrations { + if isGenerated(integration.UID) { + // Check that the UID was, in fact, generated. + if updated.Integrations[i].UID != "" { + generatedUIDs[integration.UID] = updated.Integrations[i].UID + // This ensures the following assert.Equal will pass for this generated field. + integration.UID = updated.Integrations[i].UID + } + } + } + if len(generatedUIDs) > 0 { + // Version was calculated without generated UIDs. + tc.expectedUpdate.Version = tc.expectedUpdate.Fingerprint() + + // Set UIDs in expected provenance. + for k, v := range tc.expectedProvenances { + if gen, ok := generatedUIDs[k]; ok { + tc.expectedProvenances[gen] = v + delete(tc.expectedProvenances, k) + } + } + } + + assert.Equal(t, tc.expectedUpdate, *updated) + + // Ensure receiver saved to store is correct. + q := models.GetReceiverQuery{OrgID: tc.user.GetOrgID(), Name: tc.receiver.Name, Decrypt: true} + stored, err := sut.GetReceiver(context.Background(), q, decryptUser) + require.NoError(t, err) + decrypted := models.CopyReceiverWith(tc.expectedUpdate, models.ReceiverMuts.Decrypted(models.Base64Decrypt)) + decrypted.Version = tc.expectedUpdate.Version // Version is calculated before decryption. + assert.Equal(t, decrypted, *stored) + + provenances, err := sut.provisioningStore.GetProvenances(context.Background(), tc.user.GetOrgID(), (&definitions.EmbeddedContactPoint{}).ResourceType()) + require.NoError(t, err) + assert.Equal(t, tc.expectedProvenances, provenances) + }) + } +} + +func TestReceiverService_UpdateReceiverName(t *testing.T) { + // This test is to ensure that the receiver name is updated in routes and notification settings when the name is changed. + writer := &user.SignedInUser{OrgID: 1, Permissions: map[int64]map[string][]string{ + 1: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + + secretsService := fake_secrets.NewFakeSecretsService() + sut := createReceiverServiceSut(t, &secretsService) + + receiverName := "grafana-default-email" + newReceiverName := "new-name" + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName(receiverName), models.IntegrationMuts.WithValidConfig("slack"))() + baseReceiver := models.ReceiverGen(models.ReceiverMuts.WithName(receiverName), models.ReceiverMuts.WithIntegrations(slackIntegration))() + baseReceiver.Version = "1fd7897966a2adc5" // Correct version for grafana-default-email. + baseReceiver.Name = newReceiverName // Done here instead of in a mutator so we keep the same uid. + + store := sut.ruleNotificationsStore.(*fakeConfigStore) + ns := models.NotificationSettingsGen(models.NSMuts.WithReceiver(receiverName))() + store.notificationSettings = map[int64]map[models.AlertRuleKey][]models.NotificationSettings{ + 1: { + {OrgID: 1, UID: "rule1"}: {ns}, + }, + } + + _, err := sut.UpdateReceiver(context.Background(), &baseReceiver, nil, writer.GetOrgID(), writer) + require.NoError(t, err) + + // Ensure receiver name is updated in notification settings. + oldSettings, err := sut.ruleNotificationsStore.ListNotificationSettings(context.Background(), models.ListNotificationSettingsQuery{ + OrgID: writer.GetOrgID(), + ReceiverName: receiverName, + }) + require.NoError(t, err) + assert.Equal(t, 0, len(oldSettings)) + newSettings, err := sut.ruleNotificationsStore.ListNotificationSettings(context.Background(), models.ListNotificationSettingsQuery{ + OrgID: writer.GetOrgID(), + ReceiverName: baseReceiver.Name, + }) + require.NoError(t, err) + assert.Equal(t, 1, len(newSettings)) + assert.Equal(t, newReceiverName, newSettings[models.AlertRuleKey{OrgID: 1, UID: "rule1"}][0].Receiver) + + // Ensure receiver name is updated in routes. + revision, err := sut.cfgStore.Get(context.Background(), writer.GetOrgID()) + require.NoError(t, err) + + assert.Falsef(t, revision.ReceiverNameUsedByRoutes(receiverName), "old receiver name '%s' should not be used by routes", receiverName) + assert.Truef(t, revision.ReceiverNameUsedByRoutes(newReceiverName), "new receiver name '%s' should be used by routes", newReceiverName) +} + +func TestReceiverServiceAC_Read(t *testing.T) { + var orgId int64 = 1 + secretsService := fake_secrets.NewFakeSecretsService() + + admin := &user.SignedInUser{OrgID: orgId, OrgRole: org.RoleAdmin, Permissions: map[int64]map[string][]string{ + orgId: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack")) + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email")) + recv1 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver1"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv2 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver2"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv3 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver3"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + allReceivers := func() []models.Receiver { + return []models.Receiver{recv1, recv2, recv3} + } + testCases := []struct { + name string + permissions map[string][]string + existing []models.Receiver + + visible []models.Receiver + }{ + { + name: "not authorized without permissions", + existing: allReceivers(), + visible: nil, + }, + { + name: "not authorized without receivers scope", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversRead: nil}, + existing: allReceivers(), + visible: nil, + }, + { + name: "global legacy permissions - read all", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsRead: nil}, + existing: allReceivers(), + visible: allReceivers(), + }, + { + name: "global receivers permissions - read all", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversRead: {ac.ScopeReceiversAll}}, + existing: allReceivers(), + visible: allReceivers(), + }, + { + name: "single receivers permissions - read some", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversRead: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }}, + existing: allReceivers(), + visible: []models.Receiver{recv1, recv3}, + }, + { + name: "global receivers secret permissions - read all", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversReadSecrets: {ac.ScopeReceiversAll}}, + existing: allReceivers(), + visible: allReceivers(), + }, + { + name: "single receivers secret permissions - read some", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversReadSecrets: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }}, + existing: allReceivers(), + visible: []models.Receiver{recv1, recv3}, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + for _, recv := range tc.existing { + _, err := sut.CreateReceiver(context.Background(), &recv, orgId, admin) + require.NoError(t, err) + } + + usr := &user.SignedInUser{OrgID: orgId, Permissions: map[int64]map[string][]string{ + orgId: tc.permissions, + }} + + isVisible := func(uid string) bool { + for _, recv := range tc.visible { + if recv.UID == uid { + return true + } + } + return false + } + for _, recv := range allReceivers() { + response, err := sut.GetReceiver(context.Background(), singleQ(orgId, recv.Name), usr) + if isVisible(recv.UID) { + require.NoErrorf(t, err, "receiver '%s' should be visible, but isn't", recv.Name) + assert.NotNil(t, response) + } else { + assert.ErrorIsf(t, err, ac.ErrAuthorizationBase, "receiver '%s' should not be visible, but is", recv.Name) + } + } + }) + } +} + +func TestReceiverServiceAC_Create(t *testing.T) { + var orgId int64 = 1 + secretsService := fake_secrets.NewFakeSecretsService() + + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack")) + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email")) + recv1 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver1"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv2 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver2"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv3 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver3"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + allReceivers := func() []models.Receiver { + return []models.Receiver{recv1, recv2, recv3} + } + testCases := []struct { + name string + permissions map[string][]string + + hasAccess []models.Receiver + }{ + { + name: "not authorized without permissions", + hasAccess: nil, + }, + { + name: "global legacy permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsWrite: nil}, + hasAccess: nil, + }, + { + name: "receivers permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversCreate: nil}, + hasAccess: nil, + }, + { + name: "global legacy permissions - create all", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsWrite: nil, accesscontrol.ActionAlertingNotificationsRead: nil}, + hasAccess: allReceivers(), + }, + { + name: "receivers permissions - create all", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversCreate: nil, accesscontrol.ActionAlertingReceiversRead: nil}, + hasAccess: allReceivers(), + }, + { + name: "receivers mixed global read permissions - create all", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversCreate: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + hasAccess: allReceivers(), + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + usr := &user.SignedInUser{OrgID: orgId, Permissions: map[int64]map[string][]string{ + orgId: tc.permissions, + }} + + hasAccess := func(uid string) bool { + for _, recv := range tc.hasAccess { + if recv.UID == uid { + return true + } + } + return false + } + for _, recv := range allReceivers() { + response, err := sut.CreateReceiver(context.Background(), &recv, orgId, usr) + if hasAccess(recv.UID) { + require.NoErrorf(t, err, "should have access to receiver '%s', but doesn't", recv.Name) + assert.NotNil(t, response) + } else { + assert.ErrorIsf(t, err, ac.ErrAuthorizationBase, "should not have access to receiver '%s', but does", recv.Name) + } + } + }) + } +} + +func TestReceiverServiceAC_Update(t *testing.T) { + var orgId int64 = 1 + secretsService := fake_secrets.NewFakeSecretsService() + + admin := &user.SignedInUser{OrgID: orgId, OrgRole: org.RoleAdmin, Permissions: map[int64]map[string][]string{ + orgId: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack")) + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email")) + recv1 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver1"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv2 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver2"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv3 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver3"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + allReceivers := func() []models.Receiver { + return []models.Receiver{recv1, recv2, recv3} + } + testCases := []struct { + name string + permissions map[string][]string + existing []models.Receiver + + hasAccess []models.Receiver + }{ + { + name: "not authorized without permissions", + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "not authorized without receivers scope", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversUpdate: nil}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "global legacy permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsWrite: nil}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "global receivers permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversUpdate: {ac.ScopeReceiversAll}}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "single receivers permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversUpdate: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "global legacy permissions - update all", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsWrite: nil, accesscontrol.ActionAlertingNotificationsRead: nil}, + existing: allReceivers(), + hasAccess: allReceivers(), + }, + { + name: "global receivers permissions - update all", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversUpdate: {ac.ScopeReceiversAll}, accesscontrol.ActionAlertingReceiversRead: {ac.ScopeReceiversAll}}, + existing: allReceivers(), + hasAccess: allReceivers(), + }, + { + name: "single receivers permissions - update some", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversUpdate: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + accesscontrol.ActionAlertingReceiversRead: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + }, + existing: allReceivers(), + hasAccess: []models.Receiver{recv1, recv3}, + }, + { + name: "single receivers mixed read permissions - update some", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversUpdate: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + accesscontrol.ActionAlertingReceiversRead: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv2.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + }, + existing: allReceivers(), + hasAccess: []models.Receiver{recv3}, + }, + { + name: "single receivers mixed global read permissions - update some", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversUpdate: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + existing: allReceivers(), + hasAccess: []models.Receiver{recv1, recv3}, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + versions := map[string]string{} + for _, recv := range tc.existing { + created, err := sut.CreateReceiver(context.Background(), &recv, orgId, admin) + require.NoError(t, err) + versions[recv.UID] = created.Version + } + + usr := &user.SignedInUser{OrgID: orgId, Permissions: map[int64]map[string][]string{ + orgId: tc.permissions, + }} + + hasAccess := func(uid string) bool { + for _, recv := range tc.hasAccess { + if recv.UID == uid { + return true + } + } + return false + } + for _, recv := range allReceivers() { + clone := recv.Clone() + clone.Version = versions[recv.UID] + response, err := sut.UpdateReceiver(context.Background(), &clone, nil, orgId, usr) + if hasAccess(clone.UID) { + require.NoErrorf(t, err, "should have access to receiver '%s', but doesn't", clone.Name) + assert.NotNil(t, response) + } else { + assert.ErrorIsf(t, err, ac.ErrAuthorizationBase, "should not have access to receiver '%s', but does", clone.Name) + } + } + }) + } +} + +func TestReceiverServiceAC_Delete(t *testing.T) { + var orgId int64 = 1 + secretsService := fake_secrets.NewFakeSecretsService() + + admin := &user.SignedInUser{OrgID: orgId, OrgRole: org.RoleAdmin, Permissions: map[int64]map[string][]string{ + orgId: { + accesscontrol.ActionAlertingNotificationsWrite: nil, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + }} + + slackIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("slack")) + emailIntegration := models.IntegrationGen(models.IntegrationMuts.WithName("test receiver"), models.IntegrationMuts.WithValidConfig("email")) + recv1 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver1"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv2 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver2"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + recv3 := models.ReceiverGen(models.ReceiverMuts.WithName("receiver3"), models.ReceiverMuts.WithIntegrations(slackIntegration(), emailIntegration()))() + allReceivers := func() []models.Receiver { + return []models.Receiver{recv1, recv2, recv3} + } + testCases := []struct { + name string + permissions map[string][]string + existing []models.Receiver + + hasAccess []models.Receiver + }{ + { + name: "not authorized without permissions", + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "not authorized without receivers scope", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversDelete: nil}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "global legacy permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsWrite: nil}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "global receivers permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversDelete: {ac.ScopeReceiversAll}}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "single receivers permissions - not authorized without read", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversDelete: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }}, + existing: allReceivers(), + hasAccess: nil, + }, + { + name: "global legacy permissions - delete all", + permissions: map[string][]string{accesscontrol.ActionAlertingNotificationsWrite: nil, accesscontrol.ActionAlertingNotificationsRead: nil}, + existing: allReceivers(), + hasAccess: allReceivers(), + }, + { + name: "global receivers permissions - delete all", + permissions: map[string][]string{accesscontrol.ActionAlertingReceiversDelete: {ac.ScopeReceiversAll}, accesscontrol.ActionAlertingReceiversRead: {ac.ScopeReceiversAll}}, + existing: allReceivers(), + hasAccess: allReceivers(), + }, + { + name: "single receivers permissions - delete some", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversDelete: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + accesscontrol.ActionAlertingReceiversRead: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + }, + existing: allReceivers(), + hasAccess: []models.Receiver{recv1, recv3}, + }, + { + name: "single receivers mixed read permissions - delete some", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversDelete: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + accesscontrol.ActionAlertingReceiversRead: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv2.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + }, + existing: allReceivers(), + hasAccess: []models.Receiver{recv3}, + }, + { + name: "single receivers mixed global read permissions - delete some", + permissions: map[string][]string{ + accesscontrol.ActionAlertingReceiversDelete: { + ac.ScopeReceiversProvider.GetResourceScopeUID(recv1.UID), + ac.ScopeReceiversProvider.GetResourceScopeUID(recv3.UID), + }, + accesscontrol.ActionAlertingNotificationsRead: nil, + }, + existing: allReceivers(), + hasAccess: []models.Receiver{recv1, recv3}, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + sut := createReceiverServiceSut(t, &secretsService) + + versions := map[string]string{} + for _, recv := range tc.existing { + created, err := sut.CreateReceiver(context.Background(), &recv, orgId, admin) + require.NoError(t, err) + versions[recv.UID] = created.Version + } + + usr := &user.SignedInUser{OrgID: orgId, Permissions: map[int64]map[string][]string{ + orgId: tc.permissions, + }} + + hasAccess := func(uid string) bool { + for _, recv := range tc.hasAccess { + if recv.UID == uid { + return true + } + } + return false + } + for _, recv := range allReceivers() { + err := sut.DeleteReceiver(context.Background(), recv.UID, definitions.Provenance(models.ProvenanceNone), versions[recv.UID], orgId, usr) + if hasAccess(recv.UID) { + require.NoErrorf(t, err, "should have access to receiver '%s', but doesn't", recv.Name) + } else { + assert.ErrorIsf(t, err, ac.ErrAuthorizationBase, "should not have access to receiver '%s', but does", recv.Name) + } + } + }) + } +} + +func createReceiverServiceSut(t *testing.T, encryptSvc secretService) *ReceiverService { cfg := createEncryptedConfig(t, encryptSvc) store := fakes.NewFakeAlertmanagerConfigStore(cfg) xact := newNopTransactionManager() @@ -193,13 +1240,14 @@ func createReceiverServiceSut(t *testing.T, encryptSvc secrets.Service) *Receive ac.NewReceiverAccess[*models.Receiver](acimpl.ProvideAccessControl(featuremgmt.WithFeatures(), zanzana.NewNoopClient()), false), legacy_storage.NewAlertmanagerConfigStore(store), provisioningStore, + NewFakeConfigStore(t, nil), encryptSvc, xact, log.NewNopLogger(), ) } -func createEncryptedConfig(t *testing.T, secretService secrets.Service) string { +func createEncryptedConfig(t *testing.T, secretService secretService) string { c := &definitions.PostableUserConfig{} err := json.Unmarshal([]byte(defaultAlertmanagerConfigJSON), c) require.NoError(t, err) diff --git a/pkg/services/ngalert/notifier/redis_peer.go b/pkg/services/ngalert/notifier/redis_peer.go index 5a5ad3f8cfc..11b8c5d6d1c 100644 --- a/pkg/services/ngalert/notifier/redis_peer.go +++ b/pkg/services/ngalert/notifier/redis_peer.go @@ -64,6 +64,7 @@ type redisPeer struct { states map[string]alertingCluster.State subs map[string]*redis.PubSub statesMtx sync.RWMutex + subsMtx sync.RWMutex readyc chan struct{} shutdownc chan struct{} @@ -225,8 +226,10 @@ func newRedisPeer(cfg redisConfig, logger log.Logger, reg prometheus.Registerer, p.nodePingDuration = nodePingDuration p.nodePingFailures = nodePingFailures + p.subsMtx.Lock() p.subs[fullStateChannel] = p.redis.Subscribe(context.Background(), p.withPrefix(fullStateChannel)) p.subs[fullStateChannelReq] = p.redis.Subscribe(context.Background(), p.withPrefix(fullStateChannelReq)) + p.subsMtx.Unlock() go p.heartbeatLoop() go p.membersSyncLoop() @@ -461,7 +464,9 @@ func (p *redisPeer) AddState(key string, state alertingCluster.State, _ promethe // As we also want to get the state from other nodes, we subscribe to the key. sub := p.redis.Subscribe(context.Background(), p.withPrefix(key)) go p.receiveLoop(sub) + p.subsMtx.Lock() p.subs[key] = sub + p.subsMtx.Unlock() return newRedisChannel(p, key, p.withPrefix(key), update) } @@ -507,17 +512,29 @@ func (p *redisPeer) fullStateReqReceiveLoop() { select { case <-p.shutdownc: return - case data := <-p.subs[fullStateChannelReq].Channel(): - // The payload of a full state request is the name of the peer that is - // requesting the full state. In case we received our own request, we - // can just ignore it. Redis pub/sub fanouts to all clients, regardless - // if a client was also the publisher. - if data.Payload == p.name { + default: + p.subsMtx.RLock() + sub, ok := p.subs[fullStateChannelReq] + p.subsMtx.RUnlock() + + if !ok { + time.Sleep(waitForMsgIdle) continue } - p.fullStateSyncPublish() - default: - time.Sleep(waitForMsgIdle) + + select { + case data := <-sub.Channel(): + // The payload of a full state request is the name of the peer that is + // requesting the full state. In case we received our own request, we + // can just ignore it. Redis pub/sub fanouts to all clients, regardless + // if a client was also the publisher. + if data.Payload == p.name { + continue + } + p.fullStateSyncPublish() + default: + time.Sleep(waitForMsgIdle) + } } } } @@ -527,10 +544,22 @@ func (p *redisPeer) fullStateSyncReceiveLoop() { select { case <-p.shutdownc: return - case data := <-p.subs[fullStateChannel].Channel(): - p.mergeFullState([]byte(data.Payload)) default: - time.Sleep(waitForMsgIdle) + p.subsMtx.RLock() + sub, ok := p.subs[fullStateChannel] + p.subsMtx.RUnlock() + + if !ok { + time.Sleep(waitForMsgIdle) + continue + } + + select { + case data := <-sub.Channel(): + p.mergeFullState([]byte(data.Payload)) + default: + time.Sleep(waitForMsgIdle) + } } } } diff --git a/pkg/services/ngalert/notifier/testing.go b/pkg/services/ngalert/notifier/testing.go index 3b1a6ea965a..aac14ef988b 100644 --- a/pkg/services/ngalert/notifier/testing.go +++ b/pkg/services/ngalert/notifier/testing.go @@ -57,6 +57,28 @@ func (f *fakeConfigStore) ListNotificationSettings(ctx context.Context, q models return settings, nil } +func (f *fakeConfigStore) RenameReceiverInNotificationSettings(ctx context.Context, orgID int64, oldReceiver, newReceiver string) (int, error) { + if oldReceiver == newReceiver { + return 0, nil + } + settings, ok := f.notificationSettings[orgID] + if !ok { + return 0, nil + } + + var updated int + for _, notificationSettings := range settings { + for i, setting := range notificationSettings { + if setting.Receiver == oldReceiver { + updated++ + notificationSettings[i].Receiver = newReceiver + } + } + } + + return updated, nil +} + // Saves the image or returns an error. func (f *fakeConfigStore) SaveImage(ctx context.Context, img *models.Image) error { return alertingImages.ErrImageNotFound diff --git a/pkg/services/ngalert/provisioning/compat.go b/pkg/services/ngalert/provisioning/compat.go index 1bfeffa11e4..714452ddcc6 100644 --- a/pkg/services/ngalert/provisioning/compat.go +++ b/pkg/services/ngalert/provisioning/compat.go @@ -46,28 +46,22 @@ func PostableGrafanaReceiverToEmbeddedContactPoint(contactPoint *definitions.Pos return embeddedContactPoint, nil } -func GettableGrafanaReceiverToEmbeddedContactPoint(r *definitions.GettableGrafanaReceiver) (definitions.EmbeddedContactPoint, error) { +func GrafanaIntegrationConfigToEmbeddedContactPoint(r *models.Integration, provenance models.Provenance) definitions.EmbeddedContactPoint { settingJson := simplejson.New() if r.Settings != nil { - var err error - settingJson, err = simplejson.NewJson(r.Settings) - if err != nil { - return definitions.EmbeddedContactPoint{}, err - } + settingJson = simplejson.NewFromAny(r.Settings) } - for k := range r.SecureFields { - if settingJson.Get(k).MustString() == "" { - settingJson.Set(k, definitions.RedactedValue) - } - } + // We explicitly do not copy the secure settings to the settings field. This is because the provisioning API + // never returns decrypted or encrypted values, only redacted values. Redacted values should already exist in the + // settings field. return definitions.EmbeddedContactPoint{ UID: r.UID, Name: r.Name, - Type: r.Type, + Type: r.Config.Type, DisableResolveMessage: r.DisableResolveMessage, Settings: settingJson, - Provenance: string(r.Provenance), - }, nil + Provenance: string(provenance), + } } diff --git a/pkg/services/ngalert/provisioning/contactpoints.go b/pkg/services/ngalert/provisioning/contactpoints.go index ff7700c4a0a..ba9026f5acc 100644 --- a/pkg/services/ngalert/provisioning/contactpoints.go +++ b/pkg/services/ngalert/provisioning/contactpoints.go @@ -40,7 +40,7 @@ type ContactPointService struct { } type receiverService interface { - GetReceivers(ctx context.Context, query models.GetReceiversQuery, user identity.Requester) ([]apimodels.GettableApiReceiver, error) + GetReceivers(ctx context.Context, query models.GetReceiversQuery, user identity.Requester) ([]*models.Receiver, error) } func NewContactPointService(store alertmanagerConfigStore, encryptionService secrets.Service, @@ -79,23 +79,15 @@ func (ecp *ContactPointService) GetContactPoints(ctx context.Context, q ContactP if err != nil { return nil, convertRecSvcErr(err) } - grafanaReceivers := []*apimodels.GettableGrafanaReceiver{} if q.Name != "" && len(res) > 0 { - grafanaReceivers = res[0].GettableGrafanaReceivers.GrafanaManagedReceivers // we only expect one receiver group - } else { - for _, r := range res { - grafanaReceivers = append(grafanaReceivers, r.GettableGrafanaReceivers.GrafanaManagedReceivers...) - } + res = []*models.Receiver{res[0]} // we only expect one receiver group } - contactPoints := make([]apimodels.EmbeddedContactPoint, len(grafanaReceivers)) - for i, gr := range grafanaReceivers { - contactPoint, err := GettableGrafanaReceiverToEmbeddedContactPoint(gr) - if err != nil { - return nil, err + contactPoints := make([]apimodels.EmbeddedContactPoint, 0, len(res)) + for _, recv := range res { + for _, gr := range recv.Integrations { + contactPoints = append(contactPoints, GrafanaIntegrationConfigToEmbeddedContactPoint(gr, recv.Provenance)) } - - contactPoints[i] = contactPoint } sort.SliceStable(contactPoints, func(i, j int) bool { @@ -428,7 +420,7 @@ groupLoop: // If we're renaming, we'll need to fix up the macro receiver group for consistency. // Firstly, if we're the only receiver in the group, simply rename the group to match. Done! if len(receiverGroup.GrafanaManagedReceivers) == 1 { - replaceReferences(receiverGroup.Name, target.Name, cfg.AlertmanagerConfig.Route) + legacy_storage.RenameReceiverInRoute(receiverGroup.Name, target.Name, cfg.AlertmanagerConfig.Route) receiverGroup.Name = target.Name receiverGroup.GrafanaManagedReceivers[i] = target renamedReceiver = receiverGroup.Name @@ -476,38 +468,12 @@ groupLoop: return configModified, renamedReceiver } -func replaceReferences(oldName, newName string, routes ...*apimodels.Route) { - if len(routes) == 0 { - return - } - for _, route := range routes { - if route.Receiver == oldName { - route.Receiver = newName - } - replaceReferences(oldName, newName, route.Routes...) - } -} - func ValidateContactPoint(ctx context.Context, e apimodels.EmbeddedContactPoint, decryptFunc alertingNotify.GetDecryptedValueFn) error { - if e.Type == "" { - return fmt.Errorf("type should not be an empty string") - } - if e.Settings == nil { - return fmt.Errorf("settings should not be empty") - } integration, err := EmbeddedContactPointToGrafanaIntegrationConfig(e) if err != nil { return err } - _, err = alertingNotify.BuildReceiverConfiguration(ctx, &alertingNotify.APIReceiver{ - GrafanaIntegrations: alertingNotify.GrafanaIntegrations{ - Integrations: []*alertingNotify.GrafanaIntegrationConfig{&integration}, - }, - }, decryptFunc) - if err != nil { - return err - } - return nil + return models.ValidateIntegration(ctx, integration, decryptFunc) } // RemoveSecretsForContactPoint removes all secrets from the contact point's settings and returns them as a map. Returns error if contact point type is not known. diff --git a/pkg/services/ngalert/provisioning/contactpoints_test.go b/pkg/services/ngalert/provisioning/contactpoints_test.go index a502f9c8798..4f71bddaf11 100644 --- a/pkg/services/ngalert/provisioning/contactpoints_test.go +++ b/pkg/services/ngalert/provisioning/contactpoints_test.go @@ -392,6 +392,7 @@ func createContactPointServiceSutWithConfigStore(t *testing.T, secretService sec ac.NewReceiverAccess[*models.Receiver](acimpl.ProvideAccessControl(featuremgmt.WithFeatures(), zanzana.NewNoopClient()), true), legacy_storage.NewAlertmanagerConfigStore(configStore), provisioningStore, + notifier.NewFakeConfigStore(t, nil), secretService, xact, log.NewNopLogger(), diff --git a/pkg/services/ngalert/provisioning/errors.go b/pkg/services/ngalert/provisioning/errors.go index 5c23280000c..febdbe49923 100644 --- a/pkg/services/ngalert/provisioning/errors.go +++ b/pkg/services/ngalert/provisioning/errors.go @@ -24,6 +24,7 @@ var ( ErrTemplateNotFound = errutil.NotFound("alerting.notifications.templates.notFound") ErrTemplateInvalid = errutil.BadRequest("alerting.notifications.templates.invalidFormat").MustTemplate("Invalid format of the submitted template", errutil.WithPublic("Template is in invalid format. Correct the payload and try again.")) + ErrTemplateExists = errutil.BadRequest("alerting.notifications.templates.nameExists", errutil.WithPublicMessage("Template file with this name already exists. Use a different name or update existing one.")) ErrContactPointReferenced = errutil.Conflict("alerting.notifications.contact-points.referenced", errutil.WithPublicMessage("Contact point is currently referenced by a notification policy.")) ErrContactPointUsedInRule = errutil.Conflict("alerting.notifications.contact-points.used-by-rule", errutil.WithPublicMessage("Contact point is currently used in the notification settings of one or many alert rules.")) diff --git a/pkg/services/ngalert/provisioning/templates.go b/pkg/services/ngalert/provisioning/templates.go index bed740aa763..29bc8155e71 100644 --- a/pkg/services/ngalert/provisioning/templates.go +++ b/pkg/services/ngalert/provisioning/templates.go @@ -2,6 +2,7 @@ package provisioning import ( "context" + "errors" "fmt" "hash/fnv" "unsafe" @@ -9,6 +10,7 @@ import ( "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" "github.com/grafana/grafana/pkg/services/ngalert/models" + "github.com/grafana/grafana/pkg/services/ngalert/notifier/legacy_storage" "github.com/grafana/grafana/pkg/services/ngalert/provisioning/validation" ) @@ -48,6 +50,7 @@ func (t *TemplateService) GetTemplates(ctx context.Context, orgID int64) ([]defi templates := make([]definitions.NotificationTemplate, 0, len(revision.Config.TemplateFiles)) for name, tmpl := range revision.Config.TemplateFiles { tmpl := definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(name), Name: name, Template: tmpl, ResourceVersion: calculateTemplateFingerprint(tmpl), @@ -63,33 +66,37 @@ func (t *TemplateService) GetTemplates(ctx context.Context, orgID int64) ([]defi return templates, nil } -func (t *TemplateService) GetTemplate(ctx context.Context, orgID int64, name string) (definitions.NotificationTemplate, error) { +func (t *TemplateService) GetTemplate(ctx context.Context, orgID int64, nameOrUid string) (definitions.NotificationTemplate, error) { revision, err := t.configStore.Get(ctx, orgID) if err != nil { return definitions.NotificationTemplate{}, err } - for tmplName, tmpl := range revision.Config.TemplateFiles { - if tmplName != name { - continue - } - tmpl := definitions.NotificationTemplate{ - Name: name, - Template: tmpl, - ResourceVersion: calculateTemplateFingerprint(tmpl), - } - - provenance, err := t.provenanceStore.GetProvenance(ctx, &tmpl, orgID) - if err != nil { - return definitions.NotificationTemplate{}, err - } - tmpl.Provenance = definitions.Provenance(provenance) - return tmpl, nil + existingName := nameOrUid + existingContent, ok := revision.Config.TemplateFiles[nameOrUid] + if !ok { + existingName, existingContent, ok = getTemplateByUid(revision.Config.TemplateFiles, nameOrUid) } - return definitions.NotificationTemplate{}, ErrTemplateNotFound.Errorf("") + if !ok { + return definitions.NotificationTemplate{}, ErrTemplateNotFound.Errorf("") + } + + tmpl := definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(existingName), + Name: existingName, + Template: existingContent, + ResourceVersion: calculateTemplateFingerprint(existingContent), + } + + provenance, err := t.provenanceStore.GetProvenance(ctx, &tmpl, orgID) + if err != nil { + return definitions.NotificationTemplate{}, err + } + tmpl.Provenance = definitions.Provenance(provenance) + return tmpl, nil } -func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) { +func (t *TemplateService) UpsertTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) { err := tmpl.Validate() if err != nil { return definitions.NotificationTemplate{}, MakeErrTemplateInvalid(err) @@ -100,35 +107,48 @@ func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl def return definitions.NotificationTemplate{}, err } + d, err := t.updateTemplate(ctx, revision, orgID, tmpl) + if err != nil { + if !errors.Is(err, ErrTemplateNotFound) { + return d, err + } + // If template was not found, this is assumed to be a create operation except for two cases: + // - If a ResourceVersion is provided: we should assume that this was meant to be a conditional update operation. + // - If UID is provided: custom UID for templates is not currently supported, so this was meant to be an update + // operation without a ResourceVersion. + if tmpl.ResourceVersion != "" || tmpl.UID != "" { + return definitions.NotificationTemplate{}, ErrTemplateNotFound.Errorf("") + } + return t.createTemplate(ctx, revision, orgID, tmpl) + } + return d, err +} + +func (t *TemplateService) CreateTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) { + err := tmpl.Validate() + if err != nil { + return definitions.NotificationTemplate{}, MakeErrTemplateInvalid(err) + } + revision, err := t.configStore.Get(ctx, orgID) + if err != nil { + return definitions.NotificationTemplate{}, err + } + return t.createTemplate(ctx, revision, orgID, tmpl) +} + +func (t *TemplateService) createTemplate(ctx context.Context, revision *legacy_storage.ConfigRevision, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) { if revision.Config.TemplateFiles == nil { revision.Config.TemplateFiles = map[string]string{} } - _, ok := revision.Config.TemplateFiles[tmpl.Name] - if ok { - // check that provenance is not changed in an invalid way - storedProvenance, err := t.provenanceStore.GetProvenance(ctx, &tmpl, orgID) - if err != nil { - return definitions.NotificationTemplate{}, err - } - if err := t.validator(storedProvenance, models.Provenance(tmpl.Provenance)); err != nil { - return definitions.NotificationTemplate{}, err - } - } - - existing, ok := revision.Config.TemplateFiles[tmpl.Name] - if ok { - err = t.checkOptimisticConcurrency(tmpl.Name, existing, models.Provenance(tmpl.Provenance), tmpl.ResourceVersion, "update") - if err != nil { - return definitions.NotificationTemplate{}, err - } - } else if tmpl.ResourceVersion != "" { // if version is set then it's an update operation. Fail because resource does not exist anymore - return definitions.NotificationTemplate{}, ErrTemplateNotFound.Errorf("") + _, found := revision.Config.TemplateFiles[tmpl.Name] + if found { + return definitions.NotificationTemplate{}, ErrTemplateExists.Errorf("") } revision.Config.TemplateFiles[tmpl.Name] = tmpl.Template - err = t.xact.InTransaction(ctx, func(ctx context.Context) error { + err := t.xact.InTransaction(ctx, func(ctx context.Context) error { if err := t.configStore.Save(ctx, revision, orgID); err != nil { return err } @@ -139,6 +159,7 @@ func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl def } return definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), Name: tmpl.Name, Template: tmpl.Template, Provenance: tmpl.Provenance, @@ -146,7 +167,90 @@ func (t *TemplateService) SetTemplate(ctx context.Context, orgID int64, tmpl def }, nil } -func (t *TemplateService) DeleteTemplate(ctx context.Context, orgID int64, name string, provenance definitions.Provenance, version string) error { +func (t *TemplateService) UpdateTemplate(ctx context.Context, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) { + err := tmpl.Validate() + if err != nil { + return definitions.NotificationTemplate{}, MakeErrTemplateInvalid(err) + } + + revision, err := t.configStore.Get(ctx, orgID) + if err != nil { + return definitions.NotificationTemplate{}, err + } + return t.updateTemplate(ctx, revision, orgID, tmpl) +} + +func (t *TemplateService) updateTemplate(ctx context.Context, revision *legacy_storage.ConfigRevision, orgID int64, tmpl definitions.NotificationTemplate) (definitions.NotificationTemplate, error) { + if revision.Config.TemplateFiles == nil { + revision.Config.TemplateFiles = map[string]string{} + } + + var found bool + var existingName, existingContent string + // if UID is specified, look by UID. + if tmpl.UID != "" { + existingName, existingContent, found = getTemplateByUid(revision.Config.TemplateFiles, tmpl.UID) + // do not fall back to name because we address by UID, and resource can be deleted\renamed + } else { + existingName = tmpl.Name + existingContent, found = revision.Config.TemplateFiles[existingName] + } + if !found { + return definitions.NotificationTemplate{}, ErrTemplateNotFound.Errorf("") + } + + if existingName != tmpl.Name { // if template is renamed, check if this name is already taken + _, ok := revision.Config.TemplateFiles[tmpl.Name] + if ok { + // return error if template is being renamed to one that already exists + return definitions.NotificationTemplate{}, ErrTemplateExists.Errorf("") + } + } + + // check that provenance is not changed in an invalid way + storedProvenance, err := t.provenanceStore.GetProvenance(ctx, &tmpl, orgID) + if err != nil { + return definitions.NotificationTemplate{}, err + } + if err := t.validator(storedProvenance, models.Provenance(tmpl.Provenance)); err != nil { + return definitions.NotificationTemplate{}, err + } + + err = t.checkOptimisticConcurrency(tmpl.Name, existingContent, models.Provenance(tmpl.Provenance), tmpl.ResourceVersion, "update") + if err != nil { + return definitions.NotificationTemplate{}, err + } + + revision.Config.TemplateFiles[tmpl.Name] = tmpl.Template + + err = t.xact.InTransaction(ctx, func(ctx context.Context) error { + if existingName != tmpl.Name { // if template by was found by UID and it's name is different, then this is the rename operation. Delete old resources. + delete(revision.Config.TemplateFiles, existingName) + err := t.provenanceStore.DeleteProvenance(ctx, &definitions.NotificationTemplate{Name: existingName}, orgID) + if err != nil { + return err + } + } + + if err := t.configStore.Save(ctx, revision, orgID); err != nil { + return err + } + return t.provenanceStore.SetProvenance(ctx, &tmpl, orgID, models.Provenance(tmpl.Provenance)) + }) + if err != nil { + return definitions.NotificationTemplate{}, err + } + + return definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), // if name was changed, this UID will not match the incoming one + Name: tmpl.Name, + Template: tmpl.Template, + Provenance: tmpl.Provenance, + ResourceVersion: calculateTemplateFingerprint(tmpl.Template), + }, nil +} + +func (t *TemplateService) DeleteTemplate(ctx context.Context, orgID int64, nameOrUid string, provenance definitions.Provenance, version string) error { revision, err := t.configStore.Get(ctx, orgID) if err != nil { return err @@ -156,18 +260,22 @@ func (t *TemplateService) DeleteTemplate(ctx context.Context, orgID int64, name return nil } - existing, ok := revision.Config.TemplateFiles[name] + existingName := nameOrUid + existing, ok := revision.Config.TemplateFiles[nameOrUid] + if !ok { + existingName, existing, ok = getTemplateByUid(revision.Config.TemplateFiles, nameOrUid) + } if !ok { return nil } - err = t.checkOptimisticConcurrency(name, existing, models.Provenance(provenance), version, "delete") + err = t.checkOptimisticConcurrency(existingName, existing, models.Provenance(provenance), version, "delete") if err != nil { return err } // check that provenance is not changed in an invalid way - storedProvenance, err := t.provenanceStore.GetProvenance(ctx, &definitions.NotificationTemplate{Name: name}, orgID) + storedProvenance, err := t.provenanceStore.GetProvenance(ctx, &definitions.NotificationTemplate{Name: existingName}, orgID) if err != nil { return err } @@ -175,14 +283,14 @@ func (t *TemplateService) DeleteTemplate(ctx context.Context, orgID int64, name return err } - delete(revision.Config.TemplateFiles, name) + delete(revision.Config.TemplateFiles, existingName) return t.xact.InTransaction(ctx, func(ctx context.Context) error { if err := t.configStore.Save(ctx, revision, orgID); err != nil { return err } tgt := definitions.NotificationTemplate{ - Name: name, + Name: existingName, } return t.provenanceStore.DeleteProvenance(ctx, &tgt, orgID) }) @@ -208,3 +316,12 @@ func calculateTemplateFingerprint(t string) string { _, _ = sum.Write(unsafe.Slice(unsafe.StringData(t), len(t))) //nolint:gosec return fmt.Sprintf("%016x", sum.Sum64()) } + +func getTemplateByUid(templates map[string]string, uid string) (string, string, bool) { + for n, tmpl := range templates { + if legacy_storage.NameToUid(n) == uid { + return n, tmpl, true + } + } + return "", "", false +} diff --git a/pkg/services/ngalert/provisioning/templates_test.go b/pkg/services/ngalert/provisioning/templates_test.go index 2921a8b1499..050777e7691 100644 --- a/pkg/services/ngalert/provisioning/templates_test.go +++ b/pkg/services/ngalert/provisioning/templates_test.go @@ -46,18 +46,21 @@ func TestGetTemplates(t *testing.T) { expected := []definitions.NotificationTemplate{ { + UID: legacy_storage.NameToUid("template1"), Name: "template1", Template: "test1", Provenance: definitions.Provenance(models.ProvenanceAPI), ResourceVersion: calculateTemplateFingerprint("test1"), }, { + UID: legacy_storage.NameToUid("template2"), Name: "template2", Template: "test2", Provenance: definitions.Provenance(models.ProvenanceFile), ResourceVersion: calculateTemplateFingerprint("test2"), }, { + UID: legacy_storage.NameToUid("template3"), Name: "template3", Template: "test3", Provenance: definitions.Provenance(models.ProvenanceNone), @@ -144,6 +147,7 @@ func TestGetTemplate(t *testing.T) { require.NoError(t, err) expected := definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(templateName), Name: templateName, Template: templateContent, Provenance: definitions.Provenance(models.ProvenanceAPI), @@ -200,7 +204,7 @@ func TestGetTemplate(t *testing.T) { }) } -func TestSetTemplate(t *testing.T) { +func TestUpsertTemplate(t *testing.T) { orgID := int64(1) templateName := "template1" currentTemplateContent := "test1" @@ -240,10 +244,11 @@ func TestSetTemplate(t *testing.T) { ResourceVersion: "", } - result, err := sut.SetTemplate(context.Background(), orgID, tmpl) + result, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.NoError(t, err) require.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), Name: tmpl.Name, Template: tmpl.Template, Provenance: tmpl.Provenance, @@ -281,10 +286,11 @@ func TestSetTemplate(t *testing.T) { ResourceVersion: calculateTemplateFingerprint("test1"), } - result, err := sut.SetTemplate(context.Background(), orgID, tmpl) + result, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.NoError(t, err) assert.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), Name: tmpl.Name, Template: tmpl.Template, Provenance: tmpl.Provenance, @@ -317,10 +323,11 @@ func TestSetTemplate(t *testing.T) { ResourceVersion: "", } - result, err := sut.SetTemplate(context.Background(), orgID, tmpl) + result, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.NoError(t, err) assert.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), Name: tmpl.Name, Template: tmpl.Template, Provenance: tmpl.Provenance, @@ -351,10 +358,11 @@ func TestSetTemplate(t *testing.T) { ResourceVersion: calculateTemplateFingerprint(currentTemplateContent), } - result, _ := sut.SetTemplate(context.Background(), orgID, tmpl) + result, _ := sut.UpsertTemplate(context.Background(), orgID, tmpl) expectedContent := fmt.Sprintf("{{ define \"%s\" }}\n content\n{{ end }}", templateName) require.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), Name: tmpl.Name, Template: expectedContent, Provenance: tmpl.Provenance, @@ -375,7 +383,7 @@ func TestSetTemplate(t *testing.T) { Name: "name", Template: "{{ .NotAField }}", } - _, err := sut.SetTemplate(context.Background(), 1, tmpl) + _, err := sut.UpsertTemplate(context.Background(), 1, tmpl) require.NoError(t, err) }) @@ -388,7 +396,7 @@ func TestSetTemplate(t *testing.T) { Name: "", Template: "", } - _, err := sut.SetTemplate(context.Background(), orgID, tmpl) + _, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.ErrorIs(t, err, ErrTemplateInvalid) }) @@ -397,7 +405,7 @@ func TestSetTemplate(t *testing.T) { Name: "", Template: "{{ .MyField }", } - _, err := sut.SetTemplate(context.Background(), orgID, tmpl) + _, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.ErrorIs(t, err, ErrTemplateInvalid) }) @@ -426,7 +434,7 @@ func TestSetTemplate(t *testing.T) { } template.Provenance = definitions.Provenance(models.ProvenanceNone) - _, err := sut.SetTemplate(context.Background(), orgID, template) + _, err := sut.UpsertTemplate(context.Background(), orgID, template) require.ErrorIs(t, err, expectedErr) }) @@ -445,7 +453,7 @@ func TestSetTemplate(t *testing.T) { Provenance: definitions.Provenance(models.ProvenanceNone), } - _, err := sut.SetTemplate(context.Background(), orgID, template) + _, err := sut.UpsertTemplate(context.Background(), orgID, template) require.ErrorIs(t, err, ErrVersionConflict) prov.AssertExpectations(t) @@ -462,9 +470,25 @@ func TestSetTemplate(t *testing.T) { ResourceVersion: "version", Provenance: definitions.Provenance(models.ProvenanceNone), } - _, err := sut.SetTemplate(context.Background(), orgID, template) + _, err := sut.UpsertTemplate(context.Background(), orgID, template) require.ErrorIs(t, err, ErrTemplateNotFound) }) + + t.Run("rejects new template has UID ", func(t *testing.T) { + sut, store, _ := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + template := definitions.NotificationTemplate{ + UID: "new-template", + Name: "template2", + Template: "asdf-new", + Provenance: definitions.Provenance(models.ProvenanceNone), + } + _, err := sut.UpsertTemplate(context.Background(), orgID, template) + require.ErrorIs(t, err, ErrTemplateNotFound) + }) + t.Run("propagates errors", func(t *testing.T) { tmpl := definitions.NotificationTemplate{ Name: templateName, @@ -478,7 +502,7 @@ func TestSetTemplate(t *testing.T) { return nil, expectedErr } - _, err := sut.SetTemplate(context.Background(), orgID, tmpl) + _, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.ErrorIs(t, err, expectedErr) }) @@ -490,7 +514,7 @@ func TestSetTemplate(t *testing.T) { expectedErr := errors.New("test") prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, expectedErr) - _, err := sut.SetTemplate(context.Background(), orgID, tmpl) + _, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.ErrorIs(t, err, expectedErr) @@ -506,7 +530,7 @@ func TestSetTemplate(t *testing.T) { prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, nil) prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(expectedErr) - _, err := sut.SetTemplate(context.Background(), orgID, tmpl) + _, err := sut.UpsertTemplate(context.Background(), orgID, tmpl) require.ErrorIs(t, err, expectedErr) prov.AssertExpectations(t) @@ -524,7 +548,488 @@ func TestSetTemplate(t *testing.T) { prov.EXPECT().SaveSucceeds() prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, nil) - _, err := sut.SetTemplate(context.Background(), 1, tmpl) + _, err := sut.UpsertTemplate(context.Background(), 1, tmpl) + require.ErrorIs(t, err, expectedErr) + }) + }) +} + +func TestCreateTemplate(t *testing.T) { + orgID := int64(1) + amConfigToken := util.GenerateShortUID() + + tmpl := definitions.NotificationTemplate{ + Name: "new-template", + Template: "{{ define \"test\"}} test {{ end }}", + Provenance: definitions.Provenance(models.ProvenanceAPI), + } + + revision := func() *legacy_storage.ConfigRevision { + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{}, + ConcurrencyToken: amConfigToken, + } + } + + t.Run("adds new template to config file", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + assert.Equal(t, orgID, org) + return revision(), nil + } + store.SaveFn = func(ctx context.Context, revision *legacy_storage.ConfigRevision) error { + assertInTransaction(t, ctx) + return nil + } + prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) { + assertInTransaction(t, ctx) + }).Return(nil) + + result, err := sut.CreateTemplate(context.Background(), orgID, tmpl) + + require.NoError(t, err) + require.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), + Name: tmpl.Name, + Template: tmpl.Template, + Provenance: tmpl.Provenance, + ResourceVersion: calculateTemplateFingerprint(tmpl.Template), + }, result) + + require.Len(t, store.Calls, 2) + + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.Contains(t, saved.Config.TemplateFiles, tmpl.Name) + assert.Equal(t, tmpl.Template, saved.Config.TemplateFiles[tmpl.Name]) + + prov.AssertCalled(t, "SetProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { + return t.Name == tmpl.Name + }), orgID, models.ProvenanceAPI) + }) + + t.Run("returns ErrTemplateExists if template exists", func(t *testing.T) { + sut, store, _ := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + assert.Equal(t, orgID, org) + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{ + TemplateFiles: map[string]string{ + tmpl.Name: "test", + }, + }, + ConcurrencyToken: amConfigToken, + }, nil + } + + _, err := sut.CreateTemplate(context.Background(), orgID, tmpl) + + require.ErrorIs(t, err, ErrTemplateExists) + }) + + t.Run("rejects templates that fail validation", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + + t.Run("empty content", func(t *testing.T) { + tmpl := definitions.NotificationTemplate{ + Name: "", + Template: "", + } + _, err := sut.CreateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, ErrTemplateInvalid) + }) + + t.Run("invalid content", func(t *testing.T) { + tmpl := definitions.NotificationTemplate{ + Name: "", + Template: "{{ .MyField }", + } + _, err := sut.CreateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, ErrTemplateInvalid) + }) + + require.Empty(t, store.Calls) + prov.AssertExpectations(t) + }) + + t.Run("propagates errors", func(t *testing.T) { + t.Run("when unable to read config", func(t *testing.T) { + sut, store, _ := createTemplateServiceSut() + expectedErr := errors.New("test") + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return nil, expectedErr + } + + _, err := sut.CreateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, expectedErr) + }) + + t.Run("when provenance fails to save", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + expectedErr := errors.New("test") + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(expectedErr) + + _, err := sut.CreateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, expectedErr) + + prov.AssertExpectations(t) + }) + + t.Run("when AM config fails to save", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + expectedErr := errors.New("test") + store.SaveFn = func(ctx context.Context, revision *legacy_storage.ConfigRevision) error { + return expectedErr + } + prov.EXPECT().SaveSucceeds() + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, nil) + + _, err := sut.CreateTemplate(context.Background(), 1, tmpl) + require.ErrorIs(t, err, expectedErr) + }) + }) +} + +func TestUpdateTemplate(t *testing.T) { + orgID := int64(1) + currentTemplateContent := "test1" + + tmpl := definitions.NotificationTemplate{ + Name: "template1", + Template: "{{ define \"test\"}} test {{ end }}", + Provenance: definitions.Provenance(models.ProvenanceAPI), + ResourceVersion: "", + } + + amConfigToken := util.GenerateShortUID() + revision := func() *legacy_storage.ConfigRevision { + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{ + TemplateFiles: map[string]string{ + tmpl.Name: currentTemplateContent, + }, + }, + ConcurrencyToken: amConfigToken, + } + } + + t.Run("returns ErrTemplateNotFound if template name does not exist", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + assert.Equal(t, orgID, org) + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{}, + ConcurrencyToken: amConfigToken, + }, nil + } + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.ErrorIs(t, err, ErrTemplateNotFound) + + require.Len(t, store.Calls, 1) + prov.AssertExpectations(t) + }) + + t.Run("returns ErrTemplateNotFound if template UID does not exist", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + assert.Equal(t, orgID, org) + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{ + TemplateFiles: map[string]string{ + "not-found": "test", // create a template with name that matches UID to make sure we do not search by name + tmpl.Name: "test", + }, + }, + ConcurrencyToken: amConfigToken, + }, nil + } + tmpl := tmpl + tmpl.UID = "not-found" + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.ErrorIs(t, err, ErrTemplateNotFound) + + require.Len(t, store.Calls, 1) + prov.AssertExpectations(t) + }) + + testcases := []struct { + name string + templateUid string + }{ + { + name: "by name", + templateUid: "", + }, + { + name: "by uid", + templateUid: legacy_storage.NameToUid(tmpl.UID), + }, + } + + for _, tt := range testcases { + t.Run(fmt.Sprintf("updates current template %s", tt.name), func(t *testing.T) { + t.Run("when version matches", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceAPI, nil) + prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) { + assertInTransaction(t, ctx) + }).Return(nil) + + tmpl.UID = tt.templateUid + result, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.NoError(t, err) + assert.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), + Name: tmpl.Name, + Template: tmpl.Template, + Provenance: tmpl.Provenance, + ResourceVersion: calculateTemplateFingerprint(tmpl.Template), + }, result) + + require.Len(t, store.Calls, 2) + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.Contains(t, saved.Config.TemplateFiles, tmpl.Name) + assert.Equal(t, tmpl.Template, saved.Config.TemplateFiles[tmpl.Name]) + + prov.AssertExpectations(t) + }) + t.Run("bypasses optimistic concurrency validation when version is empty", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceAPI, nil) + prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) { + assertInTransaction(t, ctx) + }).Return(nil) + + result, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.NoError(t, err) + assert.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), + Name: tmpl.Name, + Template: tmpl.Template, + Provenance: tmpl.Provenance, + ResourceVersion: calculateTemplateFingerprint(tmpl.Template), + }, result) + + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.Contains(t, saved.Config.TemplateFiles, tmpl.Name) + assert.Equal(t, tmpl.Template, saved.Config.TemplateFiles[tmpl.Name]) + }) + }) + } + + t.Run("creates a new template and delete old one when template is renamed", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceAPI, nil) + prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Return(nil).Run(func(ctx context.Context, o models.Provisionable, org int64) { + assertInTransaction(t, ctx) + }).Return(nil) + prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64, p models.Provenance) { + assertInTransaction(t, ctx) + }).Return(nil) + + oldName := tmpl.Name + tmpl := tmpl + tmpl.UID = legacy_storage.NameToUid(tmpl.Name) // UID matches the current template + tmpl.Name = "new-template-name" // but name is different + result, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.NoError(t, err) + assert.Equal(t, definitions.NotificationTemplate{ + UID: legacy_storage.NameToUid(tmpl.Name), + Name: tmpl.Name, + Template: tmpl.Template, + Provenance: tmpl.Provenance, + ResourceVersion: calculateTemplateFingerprint(tmpl.Template), + }, result) + + require.Len(t, store.Calls, 2) + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.Contains(t, saved.Config.TemplateFiles, tmpl.Name) + assert.Equal(t, tmpl.Template, saved.Config.TemplateFiles[tmpl.Name]) + assert.NotContains(t, saved.Config.TemplateFiles, oldName) + + prov.AssertCalled(t, "DeleteProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { + return t.Name == oldName + }), mock.Anything) + prov.AssertExpectations(t) + }) + + t.Run("rejects rename operation if template with the new name exists", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{ + TemplateFiles: map[string]string{ + tmpl.Name: currentTemplateContent, + "new-template-name": "test", + }, + }, + ConcurrencyToken: amConfigToken, + }, nil + } + + tmpl := tmpl + tmpl.UID = legacy_storage.NameToUid(tmpl.Name) // UID matches the current template + tmpl.Name = "new-template-name" // but name matches another existing template + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.ErrorIs(t, err, ErrTemplateExists) + + prov.AssertExpectations(t) + }) + + t.Run("rejects templates that fail validation", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + + t.Run("empty content", func(t *testing.T) { + tmpl := definitions.NotificationTemplate{ + Name: "", + Template: "", + } + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, ErrTemplateInvalid) + }) + + t.Run("invalid content", func(t *testing.T) { + tmpl := definitions.NotificationTemplate{ + Name: "", + Template: "{{ .MyField }", + } + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, ErrTemplateInvalid) + }) + + require.Empty(t, store.Calls) + prov.AssertExpectations(t) + }) + + t.Run("rejects existing templates if provenance is not right", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceAPI, nil) + + expectedErr := errors.New("test") + sut.validator = func(from, to models.Provenance) error { + assert.Equal(t, models.ProvenanceAPI, from) + assert.Equal(t, models.ProvenanceNone, to) + return expectedErr + } + + template := definitions.NotificationTemplate{ + Name: "template1", + Template: "asdf-new", + } + template.Provenance = definitions.Provenance(models.ProvenanceNone) + + _, err := sut.UpdateTemplate(context.Background(), orgID, template) + + require.ErrorIs(t, err, expectedErr) + }) + + t.Run("rejects existing templates if version is not right", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, nil) + + template := definitions.NotificationTemplate{ + Name: "template1", + Template: "asdf-new", + ResourceVersion: "bad-version", + Provenance: definitions.Provenance(models.ProvenanceNone), + } + + _, err := sut.UpdateTemplate(context.Background(), orgID, template) + + require.ErrorIs(t, err, ErrVersionConflict) + prov.AssertExpectations(t) + }) + + t.Run("propagates errors", func(t *testing.T) { + t.Run("when unable to read config", func(t *testing.T) { + sut, store, _ := createTemplateServiceSut() + expectedErr := errors.New("test") + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return nil, expectedErr + } + + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, expectedErr) + }) + + t.Run("when reading provenance status fails", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, org int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + expectedErr := errors.New("test") + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, expectedErr) + + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + + require.ErrorIs(t, err, expectedErr) + + prov.AssertExpectations(t) + }) + + t.Run("when provenance fails to save", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + expectedErr := errors.New("test") + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, nil) + prov.EXPECT().SetProvenance(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(expectedErr) + + _, err := sut.UpdateTemplate(context.Background(), orgID, tmpl) + require.ErrorIs(t, err, expectedErr) + + prov.AssertExpectations(t) + }) + + t.Run("when AM config fails to save", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + expectedErr := errors.New("test") + store.SaveFn = func(ctx context.Context, revision *legacy_storage.ConfigRevision) error { + return expectedErr + } + prov.EXPECT().SaveSucceeds() + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceNone, nil) + + _, err := sut.UpdateTemplate(context.Background(), 1, tmpl) require.ErrorIs(t, err, expectedErr) }) }) @@ -547,61 +1052,114 @@ func TestDeleteTemplate(t *testing.T) { } } - t.Run("deletes template from config file on success", func(t *testing.T) { - t.Run("when version matches", func(t *testing.T) { - sut, store, prov := createTemplateServiceSut() - store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { - return revision(), nil - } - prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceFile, nil) - prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64) { - assertInTransaction(t, ctx) - }).Return(nil) + testCase := []struct { + name string + templateNameOrUid string + }{ + { + name: "by name", + templateNameOrUid: templateName, + }, + { + name: "by uid", + templateNameOrUid: legacy_storage.NameToUid(templateName), + }, + } + for _, tt := range testCase { + t.Run(fmt.Sprintf("deletes template from config file %s", tt.name), func(t *testing.T) { + t.Run("when version matches", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceFile, nil) + prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64) { + assertInTransaction(t, ctx) + }).Return(nil) - err := sut.DeleteTemplate(context.Background(), orgID, templateName, definitions.Provenance(models.ProvenanceFile), templateVersion) + err := sut.DeleteTemplate(context.Background(), orgID, tt.templateNameOrUid, definitions.Provenance(models.ProvenanceFile), templateVersion) - require.NoError(t, err) + require.NoError(t, err) - require.Len(t, store.Calls, 2) + require.Len(t, store.Calls, 2) - require.Equal(t, "Save", store.Calls[1].Method) - saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) - assert.Equal(t, amConfigToken, saved.ConcurrencyToken) - assert.NotContains(t, saved.Config.TemplateFiles, templateName) + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.NotContains(t, saved.Config.TemplateFiles, templateName) - prov.AssertCalled(t, "DeleteProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { - return t.Name == templateName - }), orgID) + prov.AssertCalled(t, "DeleteProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { + return t.Name == templateName + }), orgID) - prov.AssertExpectations(t) + prov.AssertExpectations(t) + }) + + t.Run("bypasses optimistic concurrency when version is empty", func(t *testing.T) { + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return revision(), nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceFile, nil) + prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64) { + assertInTransaction(t, ctx) + }).Return(nil) + + err := sut.DeleteTemplate(context.Background(), orgID, tt.templateNameOrUid, definitions.Provenance(models.ProvenanceFile), "") + + require.NoError(t, err) + require.Len(t, store.Calls, 2) + + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.NotContains(t, saved.Config.TemplateFiles, templateName) + + prov.AssertCalled(t, "DeleteProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { + return t.Name == templateName + }), orgID) + + prov.AssertExpectations(t) + }) }) + } - t.Run("bypasses optimistic concurrency when version is empty", func(t *testing.T) { - sut, store, prov := createTemplateServiceSut() - store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { - return revision(), nil - } - prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceFile, nil) - prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64) { - assertInTransaction(t, ctx) - }).Return(nil) + t.Run("should look by name before uid", func(t *testing.T) { + expectedToDelete := legacy_storage.NameToUid(templateName) + sut, store, prov := createTemplateServiceSut() + store.GetFn = func(ctx context.Context, orgID int64) (*legacy_storage.ConfigRevision, error) { + return &legacy_storage.ConfigRevision{ + Config: &definitions.PostableUserConfig{ + TemplateFiles: map[string]string{ + templateName: templateContent, + expectedToDelete: templateContent, + }, + }, + ConcurrencyToken: amConfigToken, + }, nil + } + prov.EXPECT().GetProvenance(mock.Anything, mock.Anything, mock.Anything).Return(models.ProvenanceFile, nil) + prov.EXPECT().DeleteProvenance(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, o models.Provisionable, org int64) { + assertInTransaction(t, ctx) + }).Return(nil) - err := sut.DeleteTemplate(context.Background(), orgID, templateName, definitions.Provenance(models.ProvenanceFile), "") + err := sut.DeleteTemplate(context.Background(), orgID, expectedToDelete, definitions.Provenance(models.ProvenanceFile), templateVersion) - require.NoError(t, err) - require.Len(t, store.Calls, 2) + require.NoError(t, err) - require.Equal(t, "Save", store.Calls[1].Method) - saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) - assert.Equal(t, amConfigToken, saved.ConcurrencyToken) - assert.NotContains(t, saved.Config.TemplateFiles, templateName) + require.Len(t, store.Calls, 2) - prov.AssertCalled(t, "DeleteProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { - return t.Name == templateName - }), orgID) + require.Equal(t, "Save", store.Calls[1].Method) + saved := store.Calls[1].Args[1].(*legacy_storage.ConfigRevision) + assert.Equal(t, amConfigToken, saved.ConcurrencyToken) + assert.NotContains(t, saved.Config.TemplateFiles, expectedToDelete) + assert.Contains(t, saved.Config.TemplateFiles, templateName) - prov.AssertExpectations(t) - }) + prov.AssertCalled(t, "DeleteProvenance", mock.Anything, mock.MatchedBy(func(t *definitions.NotificationTemplate) bool { + return t.Name == expectedToDelete + }), orgID) + + prov.AssertExpectations(t) }) t.Run("does not error when deleting templates that do not exist", func(t *testing.T) { diff --git a/pkg/services/ngalert/remote/alertmanager.go b/pkg/services/ngalert/remote/alertmanager.go index e5c10056221..48350b02ff1 100644 --- a/pkg/services/ngalert/remote/alertmanager.go +++ b/pkg/services/ngalert/remote/alertmanager.go @@ -263,7 +263,24 @@ func (am *Alertmanager) CompareAndSendConfiguration(ctx context.Context, config if !am.shouldSendConfig(ctx, decrypted) { return nil } - return am.sendConfiguration(ctx, decrypted, config.ConfigurationHash, config.CreatedAt, config.Default) + + isDefault, err := am.isDefaultConfiguration(decrypted) + if err != nil { + return err + } + + return am.sendConfiguration(ctx, decrypted, config.ConfigurationHash, config.CreatedAt, isDefault) +} + +func (am *Alertmanager) isDefaultConfiguration(cfg *apimodels.PostableUserConfig) (bool, error) { + rawCfg, err := json.Marshal(cfg) + if err != nil { + return false, err + } + + configHash := fmt.Sprintf("%x", md5.Sum(rawCfg)) + + return configHash == am.defaultConfigHash, nil } func (am *Alertmanager) decryptConfiguration(ctx context.Context, cfg *apimodels.PostableUserConfig) (*apimodels.PostableUserConfig, error) { diff --git a/pkg/services/ngalert/remote/alertmanager_test.go b/pkg/services/ngalert/remote/alertmanager_test.go index b04c7194ee0..5d6b9644e34 100644 --- a/pkg/services/ngalert/remote/alertmanager_test.go +++ b/pkg/services/ngalert/remote/alertmanager_test.go @@ -22,6 +22,7 @@ import ( "github.com/grafana/alerting/definition" alertingModels "github.com/grafana/alerting/models" + "github.com/grafana/alerting/notify" "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/tracing" @@ -43,8 +44,9 @@ import ( const ( // Valid Grafana Alertmanager configurations. - testGrafanaConfig = `{"template_files":{},"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"","name":"some other name","type":"email","disableResolveMessage":false,"settings":{"addresses":"\u003cexample@email.com\u003e"}}]}]}}` - testGrafanaConfigWithSecret = `{"template_files":{},"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"dde6ntuob69dtf","name":"WH","type":"webhook","disableResolveMessage":false,"settings":{"url":"http://localhost:8080","username":"test"},"secureSettings":{"password":"test"}}]}]}}` + testGrafanaConfig = `{"template_files":{},"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"","name":"some other name","type":"email","disableResolveMessage":false,"settings":{"addresses":"\u003cexample@email.com\u003e"}}]}]}}` + testGrafanaConfigWithSecret = `{"template_files":{},"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"dde6ntuob69dtf","name":"WH","type":"webhook","disableResolveMessage":false,"settings":{"url":"http://localhost:8080","username":"test"},"secureSettings":{"password":"test"}}]}]}}` + testGrafanaDefaultConfigWithDifferentFieldOrder = `{"alertmanager_config":{"route":{"group_by":["alertname","grafana_folder"],"receiver":"grafana-default-email"},"receivers":[{"grafana_managed_receiver_configs":[{"uid":"","name":"email receiver","type":"email","settings":{"addresses":""}}],"name":"grafana-default-email"}]}}` // Valid Alertmanager state base64 encoded. testSilence1 = "lwEKhgEKATESFxIJYWxlcnRuYW1lGgp0ZXN0X2FsZXJ0EiMSDmdyYWZhbmFfZm9sZGVyGhF0ZXN0X2FsZXJ0X2ZvbGRlchoMCN2CkbAGEJbKrMsDIgwI7Z6RsAYQlsqsywMqCwiAkrjDmP7///8BQgxHcmFmYW5hIFRlc3RKDFRlc3QgU2lsZW5jZRIMCO2ekbAGEJbKrMsD" @@ -333,6 +335,50 @@ func TestCompareAndSendConfiguration(t *testing.T) { } } +func Test_isDefaultConfiguration(t *testing.T) { + parsedDefaultConfig, _ := notifier.Load([]byte(defaultGrafanaConfig)) + parsedTestConfig, _ := notifier.Load([]byte(testGrafanaConfig)) + parsedDefaultConfigWithDifferentFieldOrder, _ := notifier.Load([]byte(testGrafanaDefaultConfigWithDifferentFieldOrder)) + rawDefaultCfg, _ := json.Marshal(parsedDefaultConfig) + + tests := []struct { + name string + config *apimodels.PostableUserConfig + expected bool + }{ + { + "empty configuration", + nil, + false, + }, + { + "valid configuration", + parsedTestConfig, + false, + }, + { + "default configuration", + parsedDefaultConfig, + true, + }, + { + "default configuration with different field order", + parsedDefaultConfigWithDifferentFieldOrder, + false, + }, + } + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + am := &Alertmanager{ + defaultConfig: string(rawDefaultCfg), + defaultConfigHash: fmt.Sprintf("%x", md5.Sum(rawDefaultCfg)), + } + isDefault, _ := am.isDefaultConfiguration(test.config) + require.Equal(tt, test.expected, isDefault) + }) + } +} + func TestIntegrationRemoteAlertmanagerConfiguration(t *testing.T) { if testing.Short() { t.Skip("skipping integration test") @@ -739,6 +785,66 @@ func TestIntegrationRemoteAlertmanagerReceivers(t *testing.T) { }, rcvs) } +func TestIntegrationRemoteAlertmanagerTestTemplates(t *testing.T) { + if testing.Short() { + t.Skip("skipping integration test") + } + + amURL, ok := os.LookupEnv("AM_URL") + if !ok { + t.Skip("No Alertmanager URL provided") + } + + tenantID := os.Getenv("AM_TENANT_ID") + password := os.Getenv("AM_PASSWORD") + + cfg := AlertmanagerConfig{ + OrgID: 1, + URL: amURL, + TenantID: tenantID, + BasicAuthPassword: password, + DefaultConfig: defaultGrafanaConfig, + } + + secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) + m := metrics.NewRemoteAlertmanagerMetrics(prometheus.NewRegistry()) + am, err := NewAlertmanager(cfg, nil, secretsService.Decrypt, NoopAutogenFn, m, tracing.InitializeTracerForTest()) + require.NoError(t, err) + + // Valid template + c := apimodels.TestTemplatesConfigBodyParams{ + Alerts: []*amv2.PostableAlert{ + { + Annotations: amv2.LabelSet{ + "annotations_label": "annotations_value", + }, + Alert: amv2.Alert{ + Labels: amv2.LabelSet{ + "labels_label:": "labels_value", + }, + }, + }, + }, + Template: `{{ define "test" }} {{ index .Alerts 0 }} {{ end }}`, + Name: "test", + } + res, err := am.TestTemplate(context.Background(), c) + + require.NoError(t, err) + require.Len(t, res.Errors, 0) + require.Len(t, res.Results, 1) + require.Equal(t, "test", res.Results[0].Name) + + // Invalid template + c.Template = `{{ define "test" }} {{ index 0 .Alerts }} {{ end }}` + res, err = am.TestTemplate(context.Background(), c) + + require.NoError(t, err) + require.Len(t, res.Results, 0) + require.Len(t, res.Errors, 1) + require.Equal(t, notify.ExecutionError, res.Errors[0].Kind) +} + func genAlert(active bool, labels map[string]string) amv2.PostableAlert { endsAt := time.Now() if active { diff --git a/pkg/services/ngalert/schedule/alert_rule.go b/pkg/services/ngalert/schedule/alert_rule.go index 54841860dd0..d9c93d5ee14 100644 --- a/pkg/services/ngalert/schedule/alert_rule.go +++ b/pkg/services/ngalert/schedule/alert_rule.go @@ -514,6 +514,9 @@ func SchedulerUserFor(orgID int64) *user.SignedInUser { datasources.ActionQuery: []string{ datasources.ScopeAll, }, + datasources.ActionRead: []string{ + datasources.ScopeAll, + }, }, }, } diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go index 1b9bccf0e78..13d9519deb4 100644 --- a/pkg/services/ngalert/schedule/schedule_unit_test.go +++ b/pkg/services/ngalert/schedule/schedule_unit_test.go @@ -519,7 +519,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) { expectedMetric := "" err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_group_rules") - require.NoError(t, err) + require.ErrorContains(t, err, fmt.Sprintf("expected metric name(s) not found: [%v]", "grafana_alerting_rule_group_rules")) }) alertRule1 := models.RuleGen.With(models.RuleGen.WithOrgID(firstOrgID)).GenerateRef() @@ -590,7 +590,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) { expectedMetric := "" err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_group_rules") - require.NoError(t, err) + require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_rule_group_rules]") }) }) @@ -604,7 +604,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) { expectedMetric := "" err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_groups") - require.NoError(t, err) + require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_rule_groups]") }) alertRule1 := models.RuleGen.With(models.RuleGen.WithOrgID(firstOrgID)).GenerateRef() @@ -735,7 +735,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) { expectedMetric := "" err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_simple_routing_rules") - require.NoError(t, err) + require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_simple_routing_rules]") }) }) @@ -749,7 +749,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) { expectedMetric := "" err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_groups") - require.NoError(t, err) + require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_rule_groups]") }) alertRule1 := models.RuleGen.With(models.RuleGen.WithOrgID(firstOrgID)).GenerateRef() diff --git a/pkg/services/ngalert/state/manager_test.go b/pkg/services/ngalert/state/manager_test.go index b5ac2b51447..75a25aeeb4b 100644 --- a/pkg/services/ngalert/state/manager_test.go +++ b/pkg/services/ngalert/state/manager_test.go @@ -1592,8 +1592,10 @@ func TestProcessEvalResults(t *testing.T) { grafana_alerting_state_calculation_duration_seconds_sum 0 grafana_alerting_state_calculation_duration_seconds_count %[1]d `, results) - err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_state_calculation_duration_seconds", "grafana_alerting_state_calculation_total") + err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_state_calculation_duration_seconds") require.NoError(t, err) + err = testutil.GatherAndCompare(reg, bytes.NewBufferString(""), "grafana_alerting_state_calculation_total") + require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_state_calculation_total]") }) } diff --git a/pkg/services/ngalert/tests/fakes/receivers.go b/pkg/services/ngalert/tests/fakes/receivers.go index 6f67b8c4ffd..4be1e44c892 100644 --- a/pkg/services/ngalert/tests/fakes/receivers.go +++ b/pkg/services/ngalert/tests/fakes/receivers.go @@ -4,7 +4,6 @@ import ( "context" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" "github.com/grafana/grafana/pkg/services/ngalert/models" ) @@ -15,8 +14,8 @@ type ReceiverServiceMethodCall struct { type FakeReceiverService struct { MethodCalls []ReceiverServiceMethodCall - GetReceiverFn func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) - ListReceiversFn func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) + GetReceiverFn func(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) + ListReceiversFn func(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]*models.Receiver, error) } func NewFakeReceiverService() *FakeReceiverService { @@ -26,12 +25,12 @@ func NewFakeReceiverService() *FakeReceiverService { } } -func (f *FakeReceiverService) GetReceiver(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) { +func (f *FakeReceiverService) GetReceiver(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) { f.MethodCalls = append(f.MethodCalls, ReceiverServiceMethodCall{Method: "GetReceiver", Args: []interface{}{ctx, q}}) return f.GetReceiverFn(ctx, q, u) } -func (f *FakeReceiverService) ListReceivers(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) { +func (f *FakeReceiverService) ListReceivers(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]*models.Receiver, error) { f.MethodCalls = append(f.MethodCalls, ReceiverServiceMethodCall{Method: "ListReceivers", Args: []interface{}{ctx, q}}) return f.ListReceiversFn(ctx, q, u) } @@ -51,10 +50,10 @@ func (f *FakeReceiverService) Reset() { f.ListReceiversFn = defaultReceiversFn } -func defaultReceiverFn(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (definitions.GettableApiReceiver, error) { - return definitions.GettableApiReceiver{}, nil -} - -func defaultReceiversFn(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]definitions.GettableApiReceiver, error) { +func defaultReceiverFn(ctx context.Context, q models.GetReceiverQuery, u identity.Requester) (*models.Receiver, error) { + return nil, nil +} + +func defaultReceiversFn(ctx context.Context, q models.ListReceiversQuery, u identity.Requester) ([]*models.Receiver, error) { return nil, nil } diff --git a/pkg/services/playlist/playlistimpl/xorm_store.go b/pkg/services/playlist/playlistimpl/xorm_store.go index 3b3a1998eb6..07c1ce548fd 100644 --- a/pkg/services/playlist/playlistimpl/xorm_store.go +++ b/pkg/services/playlist/playlistimpl/xorm_store.go @@ -15,6 +15,8 @@ type sqlStore struct { db db.DB } +const MAX_PLAYLISTS = 1000 + var _ store = &sqlStore{} func (s *sqlStore) Insert(ctx context.Context, cmd *playlist.CreatePlaylistCommand) (*playlist.Playlist, error) { @@ -29,6 +31,14 @@ func (s *sqlStore) Insert(ctx context.Context, cmd *playlist.CreatePlaylistComma } err := s.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error { + count, err := sess.SQL("SELECT COUNT(*) FROM playlist WHERE playlist.org_id = ?", cmd.OrgId).Count() + if err != nil { + return err + } + if count > MAX_PLAYLISTS { + return fmt.Errorf("too many playlists exist (%d > %d)", count, MAX_PLAYLISTS) + } + ts := time.Now().UnixMilli() p = playlist.Playlist{ Name: cmd.Name, @@ -39,7 +49,7 @@ func (s *sqlStore) Insert(ctx context.Context, cmd *playlist.CreatePlaylistComma UpdatedAt: ts, } - _, err := sess.Insert(&p) + _, err = sess.Insert(&p) if err != nil { return err } @@ -166,6 +176,10 @@ func (s *sqlStore) List(ctx context.Context, query *playlist.GetPlaylistsQuery) return playlists, playlist.ErrCommandValidationFailed } + if query.Limit > MAX_PLAYLISTS || query.Limit < 1 { + query.Limit = MAX_PLAYLISTS + } + err := s.db.WithDbSession(ctx, func(dbSess *db.Session) error { sess := dbSess.Limit(query.Limit) @@ -185,7 +199,7 @@ func (s *sqlStore) ListAll(ctx context.Context, orgId int64) ([]playlist.Playlis db := s.db.GetSqlxSession() // OK because dates are numbers! playlists := []playlist.PlaylistDTO{} - err := db.Select(ctx, &playlists, "SELECT * FROM playlist WHERE org_id=? ORDER BY created_at asc", orgId) + err := db.Select(ctx, &playlists, "SELECT * FROM playlist WHERE org_id=? ORDER BY created_at asc LIMIT ?", orgId, MAX_PLAYLISTS) if err != nil { return nil, err } diff --git a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go index c43d6e5e62a..9e799759157 100644 --- a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go +++ b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware.go @@ -12,8 +12,7 @@ import ( const forwardIDHeaderName = "X-Grafana-Id" // NewForwardIDMiddleware creates a new plugins.ClientMiddleware that will -// set grafana id header on outgoing plugins.Client requests if the -// feature toggle FlagIdForwarding is enabled +// set grafana id header on outgoing plugins.Client requests func NewForwardIDMiddleware() plugins.ClientMiddleware { return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client { return &ForwardIDMiddleware{ @@ -35,7 +34,6 @@ func (m *ForwardIDMiddleware) applyToken(ctx context.Context, pCtx backend.Plugi return nil } - // token will only be present if faeturemgmt.FlagIdForwarding is enabled if token := reqCtx.SignedInUser.GetIDToken(); token != "" { req.SetHTTPHeader(forwardIDHeaderName, token) } diff --git a/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware.go index 1a2b91cdd16..b37a6f88e95 100644 --- a/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware.go +++ b/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware.go @@ -27,11 +27,6 @@ func NewOAuthTokenMiddleware(oAuthTokenService oauthtoken.OAuthTokenService) plu }) } -const ( - tokenHeaderName = "Authorization" - idTokenHeaderName = "X-ID-Token" -) - type OAuthTokenMiddleware struct { baseMiddleware oAuthTokenService oauthtoken.OAuthTokenService @@ -69,19 +64,19 @@ func (m *OAuthTokenMiddleware) applyToken(ctx context.Context, pCtx backend.Plug switch t := req.(type) { case *backend.QueryDataRequest: - t.Headers[tokenHeaderName] = authorizationHeader + t.Headers[backend.OAuthIdentityTokenHeaderName] = authorizationHeader if idTokenHeader != "" { - t.Headers[idTokenHeaderName] = idTokenHeader + t.Headers[backend.OAuthIdentityIDTokenHeaderName] = idTokenHeader } case *backend.CheckHealthRequest: - t.Headers[tokenHeaderName] = authorizationHeader + t.Headers[backend.OAuthIdentityTokenHeaderName] = authorizationHeader if idTokenHeader != "" { - t.Headers[idTokenHeaderName] = idTokenHeader + t.Headers[backend.OAuthIdentityIDTokenHeaderName] = idTokenHeader } case *backend.CallResourceRequest: - t.Headers[tokenHeaderName] = []string{authorizationHeader} + t.Headers[backend.OAuthIdentityTokenHeaderName] = []string{authorizationHeader} if idTokenHeader != "" { - t.Headers[idTokenHeaderName] = []string{idTokenHeader} + t.Headers[backend.OAuthIdentityIDTokenHeaderName] = []string{idTokenHeader} } } } diff --git a/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware_test.go index 8928cc550a4..95e0a4212e2 100644 --- a/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware_test.go +++ b/pkg/services/pluginsintegration/clientmiddleware/oauthtoken_middleware_test.go @@ -112,8 +112,8 @@ func TestOAuthTokenMiddleware(t *testing.T) { require.NotNil(t, cdt.QueryDataReq) require.Len(t, cdt.QueryDataReq.Headers, 3) require.Equal(t, "test", cdt.QueryDataReq.Headers[otherHeader]) - require.Equal(t, "Bearer access-token", cdt.QueryDataReq.Headers[tokenHeaderName]) - require.Equal(t, "id-token", cdt.QueryDataReq.Headers[idTokenHeaderName]) + require.Equal(t, "Bearer access-token", cdt.QueryDataReq.Headers[backend.OAuthIdentityTokenHeaderName]) + require.Equal(t, "id-token", cdt.QueryDataReq.Headers[backend.OAuthIdentityIDTokenHeaderName]) }) t.Run("Should forward OAuth Identity when calling CallResource", func(t *testing.T) { @@ -125,10 +125,10 @@ func TestOAuthTokenMiddleware(t *testing.T) { require.NotNil(t, cdt.CallResourceReq) require.Len(t, cdt.CallResourceReq.Headers, 3) require.Equal(t, "test", cdt.CallResourceReq.Headers[otherHeader][0]) - require.Len(t, cdt.CallResourceReq.Headers[tokenHeaderName], 1) - require.Equal(t, "Bearer access-token", cdt.CallResourceReq.Headers[tokenHeaderName][0]) - require.Len(t, cdt.CallResourceReq.Headers[idTokenHeaderName], 1) - require.Equal(t, "id-token", cdt.CallResourceReq.Headers[idTokenHeaderName][0]) + require.Len(t, cdt.CallResourceReq.Headers[backend.OAuthIdentityTokenHeaderName], 1) + require.Equal(t, "Bearer access-token", cdt.CallResourceReq.Headers[backend.OAuthIdentityTokenHeaderName][0]) + require.Len(t, cdt.CallResourceReq.Headers[backend.OAuthIdentityIDTokenHeaderName], 1) + require.Equal(t, "id-token", cdt.CallResourceReq.Headers[backend.OAuthIdentityIDTokenHeaderName][0]) }) t.Run("Should forward OAuth Identity when calling CheckHealth", func(t *testing.T) { @@ -140,8 +140,8 @@ func TestOAuthTokenMiddleware(t *testing.T) { require.NotNil(t, cdt.CheckHealthReq) require.Len(t, cdt.CheckHealthReq.Headers, 3) require.Equal(t, "test", cdt.CheckHealthReq.Headers[otherHeader]) - require.Equal(t, "Bearer access-token", cdt.CheckHealthReq.Headers[tokenHeaderName]) - require.Equal(t, "id-token", cdt.CheckHealthReq.Headers[idTokenHeaderName]) + require.Equal(t, "Bearer access-token", cdt.CheckHealthReq.Headers[backend.OAuthIdentityTokenHeaderName]) + require.Equal(t, "id-token", cdt.CheckHealthReq.Headers[backend.OAuthIdentityIDTokenHeaderName]) }) }) } diff --git a/pkg/services/pluginsintegration/plugininstaller/service.go b/pkg/services/pluginsintegration/plugininstaller/service.go index 76f993f2b28..7043407f9df 100644 --- a/pkg/services/pluginsintegration/plugininstaller/service.go +++ b/pkg/services/pluginsintegration/plugininstaller/service.go @@ -3,13 +3,34 @@ package plugininstaller import ( "context" "errors" + "fmt" "runtime" + "sync" + "time" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore" "github.com/grafana/grafana/pkg/setting" + "github.com/prometheus/client_golang/prometheus" +) + +var ( + installRequestCounter = prometheus.NewCounterVec(prometheus.CounterOpts{ + Namespace: "plugins", + Name: "preinstall_total", + Help: "The total amount of plugin preinstallations", + }, []string{"plugin_id", "version"}) + + installRequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ + Namespace: "plugins", + Name: "preinstall_duration_seconds", + Help: "Plugin preinstallation duration", + Buckets: []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100}, + }, []string{"plugin_id", "version"}) + + once sync.Once ) type Service struct { @@ -18,29 +39,62 @@ type Service struct { log log.Logger pluginInstaller plugins.Installer pluginStore pluginstore.Store + failOnErr bool } -func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, pluginStore pluginstore.Store, pluginInstaller plugins.Installer) *Service { +func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, pluginStore pluginstore.Store, pluginInstaller plugins.Installer, promReg prometheus.Registerer) (*Service, error) { + once.Do(func() { + promReg.MustRegister(installRequestCounter) + promReg.MustRegister(installRequestDuration) + }) + s := &Service{ features: features, log: log.New("plugin.backgroundinstaller"), cfg: cfg, pluginInstaller: pluginInstaller, pluginStore: pluginStore, + failOnErr: !cfg.PreinstallPluginsAsync, // Fail on error if preinstall is synchronous } - return s + if !cfg.PreinstallPluginsAsync { + // Block initialization process until plugins are installed + err := s.installPluginsWithTimeout() + if err != nil { + return nil, err + } + } + return s, nil } // IsDisabled disables background installation of plugins. func (s *Service) IsDisabled() bool { return !s.features.IsEnabled(context.Background(), featuremgmt.FlagBackgroundPluginInstaller) || - len(s.cfg.InstallPlugins) == 0 + len(s.cfg.PreinstallPlugins) == 0 || + !s.cfg.PreinstallPluginsAsync } -func (s *Service) Run(ctx context.Context) error { +func (s *Service) installPluginsWithTimeout() error { + // Installation process does not timeout by default nor reuses the context + // passed to the request so we need to handle the timeout here. + // We could make this timeout configurable in the future. + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + defer cancel() + done := make(chan struct{ err error }) + go func() { + done <- struct{ err error }{err: s.installPlugins(ctx)} + }() + select { + case <-ctx.Done(): + return fmt.Errorf("failed to install plugins: %w", ctx.Err()) + case d := <-done: + return d.err + } +} + +func (s *Service) installPlugins(ctx context.Context) error { compatOpts := plugins.NewCompatOpts(s.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH) - for _, installPlugin := range s.cfg.InstallPlugins { + for _, installPlugin := range s.cfg.PreinstallPlugins { // Check if the plugin is already installed p, exists := s.pluginStore.Plugin(ctx, installPlugin.ID) if exists { @@ -52,6 +106,7 @@ func (s *Service) Run(ctx context.Context) error { } s.log.Info("Installing plugin", "pluginId", installPlugin.ID, "version", installPlugin.Version) + start := time.Now() err := s.pluginInstaller.Add(ctx, installPlugin.ID, installPlugin.Version, compatOpts) if err != nil { var dupeErr plugins.DuplicateError @@ -59,11 +114,27 @@ func (s *Service) Run(ctx context.Context) error { s.log.Debug("Plugin already installed", "pluginId", installPlugin.ID, "version", installPlugin.Version) continue } + if s.failOnErr { + // Halt execution in the synchronous scenario + return fmt.Errorf("failed to install plugin %s@%s: %w", installPlugin.ID, installPlugin.Version, err) + } s.log.Error("Failed to install plugin", "pluginId", installPlugin.ID, "version", installPlugin.Version, "error", err) continue } - s.log.Info("Plugin successfully installed", "pluginId", installPlugin.ID, "version", installPlugin.Version) + elapsed := time.Since(start) + s.log.Info("Plugin successfully installed", "pluginId", installPlugin.ID, "version", installPlugin.Version, "duration", elapsed) + installRequestDuration.WithLabelValues(installPlugin.ID, installPlugin.Version).Observe(elapsed.Seconds()) + installRequestCounter.WithLabelValues(installPlugin.ID, installPlugin.Version).Inc() } return nil } + +func (s *Service) Run(ctx context.Context) error { + err := s.installPlugins(ctx) + if err != nil { + // Unexpected error, asynchronous installation should not return errors + s.log.Error("Failed to install plugins", "error", err) + } + return nil +} diff --git a/pkg/services/pluginsintegration/plugininstaller/service_test.go b/pkg/services/pluginsintegration/plugininstaller/service_test.go index 19cc3386c6b..4a01c328503 100644 --- a/pkg/services/pluginsintegration/plugininstaller/service_test.go +++ b/pkg/services/pluginsintegration/plugininstaller/service_test.go @@ -10,20 +10,24 @@ import ( "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore" "github.com/grafana/grafana/pkg/setting" + "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) // Test if the service is disabled func TestService_IsDisabled(t *testing.T) { // Create a new service - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPluginsAsync: true, }, featuremgmt.WithFeatures(featuremgmt.FlagBackgroundPluginInstaller), pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), &fakes.FakePluginInstaller{}, + prometheus.NewRegistry(), ) + require.NoError(t, err) // Check if the service is disabled if s.IsDisabled() { @@ -34,9 +38,9 @@ func TestService_IsDisabled(t *testing.T) { func TestService_Run(t *testing.T) { t.Run("Installs a plugin", func(t *testing.T) { installed := false - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, }, featuremgmt.WithFeatures(), pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), @@ -46,18 +50,21 @@ func TestService_Run(t *testing.T) { return nil }, }, + prometheus.NewRegistry(), ) + require.NoError(t, err) - err := s.Run(context.Background()) + err = s.Run(context.Background()) require.NoError(t, err) require.True(t, installed) }) t.Run("Install a plugin with version", func(t *testing.T) { installed := false - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin", Version: "1.0.0"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin", Version: "1.0.0"}}, + PreinstallPluginsAsync: true, }, featuremgmt.WithFeatures(), pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), @@ -69,9 +76,11 @@ func TestService_Run(t *testing.T) { return nil }, }, + prometheus.NewRegistry(), ) + require.NoError(t, err) - err := s.Run(context.Background()) + err = s.Run(context.Background()) require.NoError(t, err) require.True(t, installed) }) @@ -84,9 +93,10 @@ func TestService_Run(t *testing.T) { }, }) require.NoError(t, err) - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPluginsAsync: true, }, featuremgmt.WithFeatures(), pluginstore.New(preg, &fakes.FakeLoader{}), @@ -96,7 +106,9 @@ func TestService_Run(t *testing.T) { return plugins.DuplicateError{} }, }, + prometheus.NewRegistry(), ) + require.NoError(t, err) err = s.Run(context.Background()) require.NoError(t, err) @@ -114,9 +126,10 @@ func TestService_Run(t *testing.T) { }, }) require.NoError(t, err) - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin", Version: "2.0.0"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin", Version: "2.0.0"}}, + PreinstallPluginsAsync: true, }, featuremgmt.WithFeatures(), pluginstore.New(preg, &fakes.FakeLoader{}), @@ -126,7 +139,9 @@ func TestService_Run(t *testing.T) { return nil }, }, + prometheus.NewRegistry(), ) + require.NoError(t, err) err = s.Run(context.Background()) require.NoError(t, err) @@ -135,9 +150,10 @@ func TestService_Run(t *testing.T) { t.Run("Install multiple plugins", func(t *testing.T) { installed := 0 - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin1"}, {ID: "myplugin2"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin1"}, {ID: "myplugin2"}}, + PreinstallPluginsAsync: true, }, featuremgmt.WithFeatures(), pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), @@ -147,18 +163,21 @@ func TestService_Run(t *testing.T) { return nil }, }, + prometheus.NewRegistry(), ) + require.NoError(t, err) - err := s.Run(context.Background()) + err = s.Run(context.Background()) require.NoError(t, err) require.Equal(t, 2, installed) }) t.Run("Fails to install a plugin but install the rest", func(t *testing.T) { installed := 0 - s := ProvideService( + s, err := ProvideService( &setting.Cfg{ - InstallPlugins: []setting.InstallPlugin{{ID: "myplugin1"}, {ID: "myplugin2"}}, + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin1"}, {ID: "myplugin2"}}, + PreinstallPluginsAsync: true, }, featuremgmt.WithFeatures(), pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), @@ -171,9 +190,50 @@ func TestService_Run(t *testing.T) { return nil }, }, + prometheus.NewRegistry(), ) - err := s.Run(context.Background()) + require.NoError(t, err) + err = s.Run(context.Background()) require.NoError(t, err) require.Equal(t, 1, installed) }) + + t.Run("Install a blocking plugin", func(t *testing.T) { + installed := false + _, err := ProvideService( + &setting.Cfg{ + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPluginsAsync: false, + }, + featuremgmt.WithFeatures(), + pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), + &fakes.FakePluginInstaller{ + AddFunc: func(ctx context.Context, pluginID string, version string, opts plugins.CompatOpts) error { + installed = true + return nil + }, + }, + prometheus.NewRegistry(), + ) + require.NoError(t, err) + require.True(t, installed) + }) + + t.Run("Fails to install a blocking plugin", func(t *testing.T) { + _, err := ProvideService( + &setting.Cfg{ + PreinstallPlugins: []setting.InstallPlugin{{ID: "myplugin"}}, + PreinstallPluginsAsync: false, + }, + featuremgmt.WithFeatures(), + pluginstore.New(registry.NewInMemory(), &fakes.FakeLoader{}), + &fakes.FakePluginInstaller{ + AddFunc: func(ctx context.Context, pluginID string, version string, opts plugins.CompatOpts) error { + return plugins.NotFoundError{} + }, + }, + prometheus.NewRegistry(), + ) + require.ErrorAs(t, err, &plugins.NotFoundError{}) + }) } diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go index bf0e7705fc0..e411e6c8552 100644 --- a/pkg/services/pluginsintegration/pluginsintegration.go +++ b/pkg/services/pluginsintegration/pluginsintegration.go @@ -187,12 +187,9 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken clientmiddleware.NewCookiesMiddleware(skipCookiesNames), clientmiddleware.NewResourceResponseMiddleware(), clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features), + clientmiddleware.NewForwardIDMiddleware(), ) - if features.IsEnabledGlobally(featuremgmt.FlagIdForwarding) { - middlewares = append(middlewares, clientmiddleware.NewForwardIDMiddleware()) - } - if cfg.SendUserHeader { middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware()) } diff --git a/pkg/services/pluginsintegration/pluginstore/store_test.go b/pkg/services/pluginsintegration/pluginstore/store_test.go index f6817b13d00..a4ac6434ff3 100644 --- a/pkg/services/pluginsintegration/pluginstore/store_test.go +++ b/pkg/services/pluginsintegration/pluginstore/store_test.go @@ -118,11 +118,11 @@ func TestStore_Plugins(t *testing.T) { func TestStore_Routes(t *testing.T) { t.Run("Routes returns all static routes for non-decommissioned plugins", func(t *testing.T) { - p1 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "a-test-renderer", Type: plugins.TypeRenderer}, FS: fakes.NewFakePluginFiles("/some/dir")} - p2 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "b-test-panel", Type: plugins.TypePanel}, FS: fakes.NewFakePluginFiles("/grafana/")} - p3 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "c-test-secrets", Type: plugins.TypeSecretsManager}, FS: fakes.NewFakePluginFiles("./secrets"), Class: plugins.ClassCore} - p4 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "d-test-datasource", Type: plugins.TypeDataSource}, FS: fakes.NewFakePluginFiles("../test")} - p5 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "e-test-app", Type: plugins.TypeApp}, FS: fakes.NewFakePluginFiles("any/path")} + p1 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "a-test-renderer", Type: plugins.TypeRenderer}, FS: fakes.NewFakePluginFS("/some/dir")} + p2 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "b-test-panel", Type: plugins.TypePanel}, FS: fakes.NewFakePluginFS("/grafana/")} + p3 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "c-test-secrets", Type: plugins.TypeSecretsManager}, FS: fakes.NewFakePluginFS("./secrets"), Class: plugins.ClassCore} + p4 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "d-test-datasource", Type: plugins.TypeDataSource}, FS: fakes.NewFakePluginFS("../test")} + p5 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "e-test-app", Type: plugins.TypeApp}, FS: fakes.NewFakePluginFS("any/path")} p6 := &plugins.Plugin{JSONData: plugins.JSONData{ID: "f-test-app", Type: plugins.TypeApp}} p6.RegisterClient(&DecommissionedPlugin{}) diff --git a/pkg/services/provisioning/alerting/text_templates.go b/pkg/services/provisioning/alerting/text_templates.go index e64ccdd5959..056b41f1b95 100644 --- a/pkg/services/provisioning/alerting/text_templates.go +++ b/pkg/services/provisioning/alerting/text_templates.go @@ -32,7 +32,7 @@ func (c *defaultTextTemplateProvisioner) Provision(ctx context.Context, for _, file := range files { for _, template := range file.Templates { template.Data.Provenance = definitions.Provenance(models.ProvenanceFile) - _, err := c.templateService.SetTemplate(ctx, template.OrgID, template.Data) + _, err := c.templateService.UpsertTemplate(ctx, template.OrgID, template.Data) if err != nil { return err } diff --git a/pkg/services/provisioning/datasources/datasources.go b/pkg/services/provisioning/datasources/datasources.go index 40ab9e3246f..1bbf5ff7820 100644 --- a/pkg/services/provisioning/datasources/datasources.go +++ b/pkg/services/provisioning/datasources/datasources.go @@ -192,6 +192,13 @@ func (dc *DatasourceProvisioner) applyChanges(ctx context.Context, configPath st } func makeCreateCorrelationCommand(correlation map[string]any, SourceUID string, OrgId int64) (correlations.CreateCorrelationCommand, error) { + // we look for a correlation type at the root if it is defined, if not use default + // we ignore the legacy config.type value - the only valid value at that version was "query" + var corrType = correlation["type"] + if corrType == nil || corrType == "" { + corrType = correlations.TypeQuery + } + var json = jsoniter.ConfigCompatibleWithStandardLibrary createCommand := correlations.CreateCorrelationCommand{ SourceUID: SourceUID, @@ -199,6 +206,7 @@ func makeCreateCorrelationCommand(correlation map[string]any, SourceUID string, Description: correlation["description"].(string), OrgId: OrgId, Provisioned: true, + Type: corrType.(correlations.CorrelationType), } targetUID, ok := correlation["targetUID"].(string) @@ -222,11 +230,6 @@ func makeCreateCorrelationCommand(correlation map[string]any, SourceUID string, } createCommand.Config = config - } else { - // when provisioning correlations without config we default to type="query" - createCommand.Config = correlations.CorrelationConfig{ - Type: correlations.ConfigTypeQuery, - } } if err := createCommand.Validate(); err != nil { return correlations.CreateCorrelationCommand{}, err diff --git a/pkg/services/provisioning/plugins/config_reader.go b/pkg/services/provisioning/plugins/config_reader.go index 2b626066b46..52684de6326 100644 --- a/pkg/services/provisioning/plugins/config_reader.go +++ b/pkg/services/provisioning/plugins/config_reader.go @@ -2,6 +2,7 @@ package plugins import ( "context" + "errors" "fmt" "io/fs" "os" @@ -90,18 +91,16 @@ func (cr *configReaderImpl) parsePluginConfig(path string, file fs.DirEntry) (*p func validateRequiredField(apps []*pluginsAsConfig) error { for i := range apps { - var errStrings []string + errs := []error{} for index, app := range apps[i].Apps { if app.PluginID == "" { - errStrings = append( - errStrings, - fmt.Sprintf("app item %d in configuration doesn't contain required field type", index+1), - ) + err := fmt.Errorf("app item %d in configuration doesn't contain required field type", index+1) + errs = append(errs, err) } } - if len(errStrings) != 0 { - return fmt.Errorf(strings.Join(errStrings, "\n")) + if len(errs) != 0 { + return errors.Join(errs...) } } diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go index de8ccbf479f..1fa19b0ec81 100644 --- a/pkg/services/provisioning/provisioning.go +++ b/pkg/services/provisioning/provisioning.go @@ -122,6 +122,7 @@ func newProvisioningServiceImpl( newDashboardProvisioner dashboards.DashboardProvisionerFactory, provisionDatasources func(context.Context, string, datasources.BaseDataSourceService, datasources.CorrelationsStore, org.Service) error, provisionPlugins func(context.Context, string, pluginstore.Store, pluginsettings.Service, org.Service) error, + searchService searchV2.SearchService, ) *ProvisioningServiceImpl { return &ProvisioningServiceImpl{ log: log.New("provisioning"), @@ -129,6 +130,7 @@ func newProvisioningServiceImpl( provisionDatasources: provisionDatasources, provisionPlugins: provisionPlugins, Cfg: setting.NewCfg(), + searchService: searchService, } } @@ -185,7 +187,6 @@ func (ps *ProvisioningServiceImpl) Run(ctx context.Context) error { err := ps.ProvisionDashboards(ctx) if err != nil { ps.log.Error("Failed to provision dashboard", "error", err) - return err } if ps.dashboardProvisioner.HasDashboardSources() { ps.searchService.TriggerReIndex() @@ -277,6 +278,7 @@ func (ps *ProvisioningServiceImpl) ProvisionAlerting(ctx context.Context) error alertingauthz.NewReceiverAccess[*ngmodels.Receiver](ps.ac, true), configStore, st, + st, ps.secretService, ps.SQLStore, ps.log, diff --git a/pkg/services/provisioning/provisioning_test.go b/pkg/services/provisioning/provisioning_test.go index 93691f7b12a..d7e0bd801e8 100644 --- a/pkg/services/provisioning/provisioning_test.go +++ b/pkg/services/provisioning/provisioning_test.go @@ -3,6 +3,7 @@ package provisioning import ( "context" "errors" + "fmt" "testing" "time" @@ -14,6 +15,7 @@ import ( "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/provisioning/dashboards" "github.com/grafana/grafana/pkg/services/provisioning/utils" + "github.com/grafana/grafana/pkg/services/searchV2" ) func TestProvisioningServiceImpl(t *testing.T) { @@ -66,6 +68,27 @@ func TestProvisioningServiceImpl(t *testing.T) { // Cancelling the root context and stopping the service serviceTest.cancel() }) + + t.Run("Should not return run error when dashboard provisioning fails", func(t *testing.T) { + serviceTest := setup(t) + provisioningErr := errors.New("Test error") + serviceTest.mock.ProvisionFunc = func(ctx context.Context) error { + return provisioningErr + } + err := serviceTest.service.ProvisionDashboards(context.Background()) + assert.NotNil(t, err) + serviceTest.startService() + + serviceTest.waitForPollChanges() + assert.Equal(t, 1, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called") + + // Cancelling the root context and stopping the service + serviceTest.cancel() + serviceTest.waitForStop() + + fmt.Println("serviceTest.serviceError", serviceTest.serviceError) + assert.Equal(t, context.Canceled, serviceTest.serviceError) + }) } type serviceTestStruct struct { @@ -95,12 +118,15 @@ func setup(t *testing.T) *serviceTestStruct { pollChangesChannel <- ctx } + searchStub := searchV2.NewStubSearchService() + serviceTest.service = newProvisioningServiceImpl( func(context.Context, string, dashboardstore.DashboardProvisioningService, org.Service, utils.DashboardStore, folder.Service) (dashboards.DashboardProvisioner, error) { return serviceTest.mock, nil }, nil, nil, + searchStub, ) err := serviceTest.service.setDashboardProvisioner() require.NoError(t, err) diff --git a/pkg/services/publicdashboards/service/service.go b/pkg/services/publicdashboards/service/service.go index 31a107f26c7..133ebe81e2f 100644 --- a/pkg/services/publicdashboards/service/service.go +++ b/pkg/services/publicdashboards/service/service.go @@ -9,6 +9,7 @@ import ( "github.com/google/uuid" "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend/gtime" + "go.opentelemetry.io/otel" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/infra/log" @@ -45,6 +46,7 @@ type PublicDashboardServiceImpl struct { } var LogPrefix = "publicdashboards.service" +var tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/publicdashboards/service") // Gives us compile time error if the service does not adhere to the contract of // the interface @@ -79,6 +81,9 @@ func ProvideService( } func (pd *PublicDashboardServiceImpl) GetPublicDashboardForView(ctx context.Context, accessToken string) (*dtos.DashboardFullWithMeta, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.GetPublicDashboardForView") + defer span.End() + pubdash, dash, err := pd.FindEnabledPublicDashboardAndDashboardByAccessToken(ctx, accessToken) if err != nil { return nil, err @@ -110,10 +115,14 @@ func (pd *PublicDashboardServiceImpl) GetPublicDashboardForView(ctx context.Cont // FindByDashboardUid this method would be replaced by another implementation for Enterprise version func (pd *PublicDashboardServiceImpl) FindByDashboardUid(ctx context.Context, orgId int64, dashboardUid string) (*PublicDashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.FindByDashboardUid") + defer span.End() return pd.serviceWrapper.FindByDashboardUid(ctx, orgId, dashboardUid) } func (pd *PublicDashboardServiceImpl) Find(ctx context.Context, uid string) (*PublicDashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.Find") + defer span.End() pubdash, err := pd.store.Find(ctx, uid) if err != nil { return nil, ErrInternalServerError.Errorf("Find: failed to find public dashboard%w", err) @@ -123,6 +132,8 @@ func (pd *PublicDashboardServiceImpl) Find(ctx context.Context, uid string) (*Pu // FindDashboard Gets a dashboard by Uid func (pd *PublicDashboardServiceImpl) FindDashboard(ctx context.Context, orgId int64, dashboardUid string) (*dashboards.Dashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.FindDashboard") + defer span.End() dash, err := pd.dashboardService.GetDashboard(ctx, &dashboards.GetDashboardQuery{UID: dashboardUid, OrgID: orgId}) if err != nil { var dashboardErr dashboards.DashboardErr @@ -139,6 +150,8 @@ func (pd *PublicDashboardServiceImpl) FindDashboard(ctx context.Context, orgId i // FindByAccessToken Gets public dashboard by access token func (pd *PublicDashboardServiceImpl) FindByAccessToken(ctx context.Context, accessToken string) (*PublicDashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.FindByAccessToken") + defer span.End() pubdash, err := pd.store.FindByAccessToken(ctx, accessToken) if err != nil { return nil, ErrInternalServerError.Errorf("FindByAccessToken: failed to find a public dashboard: %w", err) @@ -153,6 +166,8 @@ func (pd *PublicDashboardServiceImpl) FindByAccessToken(ctx context.Context, acc // FindEnabledPublicDashboardAndDashboardByAccessToken Gets public dashboard and a dashboard by access token if public dashboard is enabled func (pd *PublicDashboardServiceImpl) FindEnabledPublicDashboardAndDashboardByAccessToken(ctx context.Context, accessToken string) (*PublicDashboard, *dashboards.Dashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.FindEnabledPublicDashboardAndDashboardByAccessToken") + defer span.End() pubdash, dash, err := pd.FindPublicDashboardAndDashboardByAccessToken(ctx, accessToken) if err != nil { return pubdash, dash, err @@ -171,6 +186,8 @@ func (pd *PublicDashboardServiceImpl) FindEnabledPublicDashboardAndDashboardByAc // FindPublicDashboardAndDashboardByAccessToken Gets public dashboard and a dashboard by access token func (pd *PublicDashboardServiceImpl) FindPublicDashboardAndDashboardByAccessToken(ctx context.Context, accessToken string) (*PublicDashboard, *dashboards.Dashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.FindPublicDashboardAndDashboardByAccessToken") + defer span.End() pubdash, err := pd.FindByAccessToken(ctx, accessToken) if err != nil { return nil, nil, err @@ -190,6 +207,8 @@ func (pd *PublicDashboardServiceImpl) FindPublicDashboardAndDashboardByAccessTok // Creates and validates the public dashboard and saves it to the database func (pd *PublicDashboardServiceImpl) Create(ctx context.Context, u *user.SignedInUser, dto *SavePublicDashboardDTO) (*PublicDashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.Create") + defer span.End() // validate fields err := validation.ValidatePublicDashboard(dto) if err != nil { @@ -247,6 +266,8 @@ func (pd *PublicDashboardServiceImpl) Create(ctx context.Context, u *user.Signed // Update: updates an existing public dashboard based on publicdashboard.Uid func (pd *PublicDashboardServiceImpl) Update(ctx context.Context, u *user.SignedInUser, dto *SavePublicDashboardDTO) (*PublicDashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.Update") + defer span.End() // validate fields err := validation.ValidatePublicDashboard(dto) if err != nil { @@ -303,6 +324,8 @@ func (pd *PublicDashboardServiceImpl) Update(ctx context.Context, u *user.Signed // NewPublicDashboardUid Generates a unique uid to create a public dashboard. Will make 3 attempts and fail if it cannot find an unused uid func (pd *PublicDashboardServiceImpl) NewPublicDashboardUid(ctx context.Context) (string, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.NewPublicDashboardUid") + defer span.End() var uid string for i := 0; i < 3; i++ { uid = util.GenerateShortUID() @@ -317,6 +340,8 @@ func (pd *PublicDashboardServiceImpl) NewPublicDashboardUid(ctx context.Context) // NewPublicDashboardAccessToken Generates a unique accessToken to create a public dashboard. Will make 3 attempts and fail if it cannot find an unused access token func (pd *PublicDashboardServiceImpl) NewPublicDashboardAccessToken(ctx context.Context) (string, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.NewPublicDashboardAccessToken") + defer span.End() var accessToken string for i := 0; i < 3; i++ { var err error @@ -335,6 +360,8 @@ func (pd *PublicDashboardServiceImpl) NewPublicDashboardAccessToken(ctx context. // FindAllWithPagination Returns a list of public dashboards by orgId, based on permissions and with pagination func (pd *PublicDashboardServiceImpl) FindAllWithPagination(ctx context.Context, query *PublicDashboardListQuery) (*PublicDashboardListResponseWithPagination, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.FindAllWithPagination") + defer span.End() query.Offset = query.Limit * (query.Page - 1) resp, err := pd.store.FindAllWithPagination(ctx, query) if err != nil { @@ -348,18 +375,26 @@ func (pd *PublicDashboardServiceImpl) FindAllWithPagination(ctx context.Context, } func (pd *PublicDashboardServiceImpl) ExistsEnabledByDashboardUid(ctx context.Context, dashboardUid string) (bool, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.ExistsEnabledByDashboardUid") + defer span.End() return pd.store.ExistsEnabledByDashboardUid(ctx, dashboardUid) } func (pd *PublicDashboardServiceImpl) ExistsEnabledByAccessToken(ctx context.Context, accessToken string) (bool, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.ExistsEnabledByAccessToken") + defer span.End() return pd.store.ExistsEnabledByAccessToken(ctx, accessToken) } func (pd *PublicDashboardServiceImpl) GetOrgIdByAccessToken(ctx context.Context, accessToken string) (int64, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.GetOrgIdByAccessToken") + defer span.End() return pd.store.GetOrgIdByAccessToken(ctx, accessToken) } func (pd *PublicDashboardServiceImpl) Delete(ctx context.Context, uid string, dashboardUid string) error { + ctx, span := tracer.Start(ctx, "publicdashboards.Delete") + defer span.End() // get existing public dashboard if exists existingPubdash, err := pd.store.Find(ctx, uid) if err != nil { @@ -377,6 +412,8 @@ func (pd *PublicDashboardServiceImpl) Delete(ctx context.Context, uid string, da } func (pd *PublicDashboardServiceImpl) DeleteByDashboard(ctx context.Context, dashboard *dashboards.Dashboard) error { + ctx, span := tracer.Start(ctx, "publicdashboards.DeleteByDashboard") + defer span.End() if dashboard.IsFolder { // get all pubdashes for the folder pubdashes, err := pd.store.FindByFolder(ctx, dashboard.OrgID, dashboard.UID) @@ -464,6 +501,8 @@ func GenerateAccessToken() (string, error) { } func (pd *PublicDashboardServiceImpl) newCreatePublicDashboard(ctx context.Context, dto *SavePublicDashboardDTO) (*PublicDashboard, error) { + ctx, span := tracer.Start(ctx, "publicdashboards.newCreatePublicDashboard") + defer span.End() //Check if uid already exists, if none then auto generate var err error uid := dto.PublicDashboard.Uid diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go index a911529c9a6..9a54b689054 100644 --- a/pkg/services/query/query.go +++ b/pkg/services/query/query.go @@ -2,6 +2,7 @@ package query import ( "context" + "errors" "fmt" "net/http" "runtime" @@ -125,7 +126,7 @@ func (s *ServiceImpl) executeConcurrentQueries(ctx context.Context, user identit if theErr, ok := r.(error); ok { err = theErr } else if theErrString, ok := r.(string); ok { - err = fmt.Errorf(theErrString) + err = errors.New(theErrString) } else { err = fmt.Errorf("unexpected error - %s", s.cfg.UserFacingDefaultError) } diff --git a/pkg/services/quota/quotaimpl/quota.go b/pkg/services/quota/quotaimpl/quota.go index 16a4f16a949..e8867ad38e8 100644 --- a/pkg/services/quota/quotaimpl/quota.go +++ b/pkg/services/quota/quotaimpl/quota.go @@ -4,6 +4,7 @@ import ( "context" "sync" + "go.opentelemetry.io/otel" "golang.org/x/sync/errgroup" "github.com/grafana/grafana/pkg/infra/db" @@ -13,6 +14,10 @@ import ( "github.com/grafana/grafana/pkg/setting" ) +// tracer is the global tracer for the quota service. Tracer pulls the globally +// initialized tracer from the opentelemetry package. +var tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/quota/quotaimpl/service") + type serviceDisabled struct { } @@ -81,16 +86,20 @@ func (s *service) QuotaReached(c *contextmodel.ReqContext, targetSrv quota.Targe if c == nil { return false, nil } + ctx, span := tracer.Start(c.Req.Context(), "quota-service.QuotaReached") + defer span.End() params := "a.ScopeParameters{} if c.IsSignedIn { params.OrgID = c.SignedInUser.GetOrgID() params.UserID = c.UserID } - return s.CheckQuotaReached(c.Req.Context(), targetSrv, params) + return s.CheckQuotaReached(ctx, targetSrv, params) } func (s *service) GetQuotasByScope(ctx context.Context, scope quota.Scope, id int64) ([]quota.QuotaDTO, error) { + ctx, span := tracer.Start(ctx, "quota-service.GetQuotasByScope") + defer span.End() if err := scope.Validate(); err != nil { return nil, err } @@ -104,10 +113,7 @@ func (s *service) GetQuotasByScope(ctx context.Context, scope quota.Scope, id in scopeParams.UserID = id } - c, err := s.getContext(ctx) - if err != nil { - return nil, err - } + c := quota.FromContext(ctx, s.targetToSrv) customLimits, err := s.store.Get(c, &scopeParams) if err != nil { return nil, err @@ -160,6 +166,8 @@ func (s *service) GetQuotasByScope(ctx context.Context, scope quota.Scope, id in } func (s *service) Update(ctx context.Context, cmd *quota.UpdateQuotaCmd) error { + ctx, span := tracer.Start(ctx, "quota-service.Update") + defer span.End() targetFound := false knownTargets, err := s.defaultLimits.Targets() if err != nil { @@ -175,16 +183,15 @@ func (s *service) Update(ctx context.Context, cmd *quota.UpdateQuotaCmd) error { return quota.ErrInvalidTarget.Errorf("unknown quota target: %s", cmd.Target) } - c, err := s.getContext(ctx) - if err != nil { - return err - } + c := quota.FromContext(ctx, s.targetToSrv) return s.store.Update(c, cmd) } // CheckQuotaReached check that quota is reached for a target. If ScopeParameters are not defined, only global scope is checked func (s *service) CheckQuotaReached(ctx context.Context, targetSrv quota.TargetSrv, scopeParams *quota.ScopeParameters) (bool, error) { - targetSrvLimits, err := s.getOverridenLimits(ctx, targetSrv, scopeParams) + ctx, span := tracer.Start(ctx, "quota-service.CheckQuotaReached") + defer span.End() + targetSrvLimits, err := s.getOverriddenLimits(ctx, targetSrv, scopeParams) if err != nil { return false, err } @@ -233,10 +240,9 @@ func (s *service) CheckQuotaReached(ctx context.Context, targetSrv quota.TargetS } func (s *service) DeleteQuotaForUser(ctx context.Context, userID int64) error { - c, err := s.getContext(ctx) - if err != nil { - return err - } + ctx, span := tracer.Start(ctx, "quota-service.DeleteQuotaForUser") + defer span.End() + c := quota.FromContext(ctx, s.targetToSrv) return s.store.DeleteByUser(c, userID) } @@ -296,13 +302,12 @@ func (s *service) getReporters() <-chan reporter { return ch } -func (s *service) getOverridenLimits(ctx context.Context, targetSrv quota.TargetSrv, scopeParams *quota.ScopeParameters) (map[quota.Tag]int64, error) { +func (s *service) getOverriddenLimits(ctx context.Context, targetSrv quota.TargetSrv, scopeParams *quota.ScopeParameters) (map[quota.Tag]int64, error) { + ctx, span := tracer.Start(ctx, "quota-service.getOverriddenLimits") + defer span.End() targetSrvLimits := make(map[quota.Tag]int64) - c, err := s.getContext(ctx) - if err != nil { - return nil, err - } + c := quota.FromContext(ctx, s.targetToSrv) customLimits, err := s.store.Get(c, scopeParams) if err != nil { return targetSrvLimits, err @@ -331,6 +336,8 @@ func (s *service) getOverridenLimits(ctx context.Context, targetSrv quota.Target } func (s *service) getUsage(ctx context.Context, scopeParams *quota.ScopeParameters) (*quota.Map, error) { + ctx, span := tracer.Start(ctx, "quota-service.getUsage") + defer span.End() usage := "a.Map{} g, ctx := errgroup.WithContext(ctx) @@ -352,7 +359,3 @@ func (s *service) getUsage(ctx context.Context, scopeParams *quota.ScopeParamete return usage, nil } - -func (s *service) getContext(ctx context.Context) (quota.Context, error) { - return quota.FromContext(ctx, s.targetToSrv), nil -} diff --git a/pkg/services/searchV2/http.go b/pkg/services/searchV2/http.go index 0b58e134695..2d82b50c55a 100644 --- a/pkg/services/searchV2/http.go +++ b/pkg/services/searchV2/http.go @@ -6,10 +6,9 @@ import ( "io" "net/http" - "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" + "github.com/prometheus/client_golang/prometheus" "github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/routing" @@ -34,7 +33,9 @@ func (s *searchHTTPService) RegisterHTTPRoutes(storageRoute routing.RouteRegiste } func (s *searchHTTPService) doQuery(c *contextmodel.ReqContext) response.Response { - searchReadinessCheckResp := s.search.IsReady(c.Req.Context(), c.SignedInUser.GetOrgID()) + ctx, span := tracer.Start(c.Req.Context(), "searchV2.doQuery") + defer span.End() + searchReadinessCheckResp := s.search.IsReady(ctx, c.SignedInUser.GetOrgID()) if !searchReadinessCheckResp.IsReady { dashboardSearchNotServedRequestsCounter.With(prometheus.Labels{ "reason": searchReadinessCheckResp.Reason, @@ -59,7 +60,7 @@ func (s *searchHTTPService) doQuery(c *contextmodel.ReqContext) response.Respons return response.Error(http.StatusBadRequest, "error parsing body", err) } - resp := s.search.doDashboardQuery(c.Req.Context(), c.SignedInUser, c.SignedInUser.GetOrgID(), *query) + resp := s.search.doDashboardQuery(ctx, c.SignedInUser, c.SignedInUser.GetOrgID(), *query) if resp.Error != nil { return response.Error(http.StatusInternalServerError, "error handling search request", resp.Error) diff --git a/pkg/services/searchV2/service.go b/pkg/services/searchV2/service.go index b0ca3096dfc..d886ec649a0 100644 --- a/pkg/services/searchV2/service.go +++ b/pkg/services/searchV2/service.go @@ -9,6 +9,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "go.opentelemetry.io/otel" "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/infra/log" @@ -58,6 +59,7 @@ var ( Namespace: namespace, Subsystem: subsystem, }) + tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/searchv2") ) type StandardSearchService struct { @@ -120,6 +122,8 @@ func (s *StandardSearchService) IsDisabled() bool { } func (s *StandardSearchService) Run(ctx context.Context) error { + ctx, span := tracer.Start(ctx, "searchv2.Run") + defer span.End() orgQuery := &org.SearchOrgsQuery{} result, err := s.orgService.Search(ctx, orgQuery) if err != nil { @@ -146,6 +150,8 @@ func (s *StandardSearchService) RegisterDashboardIndexExtender(ext DashboardInde } func (s *StandardSearchService) getUser(ctx context.Context, backendUser *backend.User, orgId int64) (*user.SignedInUser, error) { + ctx, span := tracer.Start(ctx, "searchv2.getUser") + defer span.End() // TODO: get user & user's permissions from the request context var usr *user.SignedInUser @@ -204,6 +210,8 @@ func (s *StandardSearchService) getUser(ctx context.Context, backendUser *backen } func (s *StandardSearchService) DoDashboardQuery(ctx context.Context, user *backend.User, orgID int64, q DashboardQuery) *backend.DataResponse { + ctx, span := tracer.Start(ctx, "searchv2.DoDashboardQuery") + defer span.End() start := time.Now() signedInUser, err := s.getUser(ctx, user, orgID) @@ -232,6 +240,8 @@ func (s *StandardSearchService) DoDashboardQuery(ctx context.Context, user *back } func (s *StandardSearchService) doDashboardQuery(ctx context.Context, signedInUser *user.SignedInUser, orgID int64, q DashboardQuery) *backend.DataResponse { + ctx, span := tracer.Start(ctx, "searchv2.doDashboardQuery") + defer span.End() rsp := &backend.DataResponse{} filter, err := s.auth.GetDashboardReadFilter(ctx, orgID, signedInUser) diff --git a/pkg/services/searchV2/usage.go b/pkg/services/searchV2/usage.go index d3cc1de923d..3bbc4a7032b 100644 --- a/pkg/services/searchV2/usage.go +++ b/pkg/services/searchV2/usage.go @@ -45,7 +45,7 @@ var ( ) func updateUsageStats(ctx context.Context, reader *bluge.Reader, logger log.Logger, tracer tracing.Tracer) { - ctx, span := tracer.Start(ctx, "searchV2 updateUsageStats") + ctx, span := tracer.Start(ctx, "searchV2.updateUsageStats") defer span.End() req := bluge.NewAllMatches(bluge.NewTermQuery("panel").SetField(documentFieldKind)) for _, usage := range panelUsage { diff --git a/pkg/services/searchusers/searchusers.go b/pkg/services/searchusers/searchusers.go index b912fbecc97..036ac87aee7 100644 --- a/pkg/services/searchusers/searchusers.go +++ b/pkg/services/searchusers/searchusers.go @@ -83,7 +83,7 @@ func (s *OSSService) SearchUser(c *contextmodel.ReqContext) (*user.SearchUserQue } searchQuery := c.Query("query") - filters := make([]user.Filter, 0) + filters := []user.Filter{} for filterName := range s.searchUserFilter.GetFilterList() { filter := s.searchUserFilter.GetFilter(filterName, c.QueryStrings(filterName)) if filter != nil { @@ -112,11 +112,9 @@ func (s *OSSService) SearchUser(c *contextmodel.ReqContext) (*user.SearchUserQue for _, user := range res.Users { user.AvatarURL = dtos.GetGravatarUrl(s.cfg, user.Email) - user.AuthLabels = make([]string, 0) - if user.AuthModule != nil && len(user.AuthModule) > 0 { - for _, authModule := range user.AuthModule { - user.AuthLabels = append(user.AuthLabels, login.GetAuthProviderLabel(authModule)) - } + user.AuthLabels = make([]string, len(user.AuthModule)) + for _, authModule := range user.AuthModule { + user.AuthLabels = append(user.AuthLabels, login.GetAuthProviderLabel(authModule)) } } diff --git a/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go b/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go index aa3e108048e..4be4d60d6f5 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/team_membership.go @@ -8,7 +8,6 @@ import ( "xorm.io/xorm" "github.com/grafana/grafana/pkg/services/accesscontrol" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/grafana/grafana/pkg/services/team" @@ -64,12 +63,12 @@ func (p *teamPermissionMigrator) setRolePermissions(roleID int64, permissions [] } // mapPermissionToRBAC translates the legacy membership (Member or Admin) into RBAC permissions -func (p *teamPermissionMigrator) mapPermissionToRBAC(permission dashboardaccess.PermissionType, teamID int64) []accesscontrol.Permission { +func (p *teamPermissionMigrator) mapPermissionToRBAC(permission team.PermissionType, teamID int64) []accesscontrol.Permission { teamIDScope := accesscontrol.Scope("teams", "id", strconv.FormatInt(teamID, 10)) switch permission { - case 0: + case team.PermissionTypeMember: return []accesscontrol.Permission{{Action: "teams:read", Scope: teamIDScope}} - case dashboardaccess.PERMISSION_ADMIN: + case team.PermissionTypeAdmin: return []accesscontrol.Permission{ {Action: "teams:delete", Scope: teamIDScope}, {Action: "teams:read", Scope: teamIDScope}, @@ -210,7 +209,7 @@ func (p *teamPermissionMigrator) generateAssociatedPermissions(teamMemberships [ // Downgrade team permissions if needed: // only admins or editors (when editorsCanAdmin option is enabled) // can access team administration endpoints - if m.Permission == dashboardaccess.PERMISSION_ADMIN { + if m.Permission == team.PermissionTypeAdmin { if userRolesByOrg[m.OrgID][m.UserID] == string(org.RoleViewer) || (userRolesByOrg[m.OrgID][m.UserID] == string(org.RoleEditor) && !p.editorsCanAdmin) { m.Permission = 0 diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go index f145a5b7b65..988d1294a03 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go @@ -12,7 +12,6 @@ import ( "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/accesscontrol" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/sqlstore/migrations" @@ -328,7 +327,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) { TeamID: 1, UserID: 1, External: false, - Permission: 0, + Permission: team.PermissionTypeMember, Created: now, Updated: now, }, @@ -338,7 +337,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) { TeamID: 1, UserID: 2, External: false, - Permission: dashboardaccess.PERMISSION_ADMIN, + Permission: team.PermissionTypeAdmin, Created: now, Updated: now, }, @@ -348,7 +347,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) { TeamID: 1, UserID: 3, External: false, - Permission: dashboardaccess.PERMISSION_ADMIN, + Permission: team.PermissionTypeAdmin, Created: now, Updated: now, }, @@ -358,7 +357,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) { TeamID: 1, UserID: 4, External: false, - Permission: dashboardaccess.PERMISSION_ADMIN, + Permission: team.PermissionTypeAdmin, Created: now, Updated: now, }, @@ -368,7 +367,7 @@ func setupTeams(t *testing.T, x *xorm.Engine) { TeamID: 2, UserID: 5, External: false, - Permission: 0, + Permission: team.PermissionTypeMember, Created: now, Updated: now, }, diff --git a/pkg/services/sqlstore/migrations/correlations_mig.go b/pkg/services/sqlstore/migrations/correlations_mig.go index 9e2e4f417d1..3501b4bf867 100644 --- a/pkg/services/sqlstore/migrations/correlations_mig.go +++ b/pkg/services/sqlstore/migrations/correlations_mig.go @@ -38,7 +38,6 @@ func addCorrelationsMigrations(mg *Migrator) { // All existing records will have '0' assigned {Name: "org_id", Type: DB_BigInt, IsPrimaryKey: true, Default: "0"}, {Name: "source_uid", Type: DB_NVarchar, Length: 40, Nullable: false, IsPrimaryKey: true}, - // Nullable because in the future we want to have correlations to external resources {Name: "target_uid", Type: DB_NVarchar, Length: 40, Nullable: true}, {Name: "label", Type: DB_Text, Nullable: false}, {Name: "description", Type: DB_Text, Nullable: false}, @@ -63,4 +62,8 @@ func addCorrelationsMigrations(mg *Migrator) { mg.AddMigration("add provisioning column", NewAddColumnMigration(correlationsV2, &Column{ Name: "provisioned", Type: DB_Bool, Nullable: false, Default: "0", })) + + mg.AddMigration("add type column", NewAddColumnMigration(correlationsV2, &Column{ + Name: "type", Type: DB_NVarchar, Length: 40, Nullable: false, Default: "'query'", + })) } diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go index a3188351898..fb77908f9b0 100644 --- a/pkg/services/sqlstore/migrations/migrations.go +++ b/pkg/services/sqlstore/migrations/migrations.go @@ -127,6 +127,8 @@ func (oss *OSSMigrations) AddMigration(mg *Migrator) { ualert.AddStateResolvedAtColumns(mg) enableTraceQLStreaming(mg, oss.features != nil && oss.features.IsEnabledGlobally(featuremgmt.FlagTraceQLStreaming)) + + ualert.AddReceiverActionScopesMigration(mg) } func addStarMigrations(mg *Migrator) { diff --git a/pkg/services/sqlstore/migrations/ualert/receiver_scope_mig.go b/pkg/services/sqlstore/migrations/ualert/receiver_scope_mig.go new file mode 100644 index 00000000000..b0f92e8a13f --- /dev/null +++ b/pkg/services/sqlstore/migrations/ualert/receiver_scope_mig.go @@ -0,0 +1,49 @@ +package ualert + +import ( + "xorm.io/xorm" + + "github.com/grafana/grafana/pkg/services/sqlstore/migrator" +) + +const ( + AlertingAddReceiverActionScopes = "Add scope to alert.notifications.receivers:read and alert.notifications.receivers.secrets:read" +) + +// AddReceiverActionScopesMigration is a migration that will add scopes to alert.notifications.receivers:read and +// alert.notifications.receivers.secrets:read actions. +// Originally, they were created without any scope, but treated as if all actions were globally scoped. +// With the introduction of receiver FGAC, we need to scope these actions to UID so any existing roles should be updated +// to explicitly have the global scope. +func AddReceiverActionScopesMigration(mg *migrator.Migrator) { + mg.AddMigration(AlertingAddReceiverActionScopes, &addReceiverActionScopesMigrator{}) +} + +var _ migrator.CodeMigration = (*addReceiverActionScopesMigrator)(nil) + +type addReceiverActionScopesMigrator struct { + migrator.MigrationBase +} + +func (p addReceiverActionScopesMigrator) SQL(migrator.Dialect) string { + return codeMigration +} + +func (p addReceiverActionScopesMigrator) Exec(sess *xorm.Session, migrator *migrator.Migrator) error { + // Vendored. + actionAlertingReceiversRead := "alert.notifications.receivers:read" + actionAlertingReceiversReadSecrets := "alert.notifications.receivers.secrets:read" + + _, err := sess.Exec("UPDATE permission SET `scope` = 'receivers:*', `kind` = 'receivers', `attribute` = '*', `identifier` = '*' WHERE action = ?", actionAlertingReceiversRead) + if err != nil { + migrator.Logger.Error("Failed to update permissions for action", "action", actionAlertingReceiversRead, "error", err) + return err + } + + _, err = sess.Exec("UPDATE permission SET `scope` = 'receivers:*', `kind` = 'receivers', `attribute` = '*', `identifier` = '*' WHERE action = ?", actionAlertingReceiversReadSecrets) + if err != nil { + migrator.Logger.Error("Failed to update permissions for action", "action", actionAlertingReceiversReadSecrets, "error", err) + return err + } + return nil +} diff --git a/pkg/services/sqlstore/migrations/ualert/test/receiver_scope_mig_test.go b/pkg/services/sqlstore/migrations/ualert/test/receiver_scope_mig_test.go new file mode 100644 index 00000000000..bcb02dda7d5 --- /dev/null +++ b/pkg/services/sqlstore/migrations/ualert/test/receiver_scope_mig_test.go @@ -0,0 +1,183 @@ +package test + +import ( + "testing" + "time" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/infra/log" + "github.com/grafana/grafana/pkg/services/accesscontrol" + "github.com/grafana/grafana/pkg/services/sqlstore/migrations/ualert" + "github.com/grafana/grafana/pkg/services/sqlstore/migrator" + "github.com/grafana/grafana/pkg/setting" +) + +func TestScopeMigration(t *testing.T) { + x := setupTestDB(t) + now := time.Now() + + // Vendored. + actionAlertingReceiversRead := "alert.notifications.receivers:read" + actionAlertingReceiversReadSecrets := "alert.notifications.receivers.secrets:read" + + type migrationTestCase struct { + desc string + permissionSeed []*accesscontrol.Permission + wantPermissions []*accesscontrol.Permission + } + testCases := []migrationTestCase{ + { + desc: "convert existing alert.notifications.receivers:read regardless of scope", + permissionSeed: []*accesscontrol.Permission{ + { + RoleID: 1, + Action: actionAlertingReceiversRead, + Scope: "", + Kind: "", + Attribute: "", + Created: now, + Updated: now, + }, + { + RoleID: 2, + Action: actionAlertingReceiversRead, + Scope: "Scope", + Kind: "Kind", + Attribute: "Attribute", + Created: now, + Updated: now, + }, + }, + wantPermissions: []*accesscontrol.Permission{ + { + RoleID: 1, + Action: actionAlertingReceiversRead, + Scope: "receivers:*", + Kind: "receivers", + Attribute: "*", + Identifier: "*", + }, + { + RoleID: 2, + Action: actionAlertingReceiversRead, + Scope: "receivers:*", + Kind: "receivers", + Attribute: "*", + Identifier: "*", + }, + }, + }, + { + desc: "convert existing alert.notifications.receivers:read regardless of scope", + permissionSeed: []*accesscontrol.Permission{ + { + RoleID: 1, + Action: actionAlertingReceiversReadSecrets, + Scope: "", + Kind: "", + Attribute: "", + Created: now, + Updated: now, + }, + { + RoleID: 2, + Action: actionAlertingReceiversReadSecrets, + Scope: "Scope", + Kind: "Kind", + Attribute: "Attribute", + Created: now, + Updated: now, + }, + }, + wantPermissions: []*accesscontrol.Permission{ + { + RoleID: 1, + Action: actionAlertingReceiversReadSecrets, + Scope: "receivers:*", + Kind: "receivers", + Attribute: "*", + Identifier: "*", + }, + { + RoleID: 2, + Action: actionAlertingReceiversReadSecrets, + Scope: "receivers:*", + Kind: "receivers", + Attribute: "*", + Identifier: "*", + }, + }, + }, + { + desc: "empty perms", + permissionSeed: []*accesscontrol.Permission{}, + wantPermissions: []*accesscontrol.Permission{}, + }, + { + desc: "unrelated perms", + permissionSeed: []*accesscontrol.Permission{ + { + RoleID: 1, + Action: "some.other.resource:read", + Scope: "Scope", + Kind: "Kind", + Attribute: "Attribute", + Created: now, + Updated: now, + }, + }, + wantPermissions: []*accesscontrol.Permission{ + { + RoleID: 1, + Action: "some.other.resource:read", + Scope: "Scope", + Kind: "Kind", + Attribute: "Attribute", + Created: now, + Updated: now, + }, + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.desc, func(t *testing.T) { + // Remove migration and permissions + _, errDeleteMig := x.Exec(`DELETE FROM migration_log WHERE migration_id = ?`, ualert.AlertingAddReceiverActionScopes) + require.NoError(t, errDeleteMig) + _, errDeletePerms := x.Exec(`DELETE FROM permission`) + require.NoError(t, errDeletePerms) + + // seed DB with permissions + if len(tc.permissionSeed) != 0 { + permissionsCount, err := x.Insert(tc.permissionSeed) + require.NoError(t, err) + require.Equal(t, int64(len(tc.permissionSeed)), permissionsCount) + } + + // Run RBAC action name migration + acmigrator := migrator.NewMigrator(x, &setting.Cfg{Logger: log.New("acmigration.test")}) + ualert.AddReceiverActionScopesMigration(acmigrator) + + errRunningMig := acmigrator.Start(false, 0) + require.NoError(t, errRunningMig) + + // Check permissions + resultingPermissions := []*accesscontrol.Permission{} + err := x.Table("permission").Find(&resultingPermissions) + require.NoError(t, err) + + // verify got == want + cOpt := []cmp.Option{ + cmpopts.SortSlices(func(a, b accesscontrol.Permission) bool { return a.RoleID < b.RoleID }), + cmpopts.IgnoreFields(accesscontrol.Permission{}, "ID", "Created", "Updated"), + } + if !cmp.Equal(tc.wantPermissions, resultingPermissions, cOpt...) { + t.Errorf("Unexpected permissions: %v", cmp.Diff(tc.wantPermissions, resultingPermissions, cOpt...)) + } + }) + } +} diff --git a/pkg/services/sqlstore/migrations/ualert/test/testing.go b/pkg/services/sqlstore/migrations/ualert/test/testing.go new file mode 100644 index 00000000000..0e5d82537ac --- /dev/null +++ b/pkg/services/sqlstore/migrations/ualert/test/testing.go @@ -0,0 +1,49 @@ +package test + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/require" + "gopkg.in/ini.v1" + "xorm.io/xorm" + + "github.com/grafana/grafana/pkg/infra/log" + "github.com/grafana/grafana/pkg/services/sqlstore/migrations" + "github.com/grafana/grafana/pkg/services/sqlstore/migrator" + "github.com/grafana/grafana/pkg/services/sqlstore/sqlutil" + "github.com/grafana/grafana/pkg/setting" +) + +func setupTestDB(t *testing.T) *xorm.Engine { + t.Helper() + dbType := sqlutil.GetTestDBType() + testDB, err := sqlutil.GetTestDB(dbType) + require.NoError(t, err) + + t.Cleanup(testDB.Cleanup) + + x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr) + require.NoError(t, err) + + t.Cleanup(func() { + if err := x.Close(); err != nil { + fmt.Printf("failed to close xorm engine: %v", err) + } + }) + + err = migrator.NewDialect(x.DriverName()).CleanDB(x) + require.NoError(t, err) + + mg := migrator.NewMigrator(x, &setting.Cfg{ + Logger: log.New("acmigration.test"), + Raw: ini.Empty(), + }) + migrations := &migrations.OSSMigrations{} + migrations.AddMigration(mg) + + err = mg.Start(false, 0) + require.NoError(t, err) + + return x +} diff --git a/pkg/services/sqlstore/replstore.go b/pkg/services/sqlstore/replstore.go index 223a5ebc7e3..68854acde0a 100644 --- a/pkg/services/sqlstore/replstore.go +++ b/pkg/services/sqlstore/replstore.go @@ -41,7 +41,7 @@ func (rs *ReplStore) DB() *SQLStore { // ReadReplica returns the read-only SQLStore. If no read replica is configured, // it returns the main SQLStore. func (rs *ReplStore) ReadReplica() *SQLStore { - if rs.repls == nil || len(rs.repls) == 0 { + if len(rs.repls) == 0 { rs.log.Debug("ReadReplica not configured, using main SQLStore") return rs.SQLStore } diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go index 4b17a54e37d..e5c1a178a95 100644 --- a/pkg/services/sqlstore/sqlstore.go +++ b/pkg/services/sqlstore/sqlstore.go @@ -481,7 +481,6 @@ func getCfgForTesting(opts ...InitTestDBOpt) *setting.Cfg { func getFeaturesForTesting(opts ...InitTestDBOpt) featuremgmt.FeatureToggles { featureKeys := []any{ featuremgmt.FlagPanelTitleSearch, - featuremgmt.FlagUnifiedStorage, } for _, opt := range opts { if len(opt.FeatureFlags) > 0 { diff --git a/pkg/services/stats/statsimpl/stats_test.go b/pkg/services/stats/statsimpl/stats_test.go index 15ec1c50334..019f1ab7d47 100644 --- a/pkg/services/stats/statsimpl/stats_test.go +++ b/pkg/services/stats/statsimpl/stats_test.go @@ -104,7 +104,7 @@ func populateDB(t *testing.T, db db.DB, cfg *setting.Cfg) { Config: correlations.CorrelationConfig{ Field: "field", Target: map[string]any{}, - Type: correlations.ConfigTypeQuery, + Type: correlations.TypeQuery, }, } correlation, err := correlationsSvc.CreateCorrelation(context.Background(), cmd) diff --git a/pkg/services/store/config.go b/pkg/services/store/config.go index d2f86616702..0527aa7fe81 100644 --- a/pkg/services/store/config.go +++ b/pkg/services/store/config.go @@ -126,11 +126,11 @@ type StorageGCSConfig struct { CredentialsFile string `json:"credentialsFile"` } -func newStorage(cfg RootStorageConfig, localWorkCache string) (storageRuntime, error) { +func newStorage(cfg RootStorageConfig, _ string) (storageRuntime, error) { switch cfg.Type { case rootStorageTypeDisk: return newDiskStorage(RootStorageMeta{}, cfg), nil } - return nil, fmt.Errorf("unsupported store: " + cfg.Type) + return nil, fmt.Errorf("unsupported store: %s", cfg.Type) } diff --git a/pkg/services/store/service.go b/pkg/services/store/service.go index fe523f80f52..0e446316fe0 100644 --- a/pkg/services/store/service.go +++ b/pkg/services/store/service.go @@ -153,6 +153,8 @@ func ProvideService( // all externally-defined storages lie under the "content" root root.UnderContentRoot = true + + // TODO: remove unused second argument s, err := newStorage(root, filepath.Join(cfg.DataPath, "storage", "cache", root.Prefix)) if err != nil { grafanaStorageLogger.Warn("Error loading storage config", "error", err) diff --git a/pkg/services/team/model.go b/pkg/services/team/model.go index 8bd371de36a..debb2cd32d9 100644 --- a/pkg/services/team/model.go +++ b/pkg/services/team/model.go @@ -5,7 +5,6 @@ import ( "time" "github.com/grafana/grafana/pkg/apimachinery/identity" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/search/model" ) @@ -21,9 +20,6 @@ var ( ErrTeamMemberAlreadyAdded = errors.New("user is already added to this team") ) -const MemberPermissionName = "Member" -const AdminPermissionName = "Admin" - // Team model type Team struct { ID int64 `json:"id" xorm:"pk autoincr 'id'"` @@ -91,15 +87,29 @@ type SearchTeamsQuery struct { } type TeamDTO struct { - ID int64 `json:"id" xorm:"id"` - UID string `json:"uid" xorm:"uid"` - OrgID int64 `json:"orgId" xorm:"org_id"` - Name string `json:"name"` - Email string `json:"email"` - AvatarURL string `json:"avatarUrl"` - MemberCount int64 `json:"memberCount"` - Permission dashboardaccess.PermissionType `json:"permission"` - AccessControl map[string]bool `json:"accessControl"` + ID int64 `json:"id" xorm:"id"` + UID string `json:"uid" xorm:"uid"` + OrgID int64 `json:"orgId" xorm:"org_id"` + Name string `json:"name"` + Email string `json:"email"` + AvatarURL string `json:"avatarUrl"` + MemberCount int64 `json:"memberCount"` + Permission PermissionType `json:"permission"` + AccessControl map[string]bool `json:"accessControl"` +} + +type PermissionType int + +const ( + PermissionTypeMember PermissionType = 0 + PermissionTypeAdmin PermissionType = 4 +) + +func (p PermissionType) String() string { + if p == PermissionTypeAdmin { + return "Admin" + } + return "Member" } type SearchTeamQueryResult struct { @@ -116,7 +126,7 @@ type TeamMember struct { TeamID int64 `xorm:"team_id"` UserID int64 `xorm:"user_id"` External bool // Signals that the membership has been created by an external systems, such as LDAP - Permission dashboardaccess.PermissionType + Permission PermissionType Created time.Time Updated time.Time @@ -126,12 +136,12 @@ type TeamMember struct { // COMMANDS type AddTeamMemberCommand struct { - UserID int64 `json:"userId" binding:"Required"` - Permission dashboardaccess.PermissionType `json:"-"` + UserID int64 `json:"userId" binding:"Required"` + Permission PermissionType `json:"-"` } type UpdateTeamMemberCommand struct { - Permission dashboardaccess.PermissionType `json:"permission"` + Permission PermissionType `json:"permission"` } type SetTeamMembershipsCommand struct { @@ -161,16 +171,16 @@ type GetTeamMembersQuery struct { // Projections and DTOs type TeamMemberDTO struct { - OrgID int64 `json:"orgId" xorm:"org_id"` - TeamID int64 `json:"teamId" xorm:"team_id"` - TeamUID string `json:"teamUID" xorm:"uid"` - UserID int64 `json:"userId" xorm:"user_id"` - External bool `json:"-"` - AuthModule string `json:"auth_module"` - Email string `json:"email"` - Name string `json:"name"` - Login string `json:"login"` - AvatarURL string `json:"avatarUrl" xorm:"avatar_url"` - Labels []string `json:"labels"` - Permission dashboardaccess.PermissionType `json:"permission"` + OrgID int64 `json:"orgId" xorm:"org_id"` + TeamID int64 `json:"teamId" xorm:"team_id"` + TeamUID string `json:"teamUID" xorm:"uid"` + UserID int64 `json:"userId" xorm:"user_id"` + External bool `json:"-"` + AuthModule string `json:"auth_module"` + Email string `json:"email"` + Name string `json:"name"` + Login string `json:"login"` + AvatarURL string `json:"avatarUrl" xorm:"avatar_url"` + Labels []string `json:"labels"` + Permission PermissionType `json:"permission"` } diff --git a/pkg/services/team/teamapi/team_members.go b/pkg/services/team/teamapi/team_members.go index 6d4dc62457b..c2b796aaf58 100644 --- a/pkg/services/team/teamapi/team_members.go +++ b/pkg/services/team/teamapi/team_members.go @@ -12,7 +12,6 @@ import ( "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/services/accesscontrol" contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/login" "github.com/grafana/grafana/pkg/services/team" "github.com/grafana/grafana/pkg/services/user" @@ -92,7 +91,10 @@ func (tapi *TeamAPI) addTeamMember(c *contextmodel.ReqContext) response.Response return response.Error(http.StatusBadRequest, "User is already added to this team", nil) } - err = addOrUpdateTeamMember(c.Req.Context(), tapi.teamPermissionsService, cmd.UserID, c.SignedInUser.GetOrgID(), teamID, team.MemberPermissionName) + err = addOrUpdateTeamMember( + c.Req.Context(), tapi.teamPermissionsService, + cmd.UserID, c.SignedInUser.GetOrgID(), teamID, team.PermissionTypeMember.String(), + ) if err != nil { return response.Error(http.StatusInternalServerError, "Failed to add Member to Team", err) } @@ -135,7 +137,7 @@ func (tapi *TeamAPI) updateTeamMember(c *contextmodel.ReqContext) response.Respo return response.Error(http.StatusNotFound, "Team member not found.", nil) } - err = addOrUpdateTeamMember(c.Req.Context(), tapi.teamPermissionsService, userId, orgId, teamId, getPermissionName(cmd.Permission)) + err = addOrUpdateTeamMember(c.Req.Context(), tapi.teamPermissionsService, userId, orgId, teamId, cmd.Permission.String()) if err != nil { return response.Error(http.StatusInternalServerError, "Failed to update team member.", err) } @@ -202,13 +204,13 @@ func (tapi *TeamAPI) getTeamMembershipUpdates(ctx context.Context, orgID, teamID membersToRemove := make([]int64, 0) for _, member := range currentMemberships { if _, ok := adminEmails[member.Email]; ok { - if getPermissionName(member.Permission) == team.AdminPermissionName { + if member.Permission == team.PermissionTypeAdmin { delete(adminEmails, member.Email) } continue } if _, ok := memberEmails[member.Email]; ok { - if getPermissionName(member.Permission) == team.MemberPermissionName { + if member.Permission == team.PermissionTypeMember { delete(memberEmails, member.Email) } continue @@ -227,10 +229,10 @@ func (tapi *TeamAPI) getTeamMembershipUpdates(ctx context.Context, orgID, teamID teamMemberships := make([]accesscontrol.SetResourcePermissionCommand, 0, len(adminIDs)+len(memberIDs)+len(membersToRemove)) for _, admin := range adminIDs { - teamMemberships = append(teamMemberships, accesscontrol.SetResourcePermissionCommand{Permission: team.AdminPermissionName, UserID: admin}) + teamMemberships = append(teamMemberships, accesscontrol.SetResourcePermissionCommand{Permission: team.PermissionTypeAdmin.String(), UserID: admin}) } for _, member := range memberIDs { - teamMemberships = append(teamMemberships, accesscontrol.SetResourcePermissionCommand{Permission: team.MemberPermissionName, UserID: member}) + teamMemberships = append(teamMemberships, accesscontrol.SetResourcePermissionCommand{Permission: team.PermissionTypeMember.String(), UserID: member}) } for _, member := range membersToRemove { teamMemberships = append(teamMemberships, accesscontrol.SetResourcePermissionCommand{Permission: "", UserID: member}) @@ -252,16 +254,6 @@ func (tapi *TeamAPI) getUserIDs(ctx context.Context, emails map[string]struct{}) return userIDs, nil } -func getPermissionName(permission dashboardaccess.PermissionType) string { - permissionName := permission.String() - // Team member permission is 0, which maps to an empty string. - // However, we want the team permission service to display "Member" for team members. This is a hack to make it work. - if permissionName == "" { - permissionName = team.MemberPermissionName - } - return permissionName -} - // swagger:route DELETE /teams/{team_id}/members/{user_id} teams removeTeamMember // // Remove Member From Team. diff --git a/pkg/services/team/teamapi/team_members_test.go b/pkg/services/team/teamapi/team_members_test.go index c3eb3d2f639..fd616925b31 100644 --- a/pkg/services/team/teamapi/team_members_test.go +++ b/pkg/services/team/teamapi/team_members_test.go @@ -16,7 +16,6 @@ import ( "github.com/grafana/grafana/pkg/services/accesscontrol/actest" "github.com/grafana/grafana/pkg/services/authz/zanzana" "github.com/grafana/grafana/pkg/services/dashboards" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/licensing" "github.com/grafana/grafana/pkg/services/org" @@ -178,9 +177,9 @@ func Test_getTeamMembershipUpdates(t *testing.T) { Admins: []string{"user3"}, }, expectedUpdates: []accesscontrol.SetResourcePermissionCommand{ - {UserID: 1, Permission: team.MemberPermissionName}, - {UserID: 2, Permission: team.MemberPermissionName}, - {UserID: 3, Permission: team.AdminPermissionName}, + {UserID: 1, Permission: team.PermissionTypeMember.String()}, + {UserID: 2, Permission: team.PermissionTypeMember.String()}, + {UserID: 3, Permission: team.PermissionTypeAdmin.String()}, }, }, { @@ -190,11 +189,11 @@ func Test_getTeamMembershipUpdates(t *testing.T) { Admins: []string{"user3"}, }, currentMembers: []*team.TeamMemberDTO{ - {Email: "user1", Permission: 0}, - {Email: "user3", Permission: dashboardaccess.PERMISSION_ADMIN}, + {Email: "user1", Permission: team.PermissionTypeMember}, + {Email: "user3", Permission: team.PermissionTypeAdmin}, }, expectedUpdates: []accesscontrol.SetResourcePermissionCommand{ - {UserID: 2, Permission: team.MemberPermissionName}, + {UserID: 2, Permission: team.PermissionTypeMember.String()}, }, }, { @@ -204,13 +203,13 @@ func Test_getTeamMembershipUpdates(t *testing.T) { Admins: []string{"user3"}, }, currentMembers: []*team.TeamMemberDTO{ - {Email: "user1", Permission: 0}, - {Email: "user2", Permission: dashboardaccess.PERMISSION_ADMIN}, - {Email: "user3", Permission: 0}, + {Email: "user1", Permission: team.PermissionTypeMember}, + {Email: "user2", Permission: team.PermissionTypeAdmin}, + {Email: "user3", Permission: team.PermissionTypeMember}, }, expectedUpdates: []accesscontrol.SetResourcePermissionCommand{ - {UserID: 2, Permission: team.MemberPermissionName}, - {UserID: 3, Permission: team.AdminPermissionName}, + {UserID: 2, Permission: team.PermissionTypeMember.String()}, + {UserID: 3, Permission: team.PermissionTypeAdmin.String()}, }, }, { @@ -220,10 +219,10 @@ func Test_getTeamMembershipUpdates(t *testing.T) { Admins: []string{"user3"}, }, currentMembers: []*team.TeamMemberDTO{ - {Email: "user1", UserID: 1, Permission: 0}, - {Email: "user2", UserID: 2, Permission: 0}, - {Email: "user3", UserID: 3, Permission: dashboardaccess.PERMISSION_ADMIN}, - {Email: "user4", UserID: 4, Permission: dashboardaccess.PERMISSION_ADMIN}, + {Email: "user1", UserID: 1, Permission: team.PermissionTypeMember}, + {Email: "user2", UserID: 2, Permission: team.PermissionTypeMember}, + {Email: "user3", UserID: 3, Permission: team.PermissionTypeAdmin}, + {Email: "user4", UserID: 4, Permission: team.PermissionTypeAdmin}, }, expectedUpdates: []accesscontrol.SetResourcePermissionCommand{ {UserID: 2, Permission: ""}, diff --git a/pkg/services/team/teamimpl/store.go b/pkg/services/team/teamimpl/store.go index d1bc2afa06b..8d3b0a068ed 100644 --- a/pkg/services/team/teamimpl/store.go +++ b/pkg/services/team/teamimpl/store.go @@ -10,7 +10,6 @@ import ( "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/infra/db" ac "github.com/grafana/grafana/pkg/services/accesscontrol" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/team" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" @@ -385,7 +384,7 @@ func isTeamMember(sess *db.Session, orgId int64, teamId int64, userId int64) (bo // AddOrUpdateTeamMemberHook is called from team resource permission service // it adds user to a team or updates user permissions in a team within the given transaction session -func AddOrUpdateTeamMemberHook(sess *db.Session, userID, orgID, teamID int64, isExternal bool, permission dashboardaccess.PermissionType) error { +func AddOrUpdateTeamMemberHook(sess *db.Session, userID, orgID, teamID int64, isExternal bool, permission team.PermissionType) error { isMember, err := isTeamMember(sess, orgID, teamID, userID) if err != nil { return err @@ -400,7 +399,7 @@ func AddOrUpdateTeamMemberHook(sess *db.Session, userID, orgID, teamID int64, is return err } -func addTeamMember(sess *db.Session, orgID, teamID, userID int64, isExternal bool, permission dashboardaccess.PermissionType) error { +func addTeamMember(sess *db.Session, orgID, teamID, userID int64, isExternal bool, permission team.PermissionType) error { if _, err := teamExists(orgID, teamID, sess); err != nil { return err } @@ -419,14 +418,14 @@ func addTeamMember(sess *db.Session, orgID, teamID, userID int64, isExternal boo return err } -func updateTeamMember(sess *db.Session, orgID, teamID, userID int64, permission dashboardaccess.PermissionType) error { +func updateTeamMember(sess *db.Session, orgID, teamID, userID int64, permission team.PermissionType) error { member, err := getTeamMember(sess, orgID, teamID, userID) if err != nil { return err } - if permission != dashboardaccess.PERMISSION_ADMIN { - permission = 0 // make sure we don't get invalid permission levels in store + if permission != team.PermissionTypeAdmin { + permission = team.PermissionTypeMember // make sure we don't get invalid permission levels in store } member.Permission = permission diff --git a/pkg/services/team/teamimpl/store_test.go b/pkg/services/team/teamimpl/store_test.go index d3c4bf5cea2..1041bdb86ed 100644 --- a/pkg/services/team/teamimpl/store_test.go +++ b/pkg/services/team/teamimpl/store_test.go @@ -13,7 +13,6 @@ import ( "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/infra/tracing" ac "github.com/grafana/grafana/pkg/services/accesscontrol" - "github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess" "github.com/grafana/grafana/pkg/services/org/orgimpl" "github.com/grafana/grafana/pkg/services/quota/quotaimpl" "github.com/grafana/grafana/pkg/services/serviceaccounts" @@ -189,14 +188,14 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) { require.EqualValues(t, qBeforeUpdateResult[0].Permission, 0) err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error { - return AddOrUpdateTeamMemberHook(sess, userId, testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN) + return AddOrUpdateTeamMemberHook(sess, userId, testOrgID, team1.ID, false, team.PermissionTypeAdmin) }) require.NoError(t, err) qAfterUpdate := &team.GetTeamMembersQuery{OrgID: testOrgID, TeamID: team1.ID, SignedInUser: testUser} qAfterUpdateResult, err := teamSvc.GetTeamMembers(context.Background(), qAfterUpdate) require.NoError(t, err) - require.Equal(t, qAfterUpdateResult[0].Permission, dashboardaccess.PERMISSION_ADMIN) + require.Equal(t, qAfterUpdateResult[0].Permission, team.PermissionTypeAdmin) }) t.Run("Should default to member permission level when updating a user with invalid permission level", func(t *testing.T) { @@ -214,9 +213,9 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) { require.NoError(t, err) require.EqualValues(t, qBeforeUpdateResult[0].Permission, 0) - invalidPermissionLevel := dashboardaccess.PERMISSION_EDIT + invalidPermissionLevel := 2 err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error { - return AddOrUpdateTeamMemberHook(sess, userID, testOrgID, team1.ID, false, invalidPermissionLevel) + return AddOrUpdateTeamMemberHook(sess, userID, testOrgID, team1.ID, false, team.PermissionType(invalidPermissionLevel)) }) require.NoError(t, err) @@ -356,7 +355,7 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) { t.Run("Should have empty teams", func(t *testing.T) { err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error { - return AddOrUpdateTeamMemberHook(sess, userIds[0], testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN) + return AddOrUpdateTeamMemberHook(sess, userIds[0], testOrgID, team1.ID, false, team.PermissionTypeAdmin) }) require.NoError(t, err) @@ -379,11 +378,11 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) { setup() err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error { - err := AddOrUpdateTeamMemberHook(sess, userIds[0], testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN) + err := AddOrUpdateTeamMemberHook(sess, userIds[0], testOrgID, team1.ID, false, team.PermissionTypeAdmin) if err != nil { return err } - return AddOrUpdateTeamMemberHook(sess, userIds[1], testOrgID, team1.ID, false, dashboardaccess.PERMISSION_ADMIN) + return AddOrUpdateTeamMemberHook(sess, userIds[1], testOrgID, team1.ID, false, team.PermissionTypeAdmin) }) require.NoError(t, err) err = sqlStore.WithDbSession(context.Background(), func(sess *db.Session) error { diff --git a/pkg/services/user/identity.go b/pkg/services/user/identity.go index 83a303b28c8..c6939b47b0d 100644 --- a/pkg/services/user/identity.go +++ b/pkg/services/user/identity.go @@ -45,7 +45,6 @@ type SignedInUser struct { Permissions map[int64]map[string][]string `json:"-"` // IDToken is a signed token representing the identity that can be forwarded to plugins and external services. - // Will only be set when featuremgmt.FlagIdForwarding is enabled. IDToken string `json:"-" xorm:"-"` IDTokenClaims *authnlib.Claims[authnlib.IDTokenClaims] `json:"-" xorm:"-"` diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 22f34b43f92..04612d220ac 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -197,7 +197,8 @@ type Cfg struct { HideAngularDeprecation []string PluginInstallToken string ForwardHostEnvVars []string - InstallPlugins []InstallPlugin + PreinstallPlugins []InstallPlugin + PreinstallPluginsAsync bool PluginsCDNURLTemplate string PluginLogBackendRequests bool diff --git a/pkg/setting/setting_plugins.go b/pkg/setting/setting_plugins.go index d6cf55172d5..904dadcb20e 100644 --- a/pkg/setting/setting_plugins.go +++ b/pkg/setting/setting_plugins.go @@ -39,10 +39,10 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error { cfg.DisablePlugins = util.SplitString(pluginsSection.Key("disable_plugins").MustString("")) cfg.HideAngularDeprecation = util.SplitString(pluginsSection.Key("hide_angular_deprecation").MustString("")) cfg.ForwardHostEnvVars = util.SplitString(pluginsSection.Key("forward_host_env_vars").MustString("")) - disablePreinstall := pluginsSection.Key("disable_preinstall").MustBool(false) + disablePreinstall := pluginsSection.Key("preinstall_disabled").MustBool(false) if !disablePreinstall { rawInstallPlugins := util.SplitString(pluginsSection.Key("preinstall").MustString("")) - cfg.InstallPlugins = make([]InstallPlugin, len(rawInstallPlugins)) + cfg.PreinstallPlugins = make([]InstallPlugin, len(rawInstallPlugins)) for i, plugin := range rawInstallPlugins { parts := strings.Split(plugin, "@") id := parts[0] @@ -50,8 +50,9 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error { if len(parts) == 2 { v = parts[1] } - cfg.InstallPlugins[i] = InstallPlugin{id, v} + cfg.PreinstallPlugins[i] = InstallPlugin{id, v} } + cfg.PreinstallPluginsAsync = pluginsSection.Key("preinstall_async").MustBool(true) } cfg.PluginCatalogURL = pluginsSection.Key("plugin_catalog_url").MustString("https://grafana.com/grafana/plugins/") diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod new file mode 100644 index 00000000000..cc553c54044 --- /dev/null +++ b/pkg/storage/unified/apistore/go.mod @@ -0,0 +1,106 @@ +module github.com/grafana/grafana/pkg/storage/unified/apistore + +go 1.23.0 + +require ( + github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db + github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da + github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da + github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240821161612-71f0dae39e9d + github.com/stretchr/testify v1.9.0 + gocloud.dev v0.39.0 + google.golang.org/grpc v1.65.0 + k8s.io/apimachinery v0.31.0 + k8s.io/apiserver v0.31.0 + k8s.io/client-go v0.31.0 + k8s.io/klog/v2 v2.130.1 +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/bufbuild/protocompile v0.4.0 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/coreos/go-semver v0.3.1 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fullstorydev/grpchan v1.1.1 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.20.4 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/gax-go/v2 v2.13.0 // indirect + github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db // indirect + github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/jhump/protoreflect v1.15.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/x448/float16 v0.8.4 // indirect + go.etcd.io/etcd/api/v3 v3.5.14 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect + go.etcd.io/etcd/client/v3 v3.5.14 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/time v0.6.0 // indirect + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect + google.golang.org/api v0.191.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/api v0.31.0 // indirect + k8s.io/component-base v0.31.0 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) diff --git a/pkg/storage/unified/apistore/go.sum b/pkg/storage/unified/apistore/go.sum new file mode 100644 index 00000000000..f779d2b7281 --- /dev/null +++ b/pkg/storage/unified/apistore/go.sum @@ -0,0 +1,491 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= +cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= +cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= +cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= +cloud.google.com/go/compute v1.23.4 h1:EBT9Nw4q3zyE7G45Wvv3MzolIrCJEuHys5muLY0wvAw= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= +cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= +cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= +cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= +github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= +github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90= +github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 h1:zeN9UtUlA6FTx0vFSayxSX32HDw73Yb6Hh2izDSFxXY= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10/go.mod h1:3HKuexPDcwLWPaqpW2UR/9n8N/u/3CKcGAzSs8p8u8g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 h1:Z5r7SycxmSllHYmaAZPpmN8GviDrSGhMS6bldqtXZPw= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15/go.mod h1:CetW7bDE00QoGEmPUoZuRog07SGVAUVW6LFpNP0YfIg= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 h1:YPYe6ZmvUfDDDELqEKtAd6bo8zxhkm+XEFEzQisqUIE= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17/go.mod h1:oBtcnYua/CgzCWYN7NZ5j7PotFDaFSUjCYVTtfyn7vw= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ= +github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= +github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fullstorydev/grpchan v1.1.1 h1:heQqIJlAv5Cnks9a70GRL2EJke6QQoUB25VGR6TZQas= +github.com/fullstorydev/grpchan v1.1.1/go.mod h1:f4HpiV8V6htfY/K44GWV1ESQzHBTq7DinhzqQ95lpgc= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= +github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU= +github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= +github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= +github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= +github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= +github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db h1:z++X4DdoX+aNlZNT1ZY4cykiFay4+f077pa0AG48SGg= +github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db/go.mod h1:ptt910z9KFfpVSIbSbXvTRR7tS19mxD7EtmVbbJi/WE= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db h1:mDk0bwRV6rDrLSmKXftcPf9kLA9uH6EvxJvzpPW9bso= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= +github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da h1:2E3c/I3ayAy4Z1GwIPqXNZcpUccRapE1aBXA1ho4g7o= +github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da/go.mod h1:p09fvU5ujNL/Ig8HB7g4f+S0zyYbQq3x/f0jA4ujVOM= +github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da h1:xQMb8cRZYu7D0IO9q/lB7qFQpLGAoPUnCase1CGHrXY= +github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da/go.mod h1:8kZIdcgyLiHBwXbZFFzg9XxM9zD8Ie3wkDhxWuqa5Oo= +github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240821161612-71f0dae39e9d h1:cmJmy/KdlD+8EOWn9AogfRMr9tWoWPDnZ180sQxD/IA= +github.com/grafana/grafana/pkg/storage/unified/resource v0.0.0-20240821161612-71f0dae39e9d/go.mod h1:KL0LyEIlmuRi/zzuCopFZSmSJzBVu2hMGHIK74i4iE8= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 h1:uGoIog/wiQHI9GAxXO5TJbT0wWKH3O9HhOJW1F9c3fY= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= +github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= +github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= +github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= +github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= +github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= +go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= +go.etcd.io/etcd/api/v3 v3.5.14 h1:vHObSCxyB9zlF60w7qzAdTcGaglbJOpSj1Xj9+WGxq0= +go.etcd.io/etcd/api/v3 v3.5.14/go.mod h1:BmtWcRlQvwa1h3G2jvKYwIQy4PkHlDej5t7uLMUdJUU= +go.etcd.io/etcd/client/pkg/v3 v3.5.14 h1:SaNH6Y+rVEdxfpA2Jr5wkEvN6Zykme5+YnbCkxvuWxQ= +go.etcd.io/etcd/client/pkg/v3 v3.5.14/go.mod h1:8uMgAokyG1czCtIdsq+AGyYQMvpIKnSvPjFMunkgeZI= +go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8= +go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg= +go.etcd.io/etcd/client/v3 v3.5.14 h1:CWfRs4FDaDoSz81giL7zPpZH2Z35tbOrAJkkjMqOupg= +go.etcd.io/etcd/client/v3 v3.5.14/go.mod h1:k3XfdV/VIHy/97rqWjoUzrj9tk7GgJGH9J8L4dNXmAk= +go.etcd.io/etcd/pkg/v3 v3.5.13 h1:st9bDWNsKkBNpP4PR1MvM/9NqUPfvYZx/YXegsYEH8M= +go.etcd.io/etcd/pkg/v3 v3.5.13/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= +go.etcd.io/etcd/raft/v3 v3.5.13 h1:7r/NKAOups1YnKcfro2RvGGo2PTuizF/xh26Z2CTAzA= +go.etcd.io/etcd/raft/v3 v3.5.13/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= +go.etcd.io/etcd/server/v3 v3.5.13 h1:V6KG+yMfMSqWt+lGnhFpP5z5dRUj1BDRJ5k1fQ9DFok= +go.etcd.io/etcd/server/v3 v3.5.13/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +gocloud.dev v0.39.0 h1:EYABYGhAalPUaMrbSKOr5lejxoxvXj99nE8XFtsDgds= +gocloud.dev v0.39.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= +google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= +k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= +k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= +k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= +k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk= +k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= +k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= +k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= +k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/storage/unified/apistore/history.go b/pkg/storage/unified/apistore/history.go index 9edb5114ef5..0bc09c8bbe0 100644 --- a/pkg/storage/unified/apistore/history.go +++ b/pkg/storage/unified/apistore/history.go @@ -3,15 +3,17 @@ package apistore import ( "context" "encoding/json" + "fmt" "net/http" "strconv" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/rest" - "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/authlib/claims" "github.com/grafana/grafana/pkg/storage/unified/resource" ) @@ -57,7 +59,7 @@ func (r *historyREST) NewConnectOptions() (runtime.Object, bool, string) { } func (r *historyREST) Connect(ctx context.Context, uid string, opts runtime.Object, responder rest.Responder) (http.Handler, error) { - info, err := request.NamespaceInfoFrom(ctx, true) + info, err := NamespaceInfoFrom(ctx, true) if err != nil { return nil, err } @@ -101,3 +103,12 @@ func (r *historyREST) Connect(ctx context.Context, uid string, opts runtime.Obje responder.Object(http.StatusOK, list) }), nil } + +// TODO: This is a temporary copy of the function from pkg/services/apiserver/endpoints/request/namespace.go +func NamespaceInfoFrom(ctx context.Context, requireOrgID bool) (claims.NamespaceInfo, error) { + info, err := claims.ParseNamespace(request.NamespaceValue(ctx)) + if err == nil && requireOrgID && info.OrgID < 1 { + return info, fmt.Errorf("expected valid orgId in namespace") + } + return info, err +} diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index a4a257d34bc..360723aab76 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -1,26 +1,23 @@ module github.com/grafana/grafana/pkg/storage/unified/resource -go 1.22.4 +go 1.23.0 require ( github.com/fullstorydev/grpchan v1.1.1 - github.com/grafana/authlib v0.0.0-20240730122259-a0d13672efb1 - github.com/grafana/authlib/claims v0.0.0-20240809101159-74eaccc31a06 + github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db + github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808164224-787abccfbc9e github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel/trace v1.28.0 - gocloud.dev v0.25.0 + gocloud.dev v0.39.0 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 k8s.io/apimachinery v0.31.0 ) require ( - cloud.google.com/go v0.112.1 // indirect - cloud.google.com/go/storage v1.38.0 // indirect - github.com/aws/aws-sdk-go v1.51.31 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bufbuild/protocompile v0.4.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -32,7 +29,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/googleapis/gax-go/v2 v2.12.3 // indirect + github.com/googleapis/gax-go/v2 v2.13.0 // indirect github.com/jhump/protoreflect v1.15.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -46,15 +43,14 @@ require ( github.com/x448/float16 v0.8.4 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.16.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/api v0.176.0 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect + google.golang.org/api v0.191.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/pkg/storage/unified/resource/go.sum b/pkg/storage/unified/resource/go.sum index 4c6c5cccbc8..02d4c05722a 100644 --- a/pkg/storage/unified/resource/go.sum +++ b/pkg/storage/unified/resource/go.sum @@ -1,273 +1,98 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.82.0/go.mod h1:vlKccHJGuFBFufnAnuB08dfEH9Y3H7dzDzRECFdC2TA= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= -cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= -cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= -cloud.google.com/go/auth v0.2.2 h1:gmxNJs4YZYcw6YvKRtVBaF2fyUE6UrWPyzU8jHvYfmI= -cloud.google.com/go/auth v0.2.2/go.mod h1:2bDNJWtWziDT3Pu1URxHHbkHE/BbOCuyUiKIGcNvafo= -cloud.google.com/go/auth/oauth2adapt v0.2.1 h1:VSPmMmUlT8CkIZ2PzD9AlLN+R3+D1clXMWHHa6vG/Ag= -cloud.google.com/go/auth/oauth2adapt v0.2.1/go.mod h1:tOdK/k+D2e4GEwfBRA48dKNQiDsqIXxLh7VU319eV0g= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= -cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= -cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= -cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= -cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= -cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw= -cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= -cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= -cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= -cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI= -cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= -cloud.google.com/go/monitoring v1.1.0/go.mod h1:L81pzz7HKn14QCMaCs6NTQkdBnE87TElyanS95vIcl4= -cloud.google.com/go/monitoring v1.4.0/go.mod h1:y6xnxfwI3hTFWOdkOaD7nfJVlwuC3/mS/5kvtT131p4= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/pubsub v1.19.0/go.mod h1:/O9kmSe9bb9KRnIAWkzmqhPjHo6LtzGOBYd/kr06XSs= -cloud.google.com/go/secretmanager v1.3.0/go.mod h1:+oLTkouyiYiabAQNugCeTS3PAArGiMJuBqvJnJsyH+U= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKuqnZI01LAA= -cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= -cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= -cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= -cloud.google.com/go/trace v1.2.0/go.mod h1:Wc8y/uYyOhPy12KEnXG9XGrvfMz5F5SrYecQlbW1rwM= -contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= -contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-amqp-common-go/v3 v3.2.1/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI= -github.com/Azure/azure-amqp-common-go/v3 v3.2.2/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI= -github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v59.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= -github.com/Azure/azure-service-bus-go v0.11.5/go.mod h1:MI6ge2CuQWBVq+ly456MY7XqNLJip5LO1iSFodbNLbU= -github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= -github.com/Azure/go-amqp v0.16.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-amqp v0.16.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest v0.11.22/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/adal v0.9.17/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= -github.com/Azure/go-autorest/autorest/azure/auth v0.5.9/go.mod h1:hg3/1yw0Bq87O3KvvnJoAh34/0zbP7SFizX/qN5JvjU= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= +cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= +cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= +cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= +cloud.google.com/go/compute v1.23.4 h1:EBT9Nw4q3zyE7G45Wvv3MzolIrCJEuHys5muLY0wvAw= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= +cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= +cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= +cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbPSRmHvSXXHOwGRyeXh1jVdquA2G8= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.51.31 h1:4TM+sNc+Dzs7wY1sJ0+J8i60c6rkgnKP1pvPx8ghsSY= -github.com/aws/aws-sdk-go v1.51.31/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go-v2 v1.16.2 h1:fqlCk6Iy3bnCumtrLz9r3mJ/2gUT0pJ0wLFVIdWh+JA= -github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM= -github.com/aws/aws-sdk-go-v2/config v1.15.3 h1:5AlQD0jhVXlGzwo+VORKiUuogkG7pQcLJNzIzK7eodw= -github.com/aws/aws-sdk-go-v2/config v1.15.3/go.mod h1:9YL3v07Xc/ohTsxFXzan9ZpFpdTOFl4X65BAKYaz8jg= -github.com/aws/aws-sdk-go-v2/credentials v1.11.2 h1:RQQ5fzclAKJyY5TvF+fkjJEwzK4hnxQCLOu5JXzDmQo= -github.com/aws/aws-sdk-go-v2/credentials v1.11.2/go.mod h1:j8YsY9TXTm31k4eFhspiQicfXPLZ0gYXA50i4gxPE8g= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 h1:LWPg5zjHV9oz/myQr4wMs0gi4CjnDN/ILmyZUFYXZsU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3/go.mod h1:uk1vhHHERfSVCUnqSqz8O48LBYDSC+k6brng09jcMOk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3 h1:ir7iEq78s4txFGgwcLqD6q9IIPzTQNRJXulJd9h/zQo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3/go.mod h1:0dHuD2HZZSiwfJSy1FO5bX1hQ1TxVV1QXXjpn3XUE44= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9 h1:onz/VaaxZ7Z4V+WIN9Txly9XLTmoOh1oJ8XcAC3pako= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9/go.mod h1:AnVH5pvai0pAF4lXRq0bmhbes1u9R8wTE+g+183bZNM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3 h1:9stUQR/u2KXU6HkFJYlqnZEjBnbgrVbG6I5HN09xZh0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88H3UmEcsBoVKq309quMvm3Ds8e9d4eJM= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 h1:by9P+oy3P/CwggN4ClnW2D4oL91QV7pBzBICi1chZvQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 h1:T4pFel53bkHjL2mMo+4DKE6r6AuoZnM0fg7k1/ratr4= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1/go.mod h1:GeUru+8VzrTXV/83XyMJ80KpH8xO89VPoUileyNQ+tc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3 h1:I0dcwWitE752hVSMrsLCxqNQ+UdEp3nACx2bYNMQq+k= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3/go.mod h1:Seb8KNmD6kVTjwRjVEgOT5hPin6sq+v4C2ycJQDwuH8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3 h1:Gh1Gpyh01Yvn7ilO/b/hr01WgNpaszfbKMUgqM186xQ= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3/go.mod h1:wlY6SVjuwvh3TVRpTqdy4I1JpBFLX4UGeKZdWntaocw= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3 h1:BKjwCJPnANbkwQ8vzSbaZDKawwagDubrH/z/c0X+kbQ= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2IaN6rZ+Op7zX+bOUMdL4fsrYZiD0dsjLhNKwZc= -github.com/aws/aws-sdk-go-v2/service/kms v1.16.3/go.mod h1:QuiHPBqlOFCi4LqdSskYYAWpQlx3PKmohy+rE2F+o5g= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3 h1:rMPtwA7zzkSQZhhz9U3/SoIDz/NZ7Q+iRn4EIO8rSyU= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3/go.mod h1:g1qvDuRsJY+XghsV6zg00Z4KJ7DtFFCx8fJD2a491Ak= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4/go.mod h1:PJc8s+lxyU8rrre0/4a0pn2wgwiDvOEzoOjcJUBr67o= -github.com/aws/aws-sdk-go-v2/service/sns v1.17.4/go.mod h1:kElt+uCcXxcqFyc+bQqZPFD9DME/eC6oHBXvFzQ9Bcw= -github.com/aws/aws-sdk-go-v2/service/sqs v1.18.3/go.mod h1:skmQo0UPvsjsuYYSYMVmrPc1HWCbHUJyrCEp+ZaLzqM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.24.1/go.mod h1:NR/xoKjdbRJ+qx0pMR4mI+N/H1I1ynHwXnO6FowXJc0= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 h1:frW4ikGcxfAEDfmQqWgMLp+F1n4nRo9sF39OcIb5BkQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.3/go.mod h1:7UQ/e69kU7LDPtY40OyoHYgRmgfGM4mgsLYtcObdveU= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 h1:cJGRyzCSVwZC7zZZ1xbx9m32UnrKydRYhOvcD1NYP9Q= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.3/go.mod h1:bfBj0iVmsUyUg4weDB4NxktD9rDGeKSVWnjTnwbx9b8= -github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE= -github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= +github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= +github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90= +github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 h1:zeN9UtUlA6FTx0vFSayxSX32HDw73Yb6Hh2izDSFxXY= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10/go.mod h1:3HKuexPDcwLWPaqpW2UR/9n8N/u/3CKcGAzSs8p8u8g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 h1:Z5r7SycxmSllHYmaAZPpmN8GviDrSGhMS6bldqtXZPw= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15/go.mod h1:CetW7bDE00QoGEmPUoZuRog07SGVAUVW6LFpNP0YfIg= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 h1:YPYe6ZmvUfDDDELqEKtAd6bo8zxhkm+XEFEzQisqUIE= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17/go.mod h1:oBtcnYua/CgzCWYN7NZ5j7PotFDaFSUjCYVTtfyn7vw= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ= +github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= +github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= -github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= -github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= -github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fullstorydev/grpchan v1.1.1 h1:heQqIJlAv5Cnks9a70GRL2EJke6QQoUB25VGR6TZQas= github.com/fullstorydev/grpchan v1.1.1/go.mod h1:f4HpiV8V6htfY/K44GWV1ESQzHBTq7DinhzqQ95lpgc= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -277,196 +102,75 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-replayers/grpcreplay v1.1.0/go.mod h1:qzAvJ8/wi57zq7gWqaE6AwLM6miiXUQwP1S+I9icmhk= -github.com/google/go-replayers/httpreplay v1.1.1/go.mod h1:gN9GeLIs7l6NUoVaSSnv2RiqK1NiwAmD0MrKeC9IIks= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210506205249-923b5ab0fc1a/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= -github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= -github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= +github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= -github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= +github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= -github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/cLCKqA= -github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grafana/authlib v0.0.0-20240730122259-a0d13672efb1 h1:EiaupmOnt6XF/LPxvagjTofWmByzYaf5VyMIF+w/71M= -github.com/grafana/authlib v0.0.0-20240730122259-a0d13672efb1/go.mod h1:YA9We4kTafu7mlMnUh3In6Q2wpg8fYN3ycgCKOK1TB8= -github.com/grafana/authlib/claims v0.0.0-20240809101159-74eaccc31a06 h1:uD1LcKwvEAqzDsgVChBudPqo5BhPxkj9AgylT5QCReo= -github.com/grafana/authlib/claims v0.0.0-20240809101159-74eaccc31a06/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= +github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= +github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= +github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db h1:z++X4DdoX+aNlZNT1ZY4cykiFay4+f077pa0AG48SGg= +github.com/grafana/authlib v0.0.0-20240814074258-eae7d47f01db/go.mod h1:ptt910z9KFfpVSIbSbXvTRR7tS19mxD7EtmVbbJi/WE= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db h1:mDk0bwRV6rDrLSmKXftcPf9kLA9uH6EvxJvzpPW9bso= +github.com/grafana/authlib/claims v0.0.0-20240814074258-eae7d47f01db/go.mod h1:r+F8H6awwjNQt/KPZ2GNwjk8TvsJ7/gxzkXN26GlL/A= github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808164224-787abccfbc9e h1:3vNpomyzv714Hgls5vn+fC0vgv8wUOSHepUl7PB5nUs= github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240808164224-787abccfbc9e/go.mod h1:ORVFiW/KNRY52lNjkGwnFWCxNVfE97bJG2jr2fetq0I= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= -github.com/hanwen/go-fuse/v2 v2.1.0/go.mod h1:oRyA5eK+pvJyv5otpO/DgccS8y/RvYMaO00GgRLGryc= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= -github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= -github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= -github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= -github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= -github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= -github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= -github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= -github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= -github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= -github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= -github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= -github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw= -github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= -github.com/mattn/go-ieproxy v0.0.3/go.mod h1:6ZpRmhBaYuBX1U2za+9rC9iCGLsSp2tftelZne7CPko= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= @@ -474,56 +178,26 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= -github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= @@ -536,512 +210,118 @@ go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6b go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk= -gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y= +gocloud.dev v0.39.0 h1:EYABYGhAalPUaMrbSKOr5lejxoxvXj99nE8XFtsDgds= +gocloud.dev v0.39.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220110181412-a018aaa089fe/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.64.0/go.mod h1:931CdxA8Rm4t6zqTFGSsgwbAEZ2+GMYurbndwSimebM= -google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= -google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= -google.golang.org/api v0.68.0/go.mod h1:sOM8pTpwgflXRhz+oC8H2Dr+UcbMqkPPWNJo88Q7TH8= -google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7C80= -google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= -google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= -google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.176.0 h1:dHj1/yv5Dm/eQTXiP9hNCRT3xzJHWXeNdRq29XbMxoE= -google.golang.org/api v0.176.0/go.mod h1:Rra+ltKu14pps/4xTycZfobMgLpbosoaaL7c+SEMrO8= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= +google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210517163617-5e0236093d7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211018162055-cf77aa76bad2/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220216160803-4663080d8bc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= -google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= -google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM= +google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1050,39 +330,26 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= @@ -1091,10 +358,6 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/pkg/storage/unified/sql/backend.go b/pkg/storage/unified/sql/backend.go index d9157131ba9..75ec7806eb6 100644 --- a/pkg/storage/unified/sql/backend.go +++ b/pkg/storage/unified/sql/backend.go @@ -301,7 +301,7 @@ func (b *backend) ReadResource(ctx context.Context, req *resource.ReadRequest) * // TODO: validate key ? - readReq := sqlResourceReadRequest{ + readReq := &sqlResourceReadRequest{ SQLTemplate: sqltemplate.New(b.dialect), Request: req, readResponse: new(readResponse), @@ -313,7 +313,12 @@ func (b *backend) ReadResource(ctx context.Context, req *resource.ReadRequest) * sr = sqlResourceHistoryRead } - res, err := dbutil.QueryRow(ctx, b.db, sr, readReq) + var res *readResponse + err := b.db.WithTx(ctx, ReadCommittedRO, func(ctx context.Context, tx db.Tx) error { + var err error + res, err = dbutil.QueryRow(ctx, tx, sr, readReq) + return err + }) if errors.Is(err, sql.ErrNoRows) { return &resource.ReadResponse{ Error: resource.NewNotFoundError(req.Key), @@ -552,33 +557,28 @@ func (b *backend) poller(ctx context.Context, since groupResourceRV, stream chan // listLatestRVs returns the latest resource version for each (Group, Resource) pair. func (b *backend) listLatestRVs(ctx context.Context) (groupResourceRV, error) { - since := groupResourceRV{} - reqRVs := sqlResourceVersionListRequest{ - SQLTemplate: sqltemplate.New(b.dialect), - groupResourceVersion: new(groupResourceVersion), - } - query, err := sqltemplate.Execute(sqlResourceVersionList, reqRVs) - if err != nil { - return nil, fmt.Errorf("execute SQL template to get the latest resource version: %w", err) - } - rows, err := b.db.QueryContext(ctx, query, reqRVs.GetArgs()...) - if err != nil { - return nil, fmt.Errorf("fetching recent resource versions: %w", err) - } - defer func() { _ = rows.Close() }() + var grvs []*groupResourceVersion + err := b.db.WithTx(ctx, ReadCommittedRO, func(ctx context.Context, tx db.Tx) error { + var err error + grvs, err = dbutil.Query(ctx, tx, sqlResourceVersionList, &sqlResourceVersionListRequest{ + SQLTemplate: sqltemplate.New(b.dialect), + groupResourceVersion: new(groupResourceVersion), + }) - for rows.Next() { - if err := rows.Scan(reqRVs.GetScanDest()...); err != nil { - return nil, err - } - if _, ok := since[reqRVs.Group]; !ok { - since[reqRVs.Group] = map[string]int64{} - } - if _, ok := since[reqRVs.Group][reqRVs.Resource]; !ok { - since[reqRVs.Group] = map[string]int64{} - } - since[reqRVs.Group][reqRVs.Resource] = reqRVs.ResourceVersion + return err + }) + if err != nil { + return nil, err } + + since := groupResourceRV{} + for _, grv := range grvs { + if since[grv.Group] == nil { + since[grv.Group] = map[string]int64{} + } + since[grv.Group][grv.Resource] = grv.ResourceVersion + } + return since, nil } @@ -603,52 +603,44 @@ func (b *backend) poll(ctx context.Context, grp string, res string, since int64, ctx, span := b.tracer.Start(ctx, trace_prefix+"poll") defer span.End() - pollReq := sqlResourceHistoryPollRequest{ - SQLTemplate: sqltemplate.New(b.dialect), - Resource: res, - Group: grp, - SinceResourceVersion: since, - Response: &historyPollResponse{}, - } - query, err := sqltemplate.Execute(sqlResourceHistoryPoll, pollReq) + var records []*historyPollResponse + err := b.db.WithTx(ctx, ReadCommittedRO, func(ctx context.Context, tx db.Tx) error { + var err error + records, err = dbutil.Query(ctx, tx, sqlResourceHistoryPoll, &sqlResourceHistoryPollRequest{ + SQLTemplate: sqltemplate.New(b.dialect), + Resource: res, + Group: grp, + SinceResourceVersion: since, + Response: &historyPollResponse{}, + }) + return err + }) if err != nil { - return since, fmt.Errorf("execute SQL template to poll for resource history: %w", err) - } - rows, err := b.db.QueryContext(ctx, query, pollReq.GetArgs()...) - if err != nil { - return since, fmt.Errorf("poll for resource history: %w", err) + return 0, fmt.Errorf("poll history: %w", err) } - defer func() { _ = rows.Close() }() - nextRV := since - for rows.Next() { - // check if the context is done - if ctx.Err() != nil { - return nextRV, ctx.Err() - } - if err := rows.Scan(pollReq.GetScanDest()...); err != nil { - return nextRV, fmt.Errorf("scan row polling for resource history: %w", err) - } - resp := pollReq.Response - if resp.Key.Group == "" || resp.Key.Resource == "" || resp.Key.Name == "" { + var nextRV int64 + for _, rec := range records { + if rec.Key.Group == "" || rec.Key.Resource == "" || rec.Key.Name == "" { return nextRV, fmt.Errorf("missing key in response") } - nextRV = resp.ResourceVersion + nextRV = rec.ResourceVersion stream <- &resource.WrittenEvent{ WriteEvent: resource.WriteEvent{ - Value: resp.Value, + Value: rec.Value, Key: &resource.ResourceKey{ - Namespace: resp.Key.Namespace, - Group: resp.Key.Group, - Resource: resp.Key.Resource, - Name: resp.Key.Name, + Namespace: rec.Key.Namespace, + Group: rec.Key.Group, + Resource: rec.Key.Resource, + Name: rec.Key.Name, }, - Type: resource.WatchEvent_Type(resp.Action), + Type: resource.WatchEvent_Type(rec.Action), }, - ResourceVersion: resp.ResourceVersion, + ResourceVersion: rec.ResourceVersion, // Timestamp: , // TODO: add timestamp } } + return nextRV, nil } diff --git a/pkg/storage/unified/sql/db/dbimpl/dbEngine.go b/pkg/storage/unified/sql/db/dbimpl/dbEngine.go index 1a37751bcc9..c024c8e195a 100644 --- a/pkg/storage/unified/sql/db/dbimpl/dbEngine.go +++ b/pkg/storage/unified/sql/db/dbimpl/dbEngine.go @@ -8,7 +8,6 @@ import ( "github.com/go-sql-driver/mysql" "github.com/grafana/grafana/pkg/infra/tracing" - "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/storage/unified/sql/db" "xorm.io/xorm" ) @@ -51,8 +50,9 @@ func getEngineMySQL(getter *sectionGetter, tracer tracing.Tracer) (*xorm.Engine, } // FIXME: get rid of xorm - driverName := sqlstore.WrapDatabaseDriverWithHooks(db.DriverMySQL, tracer) - engine, err := xorm.NewEngine(driverName, config.FormatDSN()) + // TODO figure out why wrapping the db driver with hooks causes mysql errors when writing + //driverName := sqlstore.WrapDatabaseDriverWithHooks(db.DriverMySQL, tracer) + engine, err := xorm.NewEngine(db.DriverMySQL, config.FormatDSN()) if err != nil { return nil, fmt.Errorf("open database: %w", err) } @@ -106,8 +106,7 @@ func getEnginePostgres(getter *sectionGetter, tracer tracing.Tracer) (*xorm.Engi } // FIXME: get rid of xorm - driverName := sqlstore.WrapDatabaseDriverWithHooks(db.DriverPostgres, tracer) - engine, err := xorm.NewEngine(driverName, dsn) + engine, err := xorm.NewEngine(db.DriverPostgres, dsn) if err != nil { return nil, fmt.Errorf("open database: %w", err) } diff --git a/pkg/storage/unified/sql/db/dbimpl/dbimpl.go b/pkg/storage/unified/sql/db/dbimpl/dbimpl.go index af533ef0180..b9498b87cd5 100644 --- a/pkg/storage/unified/sql/db/dbimpl/dbimpl.go +++ b/pkg/storage/unified/sql/db/dbimpl/dbimpl.go @@ -61,12 +61,10 @@ func newResourceDBProvider(grafanaDB infraDB.DB, cfg *setting.Cfg, features feat } p = &resourceDBProvider{ - cfg: cfg, - log: log.New("entity-db"), - logQueries: getter.Key("log_queries").MustBool(false), - } - if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorage) { - p.migrateFunc = migrations.MigrateResourceStore + cfg: cfg, + log: log.New("entity-db"), + logQueries: getter.Key("log_queries").MustBool(false), + migrateFunc: migrations.MigrateResourceStore, } switch dbType := getter.Key("db_type").MustString(""); dbType { diff --git a/pkg/storage/unified/sql/queries.go b/pkg/storage/unified/sql/queries.go index 99f126672fb..893169c3f3a 100644 --- a/pkg/storage/unified/sql/queries.go +++ b/pkg/storage/unified/sql/queries.go @@ -79,6 +79,7 @@ func (r *historyPollResponse) Results() (*historyPollResponse, error) { } type groupResourceRV map[string]map[string]int64 + type sqlResourceHistoryPollRequest struct { sqltemplate.SQLTemplate Resource string @@ -87,10 +88,24 @@ type sqlResourceHistoryPollRequest struct { Response *historyPollResponse } -func (r sqlResourceHistoryPollRequest) Validate() error { +func (r *sqlResourceHistoryPollRequest) Validate() error { return nil // TODO } +func (r *sqlResourceHistoryPollRequest) Results() (*historyPollResponse, error) { + return &historyPollResponse{ + Key: resource.ResourceKey{ + Namespace: r.Response.Key.Namespace, + Group: r.Response.Key.Group, + Resource: r.Response.Key.Resource, + Name: r.Response.Key.Name, + }, + ResourceVersion: r.Response.ResourceVersion, + Value: r.Response.Value, + Action: r.Response.Action, + }, nil +} + // sqlResourceReadRequest can be used to retrieve a row fromthe "resource" tables. type readResponse struct { @@ -107,10 +122,20 @@ type sqlResourceReadRequest struct { *readResponse } -func (r sqlResourceReadRequest) Validate() error { +func (r *sqlResourceReadRequest) Validate() error { return nil // TODO } +func (r *sqlResourceReadRequest) Results() (*readResponse, error) { + return &readResponse{ + ReadResponse: resource.ReadResponse{ + Error: r.ReadResponse.Error, + ResourceVersion: r.ReadResponse.ResourceVersion, + Value: r.ReadResponse.Value, + }, + }, nil +} + // List type sqlResourceListRequest struct { sqltemplate.SQLTemplate @@ -189,6 +214,11 @@ type sqlResourceVersionListRequest struct { *groupResourceVersion } -func (r sqlResourceVersionListRequest) Validate() error { +func (r *sqlResourceVersionListRequest) Validate() error { return nil // TODO } + +func (r *sqlResourceVersionListRequest) Results() (*groupResourceVersion, error) { + x := *r.groupResourceVersion + return &x, nil +} diff --git a/pkg/storage/unified/sql/sqltemplate/mocks/test_snapshots.go b/pkg/storage/unified/sql/sqltemplate/mocks/test_snapshots.go index 6fbfe3e9eb3..be97124a5ad 100644 --- a/pkg/storage/unified/sql/sqltemplate/mocks/test_snapshots.go +++ b/pkg/storage/unified/sql/sqltemplate/mocks/test_snapshots.go @@ -10,8 +10,9 @@ import ( "text/template" "github.com/google/go-cmp/cmp" - sqltemplate "github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate" "github.com/stretchr/testify/require" + + sqltemplate "github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate" ) func NewTestingSQLTemplate() sqltemplate.SQLTemplate { @@ -127,7 +128,7 @@ func CheckQuerySnapshots(t *testing.T, setup TemplateTestSetup) { expect, err := os.ReadFile(fpath) if err != nil || len(expect) < 1 { update = true - t.Errorf("missing " + fpath) + t.Error("missing " + fpath) } else { if diff := cmp.Diff(string(expect), clean); diff != "" { t.Errorf("%s: %s", fname, diff) diff --git a/pkg/storage/unified/sql/test/integration_test.go b/pkg/storage/unified/sql/test/integration_test.go index d3b6ed37303..7d618d2aab1 100644 --- a/pkg/storage/unified/sql/test/integration_test.go +++ b/pkg/storage/unified/sql/test/integration_test.go @@ -31,7 +31,7 @@ func newServer(t *testing.T) (sql.Backend, resource.ResourceServer) { dbstore := infraDB.InitTestDB(t) cfg := setting.NewCfg() - features := featuremgmt.WithFeatures(featuremgmt.FlagUnifiedStorage) + features := featuremgmt.WithFeatures() eDB, err := dbimpl.ProvideResourceDB(dbstore, cfg, features, nil) require.NoError(t, err) @@ -331,7 +331,7 @@ func TestClientServer(t *testing.T) { cfg.GRPCServerAddress = "localhost:0" cfg.GRPCServerNetwork = "tcp" - features := featuremgmt.WithFeatures(featuremgmt.FlagUnifiedStorage) + features := featuremgmt.WithFeatures() svc, err := sql.ProvideService(cfg, features, dbstore, nil) require.NoError(t, err) diff --git a/pkg/tests/api/correlations/correlations_create_test.go b/pkg/tests/api/correlations/correlations_create_test.go index b41a0f3011a..1f619d75235 100644 --- a/pkg/tests/api/correlations/correlations_create_test.go +++ b/pkg/tests/api/correlations/correlations_create_test.go @@ -115,8 +115,8 @@ func TestIntegrationCreateCorrelation(t *testing.T) { url: fmt.Sprintf("/api/datasources/uid/%s/correlations", "nonexistent-ds-uid"), body: fmt.Sprintf(`{ "targetUID": "%s", + "type": "query", "config": { - "type": "query", "field": "message", "target": {} } @@ -137,13 +137,13 @@ func TestIntegrationCreateCorrelation(t *testing.T) { require.NoError(t, res.Body.Close()) }) - t.Run("inexistent target data source should result in a 404 if config.type=query", func(t *testing.T) { + t.Run("inexistent target data source should result in a 404 if type=query", func(t *testing.T) { res := ctx.Post(PostParams{ url: fmt.Sprintf("/api/datasources/uid/%s/correlations", writableDs), body: `{ "targetUID": "nonexistent-uid-uid", + "type": "query", "config": { - "type": "query", "field": "message", "target": {} } @@ -169,8 +169,8 @@ func TestIntegrationCreateCorrelation(t *testing.T) { url: fmt.Sprintf("/api/datasources/uid/%s/correlations", readOnlyDS), body: fmt.Sprintf(`{ "targetUID": "%s", + "type": "query", "config": { - "type": "query", "field": "message", "target": {} } @@ -200,8 +200,8 @@ func TestIntegrationCreateCorrelation(t *testing.T) { url: fmt.Sprintf("/api/datasources/uid/%s/correlations", writableDs), body: fmt.Sprintf(`{ "targetUID": "%s", + "type": "query", "config": { - "type": "query", "field": "message", "target": {} } @@ -230,7 +230,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) { description := "a description" label := "a label" fieldName := "fieldName" - configType := correlations.ConfigTypeQuery + corrType := correlations.TypeQuery transformation := correlations.Transformation{Type: "logfmt"} transformation2 := correlations.Transformation{Type: "regex", Expression: "testExpression", MapValue: "testVar"} res := ctx.Post(PostParams{ @@ -239,8 +239,8 @@ func TestIntegrationCreateCorrelation(t *testing.T) { "targetUID": "%s", "description": "%s", "label": "%s", + "type": "%s", "config": { - "type": "%s", "field": "%s", "target": { "expr": "foo" }, "transformations": [ @@ -248,7 +248,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) { {"type": "regex", "expression": "testExpression", "mapValue": "testVar"} ] } - }`, writableDs, description, label, configType, fieldName), + }`, writableDs, description, label, corrType, fieldName), user: adminUser, }) require.Equal(t, http.StatusOK, res.StatusCode) @@ -265,7 +265,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) { require.Equal(t, writableDs, *response.Result.TargetUID) require.Equal(t, description, response.Result.Description) require.Equal(t, label, response.Result.Label) - require.Equal(t, configType, response.Result.Config.Type) + require.Equal(t, corrType, response.Result.Type) require.Equal(t, fieldName, response.Result.Config.Field) require.Equal(t, map[string]any{"expr": "foo"}, response.Result.Config.Target) require.Equal(t, transformation, response.Result.Config.Transformations[0]) diff --git a/pkg/tests/api/correlations/correlations_provisioning_api_test.go b/pkg/tests/api/correlations/correlations_provisioning_api_test.go index 2cdc982b818..31e48becddf 100644 --- a/pkg/tests/api/correlations/correlations_provisioning_api_test.go +++ b/pkg/tests/api/correlations/correlations_provisioning_api_test.go @@ -39,7 +39,7 @@ func TestIntegrationCreateOrUpdateCorrelation(t *testing.T) { OrgId: dataSource.OrgID, Label: "needs migration", Config: correlations.CorrelationConfig{ - Type: correlations.ConfigTypeQuery, + Type: correlations.TypeQuery, Field: "foo", Target: map[string]any{}, Transformations: []correlations.Transformation{ @@ -55,7 +55,7 @@ func TestIntegrationCreateOrUpdateCorrelation(t *testing.T) { OrgId: dataSource.OrgID, Label: "existing", Config: correlations.CorrelationConfig{ - Type: correlations.ConfigTypeQuery, + Type: correlations.TypeQuery, Field: "foo", Target: map[string]any{}, Transformations: []correlations.Transformation{ diff --git a/pkg/tests/api/correlations/correlations_read_test.go b/pkg/tests/api/correlations/correlations_read_test.go index 21aa09f2caf..79cc73bcf48 100644 --- a/pkg/tests/api/correlations/correlations_read_test.go +++ b/pkg/tests/api/correlations/correlations_read_test.go @@ -77,8 +77,8 @@ func TestIntegrationReadCorrelation(t *testing.T) { SourceUID: dsWithCorrelations.UID, TargetUID: &dsWithCorrelations.UID, OrgId: dsWithCorrelations.OrgID, + Type: correlations.TypeQuery, Config: correlations.CorrelationConfig{ - Type: correlations.ConfigTypeQuery, Field: "foo", Target: map[string]any{}, Transformations: []correlations.Transformation{ diff --git a/pkg/tests/api/correlations/correlations_update_test.go b/pkg/tests/api/correlations/correlations_update_test.go index 14067c407ce..2a203542770 100644 --- a/pkg/tests/api/correlations/correlations_update_test.go +++ b/pkg/tests/api/correlations/correlations_update_test.go @@ -263,9 +263,9 @@ func TestIntegrationUpdateCorrelation(t *testing.T) { body: `{ "label": "1", "description": "1", + "type": "query", "config": { "field": "field", - "type": "query", "target": { "expr": "bar" }, "transformations": [ {"type": "logfmt"} ] } diff --git a/pkg/tests/api/loki/loki_test.go b/pkg/tests/api/loki/loki_test.go index acd96b4c8a7..4c15454e969 100644 --- a/pkg/tests/api/loki/loki_test.go +++ b/pkg/tests/api/loki/loki_test.go @@ -15,6 +15,7 @@ import ( "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/services/datasources" + "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/user" "github.com/grafana/grafana/pkg/tests/testinfra" @@ -30,7 +31,8 @@ func TestIntegrationLoki(t *testing.T) { t.Skip("skipping integration test") } dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{ - DisableAnonymous: true, + DisableAnonymous: true, + EnableFeatureToggles: []string{featuremgmt.FlagLokiSendDashboardPanelNames}, }) grafanaListeningAddr, testEnv := testinfra.StartGrafanaEnv(t, dir, path) @@ -106,4 +108,87 @@ func TestIntegrationLoki(t *testing.T) { require.Equal(t, "basicAuthUser", username) require.Equal(t, "basicAuthPassword", pwd) }) + + t.Run("should forward `X-Dashboard-Title` header but no `X-Panel-Title`", func(t *testing.T) { + query := simplejson.NewFromAny(map[string]interface{}{ + "datasource": map[string]interface{}{ + "uid": uid, + }, + "expr": "{job=\"grafana\"}", + }) + buf1 := &bytes.Buffer{} + err = json.NewEncoder(buf1).Encode(dtos.MetricRequest{ + From: "now-1h", + To: "now", + Queries: []*simplejson.Json{query}, + }) + require.NoError(t, err) + u := fmt.Sprintf("http://admin:admin@%s/api/ds/query", grafanaListeningAddr) + req, err := http.NewRequest("POST", u, buf1) + if err != nil { + require.NoError(t, err) + } + req.Header.Set("Content-Type", "application/json") + req.Header.Set("X-Dashboard-Title", "My Dashboard Title") + + resp, err := http.DefaultClient.Do(req) + require.NoError(t, err) + require.Equal(t, http.StatusBadRequest, resp.StatusCode) + t.Cleanup(func() { + err := resp.Body.Close() + require.NoError(t, err) + }) + _, err = io.ReadAll(resp.Body) + require.NoError(t, err) + + require.NotNil(t, outgoingRequest) + require.Equal(t, "My Dashboard Title", outgoingRequest.Header.Get("X-Dashboard-Title")) + require.Equal(t, "", outgoingRequest.Header.Get("X-Panel-Title")) + username, pwd, ok := outgoingRequest.BasicAuth() + require.True(t, ok) + require.Equal(t, "basicAuthUser", username) + require.Equal(t, "basicAuthPassword", pwd) + }) + + t.Run("should forward `X-Dashboard-Title` and `X-Panel-Title` header", func(t *testing.T) { + query := simplejson.NewFromAny(map[string]interface{}{ + "datasource": map[string]interface{}{ + "uid": uid, + }, + "expr": "{job=\"grafana\"}", + }) + buf1 := &bytes.Buffer{} + err = json.NewEncoder(buf1).Encode(dtos.MetricRequest{ + From: "now-1h", + To: "now", + Queries: []*simplejson.Json{query}, + }) + require.NoError(t, err) + u := fmt.Sprintf("http://admin:admin@%s/api/ds/query", grafanaListeningAddr) + req, err := http.NewRequest("POST", u, buf1) + if err != nil { + require.NoError(t, err) + } + req.Header.Set("Content-Type", "application/json") + req.Header.Set("X-Dashboard-Title", "My Dashboard Title") + req.Header.Set("X-Panel-Title", "My Panel Title") + + resp, err := http.DefaultClient.Do(req) + require.NoError(t, err) + require.Equal(t, http.StatusBadRequest, resp.StatusCode) + t.Cleanup(func() { + err := resp.Body.Close() + require.NoError(t, err) + }) + _, err = io.ReadAll(resp.Body) + require.NoError(t, err) + + require.NotNil(t, outgoingRequest) + require.Equal(t, "My Dashboard Title", outgoingRequest.Header.Get("X-Dashboard-Title")) + require.Equal(t, "My Panel Title", outgoingRequest.Header.Get("X-Panel-Title")) + username, pwd, ok := outgoingRequest.BasicAuth() + require.True(t, ok) + require.Equal(t, "basicAuthUser", username) + require.Equal(t, "basicAuthPassword", pwd) + }) } diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json index 26e4bb233a9..e2a4e1ccafb 100644 --- a/pkg/tests/api/plugins/data/expectedListResp.json +++ b/pkg/tests/api/plugins/data/expectedListResp.json @@ -1084,7 +1084,7 @@ "keywords": null }, "dependencies": { - "grafanaDependency": "", + "grafanaDependency": "\u003e=10.4.0", "grafanaVersion": "*", "plugins": [] }, diff --git a/pkg/tests/apis/dashboard/dashboards_test.go b/pkg/tests/apis/dashboard/dashboards_test.go index 1fb328153b6..a5aa7808f36 100644 --- a/pkg/tests/apis/dashboard/dashboards_test.go +++ b/pkg/tests/apis/dashboard/dashboards_test.go @@ -159,6 +159,20 @@ func TestIntegrationDashboardsApp(t *testing.T) { "update", "watch" ] + }, + { + "resource": "librarypanels", + "responseKind": { + "group": "", + "kind": "LibraryPanel", + "version": "" + }, + "scope": "Namespaced", + "singularResource": "librarypanel", + "verbs": [ + "get", + "list" + ] } ], "version": "v0alpha1" diff --git a/pkg/tests/apis/playlist/playlist_test.go b/pkg/tests/apis/playlist/playlist_test.go index d42b63d5149..6840ecc946e 100644 --- a/pkg/tests/apis/playlist/playlist_test.go +++ b/pkg/tests/apis/playlist/playlist_test.go @@ -149,7 +149,6 @@ func TestIntegrationPlaylist(t *testing.T) { DisableAnonymous: true, APIServerStorageType: "unified", // use the entity api tables EnableFeatureToggles: []string{ - featuremgmt.FlagUnifiedStorage, featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written }, DualWriterDesiredModes: map[string]grafanarest.DualWriterMode{ @@ -164,7 +163,6 @@ func TestIntegrationPlaylist(t *testing.T) { DisableAnonymous: true, APIServerStorageType: "unified", // use the entity api tables EnableFeatureToggles: []string{ - featuremgmt.FlagUnifiedStorage, featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written }, DualWriterDesiredModes: map[string]grafanarest.DualWriterMode{ @@ -179,7 +177,6 @@ func TestIntegrationPlaylist(t *testing.T) { DisableAnonymous: true, APIServerStorageType: "unified", // use the entity api tables EnableFeatureToggles: []string{ - featuremgmt.FlagUnifiedStorage, featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written }, DualWriterDesiredModes: map[string]grafanarest.DualWriterMode{ @@ -194,7 +191,6 @@ func TestIntegrationPlaylist(t *testing.T) { DisableAnonymous: true, APIServerStorageType: "unified", // use the entity api tables EnableFeatureToggles: []string{ - featuremgmt.FlagUnifiedStorage, featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written }, DualWriterDesiredModes: map[string]grafanarest.DualWriterMode{ diff --git a/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml index be175b5613b..d60eac1da96 100644 --- a/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml +++ b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-abc.yaml @@ -4,4 +4,6 @@ metadata: name: example_abc spec: scope: example - dashboard: abc \ No newline at end of file + dashboard: abc + dashboardTitle: "Example Dashboard ABC" + groups: ["group1", "group2"] \ No newline at end of file diff --git a/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml index 98cfa8ed93f..1fd6306aa1b 100644 --- a/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml +++ b/pkg/tests/apis/scopes/testdata/example-scope-dashboard-binding-xyz.yaml @@ -4,4 +4,6 @@ metadata: name: example_xyz spec: scope: example - dashboard: xyz \ No newline at end of file + dashboard: xyz + dashboardTitle: "Example Dashboard XYZ" + groups: ["group2", "group3"] \ No newline at end of file diff --git a/pkg/tsdb/cloudwatch/log_actions.go b/pkg/tsdb/cloudwatch/log_actions.go index 970b55fb491..d4097f4fa85 100644 --- a/pkg/tsdb/cloudwatch/log_actions.go +++ b/pkg/tsdb/cloudwatch/log_actions.go @@ -17,10 +17,10 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource" + "golang.org/x/sync/errgroup" + "github.com/grafana/grafana/pkg/tsdb/cloudwatch/features" "github.com/grafana/grafana/pkg/tsdb/cloudwatch/models" - - "golang.org/x/sync/errgroup" ) const ( @@ -209,7 +209,7 @@ func (e *cloudWatchExecutor) executeStartQuery(ctx context.Context, logsClient c QueryString: aws.String(modifiedQueryString), } - if logsQuery.LogGroups != nil && len(logsQuery.LogGroups) > 0 && features.IsEnabled(ctx, features.FlagCloudWatchCrossAccountQuerying) { + if len(logsQuery.LogGroups) > 0 && features.IsEnabled(ctx, features.FlagCloudWatchCrossAccountQuerying) { var logGroupIdentifiers []string for _, lg := range logsQuery.LogGroups { arn := lg.Arn diff --git a/pkg/tsdb/cloudwatch/models/settings.go b/pkg/tsdb/cloudwatch/models/settings.go index 4941684917d..58e25d736e4 100644 --- a/pkg/tsdb/cloudwatch/models/settings.go +++ b/pkg/tsdb/cloudwatch/models/settings.go @@ -26,7 +26,7 @@ type CloudWatchSettings struct { func LoadCloudWatchSettings(ctx context.Context, config backend.DataSourceInstanceSettings) (CloudWatchSettings, error) { instance := CloudWatchSettings{} - if config.JSONData != nil && len(config.JSONData) > 1 { + if len(config.JSONData) > 1 { if err := json.Unmarshal(config.JSONData, &instance); err != nil { return CloudWatchSettings{}, fmt.Errorf("could not unmarshal DatasourceSettings json: %w", err) } diff --git a/pkg/tsdb/grafana-postgresql-datasource/sqleng/sql_engine.go b/pkg/tsdb/grafana-postgresql-datasource/sqleng/sql_engine.go index 060e2bcb02e..a05aa3ce5e6 100644 --- a/pkg/tsdb/grafana-postgresql-datasource/sqleng/sql_engine.go +++ b/pkg/tsdb/grafana-postgresql-datasource/sqleng/sql_engine.go @@ -15,11 +15,10 @@ import ( "time" "github.com/grafana/grafana-plugin-sdk-go/backend" - "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/grafana/grafana-plugin-sdk-go/data/sqlutil" - "github.com/grafana/grafana-plugin-sdk-go/backend/gtime" "github.com/grafana/grafana-plugin-sdk-go/backend/log" + "github.com/grafana/grafana-plugin-sdk-go/data" + "github.com/grafana/grafana-plugin-sdk-go/data/sqlutil" ) // MetaKeyExecutedQueryString is the key where the executed query should get stored @@ -214,7 +213,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG if theErr, ok := r.(error); ok { queryResult.dataResponse.Error = theErr } else if theErrString, ok := r.(string); ok { - queryResult.dataResponse.Error = fmt.Errorf(theErrString) + queryResult.dataResponse.Error = errors.New(theErrString) } else { queryResult.dataResponse.Error = fmt.Errorf("unexpected error - %s", e.userError) } diff --git a/pkg/tsdb/grafana-testdata-datasource/sims/engine.go b/pkg/tsdb/grafana-testdata-datasource/sims/engine.go index af3b3c6d479..557484de97f 100644 --- a/pkg/tsdb/grafana-testdata-datasource/sims/engine.go +++ b/pkg/tsdb/grafana-testdata-datasource/sims/engine.go @@ -35,7 +35,7 @@ type SimulationEngine struct { func (s *SimulationEngine) register(info simulationInfo) error { if info.create == nil { - return fmt.Errorf("invalid simulation -- missing create function: " + info.Type) + return fmt.Errorf("invalid simulation -- missing create function: %s", info.Type) } if info.Type == "" { return fmt.Errorf("missing type") diff --git a/pkg/tsdb/influxdb/flux/executor.go b/pkg/tsdb/influxdb/flux/executor.go index 7154dcc5e6b..acad55df636 100644 --- a/pkg/tsdb/influxdb/flux/executor.go +++ b/pkg/tsdb/influxdb/flux/executor.go @@ -41,13 +41,13 @@ func executeQuery(ctx context.Context, logger log.Logger, query queryModel, runn // the error happens, there is not enough info to create a nice error message) var maxPointError maxPointsExceededError if errors.As(dr.Error, &maxPointError) { - text := fmt.Sprintf("A query returned too many datapoints and the results have been truncated at %d points to prevent memory issues. At the current graph size, Grafana can only draw %d.", maxPointError.Count, query.MaxDataPoints) + errMsg := "A query returned too many datapoints and the results have been truncated at %d points to prevent memory issues. At the current graph size, Grafana can only draw %d." // we recommend to the user to use AggregateWindow(), but only if it is not already used if !strings.Contains(query.RawQuery, "aggregateWindow(") { - text += " Try using the aggregateWindow() function in your query to reduce the number of points returned." + errMsg += " Try using the aggregateWindow() function in your query to reduce the number of points returned." } - dr.Error = fmt.Errorf(text) + dr.Error = fmt.Errorf(errMsg, maxPointError.Count, query.MaxDataPoints) } } } diff --git a/pkg/tsdb/influxdb/fsql/arrow_test.go b/pkg/tsdb/influxdb/fsql/arrow_test.go index 3a7a27a0489..32d260a1152 100644 --- a/pkg/tsdb/influxdb/fsql/arrow_test.go +++ b/pkg/tsdb/influxdb/fsql/arrow_test.go @@ -315,7 +315,7 @@ func TestNewFrame(t *testing.T) { }, } if !cmp.Equal(expected, actual, cmp.Comparer(cmpFrame)) { - log.Fatalf(cmp.Diff(expected, actual)) + log.Fatal(cmp.Diff(expected, actual)) } } diff --git a/pkg/tsdb/influxdb/influxql/buffered/response_parser.go b/pkg/tsdb/influxdb/influxql/buffered/response_parser.go index b6b840e6dc5..6d208d324ad 100644 --- a/pkg/tsdb/influxdb/influxql/buffered/response_parser.go +++ b/pkg/tsdb/influxdb/influxql/buffered/response_parser.go @@ -1,6 +1,7 @@ package buffered import ( + "errors" "fmt" "io" "strings" @@ -36,12 +37,12 @@ func parse(buf io.Reader, statusCode int, query *models.Query) *backend.DataResp } if response.Error != "" { - return &backend.DataResponse{Error: fmt.Errorf(response.Error)} + return &backend.DataResponse{Error: errors.New(response.Error)} } result := response.Results[0] if result.Error != "" { - return &backend.DataResponse{Error: fmt.Errorf(result.Error)} + return &backend.DataResponse{Error: errors.New(result.Error)} } if query.ResultFormat == "table" { diff --git a/pkg/tsdb/influxdb/influxql/converter/converter.go b/pkg/tsdb/influxdb/influxql/converter/converter.go index 337b24014b1..fdb49c30902 100644 --- a/pkg/tsdb/influxdb/influxql/converter/converter.go +++ b/pkg/tsdb/influxdb/influxql/converter/converter.go @@ -1,6 +1,7 @@ package converter import ( + "errors" "fmt" "strconv" "strings" @@ -39,7 +40,7 @@ l1Fields: if err != nil { rsp.Error = err } else { - rsp.Error = fmt.Errorf(v) + rsp.Error = errors.New(v) } return rsp case "code": @@ -55,12 +56,10 @@ l1Fields: } return rspErr(fmt.Errorf("%s", v)) case "": - if err != nil { - return rspErr(err) - } break l1Fields default: v, err := iter.Read() + // TODO: log this properly fmt.Printf("[ROOT] unsupported key: %s / %v\n\n", l1Field, v) if err != nil { if rsp != nil { diff --git a/pkg/tsdb/influxdb/influxql/influxql.go b/pkg/tsdb/influxdb/influxql/influxql.go index 61879579f0e..72053844cbb 100644 --- a/pkg/tsdb/influxdb/influxql/influxql.go +++ b/pkg/tsdb/influxdb/influxql/influxql.go @@ -194,7 +194,7 @@ func execute(ctx context.Context, tracer trace.Tracer, dsInfo *models.Datasource resp = buffered.ResponseParse(res.Body, res.StatusCode, query) } - if resp.Frames != nil && len(resp.Frames) > 0 { + if len(resp.Frames) > 0 { resp.Frames[0].Meta.Custom = readCustomMetadata(res) } diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go index 82083af8e82..d23985d7b54 100644 --- a/pkg/tsdb/loki/loki.go +++ b/pkg/tsdb/loki/loki.go @@ -22,6 +22,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" "github.com/grafana/grafana/pkg/infra/tracing" + "github.com/grafana/grafana/pkg/services/contexthandler" "github.com/grafana/grafana/pkg/services/featuremgmt" ngalertmodels "github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/tsdb/loki/kinds/dataquery" @@ -49,13 +50,13 @@ func ProvideService(httpClientProvider *httpclient.Provider, tracer tracing.Trac var ( legendFormat = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`) -) -// Used in logging to mark a stage -var ( stagePrepareRequest = "prepareRequest" stageDatabaseRequest = "databaseRequest" stageParseResponse = "parseResponse" + + dashboardTitleHeader = "X-Dashboard-Title" + panelTitleHeader = "X-Panel-Title" ) type datasourceInfo struct { @@ -163,9 +164,30 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) logsDataplane: isFeatureEnabled(ctx, featuremgmt.FlagLokiLogsDataplane), } + if isFeatureEnabled(ctx, featuremgmt.FlagLokiSendDashboardPanelNames) { + s.applyHeaders(ctx, req) + } + return queryData(ctx, req, dsInfo, responseOpts, s.tracer, logger, isFeatureEnabled(ctx, featuremgmt.FlagLokiRunQueriesInParallel), isFeatureEnabled(ctx, featuremgmt.FlagLokiStructuredMetadata)) } +func (s *Service) applyHeaders(ctx context.Context, req backend.ForwardHTTPHeaders) { + reqCtx := contexthandler.FromContext(ctx) + if req == nil || reqCtx == nil || reqCtx.Req == nil { + return + } + + var hList = []string{dashboardTitleHeader, panelTitleHeader} + + for _, hName := range hList { + hVal := reqCtx.Req.Header.Get(hName) + if hVal == "" { + continue + } + req.SetHTTPHeader(hName, hVal) + } +} + func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, responseOpts ResponseOpts, tracer tracing.Tracer, plog log.Logger, runInParallel bool, requestStructuredMetadata bool) (*backend.QueryDataResponse, error) { result := backend.NewQueryDataResponse() diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go index 230c4b5de1a..3db98493f0e 100644 --- a/pkg/tsdb/mssql/mssql.go +++ b/pkg/tsdb/mssql/mssql.go @@ -48,7 +48,7 @@ const ( func ProvideService(cfg *setting.Cfg) *Service { logger := backend.NewLoggerWith("logger", "tsdb.mssql") return &Service{ - im: datasource.NewInstanceManager(newInstanceSettings(cfg, logger)), + im: datasource.NewInstanceManager(NewInstanceSettings(cfg, logger)), logger: logger, } } @@ -136,12 +136,17 @@ func newMSSQL(ctx context.Context, driverName string, userFacingDefaultError str return db, handler, nil } -func newInstanceSettings(cfg *setting.Cfg, logger log.Logger) datasource.InstanceFactoryFunc { +func NewInstanceSettings(cfg *setting.Cfg, logger log.Logger) datasource.InstanceFactoryFunc { return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) { + grafCfg := backend.GrafanaConfigFromContext(ctx) + sqlCfg, err := grafCfg.SQL() + if err != nil { + return nil, err + } jsonData := sqleng.JsonData{ - MaxOpenConns: cfg.SqlDatasourceMaxOpenConnsDefault, - MaxIdleConns: cfg.SqlDatasourceMaxIdleConnsDefault, - ConnMaxLifetime: cfg.SqlDatasourceMaxConnLifetimeDefault, + MaxOpenConns: sqlCfg.DefaultMaxOpenConns, + MaxIdleConns: sqlCfg.DefaultMaxIdleConns, + ConnMaxLifetime: sqlCfg.DefaultMaxConnLifetimeSeconds, Encrypt: "false", ConnectionTimeout: 0, SecureDSProxy: false, @@ -176,20 +181,22 @@ func newInstanceSettings(cfg *setting.Cfg, logger log.Logger) datasource.Instanc UID: settings.UID, DecryptedSecureJSONData: settings.DecryptedSecureJSONData, } - cnnstr, err := generateConnectionString(dsInfo, cfg, azureCredentials, kerberosAuth, logger) + cnnstr, err := generateConnectionString(dsInfo, cfg.Azure.ManagedIdentityClientId, cfg.Azure.AzureEntraPasswordCredentialsEnabled, azureCredentials, kerberosAuth, logger) if err != nil { return nil, err } - if cfg.Env == setting.Dev { - logger.Debug("GetEngine", "connection", cnnstr) - } driverName := "mssql" if jsonData.AuthenticationType == azureAuthentication { driverName = "azuresql" } - _, handler, err := newMSSQL(ctx, driverName, cfg.UserFacingDefaultError, cfg.DataProxyRowLimit, dsInfo, cnnstr, logger, settings) + userFacingDefaultError, err := grafCfg.UserFacingDefaultError() + if err != nil { + return nil, err + } + + _, handler, err := newMSSQL(ctx, driverName, userFacingDefaultError, sqlCfg.RowLimit, dsInfo, cnnstr, logger, settings) if err != nil { logger.Error("Failed connecting to MSSQL", "err", err) @@ -230,7 +237,7 @@ func ParseURL(u string, logger DebugOnlyLogger) (*url.URL, error) { }, nil } -func generateConnectionString(dsInfo sqleng.DataSourceInfo, cfg *setting.Cfg, azureCredentials azcredentials.AzureCredentials, kerberosAuth kerberos.KerberosAuth, logger log.Logger) (string, error) { +func generateConnectionString(dsInfo sqleng.DataSourceInfo, azureManagedIdentityClientId string, azureEntraPasswordCredentialsEnabled bool, azureCredentials azcredentials.AzureCredentials, kerberosAuth kerberos.KerberosAuth, logger log.Logger) (string, error) { const dfltPort = "0" var addr util.NetworkAddress if dsInfo.URL != "" { @@ -268,7 +275,7 @@ func generateConnectionString(dsInfo sqleng.DataSourceInfo, cfg *setting.Cfg, az switch dsInfo.JsonData.AuthenticationType { case azureAuthentication: - azureCredentialDSNFragment, err := getAzureCredentialDSNFragment(azureCredentials, cfg) + azureCredentialDSNFragment, err := getAzureCredentialDSNFragment(azureCredentials, azureManagedIdentityClientId, azureEntraPasswordCredentialsEnabled) if err != nil { return "", err } @@ -305,12 +312,12 @@ func generateConnectionString(dsInfo sqleng.DataSourceInfo, cfg *setting.Cfg, az return connStr, nil } -func getAzureCredentialDSNFragment(azureCredentials azcredentials.AzureCredentials, cfg *setting.Cfg) (string, error) { +func getAzureCredentialDSNFragment(azureCredentials azcredentials.AzureCredentials, azureManagedIdentityClientId string, azureEntraPasswordCredentialsEnabled bool) (string, error) { connStr := "" switch c := azureCredentials.(type) { case *azcredentials.AzureManagedIdentityCredentials: - if cfg.Azure.ManagedIdentityClientId != "" { - connStr += fmt.Sprintf("user id=%s;", cfg.Azure.ManagedIdentityClientId) + if azureManagedIdentityClientId != "" { + connStr += fmt.Sprintf("user id=%s;", azureManagedIdentityClientId) } connStr += fmt.Sprintf("fedauth=%s;", "ActiveDirectoryManagedIdentity") @@ -322,7 +329,7 @@ func getAzureCredentialDSNFragment(azureCredentials azcredentials.AzureCredentia "ActiveDirectoryApplication", ) case *azcredentials.AzureEntraPasswordCredentials: - if cfg.Azure.AzureEntraPasswordCredentialsEnabled { + if azureEntraPasswordCredentialsEnabled { connStr += fmt.Sprintf("user id=%s;password=%s;applicationclientid=%s;fedauth=%s;", c.UserId, c.Password, @@ -360,13 +367,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque return nil, err } - err = dsHandler.Ping() - - if err != nil { - return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: dsHandler.TransformQueryError(s.logger, err).Error()}, nil - } - - return &backend.CheckHealthResult{Status: backend.HealthStatusOk, Message: "Database Connection OK"}, nil + return dsHandler.CheckHealth(ctx, req) } func (t *mssqlQueryResultTransformer) GetConverterList() []sqlutil.StringConverter { diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go index 40c6ee50ac3..f91c1e408fe 100644 --- a/pkg/tsdb/mssql/mssql_test.go +++ b/pkg/tsdb/mssql/mssql_test.go @@ -1550,7 +1550,7 @@ func TestGenerateConnectionString(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - connStr, err := generateConnectionString(tc.dataSource, nil, nil, tc.kerberosCfg, logger) + connStr, err := generateConnectionString(tc.dataSource, "", false, nil, tc.kerberosCfg, logger) require.NoError(t, err) assert.Equal(t, tc.expConnStr, connStr) }) diff --git a/pkg/tsdb/mssql/sqleng/sql_engine.go b/pkg/tsdb/mssql/sqleng/sql_engine.go index 060e2bcb02e..f129383b440 100644 --- a/pkg/tsdb/mssql/sqleng/sql_engine.go +++ b/pkg/tsdb/mssql/sqleng/sql_engine.go @@ -15,11 +15,10 @@ import ( "time" "github.com/grafana/grafana-plugin-sdk-go/backend" - "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/grafana/grafana-plugin-sdk-go/data/sqlutil" - "github.com/grafana/grafana-plugin-sdk-go/backend/gtime" "github.com/grafana/grafana-plugin-sdk-go/backend/log" + "github.com/grafana/grafana-plugin-sdk-go/data" + "github.com/grafana/grafana-plugin-sdk-go/data/sqlutil" ) // MetaKeyExecutedQueryString is the key where the executed query should get stored @@ -153,8 +152,13 @@ func (e *DataSourceHandler) Dispose() { e.log.Debug("DB disposed") } -func (e *DataSourceHandler) Ping() error { - return e.db.Ping() +func (e *DataSourceHandler) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) { + err := e.db.Ping() + + if err != nil { + return &backend.CheckHealthResult{Status: backend.HealthStatusError, Message: e.TransformQueryError(e.log, err).Error()}, nil + } + return &backend.CheckHealthResult{Status: backend.HealthStatusOk, Message: "Database Connection OK"}, nil } func (e *DataSourceHandler) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { @@ -214,7 +218,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG if theErr, ok := r.(error); ok { queryResult.dataResponse.Error = theErr } else if theErrString, ok := r.(string); ok { - queryResult.dataResponse.Error = fmt.Errorf(theErrString) + queryResult.dataResponse.Error = errors.New(theErrString) } else { queryResult.dataResponse.Error = fmt.Errorf("unexpected error - %s", e.userError) } diff --git a/pkg/tsdb/mssql/standalone/main.go b/pkg/tsdb/mssql/standalone/main.go new file mode 100644 index 00000000000..a4fafe05f1a --- /dev/null +++ b/pkg/tsdb/mssql/standalone/main.go @@ -0,0 +1,28 @@ +package main + +import ( + "os" + + "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana-plugin-sdk-go/backend/datasource" + "github.com/grafana/grafana-plugin-sdk-go/backend/log" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/tsdb/mssql" +) + +func main() { + // Start listening to requests sent from Grafana. This call is blocking so + // it won't finish until Grafana shuts down the process or the plugin choose + // to exit by itself using os.Exit. Manage automatically manages life cycle + // of datasource instances. It accepts datasource instance factory as first + // argument. This factory will be automatically called on incoming request + // from Grafana to create different instances of SampleDatasource (per datasource + // ID). When datasource configuration changed Dispose method will be called and + // new datasource instance created using NewSampleDatasource factory. + logger := backend.NewLoggerWith("logger", "tsdb.mssql") + cfg := setting.NewCfg() + if err := datasource.Manage("mssql", mssql.NewInstanceSettings(cfg, logger), datasource.ManageOpts{}); err != nil { + log.DefaultLogger.Error(err.Error()) + os.Exit(1) + } +} diff --git a/pkg/tsdb/mysql/sqleng/sql_engine.go b/pkg/tsdb/mysql/sqleng/sql_engine.go index 455f8e7bd52..43ab9d47911 100644 --- a/pkg/tsdb/mysql/sqleng/sql_engine.go +++ b/pkg/tsdb/mysql/sqleng/sql_engine.go @@ -16,11 +16,10 @@ import ( "github.com/go-sql-driver/mysql" "github.com/grafana/grafana-plugin-sdk-go/backend" - "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/grafana/grafana-plugin-sdk-go/data/sqlutil" - "github.com/grafana/grafana-plugin-sdk-go/backend/gtime" "github.com/grafana/grafana-plugin-sdk-go/backend/log" + "github.com/grafana/grafana-plugin-sdk-go/data" + "github.com/grafana/grafana-plugin-sdk-go/data/sqlutil" ) // MetaKeyExecutedQueryString is the key where the executed query should get stored @@ -224,7 +223,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG if theErr, ok := r.(error); ok { queryResult.dataResponse.Error = theErr } else if theErrString, ok := r.(string); ok { - queryResult.dataResponse.Error = fmt.Errorf(theErrString) + queryResult.dataResponse.Error = errors.New(theErrString) } else { queryResult.dataResponse.Error = fmt.Errorf("unexpected error - %s", e.userError) } diff --git a/playwright.config.ts b/playwright.config.ts index a4abcbd0263..3dc0984aef1 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -70,5 +70,14 @@ export default defineConfig({ }, dependencies: ['authenticate'], }, + { + name: 'extensions-test-app', + testDir: 'e2e/test-plugins/grafana-extensionstest-app', + use: { + ...devices['Desktop Chrome'], + storageState: 'playwright/.auth/admin.json', + }, + dependencies: ['authenticate'], + }, ], }); diff --git a/public/api-enterprise-spec.json b/public/api-enterprise-spec.json index 15c7b885ce8..4cb63fb0a8e 100644 --- a/public/api-enterprise-spec.json +++ b/public/api-enterprise-spec.json @@ -3079,7 +3079,7 @@ "description": "Policies contains all policy identifiers included in the certificate.\nIn Go 1.22, encoding/gob cannot handle and ignores this field.", "type": "array", "items": { - "$ref": "#/definitions/OID" + "type": "string" } }, "PolicyIdentifiers": { @@ -3330,15 +3330,9 @@ }, "transformations": { "$ref": "#/definitions/Transformations" - }, - "type": { - "$ref": "#/definitions/CorrelationConfigType" } } }, - "CorrelationConfigType": { - "type": "string" - }, "CorrelationConfigUpdateDTO": { "type": "object", "properties": { @@ -3372,9 +3366,6 @@ "variable": "name" } ] - }, - "type": { - "$ref": "#/definitions/CorrelationConfigType" } } }, @@ -5404,7 +5395,7 @@ "status" ], "properties": { - "error": { + "message": { "type": "string" }, "refId": { @@ -5414,6 +5405,7 @@ "type": "string", "enum": [ "OK", + "WARNING", "ERROR", "PENDING", "UNKNOWN" @@ -5491,7 +5483,7 @@ "type": "object", "title": "NavbarPreference defines model for NavbarPreference.", "properties": { - "bookmarkIds": { + "bookmarkUrls": { "type": "array", "items": { "type": "string" @@ -5542,10 +5534,6 @@ "format": "int64", "title": "NoticeSeverity is a type for the Severity property of a Notice." }, - "OID": { - "type": "object", - "title": "An OID represents an ASN.1 OBJECT IDENTIFIER." - }, "ObjectIdentifier": { "type": "array", "title": "An ObjectIdentifier represents an ASN.1 OBJECT IDENTIFIER.", diff --git a/public/api-merged.json b/public/api-merged.json index bc7800c62b9..50d08dee9ff 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -11498,9 +11498,9 @@ } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -11536,9 +11536,9 @@ "description": " The mute timing was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -11747,9 +11747,9 @@ } }, "404": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -11792,15 +11792,15 @@ } }, "400": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -11831,9 +11831,9 @@ "description": " The template was deleted successfully." }, "409": { - "description": "GenericPublicError", + "description": "PublicError", "schema": { - "$ref": "#/definitions/GenericPublicError" + "$ref": "#/definitions/PublicError" } } } @@ -13557,7 +13557,7 @@ "description": "Policies contains all policy identifiers included in the certificate.\nIn Go 1.22, encoding/gob cannot handle and ignores this field.", "type": "array", "items": { - "$ref": "#/definitions/OID" + "type": "string" } }, "PolicyIdentifiers": { @@ -13839,6 +13839,9 @@ "type": "string", "example": "PE1C5CBDA0504A6A3" }, + "type": { + "$ref": "#/definitions/CorrelationType" + }, "uid": { "description": "Unique identifier of the correlation", "type": "string", @@ -13850,7 +13853,6 @@ "type": "object", "required": [ "field", - "type", "target" ], "properties": { @@ -13872,13 +13874,10 @@ "$ref": "#/definitions/Transformations" }, "type": { - "$ref": "#/definitions/CorrelationConfigType" + "$ref": "#/definitions/CorrelationType" } } }, - "CorrelationConfigType": { - "type": "string" - }, "CorrelationConfigUpdateDTO": { "type": "object", "properties": { @@ -13912,12 +13911,12 @@ "variable": "name" } ] - }, - "type": { - "$ref": "#/definitions/CorrelationConfigType" } } }, + "CorrelationType": { + "type": "string" + }, "CounterResetHint": { "description": "or alternatively that we are dealing with a gauge histogram, where counter resets do not apply.", "type": "integer", @@ -13954,9 +13953,12 @@ "type": "boolean" }, "targetUID": { - "description": "Target data source UID to which the correlation is created. required if config.type = query", + "description": "Target data source UID to which the correlation is created. required if type = query", "type": "string", "example": "PE1C5CBDA0504A6A3" + }, + "type": { + "$ref": "#/definitions/CorrelationType" } } }, @@ -15554,14 +15556,6 @@ "$ref": "#/definitions/Frame" } }, - "GenericPublicError": { - "type": "object", - "properties": { - "body": { - "$ref": "#/definitions/PublicError" - } - } - }, "GetAccessTokenResponseDTO": { "type": "object", "properties": { @@ -17338,10 +17332,6 @@ } } }, - "OID": { - "type": "object", - "title": "An OID represents an ASN.1 OBJECT IDENTIFIER." - }, "ObjectIdentifier": { "type": "array", "title": "An ObjectIdentifier represents an ASN.1 OBJECT IDENTIFIER.", @@ -18434,7 +18424,8 @@ "example": "project_x" }, "for": { - "$ref": "#/definitions/Duration" + "type": "string", + "format": "duration" }, "id": { "type": "integer", @@ -21423,6 +21414,9 @@ "description": "Optional label identifying the correlation", "type": "string", "example": "My label" + }, + "type": { + "$ref": "#/definitions/CorrelationType" } } }, @@ -21975,7 +21969,7 @@ "ValidationError": { "type": "object", "properties": { - "msg": { + "message": { "type": "string", "example": "error message" } @@ -22169,7 +22163,6 @@ } }, "alertGroups": { - "description": "AlertGroups alert groups", "type": "array", "items": { "type": "object", @@ -22359,7 +22352,6 @@ } }, "gettableAlerts": { - "description": "GettableAlerts gettable alerts", "type": "array", "items": { "type": "object", @@ -22484,7 +22476,6 @@ } }, "gettableSilences": { - "description": "GettableSilences gettable silences", "type": "array", "items": { "type": "object", diff --git a/public/app/app.ts b/public/app/app.ts index 278884385f3..1d164a5baef 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -38,6 +38,7 @@ import { setReturnToPreviousHook, setPluginExtensionsHook, setPluginComponentHook, + setPluginComponentsHook, setCurrentUser, setChromeHeaderHeightHook, } from '@grafana/runtime'; @@ -85,8 +86,10 @@ import { DatasourceSrv } from './features/plugins/datasource_srv'; import { getCoreExtensionConfigurations } from './features/plugins/extensions/getCoreExtensionConfigurations'; import { createPluginExtensionsGetter } from './features/plugins/extensions/getPluginExtensions'; import { ReactivePluginExtensionsRegistry } from './features/plugins/extensions/reactivePluginExtensionRegistry'; +import { AddedComponentsRegistry } from './features/plugins/extensions/registry/AddedComponentsRegistry'; import { ExposedComponentsRegistry } from './features/plugins/extensions/registry/ExposedComponentsRegistry'; import { createUsePluginComponent } from './features/plugins/extensions/usePluginComponent'; +import { createUsePluginComponents } from './features/plugins/extensions/usePluginComponents'; import { createUsePluginExtensions } from './features/plugins/extensions/usePluginExtensions'; import { importPanelPlugin, syncGetPanelPlugin } from './features/plugins/importPanelPlugin'; import { preloadPlugins } from './features/plugins/pluginPreloader'; @@ -210,15 +213,18 @@ export class GrafanaApp { initWindowRuntime(); // Initialize plugin extensions - const extensionsRegistry = new ReactivePluginExtensionsRegistry(); - extensionsRegistry.register({ + const pluginExtensionsRegistries = { + extensionsRegistry: new ReactivePluginExtensionsRegistry(), + addedComponentsRegistry: new AddedComponentsRegistry(), + exposedComponentsRegistry: new ExposedComponentsRegistry(), + }; + pluginExtensionsRegistries.extensionsRegistry.register({ pluginId: 'grafana', extensionConfigs: getCoreExtensionConfigurations(), exposedComponentConfigs: [], + addedComponentConfigs: [], }); - const exposedComponentsRegistry = new ExposedComponentsRegistry(); - if (contextSrv.user.orgRole !== '') { // The "cloud-home-app" is registering banners once it's loaded, and this can cause a rerender in the AppChrome if it's loaded after the Grafana app init. // TODO: remove the following exception once the issue mentioned above is fixed. @@ -226,18 +232,24 @@ export class GrafanaApp { const awaitedAppPlugins = Object.values(config.apps).filter((app) => awaitedAppPluginIds.includes(app.id)); const appPlugins = Object.values(config.apps).filter((app) => !awaitedAppPluginIds.includes(app.id)); - preloadPlugins(appPlugins, extensionsRegistry, exposedComponentsRegistry); - await preloadPlugins( - awaitedAppPlugins, - extensionsRegistry, - exposedComponentsRegistry, - 'frontend_awaited_plugins_preload' - ); + preloadPlugins(appPlugins, pluginExtensionsRegistries); + await preloadPlugins(awaitedAppPlugins, pluginExtensionsRegistries, 'frontend_awaited_plugins_preload'); } - setPluginExtensionGetter(createPluginExtensionsGetter(extensionsRegistry)); - setPluginExtensionsHook(createUsePluginExtensions(extensionsRegistry)); - setPluginComponentHook(createUsePluginComponent(exposedComponentsRegistry)); + setPluginExtensionGetter( + createPluginExtensionsGetter( + pluginExtensionsRegistries.extensionsRegistry, + pluginExtensionsRegistries.addedComponentsRegistry + ) + ); + setPluginExtensionsHook( + createUsePluginExtensions( + pluginExtensionsRegistries.extensionsRegistry, + pluginExtensionsRegistries.addedComponentsRegistry + ) + ); + setPluginComponentHook(createUsePluginComponent(pluginExtensionsRegistries.exposedComponentsRegistry)); + setPluginComponentsHook(createUsePluginComponents(pluginExtensionsRegistries.addedComponentsRegistry)); // initialize chrome service const queryParams = locationService.getSearchObject(); diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx index d3bed574dcc..b01d6951d5c 100644 --- a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx +++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { DOMAttributes } from '@react-types/shared'; import { memo, forwardRef, useCallback } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, NavModelItem } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx index 94410dfa696..3640ff5fed9 100644 --- a/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx +++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx @@ -1,7 +1,7 @@ import { css, cx } from '@emotion/css'; import { useEffect, useRef } from 'react'; import * as React from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { useLocalStorage } from 'react-use'; import { GrafanaTheme2, NavModelItem, toIconName } from '@grafana/data'; diff --git a/public/app/core/components/AppChrome/TopBar/SignInLink.tsx b/public/app/core/components/AppChrome/TopBar/SignInLink.tsx index 95f5006f507..538614eb527 100644 --- a/public/app/core/components/AppChrome/TopBar/SignInLink.tsx +++ b/public/app/core/components/AppChrome/TopBar/SignInLink.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, locationUtil, textUtil } from '@grafana/data'; import { useStyles2 } from '@grafana/ui'; diff --git a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx index 8f5635d0e74..ecfcdd468db 100644 --- a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx +++ b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { cloneDeep } from 'lodash'; import { memo } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, locationUtil, textUtil } from '@grafana/data'; import { Dropdown, ToolbarButton, useStyles2 } from '@grafana/ui'; diff --git a/public/app/core/components/Login/LoginServiceButtons.tsx b/public/app/core/components/Login/LoginServiceButtons.tsx index 0cc28c6eb83..ae52e23a73c 100644 --- a/public/app/core/components/Login/LoginServiceButtons.tsx +++ b/public/app/core/components/Login/LoginServiceButtons.tsx @@ -108,20 +108,17 @@ const getServiceStyles = (theme: GrafanaTheme2) => { const LoginDivider = () => { const styles = useStyles2(getServiceStyles); return ( - <> -
-
-
-
-
- {!config.disableLoginForm && or} -
-
-
-
+
+
+
-
- +
+ {!config.disableLoginForm && or} +
+
+
+
+
); }; diff --git a/public/app/core/components/NativeScrollbar.tsx b/public/app/core/components/NativeScrollbar.tsx index d0eb36adab7..26d68c9e361 100644 --- a/public/app/core/components/NativeScrollbar.tsx +++ b/public/app/core/components/NativeScrollbar.tsx @@ -2,28 +2,35 @@ import { css, cx } from '@emotion/css'; import { useEffect, useRef } from 'react'; import { config } from '@grafana/runtime'; -import { CustomScrollbar, useStyles2 } from '@grafana/ui'; +import { useStyles2 } from '@grafana/ui'; -type Props = Parameters[0]; +export interface Props { + children: React.ReactNode; + onSetScrollRef?: (ref: ScrollRefElement) => void; + divId?: string; +} + +export interface ScrollRefElement { + scrollTop: number; + scrollTo: (x: number, y: number) => void; +} // Shim to provide API-compatibility for Page's scroll-related props // when bodyScrolling is enabled, this is a no-op // TODO remove this shim completely when bodyScrolling is enabled -export default function NativeScrollbar({ children, scrollRefCallback, scrollTop, divId }: Props) { +export default function NativeScrollbar({ children, onSetScrollRef, divId }: Props) { const styles = useStyles2(getStyles); const ref = useRef(null); useEffect(() => { - if (!config.featureToggles.bodyScrolling && ref.current && scrollRefCallback) { - scrollRefCallback(ref.current); + if (config.featureToggles.bodyScrolling && onSetScrollRef) { + onSetScrollRef(new DivScrollElement(document.documentElement)); } - }, [ref, scrollRefCallback]); - useEffect(() => { - if (!config.featureToggles.bodyScrolling && ref.current && scrollTop != null) { - ref.current?.scrollTo(0, scrollTop); + if (!config.featureToggles.bodyScrolling && ref.current && onSetScrollRef) { + onSetScrollRef(new DivScrollElement(ref.current)); } - }, [scrollTop]); + }, [ref, onSetScrollRef]); return config.featureToggles.bodyScrolling ? ( children @@ -35,6 +42,26 @@ export default function NativeScrollbar({ children, scrollRefCallback, scrollTop ); } +class DivScrollElement { + public constructor(private element: HTMLElement) {} + public get scrollTop() { + return this.element.scrollTop; + } + + public scrollTo(x: number, y: number, retry = 0) { + // If the element does not have the height we wait a few frames and look again + // Gives the view time to render and get the correct height before we restore scroll position + const canScroll = this.element.scrollHeight - this.element.clientHeight - y >= 0; + + if (!canScroll && retry < 10) { + requestAnimationFrame(() => this.scrollTo(x, y, retry + 1)); + return; + } + + this.element.scrollTo(x, y); + } +} + function getStyles() { return { nativeScrollbars: css({ diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx index 9056a7dfca5..0f82fd4ba8c 100644 --- a/public/app/core/components/Page/Page.tsx +++ b/public/app/core/components/Page/Page.tsx @@ -27,8 +27,7 @@ export const Page: PageType = ({ className, info, layout = PageLayoutType.Standard, - scrollTop, - scrollRef, + onSetScrollRef, ...otherProps }) => { const styles = useStyles2(getStyles); @@ -57,9 +56,7 @@ export const Page: PageType = ({
{pageHeaderNav && ( @@ -82,9 +79,7 @@ export const Page: PageType = ({
{children}
 diff --git a/public/app/core/components/Page/types.ts b/public/app/core/components/Page/types.ts index f1df40ab280..cc83c18aade 100644 --- a/public/app/core/components/Page/types.ts +++ b/public/app/core/components/Page/types.ts @@ -1,8 +1,10 @@ -import { FC, HTMLAttributes, RefCallback } from 'react'; +import { FC, HTMLAttributes } from 'react'; import * as React from 'react'; import { NavModel, NavModelItem, PageLayoutType } from '@grafana/data'; +import { ScrollRefElement } from '../NativeScrollbar'; + import { PageContents } from './PageContents'; export interface PageProps extends HTMLAttributes { @@ -22,15 +24,11 @@ export interface PageProps extends HTMLAttributes { /** Control the page layout. */ layout?: PageLayoutType; /** + * TODO: Not sure we should deprecated it given the sidecar project? * @deprecated this will be removed when bodyScrolling is enabled by default * Can be used to get the scroll container element to access scroll position * */ - scrollRef?: RefCallback; - /** - * @deprecated this will be removed when bodyScrolling is enabled by default - * Can be used to update the current scroll position - * */ - scrollTop?: number; + onSetScrollRef?: (ref: ScrollRefElement) => void; } export interface PageInfoItem { diff --git a/public/app/core/hooks/useQueryParams.ts b/public/app/core/hooks/useQueryParams.ts index 907f039e1e5..832330af4ed 100644 --- a/public/app/core/hooks/useQueryParams.ts +++ b/public/app/core/hooks/useQueryParams.ts @@ -1,5 +1,5 @@ import { useCallback, useMemo } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { UrlQueryMap } from '@grafana/data'; import { locationSearchToObject, locationService } from '@grafana/runtime'; diff --git a/public/app/core/navigation/GrafanaRouteError.tsx b/public/app/core/navigation/GrafanaRouteError.tsx index 052df6bb0f7..7c3650eaec7 100644 --- a/public/app/core/navigation/GrafanaRouteError.tsx +++ b/public/app/core/navigation/GrafanaRouteError.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { ErrorInfo, useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, locationUtil, PageLayoutType } from '@grafana/data'; import { Button, ErrorWithStack, useStyles2 } from '@grafana/ui'; diff --git a/public/app/core/navigation/hooks.ts b/public/app/core/navigation/hooks.ts index b03333d3fe9..a6c35d44a75 100644 --- a/public/app/core/navigation/hooks.ts +++ b/public/app/core/navigation/hooks.ts @@ -1,4 +1,4 @@ -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { locationService } from '@grafana/runtime'; diff --git a/public/app/core/utils/dag.test.ts b/public/app/core/utils/dag.test.ts index 22e02e3a6e0..ee3feaa27e7 100644 --- a/public/app/core/utils/dag.test.ts +++ b/public/app/core/utils/dag.test.ts @@ -116,5 +116,11 @@ describe('Directed acyclic graph', () => { dag.link('A', 'non-existing'); }).toThrowError("cannot link output node named non-existing since it doesn't exist in graph"); }); + + it('when linking would create a cycle should throw error', () => { + expect(() => dag.link('C', 'C')).toThrow('cannot link C to C since it would create a cycle'); + expect(() => dag.link('A', 'B')).toThrow('cannot link A to B since it would create a cycle'); + expect(() => dag.link('A', 'E')).toThrow('cannot link A to E since it would create a cycle'); + }); }); }); diff --git a/public/app/core/utils/dag.ts b/public/app/core/utils/dag.ts index 3997442ffa1..c4e84f520ac 100644 --- a/public/app/core/utils/dag.ts +++ b/public/app/core/utils/dag.ts @@ -183,6 +183,9 @@ export class Graph { const edges: Edge[] = []; inputNodes.forEach((input) => { outputNodes.forEach((output) => { + if (this.willCreateCycle(input, output)) { + throw Error(`cannot link ${input.name} to ${output.name} since it would create a cycle`); + } edges.push(this.createEdge().link(input, output)); }); }); @@ -217,6 +220,34 @@ export class Graph { return descendants; } + private willCreateCycle(input: Node, output: Node): boolean { + if (input === output) { + return true; + } + + // Perform a DFS to check if the input node is reachable from the output node + const visited = new Set(); + const stack = [output]; + + while (stack.length) { + const current = stack.pop()!; + if (current === input) { + return true; + } + + visited.add(current); + + for (const edge of current.outputEdges) { + const next = edge.outputNode; + if (next && !visited.has(next)) { + stack.push(next); + } + } + } + + return false; + } + createEdge(): Edge { return new Edge(); } diff --git a/public/app/core/utils/fetch.test.ts b/public/app/core/utils/fetch.test.ts index ffb1058ff14..4c05a50497c 100644 --- a/public/app/core/utils/fetch.test.ts +++ b/public/app/core/utils/fetch.test.ts @@ -52,7 +52,6 @@ describe('parseInitFromOptions', () => { describe('parseHeaders', () => { it.each` options | expected - ${undefined} | ${{ map: { accept: 'application/json, text/plain, */*' } }} ${{ propKey: 'some prop value' }} | ${{ map: { accept: 'application/json, text/plain, */*' } }} ${{ method: 'GET' }} | ${{ map: { accept: 'application/json, text/plain, */*' } }} ${{ method: 'POST' }} | ${{ map: { accept: 'application/json, text/plain, */*', 'content-type': 'application/json' } }} @@ -70,6 +69,8 @@ describe('parseHeaders', () => { ${{ method: 'PUT', headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }} | ${{ map: { accept: 'application/json, text/plain, */*', 'content-type': 'application/x-www-form-urlencoded' } }} ${{ headers: { Accept: 'text/plain' } }} | ${{ map: { accept: 'text/plain' } }} ${{ headers: { Auth: 'Basic asdasdasd' } }} | ${{ map: { accept: 'application/json, text/plain, */*', auth: 'Basic asdasdasd' } }} + ${{ headers: { Key: '🚀' } }} | ${{ map: { key: '%F0%9F%9A%80', accept: 'application/json, text/plain, */*' } }} + ${{ headers: { '🚀': 'value' } }} | ${{ map: { '%f0%9f%9a%80': 'value', accept: 'application/json, text/plain, */*' } }} `("when called with options: '$options' then the result should be '$expected'", ({ options, expected }) => { expect(parseHeaders(options)).toEqual(expected); }); diff --git a/public/app/core/utils/fetch.ts b/public/app/core/utils/fetch.ts index 252d0e6aca4..027ae66ca0e 100644 --- a/public/app/core/utils/fetch.ts +++ b/public/app/core/utils/fetch.ts @@ -57,9 +57,22 @@ const putHeaderParser: HeaderParser = parseHeaderByMethodFactory('put'); const patchHeaderParser: HeaderParser = parseHeaderByMethodFactory('patch'); const headerParsers = [postHeaderParser, putHeaderParser, patchHeaderParser, defaultHeaderParser]; +const unsafeCharacters = /[^\u0000-\u00ff]/g; + +/** + * Header values can only contain ISO-8859-1 characters. If a header key or value contains characters outside of this, we will encode the whole value. + * Since `encodeURI` also encodes spaces, we won't encode if the value doesn't contain any unsafe characters. + */ +function sanitizeHeader(v: string) { + return unsafeCharacters.test(v) ? encodeURI(v) : v; +} export const parseHeaders = (options: BackendSrvRequest) => { - const headers = options?.headers ? new Headers(options.headers) : new Headers(); + const safeHeaders: Record = {}; + for (let [key, value] of Object.entries(options.headers ?? {})) { + safeHeaders[sanitizeHeader(key)] = sanitizeHeader(value); + } + const headers = new Headers(safeHeaders); const parsers = headerParsers.filter((parser) => parser.canParse(options)); const combinedHeaders = parsers.reduce((prev, parser) => { return parser.parse(prev); diff --git a/public/app/features/admin/ldap/LdapDrawer.tsx b/public/app/features/admin/ldap/LdapDrawer.tsx new file mode 100644 index 00000000000..eec47a0100d --- /dev/null +++ b/public/app/features/admin/ldap/LdapDrawer.tsx @@ -0,0 +1,258 @@ +import { css } from '@emotion/css'; +import { useId } from 'react'; +import { useFormContext } from 'react-hook-form'; + +import { GrafanaTheme2, SelectableValue } from '@grafana/data'; +import { + useStyles2, + CollapsableSection, + Divider, + Drawer, + Field, + Icon, + Input, + Label, + Select, + Stack, + Switch, + Text, + TextLink, + Tooltip, +} from '@grafana/ui'; +import { t, Trans } from 'app/core/internationalization'; +import { LdapPayload } from 'app/types'; + +interface Props { + onClose: () => void; +} + +const tlsOptions: Array> = ['TLS1.2', 'TLS1.3'].map((v) => ({ label: v, value: v })); + +export const LdapDrawerComponent = ({ onClose }: Props) => { + const styles = useStyles2(getStyles); + const { register, setValue, watch } = useFormContext(); + + const nameId = useId(); + const surnameId = useId(); + const usernameId = useId(); + const memberOfId = useId(); + const emailId = useId(); + + const groupMappingsLabel = ( + + ); + + const useTlsDescription = ( + + For a complete list of supported ciphers and TLS versions, refer to:{' '} + { + + https://go.dev/src/crypto/tls/cipher_suites.go + + } + + ); + + return ( + + + + + + + + + + + + + + + + Specify the LDAP attributes that map to the user‘s given name, surname, and email address, ensuring + the application correctly retrieves and displays user information. + + + + + + + + + + + + + + + + + + + + + + + + + + + + setValue('settings.config.servers.0.group_search_base_dns', [value]) + } + /> + + + + + + + + + + + + + + + + {watch('settings.config.servers.0.use_ssl') && ( + <> + + + + + + setValue( + 'settings.config.servers.0.tls_ciphers', + value?.split(/,|\s/).map((v: string) => v.trim()) + ) + } + /> + + + )} + + + ); +}; + +function getStyles(theme: GrafanaTheme2) { + return { + sectionLabel: css({ + fontSize: theme.typography.size.lg, + }), + }; +} diff --git a/public/app/features/admin/ldap/LdapSettingsPage.tsx b/public/app/features/admin/ldap/LdapSettingsPage.tsx new file mode 100644 index 00000000000..1dbfe1e8c21 --- /dev/null +++ b/public/app/features/admin/ldap/LdapSettingsPage.tsx @@ -0,0 +1,319 @@ +import { css } from '@emotion/css'; +import { useEffect, useState } from 'react'; +import { FormProvider, useForm } from 'react-hook-form'; +import { connect } from 'react-redux'; + +import { AppEvents, GrafanaTheme2, NavModelItem } from '@grafana/data'; +import { getBackendSrv, getAppEvents } from '@grafana/runtime'; +import { useStyles2, Alert, Box, Button, Field, Input, Stack, Text, TextLink } from '@grafana/ui'; +import { Page } from 'app/core/components/Page/Page'; +import config from 'app/core/config'; +import { t, Trans } from 'app/core/internationalization'; +import { Loader } from 'app/features/plugins/admin/components/Loader'; +import { LdapPayload, StoreState } from 'app/types'; + +import { LdapDrawerComponent } from './LdapDrawer'; + +const appEvents = getAppEvents(); + +const mapStateToProps = (state: StoreState) => ({ + ldapSsoSettings: state.ldap.ldapSsoSettings, +}); + +const mapDispatchToProps = {}; + +const connector = connect(mapStateToProps, mapDispatchToProps); + +const pageNav: NavModelItem = { + text: 'LDAP', + icon: 'shield', + id: 'LDAP', +}; + +const emptySettings: LdapPayload = { + id: '', + provider: '', + source: '', + settings: { + activeSyncEnabled: false, + allowSignUp: false, + config: { + servers: [ + { + attributes: {}, + bind_dn: '', + bind_password: '', + client_cert: '', + client_key: '', + group_mappings: [], + group_search_base_dns: [], + group_search_filter: '', + group_search_filter_user_attribute: '', + host: '', + min_tls_version: '', + port: 389, + root_ca_cert: '', + search_base_dns: [], + search_filter: '', + skip_org_role_sync: false, + ssl_skip_verify: false, + start_tls: false, + timeout: 10, + tls_ciphers: [], + tls_skip_verify: false, + use_ssl: false, + }, + ], + }, + enabled: false, + skipOrgRoleSync: false, + syncCron: '', + }, +}; + +export const LdapSettingsPage = () => { + const [isLoading, setIsLoading] = useState(true); + const [isDrawerOpen, setIsDrawerOpen] = useState(false); + + const methods = useForm({ defaultValues: emptySettings }); + const { getValues, handleSubmit, register, reset } = methods; + + const styles = useStyles2(getStyles); + + useEffect(() => { + async function init() { + const payload = await getBackendSrv().get('/api/v1/sso-settings/ldap'); + if (!payload || !payload.settings || !payload.settings.config) { + appEvents.publish({ + type: AppEvents.alertError.name, + payload: [t('ldap-settings-page.alert.error-fetching', 'Error fetching LDAP settings')], + }); + return; + } + + reset(payload); + setIsLoading(false); + } + init(); + }, [reset]); + + /** + * Display warning if the feature flag is disabled + */ + if (!config.featureToggles.ssoSettingsLDAP) { + return ( + + + This page is only accessible by enabling the ssoSettingsLDAP feature flag. + + + ); + } + + /** + * Save payload to the backend + * @param payload LdapPayload + */ + const putPayload = async (payload: LdapPayload) => { + try { + const result = await getBackendSrv().put('/api/v1/sso-settings/ldap', payload); + if (result) { + appEvents.publish({ + type: AppEvents.alertError.name, + payload: [t('ldap-settings-page.alert.error-saving', 'Error saving LDAP settings')], + }); + } + appEvents.publish({ + type: AppEvents.alertSuccess.name, + payload: [t('ldap-settings-page.alert.saved', 'LDAP settings saved')], + }); + } catch (error) { + appEvents.publish({ + type: AppEvents.alertError.name, + payload: [t('ldap-settings-page.alert.error-saving', 'Error saving LDAP settings')], + }); + } + }; + + const onErrors = () => { + appEvents.publish({ + type: AppEvents.alertError.name, + payload: [t('ldap-settings-page.alert.error-validate-form', 'Error validating LDAP settings')], + }); + }; + + /** + * Button's Actions + */ + const submitAndEnableLdapSettings = (payload: LdapPayload) => { + payload.settings.enabled = true; + putPayload(payload); + }; + const saveForm = () => { + putPayload(getValues()); + }; + const discardForm = async () => { + try { + setIsLoading(true); + await getBackendSrv().delete('/api/v1/sso-settings/ldap'); + const payload = await getBackendSrv().get('/api/v1/sso-settings/ldap'); + if (!payload || !payload.settings || !payload.settings.config) { + appEvents.publish({ + type: AppEvents.alertError.name, + payload: [t('ldap-settings-page.alert.error-update', 'Error updating LDAP settings')], + }); + return; + } + appEvents.publish({ + type: AppEvents.alertSuccess.name, + payload: [t('ldap-settings-page.alert.discard-success', 'LDAP settings discarded')], + }); + reset(payload); + } catch (error) { + appEvents.publish({ + type: AppEvents.alertError.name, + payload: [t('ldap-settings-page.alert.error-saving', 'Error saving LDAP settings')], + }); + } finally { + setIsLoading(false); + } + }; + + const documentation = ( + + documentation + + ); + const subTitle = ( + + The LDAP integration in Grafana allows your Grafana users to log in with their LDAP credentials. Find out more in + our {documentation}. + + ); + + return ( + + + +
+ {isLoading && } + {!isLoading && ( +
+

+ Basic Settings +

+ + + + + + + + + + + + + + + + + + + + Advanced Settings + + + + Mappings, extra security measures, and more. + + + + + + + + + + + + + +
+ )} + {isDrawerOpen && setIsDrawerOpen(false)} />} + +
+ + + ); +}; + +function getStyles(theme: GrafanaTheme2) { + return { + form: css({ + width: theme.spacing(68), + }), + }; +} + +export default connector(LdapSettingsPage); diff --git a/public/app/features/alerting/unified/Analytics.ts b/public/app/features/alerting/unified/Analytics.ts index f96e20cd918..93101ec6250 100644 --- a/public/app/features/alerting/unified/Analytics.ts +++ b/public/app/features/alerting/unified/Analytics.ts @@ -240,14 +240,6 @@ export function trackRulesSearchComponentInteraction(filter: keyof RulesFilter) export function trackRulesListViewChange(payload: { view: string }) { reportInteraction('grafana_alerting_rules_list_mode', { ...payload }); } -export function trackSwitchToSimplifiedRouting() { - reportInteraction('grafana_alerting_switch_to_simplified_routing'); -} - -export function trackSwitchToPoliciesRouting() { - reportInteraction('grafana_alerting_switch_to_policies_routing'); -} - export function trackEditInputWithTemplate() { reportInteraction('grafana_alerting_contact_point_form_edit_input_with_template'); } diff --git a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx index aae12f66c77..3372d095755 100644 --- a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx +++ b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx @@ -76,6 +76,9 @@ describe('Redirect to Rule viewer', () => { }); it('should properly decode rule name', () => { + // TODO: Fix console warning that happens once CompatRouter is wrapped around this component render + jest.spyOn(console, 'warn').mockImplementation(); + const rulesMatchingSpy = jest.spyOn(combinedRuleHooks, 'useCloudCombinedRulesMatching').mockReturnValue({ rules: [mockedRules[0]], loading: false, @@ -112,6 +115,9 @@ describe('Redirect to Rule viewer', () => { }); it('should properly decode source name', () => { + // TODO: Fix console warning that happens once CompatRouter is wrapped around this component render + jest.spyOn(console, 'warn').mockImplementation(); + const rulesMatchingSpy = jest.spyOn(combinedRuleHooks, 'useCloudCombinedRulesMatching').mockReturnValue({ rules: [mockedRules[0]], loading: false, diff --git a/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx b/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx index 10f71e526d3..724ce2bed77 100644 --- a/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx +++ b/public/app/features/alerting/unified/RuleEditorCloudOnlyAllowed.test.tsx @@ -10,7 +10,7 @@ import { PromApiFeatures, PromApplication } from 'app/types/unified-alerting-dto import { searchFolders } from '../../manage-dashboards/state/actions'; import { discoverFeatures } from './api/buildInfo'; -import { fetchRulerRules, fetchRulerRulesGroup, fetchRulerRulesNamespace, setRulerRuleGroup } from './api/ruler'; +import { fetchRulerRules, fetchRulerRulesGroup, fetchRulerRulesNamespace } from './api/ruler'; import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor'; import { grantUserPermissions, mockDataSource, MockDataSourceSrv } from './mocks'; import { fetchRulerRulesIfNotFetchedYet } from './state/actions'; @@ -114,7 +114,6 @@ const mocks = { api: { discoverFeatures: jest.mocked(discoverFeatures), fetchRulerRulesGroup: jest.mocked(fetchRulerRulesGroup), - setRulerRuleGroup: jest.mocked(setRulerRuleGroup), fetchRulerRulesNamespace: jest.mocked(fetchRulerRulesNamespace), fetchRulerRules: jest.mocked(fetchRulerRules), fetchRulerRulesIfNotFetchedYet: jest.mocked(fetchRulerRulesIfNotFetchedYet), diff --git a/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx b/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx index 307bf53b438..6465ba48b86 100644 --- a/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx +++ b/public/app/features/alerting/unified/RuleEditorCloudRules.test.tsx @@ -1,23 +1,18 @@ import userEvent from '@testing-library/user-event'; -import * as React from 'react'; import { renderRuleEditor, ui } from 'test/helpers/alertingRuleEditor'; import { clickSelectOption } from 'test/helpers/selectOptionInTest'; -import { screen, waitFor, waitForElementToBeRemoved } from 'test/test-utils'; +import { screen, waitForElementToBeRemoved } from 'test/test-utils'; import { selectors } from '@grafana/e2e-selectors'; -import { contextSrv } from 'app/core/services/context_srv'; import { AccessControlAction } from 'app/types'; -import { searchFolders } from '../../manage-dashboards/state/actions'; - -import { fetchRulerRules, fetchRulerRulesGroup, fetchRulerRulesNamespace, setRulerRuleGroup } from './api/ruler'; import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor'; -import { mockFeatureDiscoveryApi, setupMswServer } from './mockApi'; -import { grantUserPermissions, mockDataSource } from './mocks'; -import { emptyExternalAlertmanagersResponse, mockAlertmanagersResponse } from './mocks/alertmanagerApi'; -import { fetchRulerRulesIfNotFetchedYet } from './state/actions'; -import { setupDataSources } from './testSetup/datasources'; -import { buildInfoResponse } from './testSetup/featureDiscovery'; +import { setupMswServer } from './mockApi'; +import { grantUserPermissions } from './mocks'; +import { GROUP_3, NAMESPACE_2 } from './mocks/mimirRulerApi'; +import { mimirDataSource } from './mocks/server/configure'; +import { MIMIR_DATASOURCE_UID } from './mocks/server/constants'; +import { captureRequests, serializeRequests } from './mocks/server/events'; jest.mock('./components/rule-editor/ExpressionEditor', () => ({ // eslint-disable-next-line react/display-name @@ -26,54 +21,17 @@ jest.mock('./components/rule-editor/ExpressionEditor', () => ({ ), })); -jest.mock('./api/ruler'); jest.mock('../../../../app/features/manage-dashboards/state/actions'); -jest.mock('./components/rule-editor/util', () => { - const originalModule = jest.requireActual('./components/rule-editor/util'); - return { - ...originalModule, - getThresholdsForQueries: jest.fn(() => ({})), - }; -}); - -const dataSources = { - default: mockDataSource({ type: 'prometheus', name: 'Prom', isDefault: true }, { alerting: true }), -}; - jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({ AppChromeUpdate: ({ actions }: { actions: React.ReactNode }) =>
{actions}
, })); -setupDataSources(dataSources.default); - -const server = setupMswServer(); - -mockFeatureDiscoveryApi(server).discoverDsFeatures(dataSources.default, buildInfoResponse.mimir); -mockAlertmanagersResponse(server, emptyExternalAlertmanagersResponse); - -// these tests are rather slow because we have to wait for various API calls and mocks to be called -// and wait for the UI to be in particular states, drone seems to time out quite often so -// we're increasing the timeout here to remove the flakey-ness of this test -// ideally we'd move this to an e2e test but it's quite involved to set up the test environment -jest.setTimeout(60 * 1000); - -const mocks = { - searchFolders: jest.mocked(searchFolders), - api: { - fetchRulerRulesGroup: jest.mocked(fetchRulerRulesGroup), - setRulerRuleGroup: jest.mocked(setRulerRuleGroup), - fetchRulerRulesNamespace: jest.mocked(fetchRulerRulesNamespace), - fetchRulerRules: jest.mocked(fetchRulerRules), - fetchRulerRulesIfNotFetchedYet: jest.mocked(fetchRulerRulesIfNotFetchedYet), - }, -}; +setupMswServer(); +mimirDataSource(); describe('RuleEditor cloud', () => { beforeEach(() => { - jest.clearAllMocks(); - contextSrv.isEditor = true; - contextSrv.hasEditPermissionInFolders = true; grantUserPermissions([ AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleUpdate, @@ -88,28 +46,6 @@ describe('RuleEditor cloud', () => { }); it('can create a new cloud alert', async () => { - mocks.api.setRulerRuleGroup.mockResolvedValue(); - mocks.api.fetchRulerRulesNamespace.mockResolvedValue([]); - mocks.api.fetchRulerRulesGroup.mockResolvedValue({ - name: 'group2', - rules: [], - }); - mocks.api.fetchRulerRules.mockResolvedValue({ - namespace1: [ - { - name: 'group1', - rules: [], - }, - ], - namespace2: [ - { - name: 'group2', - rules: [], - }, - ], - }); - mocks.searchFolders.mockResolvedValue([]); - const user = userEvent.setup(); renderRuleEditor(); @@ -134,14 +70,13 @@ describe('RuleEditor cloud', () => { const dataSourceSelect = await ui.inputs.dataSource.find(); await user.click(dataSourceSelect); - await user.click(screen.getByText('Prom')); - await waitFor(() => expect(mocks.api.fetchRulerRules).toHaveBeenCalled()); + await user.click(screen.getByText(MIMIR_DATASOURCE_UID)); await user.type(await ui.inputs.expr.find(), 'up == 1'); await user.type(ui.inputs.name.get(), 'my great new rule'); - await clickSelectOption(ui.inputs.namespace.get(), 'namespace2'); - await clickSelectOption(ui.inputs.group.get(), 'group2'); + await clickSelectOption(ui.inputs.namespace.get(), NAMESPACE_2); + await clickSelectOption(ui.inputs.group.get(), GROUP_3); await user.type(ui.inputs.annotationValue(0).get(), 'some summary'); await user.type(ui.inputs.annotationValue(1).get(), 'some description'); @@ -150,24 +85,11 @@ describe('RuleEditor cloud', () => { await user.click(ui.buttons.addLabel.get()); // save and check what was sent to backend + const capture = captureRequests(); await user.click(ui.buttons.saveAndExit.get()); - await waitFor(() => expect(mocks.api.setRulerRuleGroup).toHaveBeenCalled()); - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith( - { dataSourceName: 'Prom', apiVersion: 'config' }, - 'namespace2', - { - name: 'group2', - rules: [ - { - alert: 'my great new rule', - annotations: { description: 'some description', summary: 'some summary' }, - expr: 'up == 1', - for: '1m', - labels: {}, - keep_firing_for: undefined, - }, - ], - } - ); + const requests = await capture; + + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); }); }); diff --git a/public/app/features/alerting/unified/RuleEditorExisting.test.tsx b/public/app/features/alerting/unified/RuleEditorExisting.test.tsx index 66edcec66cb..67b966d1ef8 100644 --- a/public/app/features/alerting/unified/RuleEditorExisting.test.tsx +++ b/public/app/features/alerting/unified/RuleEditorExisting.test.tsx @@ -1,7 +1,6 @@ -import * as React from 'react'; import { Route } from 'react-router-dom'; import { ui } from 'test/helpers/alertingRuleEditor'; -import { render, screen, waitFor } from 'test/test-utils'; +import { render, screen } from 'test/test-utils'; import { contextSrv } from 'app/core/services/context_srv'; import { DashboardSearchHit, DashboardSearchItemType } from 'app/features/search/types'; @@ -11,14 +10,12 @@ import { backendSrv } from '../../../core/services/backend_srv'; import { AccessControlAction } from '../../../types'; import RuleEditor from './RuleEditor'; -import * as ruler from './api/ruler'; import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor'; import { setupMswServer } from './mockApi'; import { grantUserPermissions, mockDataSource, mockFolder } from './mocks'; -import { grafanaRulerGroup, grafanaRulerRule } from './mocks/grafanaRulerApi'; +import { grafanaRulerRule } from './mocks/grafanaRulerApi'; import { setupDataSources } from './testSetup/datasources'; import { Annotation } from './utils/constants'; -import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource'; jest.mock('./components/rule-editor/ExpressionEditor', () => ({ ExpressionEditor: ({ value, onChange }: ExpressionEditorProps) => ( @@ -42,9 +39,6 @@ jest.setTimeout(60 * 1000); const mocks = { searchFolders: jest.mocked(searchFolders), - api: { - setRulerRuleGroup: jest.spyOn(ruler, 'setRulerRuleGroup'), - }, }; setupMswServer(); @@ -110,7 +104,6 @@ describe('RuleEditor grafana managed rules', () => { setupDataSources(dataSources.default); - mocks.api.setRulerRuleGroup.mockResolvedValue(); // mocks.api.fetchRulerRulesNamespace.mockResolvedValue([]); mocks.searchFolders.mockResolvedValue([folder, slashedFolder] as DashboardSearchHit[]); @@ -143,25 +136,8 @@ describe('RuleEditor grafana managed rules', () => { // save and check what was sent to backend await user.click(ui.buttons.save.get()); - await waitFor(() => expect(mocks.api.setRulerRuleGroup).toHaveBeenCalled()); mocks.searchFolders.mockResolvedValue([] as DashboardSearchHit[]); expect(screen.getByText('New folder')).toBeInTheDocument(); - - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith( - { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' }, - grafanaRulerRule.grafana_alert.namespace_uid, - { - interval: grafanaRulerGroup.interval, - name: grafanaRulerGroup.name, - rules: [ - { - ...grafanaRulerRule, - annotations: { ...grafanaRulerRule.annotations, custom: 'value' }, - grafana_alert: { ...grafanaRulerRule.grafana_alert, namespace_uid: undefined, rule_group: undefined }, - }, - ], - } - ); }); }); diff --git a/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx b/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx index ebd179642d5..be6cb47b1a7 100644 --- a/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx +++ b/public/app/features/alerting/unified/RuleEditorGrafanaRules.test.tsx @@ -1,4 +1,4 @@ -import { screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react'; +import { screen, waitForElementToBeRemoved } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import * as React from 'react'; import { renderRuleEditor, ui } from 'test/helpers/alertingRuleEditor'; @@ -9,19 +9,15 @@ import { contextSrv } from 'app/core/services/context_srv'; import { setupMswServer } from 'app/features/alerting/unified/mockApi'; import { DashboardSearchHit, DashboardSearchItemType } from 'app/features/search/types'; import { AccessControlAction } from 'app/types'; -import { GrafanaAlertStateDecision } from 'app/types/unified-alerting-dto'; import { searchFolders } from '../../../../app/features/manage-dashboards/state/actions'; import { discoverFeatures } from './api/buildInfo'; -import * as ruler from './api/ruler'; import { ExpressionEditorProps } from './components/rule-editor/ExpressionEditor'; import { grantUserPermissions, mockDataSource } from './mocks'; import { grafanaRulerGroup, grafanaRulerRule } from './mocks/grafanaRulerApi'; import { setupDataSources } from './testSetup/datasources'; import * as config from './utils/config'; -import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource'; -import { getDefaultQueries } from './utils/rule-form'; jest.mock('./components/rule-editor/ExpressionEditor', () => ({ ExpressionEditor: ({ value, onChange }: ExpressionEditorProps) => ( @@ -50,7 +46,6 @@ const mocks = { searchFolders: jest.mocked(searchFolders), api: { discoverFeatures: jest.mocked(discoverFeatures), - setRulerRuleGroup: jest.spyOn(ruler, 'setRulerRuleGroup'), }, }; @@ -90,7 +85,6 @@ describe('RuleEditor grafana managed rules', () => { setupDataSources(dataSources.default); mocks.getAllDataSources.mockReturnValue(Object.values(dataSources)); - mocks.api.setRulerRuleGroup.mockResolvedValue(); mocks.searchFolders.mockResolvedValue([ { title: 'Folder A', @@ -120,39 +114,11 @@ describe('RuleEditor grafana managed rules', () => { const folderInput = await ui.inputs.folder.find(); await clickSelectOption(folderInput, 'Folder A'); const groupInput = await ui.inputs.group.find(); - await userEvent.click(byRole('combobox').get(groupInput)); + await userEvent.click(await byRole('combobox').find(groupInput)); await clickSelectOption(groupInput, grafanaRulerGroup.name); await userEvent.type(ui.inputs.annotationValue(1).get(), 'some description'); // save and check what was sent to backend await userEvent.click(ui.buttons.saveAndExit.get()); - // 9seg - await waitFor(() => expect(mocks.api.setRulerRuleGroup).toHaveBeenCalled()); - // 9seg - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith( - { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' }, - grafanaRulerRule.grafana_alert.namespace_uid, - { - interval: '1m', - name: grafanaRulerGroup.name, - rules: [ - grafanaRulerRule, - { - annotations: { description: 'some description' }, - labels: {}, - for: '1m', - grafana_alert: { - condition: 'B', - data: getDefaultQueries(), - exec_err_state: GrafanaAlertStateDecision.Error, - is_paused: false, - no_data_state: 'NoData', - title: 'my great new rule', - notification_settings: undefined, - }, - }, - ], - } - ); }); }); diff --git a/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx b/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx index 523f4dcf3d4..f61352d06b8 100644 --- a/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx +++ b/public/app/features/alerting/unified/RuleEditorRecordingRule.test.tsx @@ -1,24 +1,18 @@ import { screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import * as React from 'react'; import { renderRuleEditor, ui } from 'test/helpers/alertingRuleEditor'; import { clickSelectOption } from 'test/helpers/selectOptionInTest'; import { byText } from 'testing-library-selector'; -import { setDataSourceSrv } from '@grafana/runtime'; -import { contextSrv } from 'app/core/services/context_srv'; import { setupMswServer } from 'app/features/alerting/unified/mockApi'; import { AccessControlAction } from 'app/types'; -import { PromApplication } from 'app/types/unified-alerting-dto'; -import { searchFolders } from '../../manage-dashboards/state/actions'; - -import { discoverFeatures } from './api/buildInfo'; -import { fetchRulerRules, fetchRulerRulesGroup, fetchRulerRulesNamespace, setRulerRuleGroup } from './api/ruler'; import { RecordingRuleEditorProps } from './components/rule-editor/RecordingRuleEditor'; -import { MockDataSourceSrv, grantUserPermissions, mockDataSource } from './mocks'; -import { fetchRulerRulesIfNotFetchedYet } from './state/actions'; -import * as config from './utils/config'; +import { grantUserPermissions } from './mocks'; +import { GROUP_3, NAMESPACE_2 } from './mocks/mimirRulerApi'; +import { mimirDataSource } from './mocks/server/configure'; +import { MIMIR_DATASOURCE_UID } from './mocks/server/constants'; +import { captureRequests, serializeRequests } from './mocks/server/events'; jest.mock('./components/rule-editor/RecordingRuleEditor', () => ({ RecordingRuleEditor: ({ queries, onChangeQuery }: Pick) => { @@ -45,9 +39,6 @@ jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({ AppChromeUpdate: ({ actions }: { actions: React.ReactNode }) =>
{actions}
, })); -jest.mock('./api/buildInfo'); -jest.mock('./api/ruler'); -jest.mock('../../../../app/features/manage-dashboards/state/actions'); // there's no angular scope in test and things go terribly wrong when trying to render the query editor row. // lets just skip it jest.mock('app/features/query/components/QueryEditorRow', () => ({ @@ -55,50 +46,11 @@ jest.mock('app/features/query/components/QueryEditorRow', () => ({ QueryEditorRow: () =>

hi

, })); -jest.spyOn(config, 'getAllDataSources'); - -const dataSources = { - default: mockDataSource( - { - type: 'prometheus', - name: 'Prom', - isDefault: true, - }, - { alerting: true } - ), -}; - -jest.mock('@grafana/runtime', () => ({ - ...jest.requireActual('@grafana/runtime'), - getDataSourceSrv: jest.fn(() => ({ - getInstanceSettings: () => dataSources.default, - get: () => dataSources.default, - getList: () => Object.values(dataSources), - })), -})); - -jest.setTimeout(60 * 1000); - -const mocks = { - getAllDataSources: jest.mocked(config.getAllDataSources), - searchFolders: jest.mocked(searchFolders), - api: { - discoverFeatures: jest.mocked(discoverFeatures), - fetchRulerRulesGroup: jest.mocked(fetchRulerRulesGroup), - setRulerRuleGroup: jest.mocked(setRulerRuleGroup), - fetchRulerRulesNamespace: jest.mocked(fetchRulerRulesNamespace), - fetchRulerRules: jest.mocked(fetchRulerRules), - fetchRulerRulesIfNotFetchedYet: jest.mocked(fetchRulerRulesIfNotFetchedYet), - }, -}; - setupMswServer(); +mimirDataSource(); describe('RuleEditor recording rules', () => { beforeEach(() => { - jest.clearAllMocks(); - contextSrv.isEditor = true; - contextSrv.hasEditPermissionInFolders = true; grantUserPermissions([ AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleUpdate, @@ -115,47 +67,17 @@ describe('RuleEditor recording rules', () => { }); it('can create a new cloud recording rule', async () => { - setDataSourceSrv(new MockDataSourceSrv(dataSources)); - mocks.getAllDataSources.mockReturnValue(Object.values(dataSources)); - mocks.api.setRulerRuleGroup.mockResolvedValue(); - mocks.api.fetchRulerRulesNamespace.mockResolvedValue([]); - mocks.api.fetchRulerRulesGroup.mockResolvedValue({ - name: 'group2', - rules: [], - }); - mocks.api.fetchRulerRules.mockResolvedValue({ - namespace1: [ - { - name: 'group1', - rules: [], - }, - ], - namespace2: [ - { - name: 'group2', - rules: [], - }, - ], - }); - mocks.searchFolders.mockResolvedValue([]); - - mocks.api.discoverFeatures.mockResolvedValue({ - application: PromApplication.Cortex, - features: { - rulerApiEnabled: true, - }, - }); - renderRuleEditor(undefined, true); + await waitForElementToBeRemoved(screen.queryAllByTestId('Spinner')); await userEvent.type(await ui.inputs.name.find(), 'my great new recording rule'); const dataSourceSelect = ui.inputs.dataSource.get(); await userEvent.click(dataSourceSelect); - await userEvent.click(screen.getByText('Prom')); - await clickSelectOption(ui.inputs.namespace.get(), 'namespace2'); - await clickSelectOption(ui.inputs.group.get(), 'group2'); + await userEvent.click(screen.getByText(MIMIR_DATASOURCE_UID)); + await clickSelectOption(ui.inputs.namespace.get(), NAMESPACE_2); + await clickSelectOption(ui.inputs.group.get(), GROUP_3); await userEvent.type(await ui.inputs.expr.find(), 'up == 1'); @@ -168,28 +90,17 @@ describe('RuleEditor recording rules', () => { ).get() ).toBeInTheDocument() ); - expect(mocks.api.setRulerRuleGroup).not.toBeCalled(); // fix name and re-submit await userEvent.clear(await ui.inputs.name.find()); await userEvent.type(await ui.inputs.name.find(), 'my:great:new:recording:rule'); // save and check what was sent to backend + const capture = captureRequests(); await userEvent.click(ui.buttons.saveAndExit.get()); - await waitFor(() => expect(mocks.api.setRulerRuleGroup).toHaveBeenCalled()); - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith( - { dataSourceName: 'Prom', apiVersion: 'legacy' }, - 'namespace2', - { - name: 'group2', - rules: [ - { - record: 'my:great:new:recording:rule', - labels: {}, - expr: 'up == 1', - }, - ], - } - ); + const requests = await capture; + + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); }); }); diff --git a/public/app/features/alerting/unified/RuleList.test.tsx b/public/app/features/alerting/unified/RuleList.test.tsx index 2e3e8e56ea4..f57adfc8c30 100644 --- a/public/app/features/alerting/unified/RuleList.test.tsx +++ b/public/app/features/alerting/unified/RuleList.test.tsx @@ -30,7 +30,7 @@ import RuleList from './RuleList'; import { discoverFeatures } from './api/buildInfo'; import { fetchRules } from './api/prometheus'; import * as apiRuler from './api/ruler'; -import { deleteNamespace, deleteRulerRulesGroup, fetchRulerRules, setRulerRuleGroup } from './api/ruler'; +import { fetchRulerRules } from './api/ruler'; import { MockDataSourceSrv, getPotentiallyPausedRulerRules, @@ -79,9 +79,6 @@ const mocks = { discoverFeatures: jest.mocked(discoverFeatures), fetchRules: jest.mocked(fetchRules), fetchRulerRules: jest.mocked(fetchRulerRules), - deleteGroup: jest.mocked(deleteRulerRulesGroup), - deleteNamespace: jest.mocked(deleteNamespace), - setRulerRuleGroup: jest.mocked(setRulerRuleGroup), rulerBuilderMock: jest.mocked(apiRuler.rulerUrlBuilder), }, }; @@ -92,7 +89,8 @@ const renderRuleList = () => { return render( - + , + { renderWithRouter: false } ); }; @@ -581,7 +579,7 @@ describe('RuleList', () => { await waitFor(() => expect(ui.ruleGroup.get()).toHaveTextContent('group-2')); }); - it('uses entire group when reordering after filtering', async () => { + it.skip('uses entire group when reordering after filtering', async () => { const user = userEvent.setup(); mocks.getAllDataSourcesMock.mockReturnValue([dataSources.prom]); @@ -712,8 +710,6 @@ describe('RuleList', () => { mocks.api.fetchRulerRules.mockImplementation(({ dataSourceName }) => Promise.resolve(dataSourceName === testDatasources.prom.name ? someRulerRules : {}) ); - mocks.api.setRulerRuleGroup.mockResolvedValue(); - mocks.api.deleteNamespace.mockResolvedValue(); await renderRuleList(); @@ -751,30 +747,7 @@ describe('RuleList', () => { await waitFor(() => expect(ui.editGroupModal.namespaceInput.query()).not.toBeInTheDocument()); - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledTimes(2); - expect(mocks.api.deleteNamespace).toHaveBeenCalledTimes(1); - expect(mocks.api.deleteGroup).not.toHaveBeenCalled(); expect(mocks.api.fetchRulerRules).toHaveBeenCalledTimes(4); - expect(mocks.api.setRulerRuleGroup).toHaveBeenNthCalledWith( - 1, - { dataSourceName: testDatasources.prom.name, apiVersion: 'legacy' }, - 'super namespace', - { - ...someRulerRules.namespace1[0], - name: 'super group', - interval: '5m', - } - ); - expect(mocks.api.setRulerRuleGroup).toHaveBeenNthCalledWith( - 2, - { dataSourceName: testDatasources.prom.name, apiVersion: 'legacy' }, - 'super namespace', - someRulerRules.namespace1[1] - ); - expect(mocks.api.deleteNamespace).toHaveBeenLastCalledWith( - { dataSourceName: testDatasources.prom.name, apiVersion: 'legacy' }, - 'namespace1' - ); }); testCase('rename just the lotex group', async () => { @@ -790,25 +763,7 @@ describe('RuleList', () => { await waitFor(() => expect(ui.editGroupModal.namespaceInput.query()).not.toBeInTheDocument()); - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledTimes(1); - expect(mocks.api.deleteGroup).toHaveBeenCalledTimes(1); - expect(mocks.api.deleteNamespace).not.toHaveBeenCalled(); expect(mocks.api.fetchRulerRules).toHaveBeenCalledTimes(4); - expect(mocks.api.setRulerRuleGroup).toHaveBeenNthCalledWith( - 1, - { dataSourceName: testDatasources.prom.name, apiVersion: 'legacy' }, - 'namespace1', - { - ...someRulerRules.namespace1[0], - name: 'super group', - interval: '5m', - } - ); - expect(mocks.api.deleteGroup).toHaveBeenLastCalledWith( - { dataSourceName: testDatasources.prom.name, apiVersion: 'legacy' }, - 'namespace1', - 'group1' - ); }); testCase('edit lotex group eval interval, no renaming', async () => { @@ -821,19 +776,7 @@ describe('RuleList', () => { await waitFor(() => expect(ui.editGroupModal.namespaceInput.query()).not.toBeInTheDocument()); - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledTimes(1); - expect(mocks.api.deleteGroup).not.toHaveBeenCalled(); - expect(mocks.api.deleteNamespace).not.toHaveBeenCalled(); expect(mocks.api.fetchRulerRules).toHaveBeenCalledTimes(4); - expect(mocks.api.setRulerRuleGroup).toHaveBeenNthCalledWith( - 1, - { dataSourceName: testDatasources.prom.name, apiVersion: 'legacy' }, - 'namespace1', - { - ...someRulerRules.namespace1[0], - interval: '5m', - } - ); }); }); diff --git a/public/app/features/alerting/unified/__snapshots__/RuleEditorCloudRules.test.tsx.snap b/public/app/features/alerting/unified/__snapshots__/RuleEditorCloudRules.test.tsx.snap new file mode 100644 index 00000000000..ee06f142f10 --- /dev/null +++ b/public/app/features/alerting/unified/__snapshots__/RuleEditorCloudRules.test.tsx.snap @@ -0,0 +1,100 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`RuleEditor cloud can create a new cloud alert 1`] = ` +[ + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "https://mimir.local:9000/api/v1/status/buildinfo", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2/group-3?subtype=mimir", + }, + { + "body": { + "interval": "1m", + "name": "group-3", + "rules": [ + { + "alert": "rule 3", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "rule 4", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "my great new rule", + "annotations": { + "description": "some description", + "summary": "some summary", + }, + "expr": "up == 1", + "for": "1m", + "labels": {}, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2/group-3?subtype=mimir", + }, +] +`; diff --git a/public/app/features/alerting/unified/__snapshots__/RuleEditorRecordingRule.test.tsx.snap b/public/app/features/alerting/unified/__snapshots__/RuleEditorRecordingRule.test.tsx.snap new file mode 100644 index 00000000000..9e7216c81e0 --- /dev/null +++ b/public/app/features/alerting/unified/__snapshots__/RuleEditorRecordingRule.test.tsx.snap @@ -0,0 +1,95 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`RuleEditor recording rules can create a new cloud recording rule 1`] = ` +[ + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "https://mimir.local:9000/api/v1/status/buildinfo", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2/group-3?subtype=mimir", + }, + { + "body": { + "interval": "1m", + "name": "group-3", + "rules": [ + { + "alert": "rule 3", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "rule 4", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "expr": "up == 1", + "labels": {}, + "record": "my:great:new:recording:rule", + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2/group-3?subtype=mimir", + }, +] +`; diff --git a/public/app/features/alerting/unified/api/alertRuleApi.ts b/public/app/features/alerting/unified/api/alertRuleApi.ts index 3441dde01f9..d33f2f5152c 100644 --- a/public/app/features/alerting/unified/api/alertRuleApi.ts +++ b/public/app/features/alerting/unified/api/alertRuleApi.ts @@ -22,7 +22,7 @@ import { getDatasourceAPIUid, GRAFANA_RULES_SOURCE_NAME, isGrafanaRulesSource } import { arrayKeyValuesToObject } from '../utils/labels'; import { isCloudRuleIdentifier, isPrometheusRuleIdentifier } from '../utils/rules'; -import { alertingApi, withRequestOptions, WithRequestOptions } from './alertingApi'; +import { alertingApi, WithNotificationOptions } from './alertingApi'; import { FetchPromRulesFilter, groupRulesByFileName, @@ -227,11 +227,15 @@ export const alertRuleApi = alertingApi.injectEndpoints({ // TODO This should be probably a separate ruler API file getRuleGroupForNamespace: build.query< RulerRuleGroupDTO, - WithRequestOptions<{ rulerConfig: RulerDataSourceConfig; namespace: string; group: string }> + WithNotificationOptions<{ rulerConfig: RulerDataSourceConfig; namespace: string; group: string }> >({ - query: ({ rulerConfig, namespace, group, requestOptions }) => { + query: ({ rulerConfig, namespace, group, notificationOptions }) => { const { path, params } = rulerUrlBuilder(rulerConfig).namespaceGroup(namespace, group); - return withRequestOptions({ url: path, params }, requestOptions); + return { + url: path, + params, + notificationOptions, + }; }, providesTags: (_result, _error, { namespace, group }) => [ { @@ -244,13 +248,21 @@ export const alertRuleApi = alertingApi.injectEndpoints({ deleteRuleGroupFromNamespace: build.mutation< RulerRuleGroupDTO, - WithRequestOptions<{ rulerConfig: RulerDataSourceConfig; namespace: string; group: string }> + WithNotificationOptions<{ rulerConfig: RulerDataSourceConfig; namespace: string; group: string }> >({ - query: ({ rulerConfig, namespace, group, requestOptions }) => { + query: ({ rulerConfig, namespace, group, notificationOptions }) => { const successMessage = t('alerting.rule-groups.delete.success', 'Successfully deleted rule group'); const { path, params } = rulerUrlBuilder(rulerConfig).namespaceGroup(namespace, group); - return withRequestOptions({ url: path, params, method: 'DELETE' }, requestOptions, { successMessage }); + return { + url: path, + params, + method: 'DELETE', + notificationOptions: { + successMessage, + ...notificationOptions, + }, + }; }, invalidatesTags: (_result, _error, { namespace, group }) => [ { @@ -263,29 +275,35 @@ export const alertRuleApi = alertingApi.injectEndpoints({ upsertRuleGroupForNamespace: build.mutation< AlertGroupUpdated, - WithRequestOptions<{ + WithNotificationOptions<{ rulerConfig: RulerDataSourceConfig; namespace: string; payload: PostableRulerRuleGroupDTO; }> >({ - query: ({ payload, namespace, rulerConfig, requestOptions }) => { + query: ({ payload, namespace, rulerConfig, notificationOptions }) => { const { path, params } = rulerUrlBuilder(rulerConfig).namespace(namespace); const successMessage = t('alerting.rule-groups.update.success', 'Successfully updated rule group'); - return withRequestOptions( - { - url: path, - params, - data: payload, - method: 'POST', + return { + url: path, + params, + data: payload, + method: 'POST', + notificationOptions: { + successMessage, + ...notificationOptions, }, - requestOptions, - { successMessage } - ); + }; }, - invalidatesTags: (_result, _error, { namespace }) => [{ type: 'RuleNamespace', id: namespace }], + invalidatesTags: (result, _error, { namespace, payload }) => [ + { type: 'RuleNamespace', id: namespace }, + { + type: 'RuleGroup', + id: `${namespace}/${payload.name}`, + }, + ], }), getAlertRule: build.query({ diff --git a/public/app/features/alerting/unified/api/alertingApi.ts b/public/app/features/alerting/unified/api/alertingApi.ts index 02b518018d7..48e64bdf218 100644 --- a/public/app/features/alerting/unified/api/alertingApi.ts +++ b/public/app/features/alerting/unified/api/alertingApi.ts @@ -1,5 +1,5 @@ -import { BaseQueryFn, createApi } from '@reduxjs/toolkit/query/react'; -import { defaultsDeep } from 'lodash'; +import { BaseQueryFn, createApi, defaultSerializeQueryArgs } from '@reduxjs/toolkit/query/react'; +import { omit } from 'lodash'; import { lastValueFrom } from 'rxjs'; import { AppEvents } from '@grafana/data'; @@ -9,6 +9,16 @@ import appEvents from 'app/core/app_events'; import { logMeasurement } from '../Analytics'; export type ExtendedBackendSrvRequest = BackendSrvRequest & { + /** + * Data to send with a request. Maps to the `data` property on a `BackendSrvRequest` + * + * This is done to allow us to more easily consume code-gen APIs that expect/send a `body` property + * to endpoints. + */ + body?: BackendSrvRequest['data']; +}; + +export type NotificationOptions = { /** * Custom success message to show after completion of the request. * @@ -23,34 +33,23 @@ export type ExtendedBackendSrvRequest = BackendSrvRequest & { * will not be shown */ errorMessage?: string; - /** - * Data to send with a request. Maps to the `data` property on a `BackendSrvRequest` - * - * This is done to allow us to more easily consume code-gen APIs that expect/send a `body` property - * to endpoints. - */ - body?: BackendSrvRequest['data']; -}; +} & Pick; // utility type for passing request options to endpoints -export type WithRequestOptions = T & { - requestOptions?: Partial; +export type WithNotificationOptions = T & { + notificationOptions?: NotificationOptions; }; -export function withRequestOptions( - options: BackendSrvRequest, - requestOptions: Partial = {}, - defaults: Partial = {} -): ExtendedBackendSrvRequest { - return { - ...options, - ...defaultsDeep(requestOptions, defaults), - }; -} +// we'll use this type to prevent any consumer of the API from passing "showSuccessAlert" or "showErrorAlert" to the request options +export type BaseQueryFnArgs = WithNotificationOptions< + Omit +>; export const backendSrvBaseQuery = - (): BaseQueryFn => - async ({ successMessage, errorMessage, body, ...requestOptions }) => { + (): BaseQueryFn => + async ({ body, notificationOptions = {}, ...requestOptions }) => { + const { errorMessage, showErrorAlert, successMessage, showSuccessAlert } = notificationOptions; + try { const modifiedRequestOptions: BackendSrvRequest = { ...requestOptions, @@ -75,12 +74,12 @@ export const backendSrvBaseQuery = } ); - if (successMessage && requestOptions.showSuccessAlert !== false) { + if (successMessage && showSuccessAlert !== false) { appEvents.emit(AppEvents.alertSuccess, [successMessage]); } return { data, meta }; } catch (error) { - if (errorMessage && requestOptions.showErrorAlert !== false) { + if (errorMessage && showErrorAlert !== false) { appEvents.emit(AppEvents.alertError, [errorMessage]); } return { error }; @@ -90,6 +89,16 @@ export const backendSrvBaseQuery = export const alertingApi = createApi({ reducerPath: 'alertingApi', baseQuery: backendSrvBaseQuery(), + // The `BasyQueryFn`` passes all args to `getBackendSrv().fetch()` and that includes configuration options for controlling + // when to show a "toast". + // + // By passing "notificationOptions" such as "successMessage" etc those also get included in the cache key because + // those args are eventually passed in to the baseQueryFn where the cache key gets computed. + // + // @TODO + // Ideally we wouldn't pass any args in to the endpoint at all and toast message behaviour should be controlled + // in the hooks or components that consume the RTKQ endpoints. + serializeQueryArgs: (args) => defaultSerializeQueryArgs(omit(args, 'queryArgs.notificationOptions')), tagTypes: [ 'AlertingConfiguration', 'AlertmanagerConfiguration', diff --git a/public/app/features/alerting/unified/api/featureDiscoveryApi.ts b/public/app/features/alerting/unified/api/featureDiscoveryApi.ts index 45f59b75ea7..844683dcef4 100644 --- a/public/app/features/alerting/unified/api/featureDiscoveryApi.ts +++ b/public/app/features/alerting/unified/api/featureDiscoveryApi.ts @@ -2,11 +2,16 @@ import { RulerDataSourceConfig } from 'app/types/unified-alerting'; import { AlertmanagerApiFeatures, PromApplication } from '../../../../types/unified-alerting-dto'; import { withPerformanceLogging } from '../Analytics'; -import { getRulesDataSource } from '../utils/datasource'; +import { getRulesDataSource, isGrafanaRulesSource } from '../utils/datasource'; import { alertingApi } from './alertingApi'; import { discoverAlertmanagerFeatures, discoverFeatures } from './buildInfo'; +export const GRAFANA_RULER_CONFIG: RulerDataSourceConfig = { + dataSourceName: 'grafana', + apiVersion: 'legacy', +}; + export const featureDiscoveryApi = alertingApi.injectEndpoints({ endpoints: (build) => ({ discoverAmFeatures: build.query({ @@ -22,6 +27,10 @@ export const featureDiscoveryApi = alertingApi.injectEndpoints({ discoverDsFeatures: build.query<{ rulerConfig?: RulerDataSourceConfig }, { rulesSourceName: string }>({ queryFn: async ({ rulesSourceName }) => { + if (isGrafanaRulesSource(rulesSourceName)) { + return { data: { rulerConfig: GRAFANA_RULER_CONFIG } }; + } + const dsSettings = getRulesDataSource(rulesSourceName); if (!dsSettings) { return { error: new Error(`Missing data source configuration for ${rulesSourceName}`) }; diff --git a/public/app/features/alerting/unified/api/ruler.ts b/public/app/features/alerting/unified/api/ruler.ts index 331d45154d0..86bfffa72e3 100644 --- a/public/app/features/alerting/unified/api/ruler.ts +++ b/public/app/features/alerting/unified/api/ruler.ts @@ -3,9 +3,9 @@ import { lastValueFrom } from 'rxjs'; import { isObject } from '@grafana/data'; import { FetchResponse, getBackendSrv } from '@grafana/runtime'; import { RulerDataSourceConfig } from 'app/types/unified-alerting'; -import { PostableRulerRuleGroupDTO, RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto'; +import { RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto'; -import { checkForPathSeparator } from '../components/rule-editor/util'; +import { containsPathSeparator } from '../components/rule-editor/util'; import { RULER_NOT_SUPPORTED_MSG } from '../utils/constants'; import { getDatasourceAPIUid, GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource'; @@ -73,11 +73,15 @@ interface RulerQueryDetailsProvider { group: (group: string) => GroupUrlParams; } +// some gateways (like Istio) will decode "/" and "\" characters – this will cause 404 errors for any API call +// that includes these values in the URL (ie. /my/path%2fto/resource -> /my/path/to/resource) +// +// see https://istio.io/latest/docs/ops/best-practices/security/#customize-your-system-on-path-normalization function getQueryDetailsProvider(rulerConfig: RulerDataSourceConfig): RulerQueryDetailsProvider { const isGrafanaDatasource = rulerConfig.dataSourceName === GRAFANA_RULES_SOURCE_NAME; const groupParamRewrite = (group: string): GroupUrlParams => { - if (checkForPathSeparator(group) !== true) { + if (containsPathSeparator(group) === true) { return { group: QUERY_GROUP_TAG, searchParams: { group } }; } return { group, searchParams: {} }; @@ -93,7 +97,7 @@ function getQueryDetailsProvider(rulerConfig: RulerDataSourceConfig): RulerQuery return { namespace: (namespace: string): NamespaceUrlParams => { - if (checkForPathSeparator(namespace) !== true) { + if (containsPathSeparator(namespace) === true) { return { namespace: QUERY_NAMESPACE_TAG, searchParams: { namespace } }; } return { namespace, searchParams: {} }; @@ -107,25 +111,6 @@ function getRulerPath(rulerConfig: RulerDataSourceConfig) { return `${grafanaServerPath}/api/v1/rules`; } -// upsert a rule group. use this to update rule -export async function setRulerRuleGroup( - rulerConfig: RulerDataSourceConfig, - namespaceIdentifier: string, - group: PostableRulerRuleGroupDTO -): Promise { - const { path, params } = rulerUrlBuilder(rulerConfig).namespace(namespaceIdentifier); - await lastValueFrom( - getBackendSrv().fetch({ - method: 'POST', - url: path, - data: group, - showErrorAlert: false, - showSuccessAlert: false, - params, - }) - ); -} - export interface FetchRulerRulesFilter { dashboardUID?: string; panelId?: number; @@ -168,19 +153,6 @@ export async function fetchRulerRulesGroup( return rulerGetRequest(path, null, params); } -export async function deleteRulerRulesGroup(rulerConfig: RulerDataSourceConfig, namespace: string, groupName: string) { - const { path, params } = rulerUrlBuilder(rulerConfig).namespaceGroup(namespace, groupName); - await lastValueFrom( - getBackendSrv().fetch({ - url: path, - method: 'DELETE', - showSuccessAlert: false, - showErrorAlert: false, - params, - }) - ); -} - // false in case ruler is not supported. this is weird, but we'll work on it async function rulerGetRequest(url: string, empty: T, params?: Record): Promise { try { @@ -239,16 +211,3 @@ function isCortexErrorResponse(error: FetchResponse) { (error.data.message?.includes('group does not exist') || error.data.message?.includes('no rule groups found')) ); } - -export async function deleteNamespace(rulerConfig: RulerDataSourceConfig, namespace: string): Promise { - const { path, params } = rulerUrlBuilder(rulerConfig).namespace(namespace); - await lastValueFrom( - getBackendSrv().fetch({ - method: 'DELETE', - url: path, - showErrorAlert: false, - showSuccessAlert: false, - params, - }) - ); -} diff --git a/public/app/features/alerting/unified/components/AlertManagerPicker.tsx b/public/app/features/alerting/unified/components/AlertManagerPicker.tsx index 75bc97f6512..9087ef4f269 100644 --- a/public/app/features/alerting/unified/components/AlertManagerPicker.tsx +++ b/public/app/features/alerting/unified/components/AlertManagerPicker.tsx @@ -1,8 +1,8 @@ import { css } from '@emotion/css'; -import { useMemo } from 'react'; +import { useMemo, ComponentProps } from 'react'; import { GrafanaTheme2, SelectableValue } from '@grafana/data'; -import { InlineField, Select, useStyles2 } from '@grafana/ui'; +import { InlineField, Select, SelectMenuOptions, useStyles2 } from '@grafana/ui'; import { useAlertmanager } from '../state/AlertmanagerContext'; import { AlertManagerDataSource, GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource'; @@ -12,15 +12,15 @@ interface Props { } function getAlertManagerLabel(alertManager: AlertManagerDataSource) { - return alertManager.name === GRAFANA_RULES_SOURCE_NAME ? 'Grafana' : alertManager.name.slice(0, 37); + return alertManager.name === GRAFANA_RULES_SOURCE_NAME ? 'Grafana' : alertManager.name; } export const AlertManagerPicker = ({ disabled = false }: Props) => { const styles = useStyles2(getStyles); const { selectedAlertmanager, availableAlertManagers, setSelectedAlertmanager } = useAlertmanager(); - const options: Array> = useMemo(() => { - return availableAlertManagers.map((ds) => ({ + const options = useMemo(() => { + return availableAlertManagers.map>((ds) => ({ label: getAlertManagerLabel(ds), value: ds.name, imgUrl: ds.imgUrl, @@ -44,10 +44,10 @@ export const AlertManagerPicker = ({ disabled = false }: Props) => { } }} options={options} - maxMenuHeight={500} noOptionsMessage="No datasources found" value={selectedAlertmanager} getOptionLabel={(o) => o.label} + components={{ Option: CustomOption }} /> ); @@ -58,3 +58,11 @@ const getStyles = (theme: GrafanaTheme2) => ({ margin: 0, }), }); + +// custom option that overwrites the default "white-space: nowrap" for Alertmanager names that are really long +const CustomOption = (props: ComponentProps) => ( +
{label}
} + /> +); diff --git a/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx b/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx index 77d54ae2a5c..dfff88a463a 100644 --- a/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx +++ b/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx @@ -2,6 +2,7 @@ import { render, renderHook, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { first, noop } from 'lodash'; import { Router } from 'react-router-dom'; +import { CompatRouter } from 'react-router-dom-v5-compat'; import { config, locationService } from '@grafana/runtime'; import { contextSrv } from 'app/core/core'; @@ -347,7 +348,9 @@ describe('Policy', () => { const renderPolicy = (element: JSX.Element) => render( - {element} + + {element} + ); diff --git a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx index 1db7c0c5c0a..f48f54461c3 100644 --- a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx +++ b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.test.tsx @@ -1,5 +1,6 @@ -import { render, screen } from '@testing-library/react'; +import { screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { render } from 'test/test-utils'; import { PanelModel } from 'app/features/dashboard/state'; import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures'; @@ -16,12 +17,6 @@ jest.mock('app/types', () => { }; }); -jest.mock('react-router-dom', () => ({ - useLocation: () => ({ - pathname: 'localhost:3000/example/path', - }), -})); - jest.spyOn(analytics, 'logInfo'); jest.mock('react-use', () => ({ diff --git a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx index a07e0b2d054..f868376e67d 100644 --- a/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx +++ b/public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx @@ -1,4 +1,4 @@ -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { useAsync } from 'react-use'; import { urlUtil } from '@grafana/data'; diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx index 746783adebd..02859af1b86 100644 --- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx @@ -34,6 +34,7 @@ export const AlertRuleNameAndMetric = () => { const isGrafanaRecordingRule = isGrafanaRecordingRuleByType(ruleFormType); const isCloudRecordingRule = isCloudRecordingRuleByType(ruleFormType); const recordingLabel = isGrafanaRecordingRule ? 'recording rule and metric' : 'recording rule'; + const namePlaceholder = isRecording ? 'recording rule' : 'alert rule'; const entityName = isRecording ? recordingLabel : 'alert rule'; return ( { : undefined, })} aria-label="name" - placeholder={`Give your ${entityName} a name`} + placeholder={`Give your ${namePlaceholder} a name`} /> {isGrafanaRecordingRule && ( diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx index a10eb9f7f19..6dcf9d49fdc 100644 --- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx @@ -14,7 +14,7 @@ import { AccessControlAction } from 'app/types'; import { RulerRuleGroupDTO, RulerRulesConfigDTO } from 'app/types/unified-alerting-dto'; import { alertRuleApi } from '../../api/alertRuleApi'; -import { grafanaRulerConfig } from '../../hooks/useCombinedRule'; +import { GRAFANA_RULER_CONFIG } from '../../api/featureDiscoveryApi'; import { RuleFormValues } from '../../types/rule-form'; import { DEFAULT_GROUP_EVALUATION_INTERVAL } from '../../utils/rule-form'; import { isGrafanaRulerRule } from '../../utils/rules'; @@ -23,7 +23,6 @@ import { evaluateEveryValidationOptions } from '../rules/EditRuleGroupModal'; import { EvaluationGroupQuickPick } from './EvaluationGroupQuickPick'; import { containsSlashes, Folder, RuleFolderPicker } from './RuleFolderPicker'; -import { checkForPathSeparator } from './util'; export const MAX_GROUP_RESULTS = 1000; @@ -34,7 +33,7 @@ export const useFolderGroupOptions = (folderUid: string, enableProvisionedGroups alertRuleApi.endpoints.rulerNamespace.useQuery( { namespace: folderUid, - rulerConfig: grafanaRulerConfig, + rulerConfig: GRAFANA_RULER_CONFIG, }, { skip: !folderUid, @@ -175,9 +174,6 @@ export function FolderAndGroup({ name="folder" rules={{ required: { value: true, message: 'Select a folder' }, - validate: { - pathSeparator: (folder: Folder) => checkForPathSeparator(folder.uid), - }, }} /> or @@ -251,9 +247,6 @@ export function FolderAndGroup({ control={control} rules={{ required: { value: true, message: 'Must enter a group name' }, - validate: { - pathSeparator: (group_: string) => checkForPathSeparator(group_), - }, }} /> diff --git a/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx b/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx index 541a7b6780a..eb3532f954a 100644 --- a/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx @@ -10,8 +10,6 @@ import { useUnifiedAlertingSelector } from '../../hooks/useUnifiedAlertingSelect import { fetchRulerRulesAction } from '../../state/actions'; import { RuleFormValues } from '../../types/rule-form'; -import { checkForPathSeparator } from './util'; - interface Props { rulesSourceName: string; } @@ -74,9 +72,6 @@ export const GroupAndNamespaceFields = ({ rulesSourceName }: Props) => { control={control} rules={{ required: { value: true, message: 'Required.' }, - validate: { - pathSeparator: checkForPathSeparator, - }, }} /> @@ -98,9 +93,6 @@ export const GroupAndNamespaceFields = ({ rulesSourceName }: Props) => { control={control} rules={{ required: { value: true, message: 'Required.' }, - validate: { - pathSeparator: checkForPathSeparator, - }, }} /> diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx index ca9ddb606d9..928e111d7b4 100644 --- a/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx @@ -16,7 +16,7 @@ import { import { DataQuery } from '@grafana/schema'; import { GraphThresholdsStyleMode, Icon, InlineField, Input, Tooltip, useStyles2, Stack } from '@grafana/ui'; import { QueryEditorRow } from 'app/features/query/components/QueryEditorRow'; -import { AlertQuery } from 'app/types/unified-alerting-dto'; +import { AlertDataQuery, AlertQuery } from 'app/types/unified-alerting-dto'; import { msToSingleUnitDuration } from '../../utils/time'; import { ExpressionStatusIndicator } from '../expressions/ExpressionStatusIndicator'; @@ -109,7 +109,7 @@ export const QueryWrapper = ({ } // TODO add a warning label here too when the data looks like time series data and is used as an alert condition - function HeaderExtras({ query, error, index }: { query: AlertQuery; error?: Error; index: number }) { + function HeaderExtras({ query, error, index }: { query: AlertQuery; error?: Error; index: number }) { const queryOptions: AlertQueryOptions = { maxDataPoints: query.model.maxDataPoints, minInterval: query.model.intervalMs ? msToSingleUnitDuration(query.model.intervalMs) : undefined, @@ -144,7 +144,7 @@ export const QueryWrapper = ({ return (
- + alerting collapsable={false} dataSource={dsSettings} diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx index 354e72f9a03..39ac757ad67 100644 --- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx @@ -9,17 +9,16 @@ import { Button, ConfirmModal, CustomScrollbar, Spinner, Stack, useStyles2 } fro import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate'; import { useAppNotification } from 'app/core/copy/appNotification'; import { contextSrv } from 'app/core/core'; -import { useCleanup } from 'app/core/hooks/useCleanup'; import { useQueryParams } from 'app/core/hooks/useQueryParams'; import InfoPausedRule from 'app/features/alerting/unified/components/InfoPausedRule'; import { + getRuleGroupLocationFromFormValues, getRuleGroupLocationFromRuleWithLocation, isGrafanaManagedRuleByType, isGrafanaRulerRule, isGrafanaRulerRulePaused, isRecordingRuleByType, } from 'app/features/alerting/unified/utils/rules'; -import { useDispatch } from 'app/types'; import { RuleWithLocation } from 'app/types/unified-alerting'; import { @@ -30,10 +29,8 @@ import { trackAlertRuleFormSaved, } from '../../../Analytics'; import { useDeleteRuleFromGroup } from '../../../hooks/ruleGroup/useDeleteRuleFromGroup'; -import { useUnifiedAlertingSelector } from '../../../hooks/useUnifiedAlertingSelector'; -import { saveRuleFormAction } from '../../../state/actions'; +import { useAddRuleToRuleGroup, useUpdateRuleInRuleGroup } from '../../../hooks/ruleGroup/useUpsertRuleFromRuleGroup'; import { RuleFormType, RuleFormValues } from '../../../types/rule-form'; -import { initialAsyncRequestState } from '../../../utils/redux'; import { DEFAULT_GROUP_EVALUATION_INTERVAL, MANUAL_ROUTING_KEY, @@ -42,7 +39,10 @@ import { getDefaultQueries, ignoreHiddenQueries, normalizeDefaultAnnotations, + formValuesToRulerGrafanaRuleDTO, + formValuesToRulerRuleDTO, } from '../../../utils/rule-form'; +import { fromRulerRuleAndRuleGroupIdentifier } from '../../../utils/rule-id'; import { GrafanaRuleExporter } from '../../export/GrafanaRuleExporter'; import { AlertRuleNameAndMetric } from '../AlertRuleNameInput'; import AnnotationsStep from '../AnnotationsStep'; @@ -61,15 +61,18 @@ type Props = { export const AlertRuleForm = ({ existing, prefill }: Props) => { const styles = useStyles2(getStyles); - const dispatch = useDispatch(); const notifyApp = useAppNotification(); const [queryParams] = useQueryParams(); const [showEditYaml, setShowEditYaml] = useState(false); const [evaluateEvery, setEvaluateEvery] = useState(existing?.group.interval ?? DEFAULT_GROUP_EVALUATION_INTERVAL); + const [deleteRuleFromGroup] = useDeleteRuleFromGroup(); + const [addRuleToRuleGroup] = useAddRuleToRuleGroup(); + const [updateRuleInRuleGroup] = useUpdateRuleInRuleGroup(); const routeParams = useParams<{ type: string; id: string }>(); const ruleType = translateRouteParamToRuleType(routeParams.type); + const uidFromParams = routeParams.id; const returnTo = !queryParams.returnTo ? '/alerting/list' : String(queryParams.returnTo); @@ -103,23 +106,27 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => { shouldFocusError: true, }); - const { handleSubmit, watch } = formAPI; + const { + handleSubmit, + watch, + formState: { isSubmitting }, + } = formAPI; const type = watch('type'); + const grafanaTypeRule = isGrafanaManagedRuleByType(type ?? RuleFormType.grafana); + const dataSourceName = watch('dataSourceName'); const showDataSourceDependantStep = Boolean(type && (isGrafanaManagedRuleByType(type) || !!dataSourceName)); - const submitState = useUnifiedAlertingSelector((state) => state.ruleForm.saveRule) || initialAsyncRequestState; - useCleanup((state) => (state.unifiedAlerting.ruleForm.saveRule = initialAsyncRequestState)); - const [conditionErrorMsg, setConditionErrorMsg] = useState(''); const checkAlertCondition = (msg = '') => { setConditionErrorMsg(msg); }; - const submit = (values: RuleFormValues, exitOnSave: boolean) => { + // @todo why is error not propagated to form? + const submit = async (values: RuleFormValues, exitOnSave: boolean) => { if (conditionErrorMsg !== '') { notifyApp.error(conditionErrorMsg); return; @@ -136,33 +143,39 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => { } } - dispatch( - saveRuleFormAction({ - values: { - ...defaultValues, - ...values, - annotations: - values.annotations - ?.map(({ key, value }) => ({ key: key.trim(), value: value.trim() })) - .filter(({ key, value }) => !!key && !!value) ?? [], - labels: - values.labels - ?.map(({ key, value }) => ({ key: key.trim(), value: value.trim() })) - .filter(({ key }) => !!key) ?? [], - }, - existing, - redirectOnSave: exitOnSave ? returnTo : undefined, - initialAlertRuleName: defaultValues.name, - evaluateEvery: evaluateEvery, - }) - ); + const ruleDefinition = grafanaTypeRule ? formValuesToRulerGrafanaRuleDTO(values) : formValuesToRulerRuleDTO(values); + + const ruleGroupIdentifier = existing + ? getRuleGroupLocationFromRuleWithLocation(existing) + : getRuleGroupLocationFromFormValues(values); + + // @TODO what is "evaluateEvery" being used for? + // @TODO move this to a hook too to make sure the logic here is tested for regressions? + if (!existing) { + await addRuleToRuleGroup.execute(ruleGroupIdentifier, ruleDefinition, values.evaluateEvery); + } else { + const ruleIdentifier = fromRulerRuleAndRuleGroupIdentifier(ruleGroupIdentifier, existing.rule); + const targetRuleGroupIdentifier = getRuleGroupLocationFromFormValues(values); + + await updateRuleInRuleGroup.execute( + ruleGroupIdentifier, + ruleIdentifier, + ruleDefinition, + targetRuleGroupIdentifier + ); + } + + if (exitOnSave && returnTo) { + locationService.push(returnTo); + } }; const deleteRule = async () => { if (existing) { const ruleGroupIdentifier = getRuleGroupLocationFromRuleWithLocation(existing); + const ruleIdentifier = fromRulerRuleAndRuleGroupIdentifier(ruleGroupIdentifier, existing.rule); - await deleteRuleFromGroup.execute(ruleGroupIdentifier, existing.rule); + await deleteRuleFromGroup.execute(ruleGroupIdentifier, ruleIdentifier); locationService.replace(returnTo); } }; @@ -194,9 +207,9 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => { type="button" size="sm" onClick={handleSubmit((values) => submit(values, false), onInvalid)} - disabled={submitState.loading} + disabled={isSubmitting} > - {submitState.loading && } + {isSubmitting && } Save rule )} @@ -205,13 +218,13 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => { type="button" size="sm" onClick={handleSubmit((values) => submit(values, true), onInvalid)} - disabled={submitState.loading} + disabled={isSubmitting} > - {submitState.loading && } + {isSubmitting && } Save rule and exit - @@ -225,7 +238,7 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => { variant="secondary" type="button" onClick={() => setShowEditYaml(true)} - disabled={submitState.loading} + disabled={isSubmitting} size="sm" > Edit YAML diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx index 67f8db90e1a..87acb2ba535 100644 --- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/SimplifiedRuleEditor.test.tsx @@ -2,29 +2,23 @@ import { ReactNode } from 'react'; import { Route } from 'react-router-dom'; import { ui } from 'test/helpers/alertingRuleEditor'; import { clickSelectOption } from 'test/helpers/selectOptionInTest'; -import { render, screen, waitFor, waitForElementToBeRemoved, userEvent } from 'test/test-utils'; +import { render, screen, waitForElementToBeRemoved, userEvent } from 'test/test-utils'; import { byRole } from 'testing-library-selector'; import { config } from '@grafana/runtime'; import { contextSrv } from 'app/core/services/context_srv'; import RuleEditor from 'app/features/alerting/unified/RuleEditor'; -import * as ruler from 'app/features/alerting/unified/api/ruler'; import { setupMswServer } from 'app/features/alerting/unified/mockApi'; import { grantUserPermissions, mockDataSource } from 'app/features/alerting/unified/mocks'; import { setAlertmanagerChoices } from 'app/features/alerting/unified/mocks/server/configure'; +import { captureRequests, serializeRequests } from 'app/features/alerting/unified/mocks/server/events'; import { FOLDER_TITLE_HAPPY_PATH } from 'app/features/alerting/unified/mocks/server/handlers/search'; import { AlertmanagerProvider } from 'app/features/alerting/unified/state/AlertmanagerContext'; -import { - DataSourceType, - GRAFANA_DATASOURCE_NAME, - GRAFANA_RULES_SOURCE_NAME, -} from 'app/features/alerting/unified/utils/datasource'; -import { getDefaultQueries } from 'app/features/alerting/unified/utils/rule-form'; +import { DataSourceType, GRAFANA_DATASOURCE_NAME } from 'app/features/alerting/unified/utils/datasource'; import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types'; import { AccessControlAction } from 'app/types'; -import { GrafanaAlertStateDecision } from 'app/types/unified-alerting-dto'; -import { grafanaRulerEmptyGroup, grafanaRulerNamespace2 } from '../../../../mocks/grafanaRulerApi'; +import { grafanaRulerEmptyGroup } from '../../../../mocks/grafanaRulerApi'; import { setupDataSources } from '../../../../testSetup/datasources'; jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({ @@ -33,12 +27,6 @@ jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({ jest.setTimeout(60 * 1000); -const mocks = { - api: { - setRulerRuleGroup: jest.spyOn(ruler, 'setRulerRuleGroup'), - }, -}; - setupMswServer(); const dataSources = { @@ -91,6 +79,7 @@ describe('Can create a new grafana managed alert using simplified routing', () = it('cannot create new grafana managed alert when using simplified routing and not selecting a contact point', async () => { const user = userEvent.setup(); + const capture = captureRequests((r) => r.method === 'POST' && r.url.includes('/api/ruler/')); renderSimplifiedRuleEditor(); await waitForElementToBeRemoved(screen.queryAllByTestId('Spinner')); @@ -106,7 +95,9 @@ describe('Can create a new grafana managed alert using simplified routing', () = // save and check that call to backend was not made await user.click(ui.buttons.saveAndExit.get()); expect(await screen.findByText('Contact point is required.')).toBeInTheDocument(); - expect(mocks.api.setRulerRuleGroup).not.toHaveBeenCalled(); + const capturedRequests = await capture; + + expect(capturedRequests).toHaveLength(0); }); it('simplified routing is not available when Grafana AM is not enabled', async () => { @@ -120,6 +111,7 @@ describe('Can create a new grafana managed alert using simplified routing', () = it('can create new grafana managed alert when using simplified routing and selecting a contact point', async () => { const user = userEvent.setup(); const contactPointName = 'lotsa-emails'; + const capture = captureRequests((r) => r.method === 'POST' && r.url.includes('/api/ruler/')); renderSimplifiedRuleEditor(); await waitForElementToBeRemoved(screen.queryAllByTestId('Spinner')); @@ -136,38 +128,10 @@ describe('Can create a new grafana managed alert using simplified routing', () = // save and check what was sent to backend await user.click(ui.buttons.saveAndExit.get()); - await waitFor(() => expect(mocks.api.setRulerRuleGroup).toHaveBeenCalled()); - expect(mocks.api.setRulerRuleGroup).toHaveBeenCalledWith( - { dataSourceName: GRAFANA_RULES_SOURCE_NAME, apiVersion: 'legacy' }, - grafanaRulerNamespace2.uid, - { - interval: grafanaRulerEmptyGroup.interval, - name: grafanaRulerEmptyGroup.name, - rules: [ - { - annotations: {}, - labels: {}, - for: '1m', - grafana_alert: { - condition: 'B', - data: getDefaultQueries(), - exec_err_state: GrafanaAlertStateDecision.Error, - is_paused: false, - no_data_state: 'NoData', - title: 'my great new rule', - notification_settings: { - group_by: undefined, - group_interval: undefined, - group_wait: undefined, - mute_timings: undefined, - receiver: contactPointName, - repeat_interval: undefined, - }, - }, - }, - ], - } - ); + const requests = await capture; + + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); }); describe('alertingApiServer enabled', () => { diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/__snapshots__/SimplifiedRuleEditor.test.tsx.snap b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/__snapshots__/SimplifiedRuleEditor.test.tsx.snap new file mode 100644 index 00000000000..594f329ed16 --- /dev/null +++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/__snapshots__/SimplifiedRuleEditor.test.tsx.snap @@ -0,0 +1,116 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Can create a new grafana managed alert using simplified routing can create new grafana managed alert when using simplified routing and selecting a contact point 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "empty-group", + "rules": [ + { + "annotations": {}, + "for": "1m", + "grafana_alert": { + "condition": "B", + "data": [ + { + "datasourceUid": "__expr__", + "model": { + "conditions": [ + { + "evaluator": { + "params": [], + "type": "gt", + }, + "operator": { + "type": "and", + }, + "query": { + "params": [ + "A", + ], + }, + "reducer": { + "params": [], + "type": "last", + }, + "type": "query", + }, + ], + "datasource": { + "type": "__expr__", + "uid": "__expr__", + }, + "expression": "A", + "reducer": "last", + "refId": "A", + "type": "reduce", + }, + "queryType": "", + "refId": "A", + }, + { + "datasourceUid": "__expr__", + "model": { + "conditions": [ + { + "evaluator": { + "params": [ + 0, + ], + "type": "gt", + }, + "operator": { + "type": "and", + }, + "query": { + "params": [ + "B", + ], + }, + "reducer": { + "params": [], + "type": "last", + }, + "type": "query", + }, + ], + "datasource": { + "type": "__expr__", + "uid": "__expr__", + }, + "expression": "A", + "refId": "B", + "type": "threshold", + }, + "queryType": "", + "refId": "B", + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "no_data_state": "NoData", + "notification_settings": { + "receiver": "lotsa-emails", + }, + "title": "my great new rule", + }, + "labels": {}, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/6abdb25bc1eb?subtype=cortex", + }, +] +`; diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.test.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.test.tsx index 8a4a72c2173..ba5f3dcfd7a 100644 --- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.test.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.test.tsx @@ -233,19 +233,22 @@ describe('Query and expressions reducer', () => { }); }); - it('Should update time range for all expressions that have this data source when dispatching updateExpressionTimeRange', () => { - const expressionQuery: AlertQuery = { + it('Should update time range for all resample expressions that have this data source when dispatching updateExpressionTimeRange', () => { + const expressionQuery: AlertQuery = { refId: 'B', queryType: 'expression', datasourceUid: '__expr__', model: { + datasource: { + type: '__expr__', + uid: '__expr__', + }, queryType: 'query', - datasource: '__expr__', refId: 'B', expression: 'A', - type: ExpressionQueryType.classic, + type: ExpressionQueryType.resample, window: '10s', - } as ExpressionQuery, + }, }; const customTimeRange: RelativeTimeRange = { from: 900, to: 1000 }; @@ -262,7 +265,7 @@ describe('Query and expressions reducer', () => { }; const newState = queriesAndExpressionsReducer(initialState, updateExpressionTimeRange()); - expect(newState).toStrictEqual({ + expect(newState).toStrictEqual<{ queries: AlertQuery[] }>({ queries: [ { refId: 'A', @@ -274,19 +277,19 @@ describe('Query and expressions reducer', () => { { datasourceUid: '__expr__', model: { - datasource: '__expr__', expression: 'A', + datasource: { + type: '__expr__', + uid: '__expr__', + }, queryType: 'query', refId: 'B', - type: ExpressionQueryType.classic, + type: ExpressionQueryType.resample, window: '10s', }, queryType: 'expression', refId: 'B', - relativeTimeRange: { - from: 900, - to: 1000, - }, + relativeTimeRange: customTimeRange, }, ], }); diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts index ab483e93843..44ebf2f1f18 100644 --- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts +++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts @@ -1,4 +1,4 @@ -import { createAction, createReducer } from '@reduxjs/toolkit'; +import { createAction, createReducer, original } from '@reduxjs/toolkit'; import { DataQuery, @@ -8,27 +8,34 @@ import { rangeUtil, RelativeTimeRange, } from '@grafana/data'; -import { findDataSourceFromExpressionRecursive } from 'app/features/alerting/unified/utils/dataSourceFromExpression'; import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource'; import { isExpressionQuery } from 'app/features/expressions/guards'; import { ExpressionDatasourceUID, ExpressionQuery, ExpressionQueryType } from 'app/features/expressions/types'; import { defaultCondition } from 'app/features/expressions/utils/expressionTypes'; import { AlertQuery } from 'app/types/unified-alerting-dto'; +import { logError } from '../../../Analytics'; import { getDefaultOrFirstCompatibleDataSource } from '../../../utils/datasource'; +import { createDagFromQueries, getOriginOfRefId } from '../dag'; import { queriesWithUpdatedReferences, refIdExists } from '../util'; export interface QueriesAndExpressionsState { queries: AlertQuery[]; } -const findDataSourceFromExpression = ( - queries: AlertQuery[], - expression: string | undefined -): AlertQuery | null | undefined => { - const firstReference = queries.find((alertQuery) => alertQuery.refId === expression); - const dataSource = firstReference && findDataSourceFromExpressionRecursive(queries, firstReference); - return dataSource; +const findDataSourceFromExpression = (queries: AlertQuery[], refId: string): AlertQuery | undefined => { + const dag = createDagFromQueries(queries); + const dataSource = getOriginOfRefId(refId, dag)[0]; + if (!dataSource) { + return; + } + + const originQuery = queries.find((query) => query.refId === dataSource); + if (originQuery && 'relativeTimeRange' in originQuery) { + return originQuery; + } + + return; }; const initialState: QueriesAndExpressionsState = { @@ -137,33 +144,51 @@ export const queriesAndExpressionsReducer = createReducer(initialState, (builder state.queries = [...state.queries, ...payload]; }) .addCase(updateExpression, (state, { payload }) => { - state.queries = state.queries.map((query) => { - const dataSourceAlertQuery = findDataSourceFromExpression(state.queries, payload.expression); + const queryToUpdate = state.queries.find((query) => query.refId === payload.refId); + if (!queryToUpdate) { + return; + } - const relativeTimeRange = dataSourceAlertQuery - ? dataSourceAlertQuery.relativeTimeRange - : getDefaultRelativeTimeRange(); + queryToUpdate.model = payload; - if (query.refId === payload.refId) { - query.model = payload; - if (payload.type === ExpressionQueryType.resample) { - query.relativeTimeRange = relativeTimeRange; + // the resample expression needs to also know what the relative time range is to work with, this means we have to copy it from the source node (data source query) + if (payload.type === ExpressionQueryType.resample && payload.expression) { + // findDataSourceFromExpression uses memoization and it doesn't always work with proxies when the proxy has been revoked + const originalQueries = original(state)?.queries ?? []; + + let relativeTimeRange = getDefaultRelativeTimeRange(); + try { + const dataSourceAlertQuery = findDataSourceFromExpression(originalQueries, payload.expression); + if (dataSourceAlertQuery?.relativeTimeRange) { + relativeTimeRange = dataSourceAlertQuery.relativeTimeRange; + } + } catch (error) { + if (error instanceof Error) { + logError(error); + } else { + logError(new Error('Error while trying to find data source from expression')); } } - return query; - }); + + queryToUpdate.relativeTimeRange = relativeTimeRange; + } }) .addCase(updateExpressionTimeRange, (state) => { - const newState = state.queries.map((query) => { - // It's an expression , let's update the relativeTimeRange with its dataSource relativeTimeRange - if (query.datasourceUid === ExpressionDatasourceUID) { - const dataSource = findDataSourceFromExpression(state.queries, query.model.expression); + state.queries.forEach((query) => { + // Resample expression needs to get the relativeTimeRange with its dataSource relativeTimeRange + if ( + isExpressionQuery(query.model) && + query.model.type === ExpressionQueryType.resample && + query.model.expression + ) { + // findDataSourceFromExpression uses memoization and doesn't work with proxies + const originalQueries = original(state)?.queries ?? []; + + const dataSource = findDataSourceFromExpression(originalQueries, query.model.expression); const relativeTimeRange = dataSource ? dataSource.relativeTimeRange : getDefaultRelativeTimeRange(); query.relativeTimeRange = relativeTimeRange; } - return query; }); - state.queries = newState; }) .addCase(updateExpressionRefId, (state, { payload }) => { const { newRefId, oldRefId } = payload; diff --git a/public/app/features/alerting/unified/components/rule-editor/util.test.ts b/public/app/features/alerting/unified/components/rule-editor/util.test.ts index ec51a60f31e..680367f38ec 100644 --- a/public/app/features/alerting/unified/components/rule-editor/util.test.ts +++ b/public/app/features/alerting/unified/components/rule-editor/util.test.ts @@ -3,7 +3,7 @@ import { ClassicCondition, ExpressionQuery } from 'app/features/expressions/type import { AlertQuery } from 'app/types/unified-alerting-dto'; import { - checkForPathSeparator, + containsPathSeparator, findRenamedDataQueryReferences, getThresholdsForQueries, queriesWithUpdatedReferences, @@ -229,17 +229,15 @@ describe('rule-editor', () => { }); }); -describe('checkForPathSeparator', () => { - it('should not allow strings with /', () => { - expect(checkForPathSeparator('foo / bar')).not.toBe(true); - expect(typeof checkForPathSeparator('foo / bar')).toBe('string'); +describe('containsPathSeparator', () => { + it('should return true for strings with /', () => { + expect(containsPathSeparator('foo / bar')).toBe(true); }); - it('should not allow strings with \\', () => { - expect(checkForPathSeparator('foo \\ bar')).not.toBe(true); - expect(typeof checkForPathSeparator('foo \\ bar')).toBe('string'); + it('should return true for strings with \\', () => { + expect(containsPathSeparator('foo \\ bar')).toBe(true); }); - it('should allow anything without / or \\', () => { - expect(checkForPathSeparator('foo bar')).toBe(true); + it('should return false for strings without / or \\', () => { + expect(containsPathSeparator('foo !@#$%^&*() <> [] {} bar')).toBe(false); }); }); @@ -424,7 +422,7 @@ describe('findRenamedReferences', () => { { refId: 'MATH', model: { datasource: '-100' } }, { refId: 'B' }, { refId: 'C' }, - ] as AlertQuery[]; + ] as Array>; // @ts-expect-error const updated = [ @@ -432,7 +430,7 @@ describe('findRenamedReferences', () => { { refId: 'REDUCE', model: { datasource: '-100' } }, { refId: 'B' }, { refId: 'C' }, - ] as AlertQuery[]; + ] as Array>; expect(findRenamedDataQueryReferences(previous, updated)).toEqual(['A', 'FOO']); }); diff --git a/public/app/features/alerting/unified/components/rule-editor/util.ts b/public/app/features/alerting/unified/components/rule-editor/util.ts index 7c09766a2db..716c9f2fbbc 100644 --- a/public/app/features/alerting/unified/components/rule-editor/util.ts +++ b/public/app/features/alerting/unified/components/rule-editor/util.ts @@ -1,5 +1,4 @@ import { xor } from 'lodash'; -import { ValidateResult } from 'react-hook-form'; import { DataFrame, @@ -89,17 +88,8 @@ export function refIdExists(queries: AlertQuery[], refId: string | null): boolea return queries.find((query) => query.refId === refId) !== undefined; } -// some gateways (like Istio) will decode "/" and "\" characters – this will cause 404 errors for any API call -// that includes these values in the URL (ie. /my/path%2fto/resource -> /my/path/to/resource) -// -// see https://istio.io/latest/docs/ops/best-practices/security/#customize-your-system-on-path-normalization -export function checkForPathSeparator(value: string): ValidateResult { - const containsPathSeparator = value.includes('/') || value.includes('\\'); - if (containsPathSeparator) { - return 'Cannot contain "/" or "\\" characters'; - } - - return true; +export function containsPathSeparator(value: string): boolean { + return value.includes('/') || value.includes('\\'); } // this function assumes we've already checked if the data passed in to the function is of the alert condition diff --git a/public/app/features/alerting/unified/components/rule-list/RuleList.v1.tsx b/public/app/features/alerting/unified/components/rule-list/RuleList.v1.tsx index a61e94cfd9b..8b0fe0707d9 100644 --- a/public/app/features/alerting/unified/components/rule-list/RuleList.v1.tsx +++ b/public/app/features/alerting/unified/components/rule-list/RuleList.v1.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { useAsyncFn, useInterval } from 'react-use'; import { GrafanaTheme2, urlUtil } from '@grafana/data'; diff --git a/public/app/features/alerting/unified/components/rule-list/RuleList.v2.tsx b/public/app/features/alerting/unified/components/rule-list/RuleList.v2.tsx index 21271c658c9..4cd337802a1 100644 --- a/public/app/features/alerting/unified/components/rule-list/RuleList.v2.tsx +++ b/public/app/features/alerting/unified/components/rule-list/RuleList.v2.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { useAsyncFn, useInterval, useMeasure } from 'react-use'; import { GrafanaTheme2, urlUtil } from '@grafana/data'; diff --git a/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx b/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx index 9821f7483b4..3e2e87a4438 100644 --- a/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx +++ b/public/app/features/alerting/unified/components/rule-viewer/DeleteModal.tsx @@ -7,6 +7,7 @@ import { CombinedRule } from 'app/types/unified-alerting'; import { useDeleteRuleFromGroup } from '../../hooks/ruleGroup/useDeleteRuleFromGroup'; import { fetchPromAndRulerRulesAction } from '../../state/actions'; +import { fromRulerRuleAndRuleGroupIdentifier } from '../../utils/rule-id'; import { getRuleGroupLocationFromCombinedRule } from '../../utils/rules'; type DeleteModalHook = [JSX.Element, (rule: CombinedRule) => void, () => void]; @@ -29,12 +30,14 @@ export const useDeleteModal = (redirectToListView = false): DeleteModalHook => { return; } - const location = getRuleGroupLocationFromCombinedRule(rule); - await deleteRuleFromGroup.execute(location, rule.rulerRule); + const ruleGroupIdentifier = getRuleGroupLocationFromCombinedRule(rule); + const ruleIdentifier = fromRulerRuleAndRuleGroupIdentifier(ruleGroupIdentifier, rule.rulerRule); + + await deleteRuleFromGroup.execute(ruleGroupIdentifier, ruleIdentifier); // refetch rules for this rules source // @TODO remove this when we moved everything to RTKQ – then the endpoint will simply invalidate the tags - dispatch(fetchPromAndRulerRulesAction({ rulesSourceName: location.dataSourceName })); + dispatch(fetchPromAndRulerRulesAction({ rulesSourceName: ruleGroupIdentifier.dataSourceName })); dismissModal(); diff --git a/public/app/features/alerting/unified/components/rules/CloudRules.tsx b/public/app/features/alerting/unified/components/rules/CloudRules.tsx index e7bf42ea817..56157c689a3 100644 --- a/public/app/features/alerting/unified/components/rules/CloudRules.tsx +++ b/public/app/features/alerting/unified/components/rules/CloudRules.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import pluralize from 'pluralize'; import { useMemo } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, urlUtil } from '@grafana/data'; import { LinkButton, LoadingPlaceholder, Pagination, Spinner, Text, useStyles2 } from '@grafana/ui'; diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx index 7569cb33d18..65c65e07685 100644 --- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx +++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.test.tsx @@ -1,4 +1,4 @@ -import { render, screen, userEvent } from 'test/test-utils'; +import { render } from 'test/test-utils'; import { byLabelText, byTestId, byText, byTitle } from 'testing-library-selector'; import { CombinedRuleNamespace } from 'app/types/unified-alerting'; @@ -158,12 +158,4 @@ describe('EditGroupModal component on grafana-managed alert rules', () => { expect(await ui.input.namespace.find()).toHaveValue('namespace1'); expect(ui.folderLink.query()).not.toBeInTheDocument(); }); - - it('does not allow slashes in the group name', async () => { - const user = userEvent.setup(); - renderWithGrafanaGroup(); - await user.type(await ui.input.group.find(), 'group/with/slashes'); - await user.click(ui.input.interval.get()); - expect(await screen.findByText(/cannot contain \"\/\"/i)).toBeInTheDocument(); - }); }); diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx index 883fd11c733..2ff9d57baaf 100644 --- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx +++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx @@ -28,7 +28,6 @@ import { EvaluationIntervalLimitExceeded } from '../InvalidIntervalWarning'; import { decodeGrafanaNamespace, encodeGrafanaNamespace } from '../expressions/util'; import { EvaluationGroupQuickPick } from '../rule-editor/EvaluationGroupQuickPick'; import { MIN_TIME_RANGE_STEP_S } from '../rule-editor/GrafanaEvaluationBehavior'; -import { checkForPathSeparator } from '../rule-editor/util'; const ITEMS_PER_PAGE = 10; @@ -300,11 +299,6 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement { readOnly={intervalEditOnly || isGrafanaManagedGroup} {...register('namespaceName', { required: 'Namespace name is required.', - validate: { - // for Grafana-managed we do not validate the name of the folder because we use the UID anyway - pathSeparator: (namespaceName) => - isGrafanaManagedGroup ? true : checkForPathSeparator(namespaceName), - }, })} /> @@ -337,9 +331,6 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement { readOnly={intervalEditOnly} {...register('groupName', { required: 'Evaluation group name is required.', - validate: { - pathSeparator: (namespace) => checkForPathSeparator(namespace), - }, })} /> diff --git a/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.test.tsx b/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.test.tsx deleted file mode 100644 index 8744867ab72..00000000000 --- a/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.test.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import { reorder } from './ReorderRuleGroupModal'; - -describe('test reorder', () => { - it('should reorder arrays', () => { - const original = [1, 2, 3]; - const expected = [1, 3, 2]; - - expect(reorder(original, 1, 2)).toEqual(expected); - expect(original).not.toEqual(expected); // make sure we've not mutated the original - }); -}); diff --git a/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx index 278be0bf5dd..3a40868f20e 100644 --- a/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx +++ b/public/app/features/alerting/unified/components/rules/ReorderRuleGroupModal.tsx @@ -8,22 +8,30 @@ import { DropResult, } from '@hello-pangea/dnd'; import cx from 'classnames'; -import { compact } from 'lodash'; -import { useCallback, useState } from 'react'; +import { produce } from 'immer'; +import { useCallback, useEffect, useState } from 'react'; import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data'; -import { Badge, Icon, Modal, Tooltip, useStyles2 } from '@grafana/ui'; -import { useCombinedRuleNamespaces } from 'app/features/alerting/unified/hooks/useCombinedRuleNamespaces'; -import { dispatch } from 'app/store/store'; -import { CombinedRule, CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting'; +import { Badge, Button, Icon, Modal, Tooltip, useStyles2 } from '@grafana/ui'; +import { Trans } from 'app/core/internationalization'; +import { dispatch, getState } from 'app/store/store'; +import { CombinedRuleGroup, CombinedRuleNamespace, RuleGroupIdentifier } from 'app/types/unified-alerting'; +import { RulerRuleDTO } from 'app/types/unified-alerting-dto'; -import { updateRulesOrder } from '../../state/actions'; -import { getRulesSourceName, isCloudRulesSource } from '../../utils/datasource'; +import { alertRuleApi } from '../../api/alertRuleApi'; +import { useReorderRuleForRuleGroup } from '../../hooks/ruleGroup/useUpdateRuleGroup'; +import { isLoading } from '../../hooks/useAsync'; +import { swapItems, SwapOperation } from '../../reducers/ruler/ruleGroups'; +import { fetchRulerRulesAction, getDataSourceRulerConfig } from '../../state/actions'; +import { isCloudRulesSource } from '../../utils/datasource'; import { hashRulerRule } from '../../utils/rule-id'; -import { isAlertingRule, isRecordingRule } from '../../utils/rules'; - -import { AlertStateTag } from './AlertStateTag'; +import { + isAlertingRulerRule, + isGrafanaRulerRule, + isRecordingRulerRule, + rulesSourceToDataSourceName, +} from '../../utils/rules'; interface ModalProps { namespace: CombinedRuleNamespace; @@ -32,24 +40,36 @@ interface ModalProps { folderUid?: string; } -type CombinedRuleWithUID = { uid: string } & CombinedRule; +type RulerRuleWithUID = { uid: string } & RulerRuleDTO; export const ReorderCloudGroupModal = (props: ModalProps) => { + const styles = useStyles2(getStyles); const { group, namespace, onClose, folderUid } = props; + const [operations, setOperations] = useState>([]); + + const [reorderRulesInGroup, reorderState] = useReorderRuleForRuleGroup(); + const isUpdating = isLoading(reorderState); // The list of rules might have been filtered before we get to this reordering modal - // We need to grab the full (unfiltered) list so we are able to reorder via the API without - // deleting any rules (as they otherwise would have been omitted from the payload) - const unfilteredNamespaces = useCombinedRuleNamespaces(); - const matchedNamespace = unfilteredNamespaces.find( - (ns) => ns.rulesSource === namespace.rulesSource && ns.name === namespace.name + // We need to grab the full (unfiltered) list + const dataSourceName = rulesSourceToDataSourceName(namespace.rulesSource); + const rulerConfig = getDataSourceRulerConfig(getState, dataSourceName); + const { currentData: ruleGroup, isLoading: loadingRules } = alertRuleApi.endpoints.getRuleGroupForNamespace.useQuery( + { + rulerConfig, + namespace: folderUid ?? namespace.name, + group: group.name, + }, + { refetchOnMountOrArgChange: true } ); - const matchedGroup = matchedNamespace?.groups.find((g) => g.name === group.name); - const [pending, setPending] = useState(false); - const [rulesList, setRulesList] = useState(matchedGroup?.rules || []); + const [rulesList, setRulesList] = useState([]); - const styles = useStyles2(getStyles); + useEffect(() => { + if (ruleGroup) { + setRulesList(ruleGroup?.rules); + } + }, [ruleGroup]); const onDragEnd = useCallback( (result: DropResult) => { @@ -58,39 +78,50 @@ export const ReorderCloudGroupModal = (props: ModalProps) => { return; } - const sameIndex = result.destination.index === result.source.index; - if (sameIndex) { - return; - } + const swapOperation: SwapOperation = [result.source.index, result.destination.index]; - const newOrderedRules = reorder(rulesList, result.source.index, result.destination.index); - setRulesList(newOrderedRules); // optimistically update the new rules list - - const rulesSourceName = getRulesSourceName(namespace.rulesSource); - const rulerRules = compact(newOrderedRules.map((rule) => rule.rulerRule)); - - setPending(true); - dispatch( - updateRulesOrder({ - namespaceName: namespace.name, - groupName: group.name, - rulesSourceName: rulesSourceName, - newRules: rulerRules, - folderUid: folderUid || namespace.name, + // add old index and new index to the modifications object + setOperations( + produce(operations, (draft) => { + draft.push(swapOperation); }) - ) - .unwrap() - .finally(() => { - setPending(false); - }); + ); + + // re-order the rules list for the UI rendering + const newOrderedRules = produce(rulesList, (draft) => { + swapItems(draft, swapOperation); + }); + setRulesList(newOrderedRules); }, - [group.name, namespace.name, namespace.rulesSource, rulesList, folderUid] + [rulesList, operations] ); + const updateRulesOrder = useCallback(async () => { + const ruleGroupIdentifier: RuleGroupIdentifier = { + dataSourceName: rulesSourceToDataSourceName(namespace.rulesSource), + groupName: group.name, + namespaceName: folderUid ?? namespace.name, + }; + + await reorderRulesInGroup.execute(ruleGroupIdentifier, operations); + // TODO: Remove once RTKQ is more prevalently used + await dispatch(fetchRulerRulesAction({ rulesSourceName: dataSourceName })); + onClose(); + }, [ + namespace.rulesSource, + namespace.name, + group.name, + folderUid, + reorderRulesInGroup, + operations, + dataSourceName, + onClose, + ]); + // assign unique but stable identifiers to each (alerting / recording) rule - const rulesWithUID: CombinedRuleWithUID[] = rulesList.map((rule) => ({ - ...rule, - uid: String(hashRulerRule(rule.rulerRule!)), // TODO fix this coercion? + const rulesWithUID: RulerRuleWithUID[] = rulesList.map((rulerRule) => ({ + ...rulerRule, + uid: hashRulerRule(rulerRule), })); return ( @@ -101,37 +132,50 @@ export const ReorderCloudGroupModal = (props: ModalProps) => { onDismiss={onClose} onClickBackdrop={onClose} > - - ( - - )} - > - {(droppableProvided: DroppableProvided) => ( -
0 && ( + <> + + ( + + )} > - {rulesWithUID.map((rule, index) => ( - - {(provided: DraggableProvided) => } - - ))} - {droppableProvided.placeholder} -
- )} - - + {(droppableProvided: DroppableProvided) => ( +
+ {rulesWithUID.map((rule, index) => ( + + {(provided: DraggableProvided) => } + + ))} + {droppableProvided.placeholder} +
+ )} + + + + + + + + )} ); }; interface ListItemProps extends React.HTMLAttributes { provided: DraggableProvided; - rule: CombinedRule; + rule: RulerRuleDTO; isClone?: boolean; isDragging?: boolean; } @@ -139,6 +183,7 @@ interface ListItemProps extends React.HTMLAttributes { const ListItem = ({ provided, rule, isClone = false, isDragging = false }: ListItemProps) => { const styles = useStyles2(getStyles); + // @TODO does this work with Grafana-managed recording rules too? Double check that. return (
- {isAlertingRule(rule.promRule) && } - {isRecordingRule(rule.promRule) && } -
{rule.name}
- + {isGrafanaRulerRule(rule) &&
{rule.grafana_alert.title}
} + {isRecordingRulerRule(rule) && ( + <> +
{rule.record}
+ + + )} + {isAlertingRulerRule(rule) &&
{rule.alert}
} +
); }; @@ -235,11 +285,3 @@ const getStyles = (theme: GrafanaTheme2) => ({ height: theme.spacing(2), }), }); - -export function reorder(rules: T[], startIndex: number, endIndex: number): T[] { - const result = Array.from(rules); - const [removed] = result.splice(startIndex, 1); - result.splice(endIndex, 0, removed); - - return result; -} diff --git a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx index f4c89a906de..b747de47c3c 100644 --- a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx +++ b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx @@ -1,6 +1,6 @@ import { css, cx } from '@emotion/css'; import { useState } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2 } from '@grafana/data'; import { LinkButton, Stack, useStyles2 } from '@grafana/ui'; diff --git a/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx b/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx index f6c2e092c68..a2d07b1ec94 100644 --- a/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx +++ b/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx @@ -1,11 +1,9 @@ -import { render, waitFor } from '@testing-library/react'; -import { Provider } from 'react-redux'; -import { Router } from 'react-router-dom'; +import { waitFor } from '@testing-library/react'; +import { render } from 'test/test-utils'; import { byRole } from 'testing-library-selector'; -import { locationService, setPluginExtensionsHook } from '@grafana/runtime'; +import { setPluginExtensionsHook } from '@grafana/runtime'; import { contextSrv } from 'app/core/services/context_srv'; -import { configureStore } from 'app/store/configureStore'; import { AccessControlAction } from 'app/types'; import { CombinedRuleNamespace } from 'app/types/unified-alerting'; @@ -101,15 +99,7 @@ describe('RuleListGroupView', () => { }); function renderRuleList(namespaces: CombinedRuleNamespace[]) { - const store = configureStore(); - - render( - - - - - - ); + render(); } function getGrafanaNamespace(): CombinedRuleNamespace { diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx index bb66ef6421e..5ae024d814c 100644 --- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx +++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx @@ -6,17 +6,16 @@ import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { Badge, ConfirmModal, Icon, Spinner, Stack, Tooltip, useStyles2 } from '@grafana/ui'; -import { useDispatch } from 'app/types'; -import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting'; +import { CombinedRuleGroup, CombinedRuleNamespace, RuleGroupIdentifier } from 'app/types/unified-alerting'; import { LogMessages, logInfo } from '../../Analytics'; +import { useDeleteRuleGroup } from '../../hooks/ruleGroup/useDeleteRuleGroup'; import { useFolder } from '../../hooks/useFolder'; import { useHasRuler } from '../../hooks/useHasRuler'; -import { deleteRulesGroupAction } from '../../state/actions'; import { useRulesAccess } from '../../utils/accessControlHooks'; import { GRAFANA_RULES_SOURCE_NAME, isCloudRulesSource } from '../../utils/datasource'; import { makeFolderLink, makeFolderSettingsLink } from '../../utils/misc'; -import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules'; +import { isFederatedRuleGroup, isGrafanaRulerRule, rulesSourceToDataSourceName } from '../../utils/rules'; import { CollapseToggle } from '../CollapseToggle'; import { RuleLocation } from '../RuleLocation'; import { GrafanaRuleFolderExporter } from '../export/GrafanaRuleFolderExporter'; @@ -40,8 +39,8 @@ interface Props { export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }: Props) => { const { rulesSource } = namespace; - const dispatch = useDispatch(); const styles = useStyles2(getStyles); + const [deleteRuleGroup] = useDeleteRuleGroup(); const [isEditingGroup, setIsEditingGroup] = useState(false); const [isDeletingGroup, setIsDeletingGroup] = useState(false); @@ -74,8 +73,13 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }: const isListView = viewMode === 'list'; const isGroupView = viewMode === 'grouped'; - const deleteGroup = () => { - dispatch(deleteRulesGroupAction(namespace, group)); + const deleteGroup = async () => { + const namespaceName = decodeGrafanaNamespace(namespace).name; + const groupName = group.name; + const dataSourceName = rulesSourceToDataSourceName(namespace.rulesSource); + + const ruleGroupIdentifier: RuleGroupIdentifier = { namespaceName, groupName, dataSourceName }; + await deleteRuleGroup.execute(ruleGroupIdentifier); setIsDeletingGroup(false); }; diff --git a/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useAddRuleToRuleGroup.test.tsx.snap b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useAddRuleToRuleGroup.test.tsx.snap new file mode 100644 index 00000000000..8d3ddb718e3 --- /dev/null +++ b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useAddRuleToRuleGroup.test.tsx.snap @@ -0,0 +1,206 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Creating a Data source managed rule should be able to add a rule to a existing rule group 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "group-1", + "rules": [ + { + "alert": "alert1", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "my new rule", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1?subtype=mimir", + }, +] +`; + +exports[`Creating a Data source managed rule should be able to add a rule to a new rule group 1`] = ` +[ + { + "body": { + "interval": "15m", + "name": "new group", + "rules": [ + { + "annotations": {}, + "for": "", + "grafana_alert": { + "condition": "", + "data": [], + "exec_err_state": "Error", + "namespace_uid": "NAMESPACE_UID", + "no_data_state": "NoData", + "rule_group": "my-group", + "title": "my new rule", + "uid": "mock-rule-uid-123", + }, + "labels": {}, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/new%20namespace?subtype=mimir", + }, +] +`; + +exports[`Creating a Grafana managed rule should be able to add a rule to a existing rule group 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "grafana-group-1", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "Grafana-rule", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + { + "annotations": {}, + "for": "", + "grafana_alert": { + "condition": "", + "data": [], + "exec_err_state": "Error", + "namespace_uid": "NAMESPACE_UID", + "no_data_state": "NoData", + "rule_group": "my-group", + "title": "my new rule", + "uid": "mock-rule-uid-123", + }, + "labels": {}, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/uuid020c61ef?subtype=cortex", + }, +] +`; + +exports[`Creating a Grafana managed rule should be able to add a rule to a new rule group 1`] = ` +[ + { + "body": { + "interval": "15m", + "name": "grafana-group-3", + "rules": [ + { + "annotations": {}, + "for": "", + "grafana_alert": { + "condition": "", + "data": [], + "exec_err_state": "Error", + "namespace_uid": "NAMESPACE_UID", + "no_data_state": "NoData", + "rule_group": "my-group", + "title": "my new rule", + "uid": "mock-rule-uid-123", + }, + "labels": {}, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/uuid020c61ef?subtype=cortex", + }, +] +`; diff --git a/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useDeleteRuleGroup.test.tsx.snap b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useDeleteRuleGroup.test.tsx.snap new file mode 100644 index 00000000000..b6ecad04404 --- /dev/null +++ b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useDeleteRuleGroup.test.tsx.snap @@ -0,0 +1,33 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Grafana managed should be able to delete a Grafana managed rule group 1`] = ` +[ + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "DELETE", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/uuid020c61ef/grafana-group-1?subtype=cortex", + }, +] +`; + +exports[`data-source managed should be able to delete a data-source managed rule group 1`] = ` +[ + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "DELETE", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1/group-1?subtype=mimir", + }, +] +`; diff --git a/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useMoveRuleFromRuleGroup.test.tsx.snap b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useMoveRuleFromRuleGroup.test.tsx.snap new file mode 100644 index 00000000000..2374935f47a --- /dev/null +++ b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useMoveRuleFromRuleGroup.test.tsx.snap @@ -0,0 +1,206 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Moving a Data source managed rule should move a rule in an existing group to a new group 1`] = ` +[ + { + "body": { + "name": "entirely new group name", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "updated rule title", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "DELETE", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1/group-1?subtype=mimir", + }, +] +`; + +exports[`Moving a Data source managed rule should move a rule in an existing group to another existing group 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "group-3", + "rules": [ + { + "alert": "rule 3", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "rule 4", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "alert1", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "DELETE", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1/group-1?subtype=mimir", + }, +] +`; + +exports[`Moving a Grafana managed rule should move a rule from an existing group to another group in the same namespace 1`] = ` +[ + { + "body": { + "name": "empty-group", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "Grafana-rule", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/uuid020c61ef?subtype=cortex", + }, +] +`; diff --git a/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleGroup.test.tsx.snap b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleGroup.test.tsx.snap index 62c6e987364..5357d0c6a6d 100644 --- a/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleGroup.test.tsx.snap +++ b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleGroup.test.tsx.snap @@ -1,5 +1,83 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`reorder rules for rule group should correctly reorder rules 1`] = ` +[ + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "https://mimir.local:9000/api/v1/status/buildinfo", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2/group-3?subtype=mimir", + }, + { + "body": { + "interval": "1m", + "name": "group-3", + "rules": [ + { + "alert": "rule 4", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + { + "alert": "rule 3", + "annotations": { + "summary": "test alert", + }, + "expr": "up = 1", + "labels": { + "severity": "warning", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "GET", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-2/group-3?subtype=mimir", + }, +] +`; + exports[`useUpdateRuleGroupConfiguration should be able to move a Data Source managed rule group 1`] = ` [ { diff --git a/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleInRuleGroup.test.tsx.snap b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleInRuleGroup.test.tsx.snap new file mode 100644 index 00000000000..1b0143c619e --- /dev/null +++ b/public/app/features/alerting/unified/hooks/ruleGroup/__snapshots__/useUpdateRuleInRuleGroup.test.tsx.snap @@ -0,0 +1,311 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Updating a Data source managed rule should be able to move a rule if target group is different from current group 1`] = ` +[ + { + "body": { + "name": "a new group", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "updated rule title", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1?subtype=mimir", + }, + { + "body": "", + "headers": [ + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "DELETE", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1/group-1?subtype=mimir", + }, +] +`; + +exports[`Updating a Data source managed rule should update a rule in an existing group 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "group-1", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "updated rule title", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/mimir/api/v1/rules/namespace-1?subtype=mimir", + }, +] +`; + +exports[`Updating a Grafana managed rule should move a rule in to another group 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "grafana-group-2", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "Grafana-rule", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "updated rule title", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/uuid020c61ef?subtype=cortex", + }, +] +`; + +exports[`Updating a Grafana managed rule should update a rule in an existing group 1`] = ` +[ + { + "body": { + "interval": "1m", + "name": "grafana-group-1", + "rules": [ + { + "annotations": { + "summary": "Test alert", + }, + "for": "5m", + "grafana_alert": { + "condition": "A", + "data": [ + { + "datasourceUid": "datasource-uid", + "model": { + "datasource": { + "type": "prometheus", + "uid": "datasource-uid", + }, + "expression": "vector(1)", + "queryType": "alerting", + "refId": "A", + }, + "queryType": "alerting", + "refId": "A", + "relativeTimeRange": { + "from": 1000, + "to": 2000, + }, + }, + ], + "exec_err_state": "Error", + "is_paused": false, + "namespace_uid": "uuid020c61ef", + "no_data_state": "NoData", + "rule_group": "grafana-group-1", + "title": "updated rule title", + "uid": "4d7125fee983", + }, + "labels": { + "region": "nasa", + "severity": "critical", + }, + }, + ], + }, + "headers": [ + [ + "content-type", + "application/json", + ], + [ + "accept", + "application/json, text/plain, */*", + ], + ], + "method": "POST", + "url": "http://localhost/api/ruler/grafana/api/v1/rules/uuid020c61ef?subtype=cortex", + }, +] +`; diff --git a/public/app/features/alerting/unified/hooks/ruleGroup/useAddRuleToRuleGroup.test.tsx b/public/app/features/alerting/unified/hooks/ruleGroup/useAddRuleToRuleGroup.test.tsx new file mode 100644 index 00000000000..acbcc25052c --- /dev/null +++ b/public/app/features/alerting/unified/hooks/ruleGroup/useAddRuleToRuleGroup.test.tsx @@ -0,0 +1,157 @@ +import { render } from 'test/test-utils'; +import { byRole, byText } from 'testing-library-selector'; + +import { AccessControlAction } from 'app/types/accessControl'; +import { RuleGroupIdentifier } from 'app/types/unified-alerting'; +import { PostableRuleDTO } from 'app/types/unified-alerting-dto'; + +import { setupMswServer } from '../../mockApi'; +import { grantUserPermissions, mockGrafanaRulerRule, mockRulerAlertingRule } from '../../mocks'; +import { grafanaRulerGroupName, grafanaRulerNamespace } from '../../mocks/grafanaRulerApi'; +import { GROUP_1, NAMESPACE_1 } from '../../mocks/mimirRulerApi'; +import { mimirDataSource } from '../../mocks/server/configure'; +import { MIMIR_DATASOURCE_UID } from '../../mocks/server/constants'; +import { captureRequests, serializeRequests } from '../../mocks/server/events'; +import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource'; +import { SerializeState } from '../useAsync'; + +import { useAddRuleToRuleGroup } from './useUpsertRuleFromRuleGroup'; + +setupMswServer(); + +beforeAll(() => { + grantUserPermissions([ + AccessControlAction.AlertingRuleExternalRead, + AccessControlAction.AlertingRuleExternalWrite, + AccessControlAction.AlertingRuleRead, + AccessControlAction.AlertingRuleCreate, + ]); +}); + +describe('Creating a Grafana managed rule', () => { + it('should be able to add a rule to a existing rule group', async () => { + const capture = captureRequests((r) => r.method === 'POST'); + + const ruleGroupID: RuleGroupIdentifier = { + dataSourceName: GRAFANA_RULES_SOURCE_NAME, + groupName: grafanaRulerGroupName, + namespaceName: grafanaRulerNamespace.uid, + }; + + const rule = mockGrafanaRulerRule({ title: 'my new rule' }); + + const { user } = render(); + await user.click(byRole('button').get()); + + expect(await byText(/success/i).find()).toBeInTheDocument(); + + const requests = await capture; + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); + }); + + it('should be able to add a rule to a new rule group', async () => { + const capture = captureRequests((r) => r.method === 'POST'); + + const ruleGroupID: RuleGroupIdentifier = { + dataSourceName: GRAFANA_RULES_SOURCE_NAME, + groupName: 'grafana-group-3', + namespaceName: grafanaRulerNamespace.uid, + }; + + const rule = mockGrafanaRulerRule({ title: 'my new rule' }); + + const { user } = render(); + await user.click(byRole('button').get()); + + expect(await byText(/success/i).find()).toBeInTheDocument(); + + const requests = await capture; + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); + }); + + it('should not be able to add a rule to a non-existing namespace', async () => { + const ruleGroupID: RuleGroupIdentifier = { + dataSourceName: GRAFANA_RULES_SOURCE_NAME, + groupName: grafanaRulerGroupName, + namespaceName: 'does-not-exist', + }; + + const rule = mockGrafanaRulerRule({ title: 'my new rule' }); + + const { user } = render(); + await user.click(byRole('button').get()); + + expect(await byText(/error/i).find()).toBeInTheDocument(); + }); +}); + +describe('Creating a Data source managed rule', () => { + beforeEach(() => { + mimirDataSource(); + }); + + it('should be able to add a rule to a existing rule group', async () => { + const capture = captureRequests((r) => r.method === 'POST'); + + const ruleGroupID: RuleGroupIdentifier = { + dataSourceName: MIMIR_DATASOURCE_UID, + groupName: GROUP_1, + namespaceName: NAMESPACE_1, + }; + + const rule = mockRulerAlertingRule({ alert: 'my new rule' }); + + const { user } = render(); + await user.click(byRole('button').get()); + + expect(await byText(/success/i).find()).toBeInTheDocument(); + + const requests = await capture; + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); + }); + + it('should be able to add a rule to a new rule group', async () => { + const capture = captureRequests((r) => r.method === 'POST'); + + const ruleGroupID: RuleGroupIdentifier = { + dataSourceName: MIMIR_DATASOURCE_UID, + groupName: 'new group', + namespaceName: 'new namespace', + }; + + const rule = mockGrafanaRulerRule({ title: 'my new rule' }); + + const { user } = render(); + await user.click(byRole('button').get()); + + expect(await byText(/success/i).find()).toBeInTheDocument(); + + const requests = await capture; + const serializedRequests = await serializeRequests(requests); + expect(serializedRequests).toMatchSnapshot(); + }); +}); + +type AddRuleTestComponentProps = { + ruleGroupIdentifier: RuleGroupIdentifier; + rule: PostableRuleDTO; + interval?: string; +}; + +const AddRuleTestComponent = ({ ruleGroupIdentifier, rule, interval }: AddRuleTestComponentProps) => { + const [addRule, requestState] = useAddRuleToRuleGroup(); + + const onClick = () => { + addRule.execute(ruleGroupIdentifier, rule, interval); + }; + + return ( + <> + ) : ( diff --git a/public/app/features/explore/QueryLibrary/QueryLibraryAnalyticsEvents.ts b/public/app/features/explore/QueryLibrary/QueryLibraryAnalyticsEvents.ts new file mode 100644 index 00000000000..018f1f914cb --- /dev/null +++ b/public/app/features/explore/QueryLibrary/QueryLibraryAnalyticsEvents.ts @@ -0,0 +1,50 @@ +import { reportInteraction } from '@grafana/runtime'; + +const QUERY_LIBRARY_EXPLORE_EVENT = 'query_library_explore_clicked'; + +export function queryLibraryTrackToggle(open: boolean) { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'query_library_toggle', + type: open ? 'open' : 'close', + }); +} + +export function queryLibraryTrackAddFromQueryHistory(datasourceType: string) { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'add_query_from_query_history', + type: datasourceType, + }); +} + +export function queryLibraryTrackAddFromQueryHistoryAddModalShown() { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'add_query_modal_from_query_history', + type: 'open', + }); +} + +export function queryLibraryTrackAddFromQueryRow(datasourceType: string) { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'add_query_from_query_row', + type: datasourceType, + }); +} + +export function queryLibaryTrackDeleteQuery() { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'delete_query', + }); +} + +export function queryLibraryTrackRunQuery(datasourceType: string) { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'run_query', + type: datasourceType, + }); +} + +export function queryLibraryTrackAddOrEditDescription() { + reportInteraction(QUERY_LIBRARY_EXPLORE_EVENT, { + item: 'add_or_edit_description', + }); +} diff --git a/public/app/features/explore/QueryLibrary/QueryTemplatesTable/ActionsCell.tsx b/public/app/features/explore/QueryLibrary/QueryTemplatesTable/ActionsCell.tsx index e3ae8d14ce6..78688fe522b 100644 --- a/public/app/features/explore/QueryLibrary/QueryTemplatesTable/ActionsCell.tsx +++ b/public/app/features/explore/QueryLibrary/QueryTemplatesTable/ActionsCell.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { reportInteraction, getAppEvents } from '@grafana/runtime'; +import { getAppEvents } from '@grafana/runtime'; import { IconButton, Modal } from '@grafana/ui'; import { notifyApp } from 'app/core/actions'; import { createSuccessNotification } from 'app/core/copy/appNotification'; @@ -11,6 +11,11 @@ import { ShowConfirmModalEvent } from 'app/types/events'; import ExploreRunQueryButton from '../../ExploreRunQueryButton'; import { useQueriesDrawerContext } from '../../QueriesDrawer/QueriesDrawerContext'; +import { + queryLibaryTrackDeleteQuery, + queryLibraryTrackAddOrEditDescription, + queryLibraryTrackRunQuery, +} from '../QueryLibraryAnalyticsEvents'; import { QueryTemplateForm } from '../QueryTemplateForm'; import { useQueryLibraryListStyles } from './styles'; @@ -32,7 +37,7 @@ function ActionsCell({ queryTemplate, rootDatasourceUid, queryUid }: ActionsCell const performDelete = (queryUid: string) => { deleteQueryTemplate({ uid: queryUid }); dispatch(notifyApp(createSuccessNotification(t('explore.query-library.query-deleted', 'Query deleted')))); - reportInteraction('grafana_explore_query_library_deleted'); + queryLibaryTrackDeleteQuery(); }; getAppEvents().publish( @@ -71,12 +76,16 @@ function ActionsCell({ queryTemplate, rootDatasourceUid, queryUid }: ActionsCell tooltip={t('explore.query-library.add-edit-description', 'Add/edit description')} onClick={() => { setEditFormOpen(true); + queryLibraryTrackAddOrEditDescription(); }} /> setDrawerOpened(false)} + onClick={() => { + setDrawerOpened(false); + queryLibraryTrackRunQuery(queryTemplate.datasourceType || ''); + }} /> { return isQueryLibraryEnabled() && !hasBeenSaved ? ( <> - { if (isSuccess) { setIsOpen(false); setHasBeenSaved(true); + queryLibraryTrackAddFromQueryHistory(query.datasource?.type || ''); } }} /> diff --git a/public/app/features/explore/TraceView/components/model/link-patterns.tsx b/public/app/features/explore/TraceView/components/model/link-patterns.tsx index cf52965244d..8964b969a0d 100644 --- a/public/app/features/explore/TraceView/components/model/link-patterns.tsx +++ b/public/app/features/explore/TraceView/components/model/link-patterns.tsx @@ -124,7 +124,7 @@ function callTemplate(template: ProcessedTemplate, data: any) { export function computeTraceLink(linkPatterns: ProcessedLinkPattern[], trace: Trace) { const result: TLinksRV = []; const validKeys = (Object.keys(trace) as Array).filter( - (key) => typeof trace[key] === 'string' || trace[key] === 'number' + (key) => typeof trace[key] === 'string' || typeof trace[key] === 'number' ); linkPatterns diff --git a/public/app/features/explore/state/correlations.ts b/public/app/features/explore/state/correlations.ts index 3d8de1466fc..cbf50fa81f6 100644 --- a/public/app/features/explore/state/correlations.ts +++ b/public/app/features/explore/state/correlations.ts @@ -81,10 +81,10 @@ export function saveCurrentCorrelation( targetUID: targetDatasource.uid, label: label || (await generateDefaultLabel(sourcePane, targetPane)), description, + type: 'query', config: { field: targetPane.correlationEditorHelperData.resultField, target: targetPane.queries[0], - type: 'query', transformations: transformations, }, }; diff --git a/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx b/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx index 15c0a7d4622..afa39633756 100644 --- a/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx +++ b/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx @@ -1,9 +1,9 @@ import { useCallback, useEffect, useState } from 'react'; import { useAsync, useDebounce } from 'react-use'; -import { FetchError, isFetchError } from '@grafana/runtime'; +import { config, FetchError, isFetchError } from '@grafana/runtime'; import { LibraryPanel } from '@grafana/schema/dist/esm/index.gen'; -import { Button, Field, Input, Modal } from '@grafana/ui'; +import { Button, Field, Input, Modal, Stack } from '@grafana/ui'; import { FolderPicker } from 'app/core/components/Select/FolderPicker'; import { t, Trans } from 'app/core/internationalization'; @@ -91,15 +91,25 @@ export const AddLibraryPanelContents = ({ inputId="share-panel-library-panel-folder-picker" /> - - - - - + {config.featureToggles.newDashboardSharingComponent ? ( + + + + + ) : ( + + + + + )} ); }; diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx index a50d149cee7..171289c149a 100644 --- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx +++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/PublicDashboardListTable.tsx @@ -145,23 +145,43 @@ export const PublicDashboardListTable = () => { {!isLoading && !isError && !!paginatedPublicDashboards && (
{paginatedPublicDashboards.publicDashboards.length === 0 ? ( - - - Create a public dashboard from any existing dashboard through the Share modal.{' '} - - Learn more - - - + config.featureToggles.newDashboardSharingComponent ? ( + + + Create a shared dashboard from any existing dashboard through the Share modal.{' '} + + Learn more + + + + ) : ( + + + Create a public dashboard from any existing dashboard through the Share modal.{' '} + + Learn more + + + + ) ) : ( <>
    diff --git a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithPlugin.tsx b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithPlugin.tsx index b63970f2f8c..e9b8485a6a2 100644 --- a/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithPlugin.tsx +++ b/public/app/features/plugins/admin/components/GetStartedWithPlugin/GetStartedWithPlugin.tsx @@ -1,6 +1,7 @@ import { ReactElement } from 'react'; import { PluginType } from '@grafana/data'; +import { config } from '@grafana/runtime'; import { CatalogPlugin } from '../../types'; @@ -12,7 +13,12 @@ type Props = { }; export function GetStartedWithPlugin({ plugin }: Props): ReactElement | null { - if (!plugin.isInstalled || plugin.isDisabled) { + const isInstalled = + config.featureToggles.managedPluginsInstall && config.pluginAdminExternalManageEnabled + ? plugin.isFullyInstalled + : plugin.isInstalled; + + if (!isInstalled || plugin.isDisabled) { return null; } diff --git a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx index 4791edbe6f9..cbad3dee8e6 100644 --- a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx +++ b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { AppEvents } from '@grafana/data'; import { config, locationService } from '@grafana/runtime'; diff --git a/public/app/features/plugins/admin/components/PluginDetailsPage.tsx b/public/app/features/plugins/admin/components/PluginDetailsPage.tsx index 47d03e5c5fd..61903f80ed2 100644 --- a/public/app/features/plugins/admin/components/PluginDetailsPage.tsx +++ b/public/app/features/plugins/admin/components/PluginDetailsPage.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import * as React from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, NavModelItem } from '@grafana/data'; import { config } from '@grafana/runtime'; diff --git a/public/app/features/plugins/admin/components/PluginList.tsx b/public/app/features/plugins/admin/components/PluginList.tsx index 2650e3abee2..4d6961966c6 100644 --- a/public/app/features/plugins/admin/components/PluginList.tsx +++ b/public/app/features/plugins/admin/components/PluginList.tsx @@ -1,4 +1,4 @@ -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { config } from '@grafana/runtime'; import { EmptyState, Grid } from '@grafana/ui'; diff --git a/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx b/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx index 3173e5df198..1778c03e058 100644 --- a/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx +++ b/public/app/features/plugins/admin/hooks/usePluginDetailsTabs.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaPlugin, NavModelItem, PluginIncludeType, PluginType } from '@grafana/data'; import { config } from '@grafana/runtime'; diff --git a/public/app/features/plugins/admin/pages/Browse.tsx b/public/app/features/plugins/admin/pages/Browse.tsx index c72d702ab73..e85dedc6fb4 100644 --- a/public/app/features/plugins/admin/pages/Browse.tsx +++ b/public/app/features/plugins/admin/pages/Browse.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { ReactElement } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router-dom-v5-compat'; import { SelectableValue, GrafanaTheme2, PluginType } from '@grafana/data'; import { locationSearchToObject } from '@grafana/runtime'; diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts index 562f4da0a8a..93f7ebfb943 100644 --- a/public/app/features/plugins/built_in_plugins.ts +++ b/public/app/features/plugins/built_in_plugins.ts @@ -17,8 +17,6 @@ const mixedPlugin = async () => await import(/* webpackChunkName: "mixedPlugin" */ 'app/plugins/datasource/mixed/module'); const prometheusPlugin = async () => await import(/* webpackChunkName: "prometheusPlugin" */ 'app/plugins/datasource/prometheus/module'); -const mssqlPlugin = async () => - await import(/* webpackChunkName: "mssqlPlugin" */ 'app/plugins/datasource/mssql/module'); const alertmanagerPlugin = async () => await import(/* webpackChunkName: "alertmanagerPlugin" */ 'app/plugins/datasource/alertmanager/module'); @@ -79,7 +77,6 @@ const builtInPlugins: Record Promise { }; }); -function createPluginExtensionRegistry(preloadResults: Array<{ pluginId: string; extensionConfigs: any[] }>) { +async function createRegistries( + preloadResults: Array<{ + pluginId: string; + addedComponentConfigs: PluginAddedComponentConfig[]; + extensionConfigs: any[]; + }> +) { const registry = new ReactivePluginExtensionsRegistry(); + const addedComponentsRegistry = new AddedComponentsRegistry(); - for (const { pluginId, extensionConfigs } of preloadResults) { + for (const { pluginId, extensionConfigs, addedComponentConfigs } of preloadResults) { registry.register({ pluginId, - extensionConfigs, exposedComponentConfigs: [], + extensionConfigs, + addedComponentConfigs: [], + }); + addedComponentsRegistry.register({ + pluginId, + configs: addedComponentConfigs, }); } - return registry.getRegistry(); + return { registry: await registry.getRegistry(), addedComponentsRegistry: await addedComponentsRegistry.getState() }; } describe('getPluginExtensions()', () => { @@ -69,8 +87,13 @@ describe('getPluginExtensions()', () => { }); test('should return the extensions for the given placement', async () => { - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 }); + const registries = await createRegistries([ + { pluginId, extensionConfigs: [link1, link2], addedComponentConfigs: [] }, + ]); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint1, + }); expect(extensions).toHaveLength(1); expect(extensions[0]).toEqual( @@ -86,10 +109,13 @@ describe('getPluginExtensions()', () => { test('should not limit the number of extensions per plugin by default', async () => { // Registering 3 extensions for the same plugin for the same placement - const registry = await createPluginExtensionRegistry([ - { pluginId, extensionConfigs: [link1, link1, link1, link2] }, + const registries = await createRegistries([ + { pluginId, extensionConfigs: [link1, link1, link1, link2], addedComponentConfigs: [] }, ]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 }); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint1, + }); expect(extensions).toHaveLength(3); expect(extensions[0]).toEqual( @@ -104,10 +130,11 @@ describe('getPluginExtensions()', () => { }); test('should be possible to limit the number of extensions per plugin for a given placement', async () => { - const registry = await createPluginExtensionRegistry([ - { pluginId, extensionConfigs: [link1, link1, link1, link2] }, + const registries = await createRegistries([ + { pluginId, extensionConfigs: [link1, link1, link1, link2], addedComponentConfigs: [] }, { pluginId: 'my-plugin', + addedComponentConfigs: [], extensionConfigs: [ { ...link1, path: '/a/my-plugin/declare-incident' }, { ...link1, path: '/a/my-plugin/declare-incident' }, @@ -118,7 +145,11 @@ describe('getPluginExtensions()', () => { ]); // Limit to 1 extension per plugin - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1, limitPerPlugin: 1 }); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint1, + limitPerPlugin: 1, + }); expect(extensions).toHaveLength(2); expect(extensions[0]).toEqual( @@ -133,17 +164,22 @@ describe('getPluginExtensions()', () => { }); test('should return with an empty list if there are no extensions registered for a placement yet', async () => { - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: 'placement-with-no-extensions' }); + const registries = await createRegistries([ + { pluginId, extensionConfigs: [link1, link2], addedComponentConfigs: [] }, + ]); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: 'placement-with-no-extensions', + }); expect(extensions).toEqual([]); }); test('should pass the context to the configure() function', async () => { const context = { title: 'New title from the context!' }; - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); - getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 }); + getPluginExtensions({ ...registries, context, extensionPointId: extensionPoint2 }); expect(link2.configure).toHaveBeenCalledTimes(1); expect(link2.configure).toHaveBeenCalledWith(context); @@ -158,8 +194,11 @@ describe('getPluginExtensions()', () => { category: 'Machine Learning', })); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint2, + }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -181,8 +220,11 @@ describe('getPluginExtensions()', () => { category: 'Machine Learning', })); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint2, + }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -206,8 +248,11 @@ describe('getPluginExtensions()', () => { title: 'test', })); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint2, + }); const [extension] = extensions; expect(link2.configure).toHaveBeenCalledTimes(1); @@ -220,8 +265,12 @@ describe('getPluginExtensions()', () => { }); test('should pass a read only context to the configure() function', async () => { const context = { title: 'New title from the context!' }; - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ + ...registries, + context, + extensionPointId: extensionPoint2, + }); const [extension] = extensions; const readOnlyContext = (link2.configure as jest.Mock).mock.calls[0][0]; @@ -240,10 +289,10 @@ describe('getPluginExtensions()', () => { throw new Error('Something went wrong!'); }); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); expect(() => { - getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); }).not.toThrow(); expect(link2.configure).toHaveBeenCalledTimes(1); @@ -259,9 +308,17 @@ describe('getPluginExtensions()', () => { path: 'invalid-path', })); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link1, link2] }]); - const { extensions: extensionsAtPlacement1 } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 }); - const { extensions: extensionsAtPlacement2 } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([ + { pluginId, extensionConfigs: [link1, link2], addedComponentConfigs: [] }, + ]); + const { extensions: extensionsAtPlacement1 } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint1, + }); + const { extensions: extensionsAtPlacement2 } = getPluginExtensions({ + ...registries, + extensionPointId: extensionPoint2, + }); expect(extensionsAtPlacement1).toHaveLength(0); expect(extensionsAtPlacement2).toHaveLength(0); @@ -279,8 +336,8 @@ describe('getPluginExtensions()', () => { link2.configure = jest.fn().mockImplementation(() => overrides); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); expect(extensions).toHaveLength(0); expect(link2.configure).toHaveBeenCalledTimes(1); @@ -290,8 +347,8 @@ describe('getPluginExtensions()', () => { test('should skip the extension if the configure() function returns a promise', async () => { link2.configure = jest.fn().mockImplementation(() => Promise.resolve({})); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); expect(extensions).toHaveLength(0); expect(link2.configure).toHaveBeenCalledTimes(1); @@ -301,8 +358,8 @@ describe('getPluginExtensions()', () => { test('should skip (hide) the extension if the configure() function returns undefined', async () => { link2.configure = jest.fn().mockImplementation(() => undefined); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); expect(extensions).toHaveLength(0); expect(global.console.warn).toHaveBeenCalledTimes(0); // As this is intentional, no warning should be logged @@ -315,8 +372,8 @@ describe('getPluginExtensions()', () => { }); const context = {}; - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -338,8 +395,8 @@ describe('getPluginExtensions()', () => { link2.path = undefined; link2.onClick = jest.fn().mockRejectedValue(new Error('testing')); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -357,8 +414,8 @@ describe('getPluginExtensions()', () => { throw new Error('Something went wrong!'); }); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint2 }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -375,8 +432,8 @@ describe('getPluginExtensions()', () => { link2.path = undefined; link2.onClick = jest.fn(); - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + const { extensions } = getPluginExtensions({ ...registries, context, extensionPointId: extensionPoint2 }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -398,8 +455,8 @@ describe('getPluginExtensions()', () => { array: ['a'], }; - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]); - getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 }); + const registries = await createRegistries([{ pluginId, extensionConfigs: [link2], addedComponentConfigs: [] }]); + getPluginExtensions({ ...registries, context, extensionPointId: extensionPoint2 }); expect(() => { context.title = 'Updating the title'; @@ -411,7 +468,7 @@ describe('getPluginExtensions()', () => { test('should report interaction when onClick is triggered', async () => { const reportInteractionMock = jest.mocked(reportInteraction); - const registry = await createPluginExtensionRegistry([ + const registries = await createRegistries([ { pluginId, extensionConfigs: [ @@ -421,9 +478,10 @@ describe('getPluginExtensions()', () => { onClick: jest.fn(), }, ], + addedComponentConfigs: [], }, ]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extensionPoint1 }); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: extensionPoint1 }); const [extension] = extensions; assertPluginExtensionLink(extension); @@ -440,17 +498,65 @@ describe('getPluginExtensions()', () => { }); test('should be possible to register and get component type extensions', async () => { - const extension = component1; - const registry = await createPluginExtensionRegistry([{ pluginId, extensionConfigs: [extension] }]); - const { extensions } = getPluginExtensions({ registry, extensionPointId: extension.extensionPointId }); + const registries = await createRegistries([ + { + pluginId, + extensionConfigs: [], + addedComponentConfigs: [ + { + ...component1, + targets: component1.extensionPointId, + }, + ], + }, + ]); + const { extensions } = getPluginExtensions({ ...registries, extensionPointId: component1.extensionPointId }); expect(extensions).toHaveLength(1); expect(extensions[0]).toEqual( expect.objectContaining({ pluginId, type: PluginExtensionTypes.component, - title: extension.title, - description: extension.description, + title: component1.title, + description: component1.description, + }) + ); + }); + + test('should honour the limitPerPlugin also for component extensions', async () => { + const registries = await createRegistries([ + { + pluginId, + extensionConfigs: [], + addedComponentConfigs: [ + { + ...component1, + targets: component1.extensionPointId, + }, + { + title: 'Component 2', + description: 'Component 2 description', + targets: component1.extensionPointId, + component: (context) => { + return
    Hello world2!
    ; + }, + }, + ], + }, + ]); + const { extensions } = getPluginExtensions({ + ...registries, + limitPerPlugin: 1, + extensionPointId: component1.extensionPointId, + }); + + expect(extensions).toHaveLength(1); + expect(extensions[0]).toEqual( + expect.objectContaining({ + pluginId, + type: PluginExtensionTypes.component, + title: component1.title, + description: component1.description, }) ); }); diff --git a/public/app/features/plugins/extensions/getPluginExtensions.ts b/public/app/features/plugins/extensions/getPluginExtensions.ts index ec616707d8c..6560ca8e393 100644 --- a/public/app/features/plugins/extensions/getPluginExtensions.ts +++ b/public/app/features/plugins/extensions/getPluginExtensions.ts @@ -11,38 +11,38 @@ import { import { GetPluginExtensions, reportInteraction } from '@grafana/runtime'; import { ReactivePluginExtensionsRegistry } from './reactivePluginExtensionRegistry'; -import type { PluginExtensionRegistry } from './types'; +import { AddedComponentsRegistry } from './registry/AddedComponentsRegistry'; +import type { AddedComponentsRegistryState, PluginExtensionRegistry } from './types'; import { isPluginExtensionLinkConfig, getReadOnlyProxy, logWarning, generateExtensionId, getEventHelpers, - isPluginExtensionComponentConfig, wrapWithPluginContext, } from './utils'; -import { - assertIsReactComponent, - assertIsNotPromise, - assertLinkPathIsValid, - assertStringProps, - isPromise, -} from './validators'; +import { assertIsNotPromise, assertLinkPathIsValid, assertStringProps, isPromise } from './validators'; type GetExtensions = ({ context, extensionPointId, limitPerPlugin, registry, + addedComponentsRegistry, }: { context?: object | Record; extensionPointId: string; limitPerPlugin?: number; registry: PluginExtensionRegistry; + addedComponentsRegistry: AddedComponentsRegistryState; }) => { extensions: PluginExtension[] }; -export function createPluginExtensionsGetter(extensionRegistry: ReactivePluginExtensionsRegistry): GetPluginExtensions { +export function createPluginExtensionsGetter( + extensionRegistry: ReactivePluginExtensionsRegistry, + addedComponentRegistry: AddedComponentsRegistry +): GetPluginExtensions { let registry: PluginExtensionRegistry = { id: '', extensions: {} }; + let addedComponentsRegistryState: AddedComponentsRegistryState = {}; // Create a subscription to keep an copy of the registry state for use in the non-async // plugin extensions getter. @@ -50,11 +50,22 @@ export function createPluginExtensionsGetter(extensionRegistry: ReactivePluginEx registry = r; }); - return (options) => getPluginExtensions({ ...options, registry }); + addedComponentRegistry.asObservable().subscribe((r) => { + addedComponentsRegistryState = r; + }); + + return (options) => + getPluginExtensions({ ...options, registry, addedComponentsRegistry: addedComponentsRegistryState }); } // Returns with a list of plugin extensions for the given extension point -export const getPluginExtensions: GetExtensions = ({ context, extensionPointId, limitPerPlugin, registry }) => { +export const getPluginExtensions: GetExtensions = ({ + context, + extensionPointId, + limitPerPlugin, + registry, + addedComponentsRegistry, +}) => { const frozenContext = context ? getReadOnlyProxy(context) : {}; const registryItems = registry.extensions[extensionPointId] ?? []; // We don't return the extensions separated by type, because in that case it would be much harder to define a sort-order for them. @@ -103,23 +114,40 @@ export const getPluginExtensions: GetExtensions = ({ context, extensionPointId, extensions.push(extension); extensionsByPlugin[pluginId] += 1; } + } catch (error) { + if (error instanceof Error) { + logWarning(error.message); + } + } + } - // COMPONENT - if (isPluginExtensionComponentConfig(extensionConfig)) { - assertIsReactComponent(extensionConfig.component); + if (extensionPointId in addedComponentsRegistry) { + try { + const addedComponents = addedComponentsRegistry[extensionPointId]; + for (const addedComponent of addedComponents) { + // Only limit if the `limitPerPlugin` is set + if (limitPerPlugin && extensionsByPlugin[addedComponent.pluginId] >= limitPerPlugin) { + continue; + } + if (extensionsByPlugin[addedComponent.pluginId] === undefined) { + extensionsByPlugin[addedComponent.pluginId] = 0; + } const extension: PluginExtensionComponent = { - id: generateExtensionId(registryItem.pluginId, extensionConfig), + id: generateExtensionId(addedComponent.pluginId, { + ...addedComponent, + extensionPointId, + type: PluginExtensionTypes.component, + }), type: PluginExtensionTypes.component, - pluginId: registryItem.pluginId, - - title: extensionConfig.title, - description: extensionConfig.description, - component: wrapWithPluginContext(pluginId, extensionConfig.component), + pluginId: addedComponent.pluginId, + title: addedComponent.title, + description: addedComponent.description, + component: wrapWithPluginContext(addedComponent.pluginId, addedComponent.component), }; extensions.push(extension); - extensionsByPlugin[pluginId] += 1; + extensionsByPlugin[addedComponent.pluginId] += 1; } } catch (error) { if (error instanceof Error) { diff --git a/public/app/features/plugins/extensions/reactivePluginExtensionRegistry.test.ts b/public/app/features/plugins/extensions/reactivePluginExtensionRegistry.test.ts index b4f90414e0d..5ab6abee781 100644 --- a/public/app/features/plugins/extensions/reactivePluginExtensionRegistry.test.ts +++ b/public/app/features/plugins/extensions/reactivePluginExtensionRegistry.test.ts @@ -40,6 +40,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry = await reactiveRegistry.getRegistry(); @@ -66,6 +67,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry1 = await reactiveRegistry.getRegistry(); @@ -86,6 +88,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry2 = await reactiveRegistry.getRegistry(); @@ -120,6 +123,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry = await reactiveRegistry.getRegistry(); @@ -173,6 +177,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry1 = await reactiveRegistry.getRegistry(); @@ -207,6 +212,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry2 = await reactiveRegistry.getRegistry(); @@ -258,6 +264,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry1 = await reactiveRegistry.getRegistry(); @@ -292,6 +299,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry2 = await reactiveRegistry.getRegistry(); @@ -344,6 +352,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); // Register extensions to a different extension point @@ -360,6 +369,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry2 = await reactiveRegistry.getRegistry(); @@ -410,6 +420,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); // Register extensions to a different extension point @@ -426,6 +437,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); const registry2 = await reactiveRegistry.getRegistry(); @@ -482,6 +494,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); expect(subscribeCallback).toHaveBeenCalledTimes(2); @@ -500,6 +513,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); expect(subscribeCallback).toHaveBeenCalledTimes(3); @@ -553,6 +567,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); observable.subscribe(subscribeCallback); @@ -597,6 +612,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); expect(consoleWarn).toHaveBeenCalled(); @@ -657,6 +673,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); expect(consoleWarn).toHaveBeenCalled(); @@ -687,6 +704,7 @@ describe('createPluginExtensionsRegistry', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); expect(consoleWarn).toHaveBeenCalled(); diff --git a/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts new file mode 100644 index 00000000000..01799ecce62 --- /dev/null +++ b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts @@ -0,0 +1,380 @@ +import React from 'react'; +import { firstValueFrom } from 'rxjs'; + +import { AddedComponentsRegistry } from './AddedComponentsRegistry'; + +describe('AddedComponentsRegistry', () => { + const consoleWarn = jest.fn(); + + beforeEach(() => { + global.console.warn = consoleWarn; + consoleWarn.mockReset(); + }); + + it('should return empty registry when no extensions registered', async () => { + const reactiveRegistry = new AddedComponentsRegistry(); + const observable = reactiveRegistry.asObservable(); + const registry = await firstValueFrom(observable); + expect(registry).toEqual({}); + }); + + it('should be possible to register added components in the registry', async () => { + const pluginId = 'grafana-basic-app'; + const id = `${pluginId}/hello-world/v1`; + const reactiveRegistry = new AddedComponentsRegistry(); + + reactiveRegistry.register({ + pluginId, + configs: [ + { + targets: [id], + title: 'not important', + description: 'not important', + component: () => React.createElement('div', null, 'Hello World'), + }, + ], + }); + + const registry = await reactiveRegistry.getState(); + + expect(Object.keys(registry)).toHaveLength(1); + expect(registry[id][0]).toMatchObject({ + pluginId, + title: 'not important', + description: 'not important', + }); + }); + it('should be possible to asynchronously register component extensions for the same extension point (different plugins)', async () => { + const pluginId1 = 'grafana-basic-app'; + const pluginId2 = 'grafana-basic-app2'; + const reactiveRegistry = new AddedComponentsRegistry(); + + // Register extensions for the first plugin + reactiveRegistry.register({ + pluginId: pluginId1, + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + const registry1 = await reactiveRegistry.getState(); + expect(Object.keys(registry1)).toHaveLength(1); + expect(registry1['grafana/alerting/home'][0]).toMatchObject({ + pluginId: pluginId1, + title: 'Component 1 title', + description: 'Component 1 description', + }); + + // Register an extension component for the second plugin to the same extension point + reactiveRegistry.register({ + pluginId: pluginId2, + configs: [ + { + title: 'Component 2 title', + description: 'Component 2 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + const registry2 = await reactiveRegistry.getState(); + expect(Object.keys(registry2)).toHaveLength(1); + expect(registry2['grafana/alerting/home']).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId1, + title: 'Component 1 title', + description: 'Component 1 description', + }), + expect.objectContaining({ + pluginId: pluginId2, + title: 'Component 2 title', + description: 'Component 2 description', + }), + ]) + ); + }); + + it('should be possible to asynchronously register component extensions for a different extension points (different plugin)', async () => { + const pluginId1 = 'grafana-basic-app'; + const pluginId2 = 'grafana-basic-app2'; + const reactiveRegistry = new AddedComponentsRegistry(); + + // Register extensions for the first plugin + reactiveRegistry.register({ + pluginId: pluginId1, + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + const registry1 = await reactiveRegistry.getState(); + expect(registry1).toEqual({ + 'grafana/alerting/home': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId1, + title: 'Component 1 title', + description: 'Component 1 description', + }), + ]), + }); + + // Register an extension component for the second plugin to a different extension point + reactiveRegistry.register({ + pluginId: pluginId2, + configs: [ + { + title: 'Component 2 title', + description: 'Component 2 description', + targets: ['grafana/user/profile/tab'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + const registry2 = await reactiveRegistry.getState(); + + expect(registry2).toEqual({ + 'grafana/alerting/home': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId1, + title: 'Component 1 title', + description: 'Component 1 description', + }), + ]), + 'grafana/user/profile/tab': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId2, + title: 'Component 2 title', + description: 'Component 2 description', + }), + ]), + }); + }); + + it('should be possible to asynchronously register component extensions for the same extension point (same plugin)', async () => { + const pluginId = 'grafana-basic-app'; + const reactiveRegistry = new AddedComponentsRegistry(); + + // Register extensions for the first extension point + reactiveRegistry.register({ + pluginId: pluginId, + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + { + title: 'Component 2 title', + description: 'Component 2 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World2'), + }, + ], + }); + const registry1 = await reactiveRegistry.getState(); + expect(registry1).toEqual({ + 'grafana/alerting/home': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId, + title: 'Component 1 title', + description: 'Component 1 description', + }), + expect.objectContaining({ + pluginId: pluginId, + title: 'Component 2 title', + description: 'Component 2 description', + }), + ]), + }); + }); + + it('should be possible to register one extension component targeting multiple extension points', async () => { + const pluginId = 'grafana-basic-app'; + const reactiveRegistry = new AddedComponentsRegistry(); + + reactiveRegistry.register({ + pluginId: pluginId, + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['grafana/alerting/home', 'grafana/user/profile/tab'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + const registry1 = await reactiveRegistry.getState(); + expect(registry1).toEqual({ + 'grafana/alerting/home': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId, + title: 'Component 1 title', + description: 'Component 1 description', + }), + ]), + 'grafana/user/profile/tab': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId, + title: 'Component 1 title', + description: 'Component 1 description', + }), + ]), + }); + }); + + it('should notify subscribers when the registry changes', async () => { + const pluginId1 = 'grafana-basic-app'; + const pluginId2 = 'another-plugin'; + const reactiveRegistry = new AddedComponentsRegistry(); + const observable = reactiveRegistry.asObservable(); + const subscribeCallback = jest.fn(); + + observable.subscribe(subscribeCallback); + + reactiveRegistry.register({ + pluginId: pluginId1, + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + expect(subscribeCallback).toHaveBeenCalledTimes(2); + + reactiveRegistry.register({ + pluginId: pluginId2, + configs: [ + { + title: 'Component 2 title', + description: 'Component 2 description', + targets: ['grafana/user/profile/tab'], + component: () => React.createElement('div', null, 'Hello World2'), + }, + ], + }); + + expect(subscribeCallback).toHaveBeenCalledTimes(3); + + const registry = subscribeCallback.mock.calls[2][0]; + + expect(registry).toEqual({ + 'grafana/alerting/home': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId1, + title: 'Component 1 title', + description: 'Component 1 description', + }), + ]), + 'grafana/user/profile/tab': expect.arrayContaining([ + expect.objectContaining({ + pluginId: pluginId2, + title: 'Component 2 title', + description: 'Component 2 description', + }), + ]), + }); + }); + + it('should skip registering component and log a warning when id is not prefixed with plugin id or grafana', async () => { + const registry = new AddedComponentsRegistry(); + registry.register({ + pluginId: 'grafana-basic-app', + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + expect(consoleWarn).toHaveBeenCalledWith( + "[Plugin Extensions] Could not register added component with id 'alerting/home'. Reason: The component id does not match the id naming convention. Id should be prefixed with plugin id or grafana. e.g '/my-component-id/v1'." + ); + const currentState = await registry.getState(); + expect(Object.keys(currentState)).toHaveLength(0); + }); + + it('should log a warning when exposed component id is not suffixed with component version', async () => { + const registry = new AddedComponentsRegistry(); + registry.register({ + pluginId: 'grafana-basic-app', + configs: [ + { + title: 'Component 1 title', + description: 'Component 1 description', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + expect(consoleWarn).toHaveBeenCalledWith( + "[Plugin Extensions] Added component with id 'grafana/alerting/home' does not match the convention. It's recommended to suffix the id with the component version. e.g 'myorg-basic-app/my-component-id/v1'." + ); + const currentState = await registry.getState(); + expect(Object.keys(currentState)).toHaveLength(1); + }); + + it('should not register component when description is missing', async () => { + const registry = new AddedComponentsRegistry(); + registry.register({ + pluginId: 'grafana-basic-app', + configs: [ + { + title: 'Component 1 title', + description: '', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + expect(consoleWarn).toHaveBeenCalledWith( + "[Plugin Extensions] Could not register added component with title 'Component 1 title'. Reason: Description is missing." + ); + const currentState = await registry.getState(); + expect(Object.keys(currentState)).toHaveLength(0); + }); + + it('should not register component when title is missing', async () => { + const registry = new AddedComponentsRegistry(); + registry.register({ + pluginId: 'grafana-basic-app', + configs: [ + { + title: 'Component 1 title', + description: '', + targets: ['grafana/alerting/home'], + component: () => React.createElement('div', null, 'Hello World1'), + }, + ], + }); + + expect(consoleWarn).toHaveBeenCalledWith( + "[Plugin Extensions] Could not register added component with title 'Component 1 title'. Reason: Description is missing." + ); + + const currentState = await registry.getState(); + expect(Object.keys(currentState)).toHaveLength(0); + }); +}); diff --git a/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.ts b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.ts new file mode 100644 index 00000000000..78420c42a17 --- /dev/null +++ b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.ts @@ -0,0 +1,78 @@ +import { PluginAddedComponentConfig } from '@grafana/data'; + +import { logWarning, wrapWithPluginContext } from '../utils'; +import { extensionPointEndsWithVersion, isExtensionPointIdValid, isReactComponent } from '../validators'; + +import { PluginExtensionConfigs, Registry, RegistryType } from './Registry'; + +export type AddedComponentRegistryItem = { + pluginId: string; + title: string; + description: string; + component: React.ComponentType; +}; + +export class AddedComponentsRegistry extends Registry { + constructor(initialState: RegistryType = {}) { + super({ + initialState, + }); + } + + mapToRegistry( + registry: RegistryType, + item: PluginExtensionConfigs + ): RegistryType { + const { pluginId, configs } = item; + + for (const config of configs) { + if (!isReactComponent(config.component)) { + logWarning( + `Could not register added component with title '${config.title}'. Reason: The provided component is not a valid React component.` + ); + continue; + } + + if (!config.title) { + logWarning(`Could not register added component with title '${config.title}'. Reason: Title is missing.`); + continue; + } + + if (!config.description) { + logWarning(`Could not register added component with title '${config.title}'. Reason: Description is missing.`); + continue; + } + + const extensionPointIds = Array.isArray(config.targets) ? config.targets : [config.targets]; + for (const extensionPointId of extensionPointIds) { + if (!isExtensionPointIdValid(pluginId, extensionPointId)) { + logWarning( + `Could not register added component with id '${extensionPointId}'. Reason: The component id does not match the id naming convention. Id should be prefixed with plugin id or grafana. e.g '/my-component-id/v1'.` + ); + continue; + } + + if (!extensionPointEndsWithVersion(extensionPointId)) { + logWarning( + `Added component with id '${extensionPointId}' does not match the convention. It's recommended to suffix the id with the component version. e.g 'myorg-basic-app/my-component-id/v1'.` + ); + } + + const result = { + pluginId, + component: wrapWithPluginContext(pluginId, config.component), + description: config.description, + title: config.title, + }; + + if (!(extensionPointId in registry)) { + registry[extensionPointId] = [result]; + } else { + registry[extensionPointId].push(result); + } + } + } + + return registry; + } +} diff --git a/public/app/features/plugins/extensions/registry/ExportedComponentsRegistry.test.ts b/public/app/features/plugins/extensions/registry/ExportedComponentsRegistry.test.ts index 64e18fe74ab..fd70bb9f79e 100644 --- a/public/app/features/plugins/extensions/registry/ExportedComponentsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/ExportedComponentsRegistry.test.ts @@ -40,11 +40,9 @@ describe('ExposedComponentsRegistry', () => { expect(Object.keys(registry)).toHaveLength(1); expect(registry[id]).toMatchObject({ pluginId, - config: { - id, - title: 'not important', - description: 'not important', - }, + id, + title: 'not important', + description: 'not important', }); }); @@ -82,9 +80,9 @@ describe('ExposedComponentsRegistry', () => { const registry = await reactiveRegistry.getState(); expect(Object.keys(registry)).toHaveLength(3); - expect(registry[id1]).toMatchObject({ config: { id: id1 }, pluginId }); - expect(registry[id2]).toMatchObject({ config: { id: id2 }, pluginId }); - expect(registry[id3]).toMatchObject({ config: { id: id3 }, pluginId }); + expect(registry[id1]).toMatchObject({ id: id1, pluginId }); + expect(registry[id2]).toMatchObject({ id: id2, pluginId }); + expect(registry[id3]).toMatchObject({ id: id3, pluginId }); }); it('should be possible to register multiple exposed components from multiple plugins', async () => { @@ -135,10 +133,10 @@ describe('ExposedComponentsRegistry', () => { const registry = await reactiveRegistry.getState(); expect(Object.keys(registry)).toHaveLength(4); - expect(registry[id1]).toMatchObject({ config: { id: id1 }, pluginId: pluginId1 }); - expect(registry[id2]).toMatchObject({ config: { id: id2 }, pluginId: pluginId1 }); - expect(registry[id3]).toMatchObject({ config: { id: id3 }, pluginId: pluginId2 }); - expect(registry[id4]).toMatchObject({ config: { id: id4 }, pluginId: pluginId2 }); + expect(registry[id1]).toMatchObject({ id: id1, pluginId: pluginId1 }); + expect(registry[id2]).toMatchObject({ id: id2, pluginId: pluginId1 }); + expect(registry[id3]).toMatchObject({ id: id3, pluginId: pluginId2 }); + expect(registry[id4]).toMatchObject({ id: id4, pluginId: pluginId2 }); }); it('should notify subscribers when the registry changes', async () => { @@ -208,11 +206,9 @@ describe('ExposedComponentsRegistry', () => { expect(mock['grafana-basic-app/hello-world/v1']).toMatchObject({ pluginId: 'grafana-basic-app', - config: { - id: 'grafana-basic-app/hello-world/v1', - title: 'not important', - description: 'not important', - }, + id: 'grafana-basic-app/hello-world/v1', + title: 'not important', + description: 'not important', }); }); @@ -234,9 +230,7 @@ describe('ExposedComponentsRegistry', () => { expect(Object.keys(currentState1)).toHaveLength(1); expect(currentState1['grafana-basic-app1/hello-world/v1']).toMatchObject({ pluginId: 'grafana-basic-app1', - config: { - id: 'grafana-basic-app1/hello-world/v1', - }, + id: 'grafana-basic-app1/hello-world/v1', }); registry.register({ diff --git a/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.ts b/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.ts index f0036742fab..52b8e97a9c4 100644 --- a/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.ts +++ b/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.ts @@ -1,20 +1,28 @@ import { PluginExposedComponentConfig } from '@grafana/data'; import { logWarning } from '../utils'; +import { extensionPointEndsWithVersion } from '../validators'; import { Registry, RegistryType, PluginExtensionConfigs } from './Registry'; -export class ExposedComponentsRegistry extends Registry { - constructor(initialState: RegistryType = {}) { +export type ExposedComponentRegistryItem = { + pluginId: string; + title: string; + description: string; + component: React.ComponentType; +}; + +export class ExposedComponentsRegistry extends Registry { + constructor(initialState: RegistryType = {}) { super({ initialState, }); } mapToRegistry( - registry: RegistryType, + registry: RegistryType, { pluginId, configs }: PluginExtensionConfigs - ): RegistryType { + ): RegistryType { if (!configs) { return registry; } @@ -29,7 +37,7 @@ export class ExposedComponentsRegistry extends Registry = { configs: T[]; }; -export type RegistryItem = { - pluginId: string; - config: T; -}; - -export type RegistryType = Record>; +export type RegistryType = Record; type ConstructorOptions = { initialState: RegistryType; }; // This is the base-class used by the separate specific registries. -export abstract class Registry { - private resultSubject: Subject>; - private registrySubject: ReplaySubject>; +export abstract class Registry { + private resultSubject: Subject>; + private registrySubject: ReplaySubject>; - constructor(options: ConstructorOptions) { + constructor(options: ConstructorOptions) { const { initialState } = options; - this.resultSubject = new Subject>(); + this.resultSubject = new Subject>(); // This is the subject that we expose. // (It will buffer the last value on the stream - the registry - and emit it to new subscribers immediately.) - this.registrySubject = new ReplaySubject>(1); + this.registrySubject = new ReplaySubject>(1); this.resultSubject .pipe( @@ -41,17 +36,20 @@ export abstract class Registry { .subscribe(this.registrySubject); } - abstract mapToRegistry(registry: RegistryType, item: PluginExtensionConfigs): RegistryType; + abstract mapToRegistry( + registry: RegistryType, + item: PluginExtensionConfigs + ): RegistryType; - register(result: PluginExtensionConfigs): void { + register(result: PluginExtensionConfigs): void { this.resultSubject.next(result); } - asObservable(): Observable> { + asObservable(): Observable> { return this.registrySubject.asObservable(); } - getState(): Promise> { + getState(): Promise> { return firstValueFrom(this.asObservable()); } } diff --git a/public/app/features/plugins/extensions/types.ts b/public/app/features/plugins/extensions/types.ts index 9642cc6627d..b5e5d1ebbc8 100644 --- a/public/app/features/plugins/extensions/types.ts +++ b/public/app/features/plugins/extensions/types.ts @@ -1,5 +1,8 @@ import type { PluginExtensionConfig } from '@grafana/data'; +import { AddedComponentRegistryItem } from './registry/AddedComponentsRegistry'; +import { RegistryType } from './registry/Registry'; + // The information that is stored in the registry export type PluginExtensionRegistryItem = { // Any additional meta information that we would like to store about the extension in the registry @@ -13,3 +16,5 @@ export type PluginExtensionRegistry = { id: string; extensions: Record; }; + +export type AddedComponentsRegistryState = RegistryType>>; diff --git a/public/app/features/plugins/extensions/usePluginComponent.tsx b/public/app/features/plugins/extensions/usePluginComponent.tsx index df2689a66ce..269baf3df0f 100644 --- a/public/app/features/plugins/extensions/usePluginComponent.tsx +++ b/public/app/features/plugins/extensions/usePluginComponent.tsx @@ -26,7 +26,7 @@ export function createUsePluginComponent(registry: ExposedComponentsRegistry) { return { isLoading: false, - component: wrapWithPluginContext(registryItem.pluginId, registryItem.config.component), + component: wrapWithPluginContext(registryItem.pluginId, registryItem.component), }; }, [id, registry]); }; diff --git a/public/app/features/plugins/extensions/usePluginComponents.test.tsx b/public/app/features/plugins/extensions/usePluginComponents.test.tsx new file mode 100644 index 00000000000..1e40a1a4b21 --- /dev/null +++ b/public/app/features/plugins/extensions/usePluginComponents.test.tsx @@ -0,0 +1,171 @@ +import { act, render, screen } from '@testing-library/react'; +import { renderHook } from '@testing-library/react-hooks'; + +import { AddedComponentsRegistry } from './registry/AddedComponentsRegistry'; +import { createUsePluginComponents } from './usePluginComponents'; + +jest.mock('app/features/plugins/pluginSettings', () => ({ + getPluginSettings: jest.fn().mockResolvedValue({ + id: 'my-app-plugin', + enabled: true, + jsonData: {}, + type: 'panel', + name: 'My App Plugin', + module: 'app/plugins/my-app-plugin/module', + }), +})); + +describe('usePluginComponents()', () => { + let registry: AddedComponentsRegistry; + + beforeEach(() => { + registry = new AddedComponentsRegistry(); + }); + + it('should return an empty array if there are no extensions registered for the extension point', () => { + const usePluginComponents = createUsePluginComponents(registry); + const { result } = renderHook(() => + usePluginComponents({ + extensionPointId: 'foo/bar', + }) + ); + + expect(result.current.components).toEqual([]); + }); + + it('should only return the plugin extension components for the given extension point ids', async () => { + const extensionPointId = 'plugins/foo/bar/v1'; + const pluginId = 'my-app-plugin'; + + registry.register({ + pluginId, + configs: [ + { + targets: extensionPointId, + title: '1', + description: '1', + component: () =>
    Hello World1
    , + }, + { + targets: extensionPointId, + title: '2', + description: '2', + component: () =>
    Hello World2
    , + }, + { + targets: 'plugins/another-extension/v1', + title: '3', + description: '3', + component: () =>
    Hello World3
    , + }, + ], + }); + + const usePluginComponents = createUsePluginComponents(registry); + const { result } = renderHook(() => usePluginComponents({ extensionPointId })); + + expect(result.current.components.length).toBe(2); + + act(() => { + render(result.current.components.map((Component, index) => )); + }); + expect(await screen.findByText('Hello World1')).toBeVisible(); + expect(await screen.findByText('Hello World2')).toBeVisible(); + expect(await screen.queryByText('Hello World3')).toBeNull(); + }); + + it('should dynamically update the extensions registered for a certain extension point', () => { + const extensionPointId = 'plugins/foo/bar/v1'; + const pluginId = 'my-app-plugin'; + const usePluginComponents = createUsePluginComponents(registry); + let { result, rerender } = renderHook(() => usePluginComponents({ extensionPointId })); + + // No extensions yet + expect(result.current.components.length).toBe(0); + + // Add extensions to the registry + act(() => { + registry.register({ + pluginId, + configs: [ + { + targets: extensionPointId, + title: '1', + description: '1', + component: () =>
    Hello World1
    , + }, + { + targets: extensionPointId, + title: '2', + description: '2', + component: () =>
    Hello World2
    , + }, + { + targets: 'plugins/another-extension/v1', + title: '3', + description: '3', + component: () =>
    Hello World3
    , + }, + ], + }); + }); + + // Check if the hook returns the new extensions + rerender(); + + expect(result.current.components.length).toBe(2); + }); + + it('should only render the hook once', () => { + const spy = jest.spyOn(registry, 'asObservable'); + const extensionPointId = 'plugins/foo/bar'; + const usePluginComponents = createUsePluginComponents(registry); + + renderHook(() => usePluginComponents({ extensionPointId })); + expect(spy).toHaveBeenCalledTimes(1); + }); + + it('should honour the limitPerPlugin arg if its set', () => { + const extensionPointId = 'plugins/foo/bar/v1'; + const plugins = ['my-app-plugin1', 'my-app-plugin2', 'my-app-plugin3']; + const usePluginComponents = createUsePluginComponents(registry); + let { result, rerender } = renderHook(() => usePluginComponents({ extensionPointId, limitPerPlugin: 2 })); + + // No extensions yet + expect(result.current.components.length).toBe(0); + + // Add extensions to the registry + act(() => { + for (let pluginId of plugins) { + registry.register({ + pluginId, + configs: [ + { + targets: extensionPointId, + title: '1', + description: '1', + component: () =>
    Hello World1
    , + }, + { + targets: extensionPointId, + title: '2', + description: '2', + component: () =>
    Hello World2
    , + }, + { + targets: extensionPointId, + title: '3', + description: '3', + component: () =>
    Hello World3
    , + }, + ], + }); + } + }); + + // Check if the hook returns the new extensions + rerender(); + + expect(result.current.components.length).toBe(6); + }); +}); diff --git a/public/app/features/plugins/extensions/usePluginComponents.tsx b/public/app/features/plugins/extensions/usePluginComponents.tsx new file mode 100644 index 00000000000..db3d1c6710c --- /dev/null +++ b/public/app/features/plugins/extensions/usePluginComponents.tsx @@ -0,0 +1,53 @@ +import { useMemo } from 'react'; +import { useObservable } from 'react-use'; + +import { + UsePluginComponentOptions, + UsePluginComponentsResult, +} from '@grafana/runtime/src/services/pluginExtensions/getPluginExtensions'; + +import { AddedComponentsRegistry } from './registry/AddedComponentsRegistry'; + +// Returns an array of component extensions for the given extension point +export function createUsePluginComponents(registry: AddedComponentsRegistry) { + const observableRegistry = registry.asObservable(); + + return function usePluginComponents({ + limitPerPlugin, + extensionPointId, + }: UsePluginComponentOptions): UsePluginComponentsResult { + const registry = useObservable(observableRegistry); + + return useMemo(() => { + if (!registry || !registry[extensionPointId]) { + return { + isLoading: false, + components: [], + }; + } + const components: Array> = []; + const registryItems = registry[extensionPointId]; + const extensionsByPlugin: Record = {}; + for (const registryItem of registryItems) { + const { pluginId } = registryItem; + + // Only limit if the `limitPerPlugin` is set + if (limitPerPlugin && extensionsByPlugin[pluginId] >= limitPerPlugin) { + continue; + } + + if (extensionsByPlugin[pluginId] === undefined) { + extensionsByPlugin[pluginId] = 0; + } + + components.push(registryItem.component as React.ComponentType); + extensionsByPlugin[pluginId] += 1; + } + + return { + isLoading: false, + components, + }; + }, [extensionPointId, limitPerPlugin, registry]); + }; +} diff --git a/public/app/features/plugins/extensions/usePluginExtensions.test.tsx b/public/app/features/plugins/extensions/usePluginExtensions.test.tsx index f6259d2bfeb..886dfecdec8 100644 --- a/public/app/features/plugins/extensions/usePluginExtensions.test.tsx +++ b/public/app/features/plugins/extensions/usePluginExtensions.test.tsx @@ -4,17 +4,20 @@ import { renderHook } from '@testing-library/react-hooks'; import { PluginExtensionTypes } from '@grafana/data'; import { ReactivePluginExtensionsRegistry } from './reactivePluginExtensionRegistry'; +import { AddedComponentsRegistry } from './registry/AddedComponentsRegistry'; import { createUsePluginExtensions } from './usePluginExtensions'; describe('usePluginExtensions()', () => { let reactiveRegistry: ReactivePluginExtensionsRegistry; + let addedComponentsRegistry: AddedComponentsRegistry; beforeEach(() => { reactiveRegistry = new ReactivePluginExtensionsRegistry(); + addedComponentsRegistry = new AddedComponentsRegistry(); }); it('should return an empty array if there are no extensions registered for the extension point', () => { - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); const { result } = renderHook(() => usePluginExtensions({ extensionPointId: 'foo/bar', @@ -24,7 +27,7 @@ describe('usePluginExtensions()', () => { expect(result.current.extensions).toEqual([]); }); - it('should return the plugin extensions from the registry', () => { + it('should return the plugin link extensions from the registry', () => { const extensionPointId = 'plugins/foo/bar'; const pluginId = 'my-app-plugin'; @@ -47,9 +50,10 @@ describe('usePluginExtensions()', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); const { result } = renderHook(() => usePluginExtensions({ extensionPointId })); expect(result.current.extensions.length).toBe(2); @@ -57,10 +61,63 @@ describe('usePluginExtensions()', () => { expect(result.current.extensions[1].title).toBe('2'); }); + it('should return the plugin component extensions from the registry', () => { + const linkExtensionPointId = 'plugins/foo/bar'; + const componentExtensionPointId = 'plugins/component/bar/v1'; + const pluginId = 'my-app-plugin'; + + reactiveRegistry.register({ + pluginId, + extensionConfigs: [ + { + type: PluginExtensionTypes.link, + extensionPointId: linkExtensionPointId, + title: '1', + description: '1', + path: `/a/${pluginId}/2`, + }, + { + type: PluginExtensionTypes.link, + extensionPointId: linkExtensionPointId, + title: '2', + description: '2', + path: `/a/${pluginId}/2`, + }, + ], + exposedComponentConfigs: [], + addedComponentConfigs: [], + }); + + addedComponentsRegistry.register({ + pluginId, + configs: [ + { + targets: componentExtensionPointId, + title: 'Component 1', + description: '1', + component: () =>
    Hello World1
    , + }, + { + targets: componentExtensionPointId, + title: 'Component 2', + description: '2', + component: () =>
    Hello World2
    , + }, + ], + }); + + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); + const { result } = renderHook(() => usePluginExtensions({ extensionPointId: componentExtensionPointId })); + + expect(result.current.extensions.length).toBe(2); + expect(result.current.extensions[0].title).toBe('Component 1'); + expect(result.current.extensions[1].title).toBe('Component 2'); + }); + it('should dynamically update the extensions registered for a certain extension point', () => { const extensionPointId = 'plugins/foo/bar'; const pluginId = 'my-app-plugin'; - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); let { result, rerender } = renderHook(() => usePluginExtensions({ extensionPointId })); // No extensions yet @@ -87,6 +144,7 @@ describe('usePluginExtensions()', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); }); @@ -101,7 +159,7 @@ describe('usePluginExtensions()', () => { it('should only render the hook once', () => { const spy = jest.spyOn(reactiveRegistry, 'asObservable'); const extensionPointId = 'plugins/foo/bar'; - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); renderHook(() => usePluginExtensions({ extensionPointId })); expect(spy).toHaveBeenCalledTimes(1); @@ -110,7 +168,7 @@ describe('usePluginExtensions()', () => { it('should return the same extensions object if the context object is the same', () => { const extensionPointId = 'plugins/foo/bar'; const pluginId = 'my-app-plugin'; - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); // Add extensions to the registry act(() => { @@ -133,6 +191,7 @@ describe('usePluginExtensions()', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); }); @@ -146,7 +205,7 @@ describe('usePluginExtensions()', () => { it('should return a new extensions object if the context object is different', () => { const extensionPointId = 'plugins/foo/bar'; const pluginId = 'my-app-plugin'; - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); // Add extensions to the registry act(() => { @@ -169,6 +228,7 @@ describe('usePluginExtensions()', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); }); @@ -182,7 +242,7 @@ describe('usePluginExtensions()', () => { const extensionPointId = 'plugins/foo/bar'; const pluginId = 'my-app-plugin'; const context = {}; - const usePluginExtensions = createUsePluginExtensions(reactiveRegistry); + const usePluginExtensions = createUsePluginExtensions(reactiveRegistry, addedComponentsRegistry); // Add the first extension act(() => { @@ -198,6 +258,7 @@ describe('usePluginExtensions()', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); }); @@ -219,6 +280,7 @@ describe('usePluginExtensions()', () => { }, ], exposedComponentConfigs: [], + addedComponentConfigs: [], }); }); diff --git a/public/app/features/plugins/extensions/usePluginExtensions.tsx b/public/app/features/plugins/extensions/usePluginExtensions.tsx index d02deec66ec..b00d4517265 100644 --- a/public/app/features/plugins/extensions/usePluginExtensions.tsx +++ b/public/app/features/plugins/extensions/usePluginExtensions.tsx @@ -5,9 +5,14 @@ import { GetPluginExtensionsOptions, UsePluginExtensionsResult } from '@grafana/ import { getPluginExtensions } from './getPluginExtensions'; import { ReactivePluginExtensionsRegistry } from './reactivePluginExtensionRegistry'; +import { AddedComponentsRegistry } from './registry/AddedComponentsRegistry'; -export function createUsePluginExtensions(extensionsRegistry: ReactivePluginExtensionsRegistry) { +export function createUsePluginExtensions( + extensionsRegistry: ReactivePluginExtensionsRegistry, + addedComponentsRegistry: AddedComponentsRegistry +) { const observableRegistry = extensionsRegistry.asObservable(); + const observableAddedComponentRegistry = addedComponentsRegistry.asObservable(); const cache: { id: string; extensions: Record; @@ -18,8 +23,9 @@ export function createUsePluginExtensions(extensionsRegistry: ReactivePluginExte return function usePluginExtensions(options: GetPluginExtensionsOptions): UsePluginExtensionsResult { const registry = useObservable(observableRegistry); + const addedComponentsRegistry = useObservable(observableAddedComponentRegistry); - if (!registry) { + if (!registry || !addedComponentsRegistry) { return { extensions: [], isLoading: false }; } @@ -39,7 +45,11 @@ export function createUsePluginExtensions(extensionsRegistry: ReactivePluginExte }; } - const { extensions } = getPluginExtensions({ ...options, registry }); + const { extensions } = getPluginExtensions({ + ...options, + registry, + addedComponentsRegistry, + }); cache.extensions[key] = { context: options.context, diff --git a/public/app/features/plugins/extensions/utils.tsx b/public/app/features/plugins/extensions/utils.tsx index 48d690f0a02..fba4871185c 100644 --- a/public/app/features/plugins/extensions/utils.tsx +++ b/public/app/features/plugins/extensions/utils.tsx @@ -5,7 +5,6 @@ import { useAsync } from 'react-use'; import { type PluginExtensionLinkConfig, - type PluginExtensionComponentConfig, type PluginExtensionConfig, type PluginExtensionEventHelpers, PluginExtensionTypes, @@ -31,12 +30,6 @@ export function isPluginExtensionLinkConfig( return typeof extension === 'object' && 'type' in extension && extension['type'] === PluginExtensionTypes.link; } -export function isPluginExtensionComponentConfig( - extension: PluginExtensionConfig | undefined | PluginExtensionComponentConfig -): extension is PluginExtensionComponentConfig { - return typeof extension === 'object' && 'type' in extension && extension['type'] === PluginExtensionTypes.component; -} - export function handleErrorsInFn(fn: Function, errorMessagePrefix = '') { return (...args: unknown[]) => { try { diff --git a/public/app/features/plugins/extensions/validators.ts b/public/app/features/plugins/extensions/validators.ts index d9c0a45ebe7..1584992b670 100644 --- a/public/app/features/plugins/extensions/validators.ts +++ b/public/app/features/plugins/extensions/validators.ts @@ -6,7 +6,7 @@ import type { } from '@grafana/data'; import { isPluginExtensionLink } from '@grafana/runtime'; -import { isPluginExtensionComponentConfig, isPluginExtensionLinkConfig, logWarning } from './utils'; +import { isPluginExtensionLinkConfig, logWarning } from './utils'; export function assertPluginExtensionLink( extension: PluginExtension | undefined, @@ -41,7 +41,7 @@ export function assertIsReactComponent(component: React.ComponentType) { } export function assertExtensionPointIdIsValid(pluginId: string, extension: PluginExtensionConfig) { - if (!isExtensionPointIdValid(pluginId, extension)) { + if (!isExtensionPointIdValid(pluginId, extension.extensionPointId)) { throw new Error( `Invalid extension "${extension.title}". The extensionPointId should start with either "grafana/", "plugins/" or "capabilities/${pluginId}" (currently: "${extension.extensionPointId}"). Skipping the extension.` ); @@ -76,14 +76,18 @@ export function isLinkPathValid(pluginId: string, path: string) { return Boolean(typeof path === 'string' && path.length > 0 && path.startsWith(`/a/${pluginId}/`)); } -export function isExtensionPointIdValid(pluginId: string, extension: PluginExtensionConfig) { +export function isExtensionPointIdValid(pluginId: string, extensionPointId: string) { return Boolean( - extension.extensionPointId?.startsWith('grafana/') || - extension.extensionPointId?.startsWith('plugins/') || - extension.extensionPointId?.startsWith(`capabilities/${pluginId}/`) + extensionPointId.startsWith('grafana/') || + extensionPointId?.startsWith('plugins/') || + extensionPointId?.startsWith(pluginId) ); } +export function extensionPointEndsWithVersion(extensionPointId: string) { + return extensionPointId.match(/.*\/v\d+$/); +} + export function isConfigureFnValid(extension: PluginExtensionLinkConfig) { return extension.configure ? typeof extension.configure === 'function' : true; } @@ -111,11 +115,6 @@ export function isPluginExtensionConfigValid(pluginId: string, extension: Plugin } } - // Component - if (isPluginExtensionComponentConfig(extension)) { - assertIsReactComponent(extension.component); - } - return true; } catch (error) { if (error instanceof Error) { diff --git a/public/app/features/plugins/pluginPreloader.ts b/public/app/features/plugins/pluginPreloader.ts index 2fd705bdd4e..7fa1c536896 100644 --- a/public/app/features/plugins/pluginPreloader.ts +++ b/public/app/features/plugins/pluginPreloader.ts @@ -1,9 +1,11 @@ import type { PluginExposedComponentConfig, PluginExtensionConfig } from '@grafana/data'; +import { PluginAddedComponentConfig } from '@grafana/data/src/types/pluginExtensions'; import type { AppPluginConfig } from '@grafana/runtime'; import { startMeasure, stopMeasure } from 'app/core/utils/metrics'; import { getPluginSettings } from 'app/features/plugins/pluginSettings'; import { ReactivePluginExtensionsRegistry } from './extensions/reactivePluginExtensionRegistry'; +import { AddedComponentsRegistry } from './extensions/registry/AddedComponentsRegistry'; import { ExposedComponentsRegistry } from './extensions/registry/ExposedComponentsRegistry'; import * as pluginLoader from './plugin_loader'; @@ -12,12 +14,18 @@ export type PluginPreloadResult = { error?: unknown; extensionConfigs: PluginExtensionConfig[]; exposedComponentConfigs: PluginExposedComponentConfig[]; + addedComponentConfigs: PluginAddedComponentConfig[]; +}; + +type PluginExtensionRegistries = { + extensionsRegistry: ReactivePluginExtensionsRegistry; + addedComponentsRegistry: AddedComponentsRegistry; + exposedComponentsRegistry: ExposedComponentsRegistry; }; export async function preloadPlugins( apps: AppPluginConfig[] = [], - registry: ReactivePluginExtensionsRegistry, - exposedComponentsRegistry: ExposedComponentsRegistry, + registries: PluginExtensionRegistries, eventName = 'frontend_plugins_preload' ) { startMeasure(eventName); @@ -30,12 +38,15 @@ export async function preloadPlugins( continue; } - registry.register(preloadedPlugin); - - exposedComponentsRegistry.register({ + registries.extensionsRegistry.register(preloadedPlugin); + registries.exposedComponentsRegistry.register({ pluginId: preloadedPlugin.pluginId, configs: preloadedPlugin.exposedComponentConfigs, }); + registries.addedComponentsRegistry.register({ + pluginId: preloadedPlugin.pluginId, + configs: preloadedPlugin.addedComponentConfigs, + }); } stopMeasure(eventName); @@ -51,16 +62,16 @@ async function preload(config: AppPluginConfig): Promise { isAngular: config.angular.detected, pluginId, }); - const { extensionConfigs = [], exposedComponentConfigs = [] } = plugin; + const { extensionConfigs = [], exposedComponentConfigs = [], addedComponentConfigs = [] } = plugin; // Fetching meta-information for the preloaded app plugin and caching it for later. // (The function below returns a promise, but it's not awaited for a reason: we don't want to block the preload process, we would only like to cache the result for later.) getPluginSettings(pluginId); - return { pluginId, extensionConfigs, exposedComponentConfigs }; + return { pluginId, extensionConfigs, exposedComponentConfigs, addedComponentConfigs }; } catch (error) { console.error(`[Plugins] Failed to preload plugin: ${path} (version: ${version})`, error); - return { pluginId, extensionConfigs: [], error, exposedComponentConfigs: [] }; + return { pluginId, extensionConfigs: [], error, exposedComponentConfigs: [], addedComponentConfigs: [] }; } finally { stopMeasure(`frontend_plugin_preload_${pluginId}`); } diff --git a/public/app/features/query/components/QueryGroupOptions.tsx b/public/app/features/query/components/QueryGroupOptions.tsx index 7d73aa3fac1..8fc36b47e1e 100644 --- a/public/app/features/query/components/QueryGroupOptions.tsx +++ b/public/app/features/query/components/QueryGroupOptions.tsx @@ -3,7 +3,7 @@ import { PureComponent, ChangeEvent, FocusEvent } from 'react'; import * as React from 'react'; import { rangeUtil, PanelData, DataSourceApi } from '@grafana/data'; -import { Switch, Input, InlineFormLabel, stylesFactory } from '@grafana/ui'; +import { Input, InlineFormLabel, stylesFactory, InlineFieldRow, InlineSwitch } from '@grafana/ui'; import { QueryOperationRow } from 'app/core/components/QueryOperationRow/QueryOperationRow'; import { config } from 'app/core/config'; import { QueryGroupOptions } from 'app/types'; @@ -408,10 +408,10 @@ export class QueryGroupOptionsEditor extends PureComponent { />
{(timeShift || relativeTime) && ( -
+ Hide time info - -
+ + )} ); diff --git a/public/app/features/scopes/ScopesFacadeScene.ts b/public/app/features/scopes/ScopesFacadeScene.ts index db65da5f7a8..268634bc5f3 100644 --- a/public/app/features/scopes/ScopesFacadeScene.ts +++ b/public/app/features/scopes/ScopesFacadeScene.ts @@ -1,3 +1,5 @@ +import { isEqual } from 'lodash'; + import { SceneObjectBase, SceneObjectState } from '@grafana/scenes'; import { scopesSelectorScene } from './instance'; @@ -20,7 +22,7 @@ export class ScopesFacade extends SceneObjectBase { this._subs.add( scopesSelectorScene?.subscribeToState((newState, prevState) => { - if (!newState.isLoadingScopes && (prevState.isLoadingScopes || newState.scopes !== prevState.scopes)) { + if (!newState.isLoadingScopes && (prevState.isLoadingScopes || !isEqual(newState.scopes, prevState.scopes))) { this.state.handler?.(this); } }) diff --git a/public/app/features/scopes/internal/ScopesDashboardsScene.tsx b/public/app/features/scopes/internal/ScopesDashboardsScene.tsx index 510f589804b..e838286df3f 100644 --- a/public/app/features/scopes/internal/ScopesDashboardsScene.tsx +++ b/public/app/features/scopes/internal/ScopesDashboardsScene.tsx @@ -1,23 +1,27 @@ import { css, cx } from '@emotion/css'; import { isEqual } from 'lodash'; -import { Link } from 'react-router-dom'; -import { GrafanaTheme2, urlUtil } from '@grafana/data'; +import { GrafanaTheme2, ScopeDashboardBinding } from '@grafana/data'; import { SceneComponentProps, SceneObjectBase, SceneObjectRef, SceneObjectState } from '@grafana/scenes'; -import { Button, CustomScrollbar, FilterInput, LoadingPlaceholder, useStyles2 } from '@grafana/ui'; -import { useQueryParams } from 'app/core/hooks/useQueryParams'; +import { Button, CustomScrollbar, LoadingPlaceholder, useStyles2 } from '@grafana/ui'; import { t, Trans } from 'app/core/internationalization'; +import { ScopesDashboardsTree } from './ScopesDashboardsTree'; +import { ScopesDashboardsTreeSearch } from './ScopesDashboardsTreeSearch'; import { ScopesSelectorScene } from './ScopesSelectorScene'; -import { fetchSuggestedDashboards } from './api'; +import { fetchDashboards } from './api'; import { DASHBOARDS_OPENED_KEY } from './const'; -import { SuggestedDashboard } from './types'; -import { getScopeNamesFromSelectedScopes } from './utils'; +import { SuggestedDashboardsFoldersMap } from './types'; +import { filterFolders, getScopeNamesFromSelectedScopes, groupDashboards } from './utils'; export interface ScopesDashboardsSceneState extends SceneObjectState { selector: SceneObjectRef | null; - dashboards: SuggestedDashboard[]; - filteredDashboards: SuggestedDashboard[]; + // by keeping a track of the raw response, it's much easier to check if we got any dashboards for the currently selected scopes + dashboards: ScopeDashboardBinding[]; + // this is a grouping in folders of the `dashboards` property. it is used for filtering the dashboards and folders when the search query changes + folders: SuggestedDashboardsFoldersMap; + // a filtered version of the `folders` property. this prevents a lot of unnecessary parsings in React renders + filteredFolders: SuggestedDashboardsFoldersMap; forScopeNames: string[]; isLoading: boolean; isPanelOpened: boolean; @@ -28,7 +32,8 @@ export interface ScopesDashboardsSceneState extends SceneObjectState { export const getInitialDashboardsState: () => Omit = () => ({ dashboards: [], - filteredDashboards: [], + folders: {}, + filteredFolders: {}, forScopeNames: [], isLoading: false, isPanelOpened: localStorage.getItem(DASHBOARDS_OPENED_KEY) === 'true', @@ -80,7 +85,8 @@ export class ScopesDashboardsScene extends SceneObjectBase 0, @@ -101,14 +110,35 @@ export class ScopesDashboardsScene extends SceneObjectBase dashboardTitle.toLowerCase().includes(lowerCasedSearchQuery)); - } } export function ScopesDashboardsSceneRenderer({ model }: SceneComponentProps) { - const { dashboards, filteredDashboards, isLoading, isPanelOpened, isEnabled, searchQuery, scopesSelected } = + const { dashboards, filteredFolders, isLoading, isPanelOpened, isEnabled, searchQuery, scopesSelected } = model.useState(); - const styles = useStyles2(getStyles); - const [queryParams] = useQueryParams(); + const styles = useStyles2(getStyles); if (!isEnabled || !isPanelOpened) { return null; @@ -178,15 +201,11 @@ export function ScopesDashboardsSceneRenderer({ model }: SceneComponentProps -
- model.changeSearchQuery(value)} - /> -
+ model.changeSearchQuery(value)} + /> {isLoading ? ( - ) : filteredDashboards.length > 0 ? ( + ) : filteredFolders[''] ? ( - {filteredDashboards.map(({ dashboard, dashboardTitle }) => ( - - {dashboardTitle} - - ))} + model.updateFolder(path, isExpanded)} + /> ) : (

@@ -246,19 +260,8 @@ const getStyles = (theme: GrafanaTheme2) => { margin: 0, textAlign: 'center', }), - searchInputContainer: css({ - flex: '0 1 auto', - }), loadingIndicator: css({ alignSelf: 'center', }), - dashboardItem: css({ - padding: theme.spacing(1, 0), - borderBottom: `1px solid ${theme.colors.border.weak}`, - - '& :is(:first-child)': { - paddingTop: 0, - }, - }), }; }; diff --git a/public/app/features/scopes/internal/ScopesDashboardsTree.tsx b/public/app/features/scopes/internal/ScopesDashboardsTree.tsx new file mode 100644 index 00000000000..c90ce0fd729 --- /dev/null +++ b/public/app/features/scopes/internal/ScopesDashboardsTree.tsx @@ -0,0 +1,32 @@ +import { ScopesDashboardsTreeDashboardItem } from './ScopesDashboardsTreeDashboardItem'; +import { ScopesDashboardsTreeFolderItem } from './ScopesDashboardsTreeFolderItem'; +import { OnFolderUpdate, SuggestedDashboardsFoldersMap } from './types'; + +export interface ScopesDashboardsTreeProps { + folders: SuggestedDashboardsFoldersMap; + folderPath: string[]; + onFolderUpdate: OnFolderUpdate; +} + +export function ScopesDashboardsTree({ folders, folderPath, onFolderUpdate }: ScopesDashboardsTreeProps) { + const folderId = folderPath[folderPath.length - 1]; + const folder = folders[folderId]; + + return ( +

+ {Object.entries(folder.folders).map(([subFolderId, subFolder]) => ( + + ))} + + {Object.values(folder.dashboards).map((dashboard) => ( + + ))} +
+ ); +} diff --git a/public/app/features/scopes/internal/ScopesDashboardsTreeDashboardItem.tsx b/public/app/features/scopes/internal/ScopesDashboardsTreeDashboardItem.tsx new file mode 100644 index 00000000000..94fe444561a --- /dev/null +++ b/public/app/features/scopes/internal/ScopesDashboardsTreeDashboardItem.tsx @@ -0,0 +1,45 @@ +import { css } from '@emotion/css'; +import { Link } from 'react-router-dom'; + +import { GrafanaTheme2, urlUtil } from '@grafana/data'; +import { Icon, useStyles2 } from '@grafana/ui'; +import { useQueryParams } from 'app/core/hooks/useQueryParams'; + +import { SuggestedDashboard } from './types'; + +export interface ScopesDashboardsTreeDashboardItemProps { + dashboard: SuggestedDashboard; +} + +export function ScopesDashboardsTreeDashboardItem({ dashboard }: ScopesDashboardsTreeDashboardItemProps) { + const styles = useStyles2(getStyles); + + const [queryParams] = useQueryParams(); + + return ( + + {dashboard.dashboardTitle} + + ); +} + +const getStyles = (theme: GrafanaTheme2) => { + return { + container: css({ + display: 'flex', + alignItems: 'center', + gap: theme.spacing(1), + padding: theme.spacing(0.5, 0), + + '&:last-child': css({ + paddingBottom: 0, + }), + }), + }; +}; diff --git a/public/app/features/scopes/internal/ScopesDashboardsTreeFolderItem.tsx b/public/app/features/scopes/internal/ScopesDashboardsTreeFolderItem.tsx new file mode 100644 index 00000000000..e097fc7e266 --- /dev/null +++ b/public/app/features/scopes/internal/ScopesDashboardsTreeFolderItem.tsx @@ -0,0 +1,71 @@ +import { css } from '@emotion/css'; + +import { GrafanaTheme2 } from '@grafana/data'; +import { Icon, useStyles2 } from '@grafana/ui'; +import { t } from 'app/core/internationalization'; + +import { ScopesDashboardsTree } from './ScopesDashboardsTree'; +import { OnFolderUpdate, SuggestedDashboardsFolder, SuggestedDashboardsFoldersMap } from './types'; + +export interface ScopesDashboardsTreeFolderItemProps { + folder: SuggestedDashboardsFolder; + folderPath: string[]; + folders: SuggestedDashboardsFoldersMap; + onFolderUpdate: OnFolderUpdate; +} + +export function ScopesDashboardsTreeFolderItem({ + folder, + folderPath, + folders, + onFolderUpdate, +}: ScopesDashboardsTreeFolderItemProps) { + const styles = useStyles2(getStyles); + + return ( +
+ + + {folder.isExpanded && ( +
+ +
+ )} +
+ ); +} + +const getStyles = (theme: GrafanaTheme2) => { + return { + container: css({ + display: 'flex', + flexDirection: 'column', + padding: theme.spacing(0.5, 0), + }), + expand: css({ + alignItems: 'center', + background: 'none', + border: 0, + display: 'flex', + gap: theme.spacing(1), + margin: 0, + padding: 0, + }), + children: css({ + paddingLeft: theme.spacing(4), + }), + }; +}; diff --git a/public/app/features/scopes/internal/ScopesDashboardsTreeSearch.tsx b/public/app/features/scopes/internal/ScopesDashboardsTreeSearch.tsx new file mode 100644 index 00000000000..d9b971642a5 --- /dev/null +++ b/public/app/features/scopes/internal/ScopesDashboardsTreeSearch.tsx @@ -0,0 +1,55 @@ +import { css } from '@emotion/css'; +import { useEffect, useState } from 'react'; +import { useDebounce } from 'react-use'; + +import { GrafanaTheme2 } from '@grafana/data'; +import { FilterInput, useStyles2 } from '@grafana/ui'; +import { t } from 'app/core/internationalization'; + +export interface ScopesDashboardsTreeSearchProps { + disabled: boolean; + query: string; + onChange: (value: string) => void; +} + +export function ScopesDashboardsTreeSearch({ disabled, query, onChange }: ScopesDashboardsTreeSearchProps) { + const styles = useStyles2(getStyles); + + const [inputState, setInputState] = useState<{ value: string; isDirty: boolean }>({ value: query, isDirty: false }); + + const [getDebounceState] = useDebounce( + () => { + if (inputState.isDirty) { + onChange(inputState.value); + } + }, + 500, + [inputState.isDirty, inputState.value] + ); + + useEffect(() => { + if ((getDebounceState() || !inputState.isDirty) && inputState.value !== query) { + setInputState({ value: query, isDirty: false }); + } + }, [getDebounceState, inputState, query]); + + return ( +
+ setInputState({ value, isDirty: true })} + /> +
+ ); +} + +const getStyles = (theme: GrafanaTheme2) => { + return { + container: css({ + flex: '0 1 auto', + }), + }; +}; diff --git a/public/app/features/scopes/internal/api.ts b/public/app/features/scopes/internal/api.ts index 634de927253..81eb52d48c9 100644 --- a/public/app/features/scopes/internal/api.ts +++ b/public/app/features/scopes/internal/api.ts @@ -2,7 +2,7 @@ import { Scope, ScopeDashboardBinding, ScopeNode, ScopeSpec } from '@grafana/dat import { config, getBackendSrv } from '@grafana/runtime'; import { ScopedResourceClient } from 'app/features/apiserver/client'; -import { NodeReason, NodesMap, SelectedScope, SuggestedDashboard, TreeScope } from './types'; +import { NodeReason, NodesMap, SelectedScope, TreeScope } from './types'; import { getBasicScope, mergeScopes } from './utils'; const group = 'scope.grafana.app'; @@ -98,23 +98,3 @@ export async function fetchDashboards(scopeNames: string[]): Promise { - const items = await fetchDashboards(scopeNames); - - return Object.values( - items.reduce>((acc, item) => { - if (!acc[item.spec.dashboard]) { - acc[item.spec.dashboard] = { - dashboard: item.spec.dashboard, - dashboardTitle: item.spec.dashboardTitle, - items: [], - }; - } - - acc[item.spec.dashboard].items.push(item); - - return acc; - }, {}) - ); -} diff --git a/public/app/features/scopes/internal/types.ts b/public/app/features/scopes/internal/types.ts index 40d3cbbefae..ffa200ad18c 100644 --- a/public/app/features/scopes/internal/types.ts +++ b/public/app/features/scopes/internal/types.ts @@ -33,5 +33,16 @@ export interface SuggestedDashboard { items: ScopeDashboardBinding[]; } +export interface SuggestedDashboardsFolder { + title: string; + isExpanded: boolean; + folders: SuggestedDashboardsFoldersMap; + dashboards: SuggestedDashboardsMap; +} + +export type SuggestedDashboardsMap = Record; +export type SuggestedDashboardsFoldersMap = Record; + export type OnNodeUpdate = (path: string[], isExpanded: boolean, query: string) => void; export type OnNodeSelectToggle = (path: string[]) => void; +export type OnFolderUpdate = (path: string[], isExpanded: boolean) => void; diff --git a/public/app/features/scopes/internal/utils.ts b/public/app/features/scopes/internal/utils.ts index 5052469ac48..95bb29ff13b 100644 --- a/public/app/features/scopes/internal/utils.ts +++ b/public/app/features/scopes/internal/utils.ts @@ -1,6 +1,6 @@ -import { Scope } from '@grafana/data'; +import { Scope, ScopeDashboardBinding } from '@grafana/data'; -import { SelectedScope, TreeScope } from './types'; +import { SelectedScope, SuggestedDashboardsFoldersMap, TreeScope } from './types'; export function getBasicScope(name: string): Scope { return { @@ -43,3 +43,82 @@ export function getScopesFromSelectedScopes(scopes: SelectedScope[]): Scope[] { export function getScopeNamesFromSelectedScopes(scopes: SelectedScope[]): string[] { return scopes.map(({ scope }) => scope.metadata.name); } + +export function groupDashboards(dashboards: ScopeDashboardBinding[]): SuggestedDashboardsFoldersMap { + return dashboards.reduce( + (acc, dashboard) => { + const rootNode = acc['']; + const groups = dashboard.spec.groups ?? []; + + groups.forEach((group) => { + if (group && !rootNode.folders[group]) { + rootNode.folders[group] = { + title: group, + isExpanded: false, + folders: {}, + dashboards: {}, + }; + } + }); + + const targets = + groups.length > 0 + ? groups.map((group) => (group === '' ? rootNode.dashboards : rootNode.folders[group].dashboards)) + : [rootNode.dashboards]; + + targets.forEach((target) => { + if (!target[dashboard.spec.dashboard]) { + target[dashboard.spec.dashboard] = { + dashboard: dashboard.spec.dashboard, + dashboardTitle: dashboard.spec.dashboardTitle, + items: [], + }; + } + + target[dashboard.spec.dashboard].items.push(dashboard); + }); + + return acc; + }, + { + '': { + title: '', + isExpanded: true, + folders: {}, + dashboards: {}, + }, + } + ); +} + +export function filterFolders(folders: SuggestedDashboardsFoldersMap, query: string): SuggestedDashboardsFoldersMap { + query = (query ?? '').toLowerCase(); + + return Object.entries(folders).reduce((acc, [folderId, folder]) => { + // If folder matches the query, we show everything inside + if (folder.title.toLowerCase().includes(query)) { + acc[folderId] = { + ...folder, + isExpanded: true, + }; + + return acc; + } + + const filteredFolders = filterFolders(folder.folders, query); + const filteredDashboards = Object.entries(folder.dashboards).filter(([_, dashboard]) => + dashboard.dashboardTitle.toLowerCase().includes(query) + ); + + if (Object.keys(filteredFolders).length > 0 || filteredDashboards.length > 0) { + acc[folderId] = { + ...folder, + isExpanded: true, + folders: filteredFolders, + dashboards: Object.fromEntries(filteredDashboards), + }; + } + + return acc; + }, {}); +} diff --git a/public/app/features/scopes/scopes.test.tsx b/public/app/features/scopes/scopes.test.tsx deleted file mode 100644 index 50e014c53a6..00000000000 --- a/public/app/features/scopes/scopes.test.tsx +++ /dev/null @@ -1,634 +0,0 @@ -import { act, cleanup, waitFor } from '@testing-library/react'; -import userEvents from '@testing-library/user-event'; - -import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks'; -import { config, locationService, setPluginImportUtils } from '@grafana/runtime'; -import { sceneGraph } from '@grafana/scenes'; -import { getDashboardAPI, setDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; -import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene'; - -import { initializeScopes, scopesDashboardsScene, scopesSelectorScene } from './instance'; -import { - buildTestScene, - fetchNodesSpy, - fetchScopeSpy, - fetchSelectedScopesSpy, - fetchSuggestedDashboardsSpy, - getDashboard, - getDashboardsExpand, - getDashboardsSearch, - getMock, - getNotFoundForFilter, - getNotFoundForFilterClear, - getNotFoundForScope, - getNotFoundNoScopes, - getPersistedApplicationsSlothPictureFactorySelect, - getPersistedApplicationsSlothPictureFactoryTitle, - getPersistedApplicationsSlothVoteTrackerTitle, - getResultApplicationsClustersExpand, - getResultApplicationsClustersSelect, - getResultApplicationsClustersSlothClusterNorthSelect, - getResultApplicationsClustersSlothClusterSouthSelect, - getResultApplicationsExpand, - getResultApplicationsSlothPictureFactorySelect, - getResultApplicationsSlothPictureFactoryTitle, - getResultApplicationsSlothVoteTrackerSelect, - getResultApplicationsSlothVoteTrackerTitle, - getResultClustersExpand, - getResultClustersSelect, - getResultClustersSlothClusterEastRadio, - getResultClustersSlothClusterNorthRadio, - getResultClustersSlothClusterSouthRadio, - getSelectorApply, - getSelectorCancel, - getSelectorInput, - getTreeHeadline, - getTreeSearch, - mocksScopes, - queryAllDashboard, - queryDashboard, - queryDashboardsContainer, - queryDashboardsSearch, - queryPersistedApplicationsSlothPictureFactoryTitle, - queryPersistedApplicationsSlothVoteTrackerTitle, - queryResultApplicationsClustersTitle, - queryResultApplicationsSlothPictureFactoryTitle, - queryResultApplicationsSlothVoteTrackerTitle, - querySelectorApply, - renderDashboard, - resetScenes, -} from './testUtils'; -import { getClosestScopesFacade } from './utils'; - -jest.mock('@grafana/runtime', () => ({ - __esModule: true, - ...jest.requireActual('@grafana/runtime'), - useChromeHeaderHeight: jest.fn(), - getBackendSrv: () => ({ - get: getMock, - }), - usePluginLinkExtensions: jest.fn().mockReturnValue({ extensions: [] }), -})); - -const panelPlugin = getPanelPlugin({ - id: 'table', - skipDataQuery: true, -}); - -config.panels['table'] = panelPlugin.meta; - -setPluginImportUtils({ - importPanelPlugin: (id: string) => Promise.resolve(panelPlugin), - getPanelPluginFromCache: (id: string) => undefined, -}); - -describe('Scopes', () => { - describe('Feature flag off', () => { - beforeAll(() => { - config.featureToggles.scopeFilters = false; - config.featureToggles.groupByVariable = true; - - initializeScopes(); - }); - - it('Does not initialize', () => { - const dashboardScene = buildTestScene(); - dashboardScene.activate(); - expect(scopesSelectorScene).toBeNull(); - }); - }); - - describe('Feature flag on', () => { - let dashboardScene: DashboardScene; - - beforeAll(() => { - config.featureToggles.scopeFilters = true; - config.featureToggles.groupByVariable = true; - }); - - beforeEach(() => { - jest.spyOn(console, 'error').mockImplementation(jest.fn()); - - fetchNodesSpy.mockClear(); - fetchScopeSpy.mockClear(); - fetchSelectedScopesSpy.mockClear(); - fetchSuggestedDashboardsSpy.mockClear(); - getMock.mockClear(); - - initializeScopes(); - - dashboardScene = buildTestScene(); - - renderDashboard(dashboardScene); - }); - - afterEach(() => { - resetScenes(); - cleanup(); - }); - - describe('Tree', () => { - it('Navigates through scopes nodes', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsClustersExpand()); - await userEvents.click(getResultApplicationsExpand()); - }); - - it('Fetches scope details on select', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await waitFor(() => expect(fetchScopeSpy).toHaveBeenCalledTimes(1)); - }); - - it('Selects the proper scopes', async () => { - await act(async () => - scopesSelectorScene?.updateScopes([ - { scopeName: 'slothPictureFactory', path: [] }, - { scopeName: 'slothVoteTracker', path: [] }, - ]) - ); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - expect(getResultApplicationsSlothVoteTrackerSelect()).toBeChecked(); - expect(getResultApplicationsSlothPictureFactorySelect()).toBeChecked(); - }); - - it('Can select scopes from same level', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getResultApplicationsClustersSelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toBe('slothVoteTracker, slothPictureFactory, Cluster Index Helper'); - }); - - it('Can select a node from an inner level', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getResultApplicationsClustersExpand()); - await userEvents.click(getResultApplicationsClustersSlothClusterNorthSelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toBe('slothClusterNorth'); - }); - - it('Can select a node from an upper level', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultClustersSelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toBe('Cluster Index Helper'); - }); - - it('Respects only one select per container', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultClustersExpand()); - await userEvents.click(getResultClustersSlothClusterNorthRadio()); - expect(getResultClustersSlothClusterNorthRadio().checked).toBe(true); - expect(getResultClustersSlothClusterSouthRadio().checked).toBe(false); - await userEvents.click(getResultClustersSlothClusterSouthRadio()); - expect(getResultClustersSlothClusterNorthRadio().checked).toBe(false); - expect(getResultClustersSlothClusterSouthRadio().checked).toBe(true); - }); - - it('Search works', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.type(getTreeSearch(), 'Clusters'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - expect(queryResultApplicationsSlothPictureFactoryTitle()).not.toBeInTheDocument(); - expect(queryResultApplicationsSlothVoteTrackerTitle()).not.toBeInTheDocument(); - expect(getResultApplicationsClustersSelect()).toBeInTheDocument(); - await userEvents.clear(getTreeSearch()); - await userEvents.type(getTreeSearch(), 'sloth'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(4)); - expect(getResultApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - expect(getResultApplicationsSlothVoteTrackerSelect()).toBeInTheDocument(); - expect(queryResultApplicationsClustersTitle()).not.toBeInTheDocument(); - }); - - it('Opens to a selected scope', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultClustersExpand()); - await userEvents.click(getSelectorApply()); - await userEvents.click(getSelectorInput()); - expect(queryResultApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - }); - - it('Persists a scope', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.type(getTreeSearch(), 'slothVoteTracker'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - expect(getPersistedApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - expect(queryPersistedApplicationsSlothVoteTrackerTitle()).not.toBeInTheDocument(); - expect(queryResultApplicationsSlothPictureFactoryTitle()).not.toBeInTheDocument(); - expect(getResultApplicationsSlothVoteTrackerTitle()).toBeInTheDocument(); - }); - - it('Does not persist a retrieved scope', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.type(getTreeSearch(), 'slothPictureFactory'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - expect(queryPersistedApplicationsSlothPictureFactoryTitle()).not.toBeInTheDocument(); - expect(getResultApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - }); - - it('Removes persisted nodes', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.type(getTreeSearch(), 'slothVoteTracker'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - await userEvents.clear(getTreeSearch()); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(4)); - expect(queryPersistedApplicationsSlothPictureFactoryTitle()).not.toBeInTheDocument(); - expect(queryPersistedApplicationsSlothVoteTrackerTitle()).not.toBeInTheDocument(); - expect(getResultApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - expect(getResultApplicationsSlothVoteTrackerTitle()).toBeInTheDocument(); - }); - - it('Persists nodes from search', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.type(getTreeSearch(), 'sloth'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.type(getTreeSearch(), 'slothunknown'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(4)); - expect(getPersistedApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - expect(getPersistedApplicationsSlothVoteTrackerTitle()).toBeInTheDocument(); - await userEvents.clear(getTreeSearch()); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(5)); - expect(getResultApplicationsSlothPictureFactoryTitle()).toBeInTheDocument(); - expect(getResultApplicationsSlothVoteTrackerTitle()).toBeInTheDocument(); - }); - - it('Selects a persisted scope', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.type(getTreeSearch(), 'slothVoteTracker'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toBe('slothPictureFactory, slothVoteTracker'); - }); - - it('Deselects a persisted scope', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.type(getTreeSearch(), 'slothVoteTracker'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toBe('slothPictureFactory, slothVoteTracker'); - await userEvents.click(getSelectorInput()); - await userEvents.click(getPersistedApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toBe('slothVoteTracker'); - }); - - it('Shows the proper headline', async () => { - await userEvents.click(getSelectorInput()); - expect(getTreeHeadline()).toHaveTextContent('Recommended'); - await userEvents.type(getTreeSearch(), 'Applications'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(2)); - expect(getTreeHeadline()).toHaveTextContent('Results'); - await userEvents.type(getTreeSearch(), 'unknown'); - await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); - expect(getTreeHeadline()).toHaveTextContent('No results found for your query'); - }); - }); - - describe('Selector', () => { - it('Opens', async () => { - await userEvents.click(getSelectorInput()); - expect(getSelectorApply()).toBeInTheDocument(); - }); - - it('Fetches scope details on save', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultClustersSelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => expect(fetchSelectedScopesSpy).toHaveBeenCalled()); - expect(getClosestScopesFacade(dashboardScene)?.value).toEqual( - mocksScopes.filter(({ metadata: { name } }) => name === 'indexHelperCluster') - ); - }); - - it("Doesn't save the scopes on close", async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultClustersSelect()); - await userEvents.click(getSelectorCancel()); - await waitFor(() => expect(fetchSelectedScopesSpy).not.toHaveBeenCalled()); - expect(getClosestScopesFacade(dashboardScene)?.value).toEqual([]); - }); - - it('Shows selected scopes', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultClustersSelect()); - await userEvents.click(getSelectorApply()); - expect(getSelectorInput().value).toEqual('Cluster Index Helper'); - }); - }); - - describe('Dashboards list', () => { - it('Toggles expanded state', async () => { - await userEvents.click(getDashboardsExpand()); - expect(getNotFoundNoScopes()).toBeInTheDocument(); - }); - - it('Does not fetch dashboards list when the list is not expanded', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => expect(fetchSuggestedDashboardsSpy).not.toHaveBeenCalled()); - }); - - it('Fetches dashboards list when the list is expanded', async () => { - await userEvents.click(getDashboardsExpand()); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => expect(fetchSuggestedDashboardsSpy).toHaveBeenCalled()); - }); - - it('Fetches dashboards list when the list is expanded after scope selection', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await userEvents.click(getDashboardsExpand()); - await waitFor(() => expect(fetchSuggestedDashboardsSpy).toHaveBeenCalled()); - }); - - it('Shows dashboards for multiple scopes', async () => { - await userEvents.click(getDashboardsExpand()); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - expect(getDashboard('1')).toBeInTheDocument(); - expect(getDashboard('2')).toBeInTheDocument(); - expect(queryDashboard('3')).not.toBeInTheDocument(); - expect(queryDashboard('4')).not.toBeInTheDocument(); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getSelectorApply()); - expect(getDashboard('1')).toBeInTheDocument(); - expect(getDashboard('2')).toBeInTheDocument(); - expect(getDashboard('3')).toBeInTheDocument(); - expect(getDashboard('4')).toBeInTheDocument(); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - expect(queryDashboard('1')).not.toBeInTheDocument(); - expect(queryDashboard('2')).not.toBeInTheDocument(); - expect(getDashboard('3')).toBeInTheDocument(); - expect(getDashboard('4')).toBeInTheDocument(); - }); - - it('Filters the dashboards list', async () => { - await userEvents.click(getDashboardsExpand()); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - expect(getDashboard('1')).toBeInTheDocument(); - expect(getDashboard('2')).toBeInTheDocument(); - await userEvents.type(getDashboardsSearch(), '1'); - expect(queryDashboard('2')).not.toBeInTheDocument(); - }); - - it('Deduplicates the dashboards list', async () => { - await userEvents.click(getDashboardsExpand()); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsClustersExpand()); - await userEvents.click(getResultApplicationsClustersSlothClusterNorthSelect()); - await userEvents.click(getResultApplicationsClustersSlothClusterSouthSelect()); - await userEvents.click(getSelectorApply()); - expect(queryAllDashboard('5')).toHaveLength(1); - expect(queryAllDashboard('6')).toHaveLength(1); - expect(queryAllDashboard('7')).toHaveLength(1); - expect(queryAllDashboard('8')).toHaveLength(1); - }); - - it('Does show a proper message when no scopes are selected', async () => { - await userEvents.click(getDashboardsExpand()); - expect(getNotFoundNoScopes()).toBeInTheDocument(); - expect(queryDashboardsSearch()).not.toBeInTheDocument(); - }); - - it('Does not show the input when there are no dashboards found for scope', async () => { - await userEvents.click(getDashboardsExpand()); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultClustersExpand()); - await userEvents.click(getResultClustersSlothClusterEastRadio()); - await userEvents.click(getSelectorApply()); - expect(getNotFoundForScope()).toBeInTheDocument(); - expect(queryDashboardsSearch()).not.toBeInTheDocument(); - }); - - it('Does show the input and a message when there are no dashboards found for filter', async () => { - await userEvents.click(getDashboardsExpand()); - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await userEvents.type(getDashboardsSearch(), 'unknown'); - expect(queryDashboardsSearch()).toBeInTheDocument(); - expect(getNotFoundForFilter()).toBeInTheDocument(); - await userEvents.click(getNotFoundForFilterClear()); - expect(getDashboardsSearch().value).toBe(''); - }); - }); - - describe('View mode', () => { - it('Enters view mode', async () => { - await act(async () => dashboardScene.onEnterEditMode()); - expect(scopesSelectorScene?.state?.isReadOnly).toEqual(true); - expect(scopesDashboardsScene?.state?.isPanelOpened).toEqual(false); - }); - - it('Closes selector on enter', async () => { - await userEvents.click(getSelectorInput()); - await act(async () => dashboardScene.onEnterEditMode()); - expect(querySelectorApply()).not.toBeInTheDocument(); - }); - - it('Closes dashboards list on enter', async () => { - await userEvents.click(getDashboardsExpand()); - await act(async () => dashboardScene.onEnterEditMode()); - expect(queryDashboardsContainer()).not.toBeInTheDocument(); - }); - - it('Does not open selector when view mode is active', async () => { - await act(async () => dashboardScene.onEnterEditMode()); - await userEvents.click(getSelectorInput()); - expect(querySelectorApply()).not.toBeInTheDocument(); - }); - - it('Disables the expand button when view mode is active', async () => { - await act(async () => dashboardScene.onEnterEditMode()); - expect(getDashboardsExpand()).toBeDisabled(); - }); - }); - - describe('Enrichers', () => { - it('Data requests', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => { - const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!; - expect(dashboardScene.enrichDataRequest(queryRunner).scopes).toEqual( - mocksScopes.filter(({ metadata: { name } }) => name === 'slothPictureFactory') - ); - }); - - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => { - const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!; - expect(dashboardScene.enrichDataRequest(queryRunner).scopes).toEqual( - mocksScopes.filter( - ({ metadata: { name } }) => name === 'slothPictureFactory' || name === 'slothVoteTracker' - ) - ); - }); - - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => { - const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!; - expect(dashboardScene.enrichDataRequest(queryRunner).scopes).toEqual( - mocksScopes.filter(({ metadata: { name } }) => name === 'slothVoteTracker') - ); - }); - }); - - it('Filters requests', async () => { - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsExpand()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => { - expect(dashboardScene.enrichFiltersRequest().scopes).toEqual( - mocksScopes.filter(({ metadata: { name } }) => name === 'slothPictureFactory') - ); - }); - - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsSlothVoteTrackerSelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => { - expect(dashboardScene.enrichFiltersRequest().scopes).toEqual( - mocksScopes.filter( - ({ metadata: { name } }) => name === 'slothPictureFactory' || name === 'slothVoteTracker' - ) - ); - }); - - await userEvents.click(getSelectorInput()); - await userEvents.click(getResultApplicationsSlothPictureFactorySelect()); - await userEvents.click(getSelectorApply()); - await waitFor(() => { - expect(dashboardScene.enrichFiltersRequest().scopes).toEqual( - mocksScopes.filter(({ metadata: { name } }) => name === 'slothVoteTracker') - ); - }); - }); - }); - }); - - describe('Dashboards API', () => { - describe('Feature flag off', () => { - beforeAll(() => { - config.featureToggles.scopeFilters = true; - config.featureToggles.passScopeToDashboardApi = false; - }); - - beforeEach(() => { - setDashboardAPI(undefined); - locationService.push('/?scopes=scope1&scopes=scope2&scopes=scope3'); - }); - - afterEach(() => { - resetScenes(); - cleanup(); - }); - - it('Legacy API should not pass the scopes', async () => { - config.featureToggles.kubernetesDashboards = false; - getDashboardAPI().getDashboardDTO('1'); - await waitFor(() => expect(getMock).toHaveBeenCalledWith('/api/dashboards/uid/1', undefined)); - }); - - it('K8s API should not pass the scopes', async () => { - config.featureToggles.kubernetesDashboards = true; - getDashboardAPI().getDashboardDTO('1'); - await waitFor(() => - expect(getMock).toHaveBeenCalledWith( - '/apis/dashboard.grafana.app/v0alpha1/namespaces/default/dashboards/1/dto' - ) - ); - }); - }); - - describe('Feature flag on', () => { - beforeAll(() => { - config.featureToggles.scopeFilters = true; - config.featureToggles.passScopeToDashboardApi = true; - }); - - beforeEach(() => { - setDashboardAPI(undefined); - locationService.push('/?scopes=scope1&scopes=scope2&scopes=scope3'); - initializeScopes(); - }); - - afterEach(() => { - resetScenes(); - cleanup(); - }); - - it('Legacy API should pass the scopes', async () => { - config.featureToggles.kubernetesDashboards = false; - getDashboardAPI().getDashboardDTO('1'); - await waitFor(() => - expect(getMock).toHaveBeenCalledWith('/api/dashboards/uid/1', { scopes: ['scope1', 'scope2', 'scope3'] }) - ); - }); - - it('K8s API should not pass the scopes', async () => { - config.featureToggles.kubernetesDashboards = true; - getDashboardAPI().getDashboardDTO('1'); - await waitFor(() => - expect(getMock).toHaveBeenCalledWith( - '/apis/dashboard.grafana.app/v0alpha1/namespaces/default/dashboards/1/dto' - ) - ); - }); - }); - }); -}); diff --git a/public/app/features/scopes/testUtils.tsx b/public/app/features/scopes/testUtils.tsx deleted file mode 100644 index 1ab33d8e7ef..00000000000 --- a/public/app/features/scopes/testUtils.tsx +++ /dev/null @@ -1,494 +0,0 @@ -import { screen } from '@testing-library/react'; -import { KBarProvider } from 'kbar'; -import { getWrapper, render } from 'test/test-utils'; - -import { Scope, ScopeDashboardBinding, ScopeNode } from '@grafana/data'; -import { - AdHocFiltersVariable, - behaviors, - GroupByVariable, - sceneGraph, - SceneGridItem, - SceneGridLayout, - SceneQueryRunner, - SceneTimeRange, - SceneVariableSet, - VizPanel, -} from '@grafana/scenes'; -import { AppChrome } from 'app/core/components/AppChrome/AppChrome'; -import { AppChromeService } from 'app/core/components/AppChrome/AppChromeService'; -import { DashboardControls } from 'app/features/dashboard-scene/scene//DashboardControls'; -import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene'; -import { configureStore } from 'app/store/configureStore'; - -import { ScopesFacade } from './ScopesFacadeScene'; -import { scopesDashboardsScene, scopesSelectorScene } from './instance'; -import { getInitialDashboardsState } from './internal/ScopesDashboardsScene'; -import { initialSelectorState } from './internal/ScopesSelectorScene'; -import * as api from './internal/api'; -import { DASHBOARDS_OPENED_KEY } from './internal/const'; - -export const mocksScopes: Scope[] = [ - { - metadata: { name: 'indexHelperCluster' }, - spec: { - title: 'Cluster Index Helper', - type: 'indexHelper', - description: 'redundant label filter but makes queries faster', - category: 'indexHelpers', - filters: [{ key: 'indexHelper', value: 'cluster', operator: 'equals' }], - }, - }, - { - metadata: { name: 'slothClusterNorth' }, - spec: { - title: 'slothClusterNorth', - type: 'cluster', - description: 'slothClusterNorth', - category: 'clusters', - filters: [{ key: 'cluster', value: 'slothClusterNorth', operator: 'equals' }], - }, - }, - { - metadata: { name: 'slothClusterSouth' }, - spec: { - title: 'slothClusterSouth', - type: 'cluster', - description: 'slothClusterSouth', - category: 'clusters', - filters: [{ key: 'cluster', value: 'slothClusterSouth', operator: 'equals' }], - }, - }, - { - metadata: { name: 'slothClusterEast' }, - spec: { - title: 'slothClusterEast', - type: 'cluster', - description: 'slothClusterEast', - category: 'clusters', - filters: [{ key: 'cluster', value: 'slothClusterEast', operator: 'equals' }], - }, - }, - { - metadata: { name: 'slothPictureFactory' }, - spec: { - title: 'slothPictureFactory', - type: 'app', - description: 'slothPictureFactory', - category: 'apps', - filters: [{ key: 'app', value: 'slothPictureFactory', operator: 'equals' }], - }, - }, - { - metadata: { name: 'slothVoteTracker' }, - spec: { - title: 'slothVoteTracker', - type: 'app', - description: 'slothVoteTracker', - category: 'apps', - filters: [{ key: 'app', value: 'slothVoteTracker', operator: 'equals' }], - }, - }, -] as const; - -export const mocksScopeDashboardBindings: ScopeDashboardBinding[] = [ - { - metadata: { name: 'binding1' }, - spec: { dashboard: '1', dashboardTitle: 'My Dashboard 1', scope: 'slothPictureFactory' }, - }, - { - metadata: { name: 'binding2' }, - spec: { dashboard: '2', dashboardTitle: 'My Dashboard 2', scope: 'slothPictureFactory' }, - }, - { - metadata: { name: 'binding3' }, - spec: { dashboard: '3', dashboardTitle: 'My Dashboard 3', scope: 'slothVoteTracker' }, - }, - { - metadata: { name: 'binding4' }, - spec: { dashboard: '4', dashboardTitle: 'My Dashboard 4', scope: 'slothVoteTracker' }, - }, - { - metadata: { name: 'binding5' }, - spec: { dashboard: '5', dashboardTitle: 'My Dashboard 5', scope: 'slothClusterNorth' }, - }, - { - metadata: { name: 'binding6' }, - spec: { dashboard: '6', dashboardTitle: 'My Dashboard 6', scope: 'slothClusterNorth' }, - }, - { - metadata: { name: 'binding7' }, - spec: { dashboard: '7', dashboardTitle: 'My Dashboard 7', scope: 'slothClusterNorth' }, - }, - { - metadata: { name: 'binding8' }, - spec: { dashboard: '5', dashboardTitle: 'My Dashboard 5', scope: 'slothClusterSouth' }, - }, - { - metadata: { name: 'binding9' }, - spec: { dashboard: '6', dashboardTitle: 'My Dashboard 6', scope: 'slothClusterSouth' }, - }, - { - metadata: { name: 'binding10' }, - spec: { dashboard: '8', dashboardTitle: 'My Dashboard 8', scope: 'slothClusterSouth' }, - }, -] as const; - -export const mocksNodes: Array = [ - { - parent: '', - metadata: { name: 'applications' }, - spec: { - nodeType: 'container', - title: 'Applications', - description: 'Application Scopes', - }, - }, - { - parent: '', - metadata: { name: 'clusters' }, - spec: { - nodeType: 'container', - title: 'Clusters', - description: 'Cluster Scopes', - disableMultiSelect: true, - linkType: 'scope', - linkId: 'indexHelperCluster', - }, - }, - { - parent: 'applications', - metadata: { name: 'applications-slothPictureFactory' }, - spec: { - nodeType: 'leaf', - title: 'slothPictureFactory', - description: 'slothPictureFactory', - linkType: 'scope', - linkId: 'slothPictureFactory', - }, - }, - { - parent: 'applications', - metadata: { name: 'applications-slothVoteTracker' }, - spec: { - nodeType: 'leaf', - title: 'slothVoteTracker', - description: 'slothVoteTracker', - linkType: 'scope', - linkId: 'slothVoteTracker', - }, - }, - { - parent: 'applications', - metadata: { name: 'applications-clusters' }, - spec: { - nodeType: 'container', - title: 'Clusters', - description: 'Application/Clusters Scopes', - linkType: 'scope', - linkId: 'indexHelperCluster', - }, - }, - { - parent: 'applications-clusters', - metadata: { name: 'applications-clusters-slothClusterNorth' }, - spec: { - nodeType: 'leaf', - title: 'slothClusterNorth', - description: 'slothClusterNorth', - linkType: 'scope', - linkId: 'slothClusterNorth', - }, - }, - { - parent: 'applications-clusters', - metadata: { name: 'applications-clusters-slothClusterSouth' }, - spec: { - nodeType: 'leaf', - title: 'slothClusterSouth', - description: 'slothClusterSouth', - linkType: 'scope', - linkId: 'slothClusterSouth', - }, - }, - { - parent: 'clusters', - metadata: { name: 'clusters-slothClusterNorth' }, - spec: { - nodeType: 'leaf', - title: 'slothClusterNorth', - description: 'slothClusterNorth', - linkType: 'scope', - linkId: 'slothClusterNorth', - }, - }, - { - parent: 'clusters', - metadata: { name: 'clusters-slothClusterSouth' }, - spec: { - nodeType: 'leaf', - title: 'slothClusterSouth', - description: 'slothClusterSouth', - linkType: 'scope', - linkId: 'slothClusterSouth', - }, - }, - { - parent: 'clusters', - metadata: { name: 'clusters-slothClusterEast' }, - spec: { - nodeType: 'leaf', - title: 'slothClusterEast', - description: 'slothClusterEast', - linkType: 'scope', - linkId: 'slothClusterEast', - }, - }, - { - parent: 'clusters', - metadata: { name: 'clusters-applications' }, - spec: { - nodeType: 'container', - title: 'Applications', - description: 'Clusters/Application Scopes', - }, - }, - { - parent: 'clusters-applications', - metadata: { name: 'clusters-applications-slothPictureFactory' }, - spec: { - nodeType: 'leaf', - title: 'slothPictureFactory', - description: 'slothPictureFactory', - linkType: 'scope', - linkId: 'slothPictureFactory', - }, - }, - { - parent: 'clusters-applications', - metadata: { name: 'clusters-applications-slothVoteTracker' }, - spec: { - nodeType: 'leaf', - title: 'slothVoteTracker', - description: 'slothVoteTracker', - linkType: 'scope', - linkId: 'slothVoteTracker', - }, - }, -] as const; - -export const fetchNodesSpy = jest.spyOn(api, 'fetchNodes'); -export const fetchScopeSpy = jest.spyOn(api, 'fetchScope'); -export const fetchSelectedScopesSpy = jest.spyOn(api, 'fetchSelectedScopes'); -export const fetchSuggestedDashboardsSpy = jest.spyOn(api, 'fetchSuggestedDashboards'); - -export const getMock = jest - .fn() - .mockImplementation((url: string, params: { parent: string; scope: string[]; query?: string }) => { - if (url.startsWith('/apis/scope.grafana.app/v0alpha1/namespaces/default/find/scope_node_children')) { - return { - items: mocksNodes.filter( - ({ parent, spec: { title } }) => parent === params.parent && title.includes(params.query ?? '') - ), - }; - } - - if (url.startsWith('/apis/scope.grafana.app/v0alpha1/namespaces/default/scopes/')) { - const name = url.replace('/apis/scope.grafana.app/v0alpha1/namespaces/default/scopes/', ''); - - return mocksScopes.find((scope) => scope.metadata.name === name) ?? {}; - } - - if (url.startsWith('/apis/scope.grafana.app/v0alpha1/namespaces/default/find/scope_dashboard_bindings')) { - return { - items: mocksScopeDashboardBindings.filter(({ spec: { scope: bindingScope } }) => - params.scope.includes(bindingScope) - ), - }; - } - - if (url.startsWith('/api/dashboards/uid/')) { - return {}; - } - - if (url.startsWith('/apis/dashboard.grafana.app/v0alpha1/namespaces/default/dashboards/')) { - return { - metadata: { - name: '1', - }, - }; - } - - return {}; - }); - -const selectors = { - tree: { - search: 'scopes-tree-search', - headline: 'scopes-tree-headline', - select: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-checkbox`, - radio: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-radio`, - expand: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-expand`, - title: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-title`, - }, - selector: { - input: 'scopes-selector-input', - container: 'scopes-selector-container', - loading: 'scopes-selector-loading', - apply: 'scopes-selector-apply', - cancel: 'scopes-selector-cancel', - }, - dashboards: { - expand: 'scopes-dashboards-expand', - container: 'scopes-dashboards-container', - search: 'scopes-dashboards-search', - loading: 'scopes-dashboards-loading', - dashboard: (uid: string) => `scopes-dashboards-${uid}`, - notFoundNoScopes: 'scopes-dashboards-notFoundNoScopes', - notFoundForScope: 'scopes-dashboards-notFoundForScope', - notFoundForFilter: 'scopes-dashboards-notFoundForFilter', - notFoundForFilterClear: 'scopes-dashboards-notFoundForFilter-clear', - }, -}; - -export const getSelectorInput = () => screen.getByTestId(selectors.selector.input); -export const querySelectorApply = () => screen.queryByTestId(selectors.selector.apply); -export const getSelectorApply = () => screen.getByTestId(selectors.selector.apply); -export const getSelectorCancel = () => screen.getByTestId(selectors.selector.cancel); - -export const getDashboardsExpand = () => screen.getByTestId(selectors.dashboards.expand); -export const queryDashboardsContainer = () => screen.queryByTestId(selectors.dashboards.container); -export const queryDashboardsSearch = () => screen.queryByTestId(selectors.dashboards.search); -export const getDashboardsSearch = () => screen.getByTestId(selectors.dashboards.search); -export const queryAllDashboard = (uid: string) => screen.queryAllByTestId(selectors.dashboards.dashboard(uid)); -export const queryDashboard = (uid: string) => screen.queryByTestId(selectors.dashboards.dashboard(uid)); -export const getDashboard = (uid: string) => screen.getByTestId(selectors.dashboards.dashboard(uid)); -export const getNotFoundNoScopes = () => screen.getByTestId(selectors.dashboards.notFoundNoScopes); -export const getNotFoundForScope = () => screen.getByTestId(selectors.dashboards.notFoundForScope); -export const getNotFoundForFilter = () => screen.getByTestId(selectors.dashboards.notFoundForFilter); -export const getNotFoundForFilterClear = () => screen.getByTestId(selectors.dashboards.notFoundForFilterClear); - -export const getTreeSearch = () => screen.getByTestId(selectors.tree.search); -export const getTreeHeadline = () => screen.getByTestId(selectors.tree.headline); -export const getResultApplicationsExpand = () => screen.getByTestId(selectors.tree.expand('applications', 'result')); -export const queryResultApplicationsSlothPictureFactoryTitle = () => - screen.queryByTestId(selectors.tree.title('applications-slothPictureFactory', 'result')); -export const getResultApplicationsSlothPictureFactoryTitle = () => - screen.getByTestId(selectors.tree.title('applications-slothPictureFactory', 'result')); -export const getResultApplicationsSlothPictureFactorySelect = () => - screen.getByTestId(selectors.tree.select('applications-slothPictureFactory', 'result')); -export const queryPersistedApplicationsSlothPictureFactoryTitle = () => - screen.queryByTestId(selectors.tree.title('applications-slothPictureFactory', 'persisted')); -export const getPersistedApplicationsSlothPictureFactoryTitle = () => - screen.getByTestId(selectors.tree.title('applications-slothPictureFactory', 'persisted')); -export const getPersistedApplicationsSlothPictureFactorySelect = () => - screen.getByTestId(selectors.tree.select('applications-slothPictureFactory', 'persisted')); -export const queryResultApplicationsSlothVoteTrackerTitle = () => - screen.queryByTestId(selectors.tree.title('applications-slothVoteTracker', 'result')); -export const getResultApplicationsSlothVoteTrackerTitle = () => - screen.getByTestId(selectors.tree.title('applications-slothVoteTracker', 'result')); -export const getResultApplicationsSlothVoteTrackerSelect = () => - screen.getByTestId(selectors.tree.select('applications-slothVoteTracker', 'result')); -export const queryPersistedApplicationsSlothVoteTrackerTitle = () => - screen.queryByTestId(selectors.tree.title('applications-slothVoteTracker', 'persisted')); -export const getPersistedApplicationsSlothVoteTrackerTitle = () => - screen.getByTestId(selectors.tree.title('applications-slothVoteTracker', 'persisted')); -export const queryResultApplicationsClustersTitle = () => - screen.queryByTestId(selectors.tree.title('applications-clusters', 'result')); -export const getResultApplicationsClustersSelect = () => - screen.getByTestId(selectors.tree.select('applications-clusters', 'result')); -export const getResultApplicationsClustersExpand = () => - screen.getByTestId(selectors.tree.expand('applications-clusters', 'result')); -export const getResultApplicationsClustersSlothClusterNorthSelect = () => - screen.getByTestId(selectors.tree.select('applications-clusters-slothClusterNorth', 'result')); -export const getResultApplicationsClustersSlothClusterSouthSelect = () => - screen.getByTestId(selectors.tree.select('applications-clusters-slothClusterSouth', 'result')); - -export const getResultClustersSelect = () => screen.getByTestId(selectors.tree.select('clusters', 'result')); -export const getResultClustersExpand = () => screen.getByTestId(selectors.tree.expand('clusters', 'result')); -export const getResultClustersSlothClusterNorthRadio = () => - screen.getByTestId(selectors.tree.radio('clusters-slothClusterNorth', 'result')); -export const getResultClustersSlothClusterSouthRadio = () => - screen.getByTestId(selectors.tree.radio('clusters-slothClusterSouth', 'result')); -export const getResultClustersSlothClusterEastRadio = () => - screen.getByTestId(selectors.tree.radio('clusters-slothClusterEast', 'result')); - -export function buildTestScene(overrides: Partial = {}) { - return new DashboardScene({ - title: 'hello', - uid: 'dash-1', - description: 'hello description', - tags: ['tag1', 'tag2'], - editable: true, - $timeRange: new SceneTimeRange({ - timeZone: 'browser', - }), - controls: new DashboardControls({}), - $behaviors: [ - new behaviors.CursorSync({}), - new ScopesFacade({ - handler: (facade) => sceneGraph.getTimeRange(facade).onRefresh(), - }), - ], - $variables: new SceneVariableSet({ - variables: [ - new AdHocFiltersVariable({ - name: 'adhoc', - datasource: { uid: 'my-ds-uid' }, - }), - new GroupByVariable({ - name: 'groupby', - datasource: { uid: 'my-ds-uid' }, - }), - ], - }), - body: new SceneGridLayout({ - children: [ - new SceneGridItem({ - key: 'griditem-1', - x: 0, - y: 0, - width: 300, - height: 300, - body: new VizPanel({ - title: 'Panel A', - key: 'panel-1', - pluginId: 'table', - $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }), - }), - }), - ], - }), - ...overrides, - }); -} - -export function renderDashboard(dashboardScene: DashboardScene) { - const store = configureStore(); - const chrome = new AppChromeService(); - chrome.update({ chromeless: false }); - const Wrapper = getWrapper({ store, renderWithRouter: true, grafanaContext: { chrome } }); - - return render( - - - - - - - , - { - historyOptions: { - initialEntries: ['/'], - }, - } - ); -} - -export function resetScenes() { - scopesSelectorScene?.setState(initialSelectorState); - - localStorage.removeItem(DASHBOARDS_OPENED_KEY); - - scopesDashboardsScene?.setState(getInitialDashboardsState()); -} diff --git a/public/app/features/scopes/tests/dashboardsApi.test.ts b/public/app/features/scopes/tests/dashboardsApi.test.ts new file mode 100644 index 00000000000..530f7b49717 --- /dev/null +++ b/public/app/features/scopes/tests/dashboardsApi.test.ts @@ -0,0 +1,84 @@ +import { cleanup } from '@testing-library/react'; + +import { config, locationService } from '@grafana/runtime'; +import { getDashboardAPI, setDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; + +import { initializeScopes } from '../instance'; + +import { getMock } from './utils/mocks'; +import { resetScenes } from './utils/render'; + +jest.mock('@grafana/runtime', () => ({ + __esModule: true, + ...jest.requireActual('@grafana/runtime'), + getBackendSrv: () => ({ + get: getMock, + }), +})); + +describe('Scopes', () => { + describe('Dashboards API', () => { + describe('Feature flag off', () => { + beforeAll(() => { + config.featureToggles.scopeFilters = true; + config.featureToggles.passScopeToDashboardApi = false; + }); + + beforeEach(() => { + setDashboardAPI(undefined); + locationService.push('/?scopes=scope1&scopes=scope2&scopes=scope3'); + }); + + afterEach(() => { + resetScenes(); + cleanup(); + }); + + it('Legacy API should not pass the scopes', async () => { + config.featureToggles.kubernetesDashboards = false; + await getDashboardAPI().getDashboardDTO('1'); + expect(getMock).toHaveBeenCalledWith('/api/dashboards/uid/1', undefined); + }); + + it('K8s API should not pass the scopes', async () => { + config.featureToggles.kubernetesDashboards = true; + await getDashboardAPI().getDashboardDTO('1'); + expect(getMock).toHaveBeenCalledWith( + '/apis/dashboard.grafana.app/v0alpha1/namespaces/default/dashboards/1/dto' + ); + }); + }); + + describe('Feature flag on', () => { + beforeAll(() => { + config.featureToggles.scopeFilters = true; + config.featureToggles.passScopeToDashboardApi = true; + }); + + beforeEach(() => { + setDashboardAPI(undefined); + locationService.push('/?scopes=scope1&scopes=scope2&scopes=scope3'); + initializeScopes(); + }); + + afterEach(() => { + resetScenes(); + cleanup(); + }); + + it('Legacy API should pass the scopes', async () => { + config.featureToggles.kubernetesDashboards = false; + await getDashboardAPI().getDashboardDTO('1'); + expect(getMock).toHaveBeenCalledWith('/api/dashboards/uid/1', { scopes: ['scope1', 'scope2', 'scope3'] }); + }); + + it('K8s API should not pass the scopes', async () => { + config.featureToggles.kubernetesDashboards = true; + await getDashboardAPI().getDashboardDTO('1'); + expect(getMock).toHaveBeenCalledWith( + '/apis/dashboard.grafana.app/v0alpha1/namespaces/default/dashboards/1/dto' + ); + }); + }); + }); +}); diff --git a/public/app/features/scopes/tests/scopes.test.ts b/public/app/features/scopes/tests/scopes.test.ts new file mode 100644 index 00000000000..5d886a73b5b --- /dev/null +++ b/public/app/features/scopes/tests/scopes.test.ts @@ -0,0 +1,687 @@ +import { act, cleanup, waitFor } from '@testing-library/react'; +import userEvents from '@testing-library/user-event'; + +import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks'; +import { config, setPluginImportUtils } from '@grafana/runtime'; +import { sceneGraph } from '@grafana/scenes'; +import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene'; + +import { initializeScopes, scopesDashboardsScene, scopesSelectorScene } from '../instance'; +import { getClosestScopesFacade } from '../utils'; + +import { + fetchDashboardsSpy, + fetchNodesSpy, + fetchScopeSpy, + fetchSelectedScopesSpy, + getMock, + mocksScopes, +} from './utils/mocks'; +import { buildTestScene, renderDashboard, resetScenes } from './utils/render'; +import { + getDashboard, + getDashboardFolderExpand, + getDashboardsExpand, + getDashboardsSearch, + getNotFoundForFilter, + getNotFoundForFilterClear, + getNotFoundForScope, + getNotFoundNoScopes, + getPersistedApplicationsMimirSelect, + getPersistedApplicationsMimirTitle, + getResultApplicationsCloudDevSelect, + getResultApplicationsCloudExpand, + getResultApplicationsCloudOpsSelect, + getResultApplicationsCloudSelect, + getResultApplicationsExpand, + getResultApplicationsGrafanaSelect, + getResultApplicationsGrafanaTitle, + getResultApplicationsMimirSelect, + getResultApplicationsMimirTitle, + getResultCloudDevRadio, + getResultCloudExpand, + getResultCloudOpsRadio, + getResultCloudSelect, + getSelectorApply, + getSelectorCancel, + getSelectorInput, + getTreeHeadline, + getTreeSearch, + queryAllDashboard, + queryDashboard, + queryDashboardFolderExpand, + queryDashboardsContainer, + queryDashboardsSearch, + queryPersistedApplicationsGrafanaTitle, + queryPersistedApplicationsMimirTitle, + queryResultApplicationsCloudTitle, + queryResultApplicationsGrafanaTitle, + queryResultApplicationsMimirTitle, + querySelectorApply, +} from './utils/selectors'; + +jest.mock('@grafana/runtime', () => ({ + __esModule: true, + ...jest.requireActual('@grafana/runtime'), + useChromeHeaderHeight: jest.fn(), + getBackendSrv: () => ({ + get: getMock, + }), + usePluginLinkExtensions: jest.fn().mockReturnValue({ extensions: [] }), +})); + +const panelPlugin = getPanelPlugin({ + id: 'table', + skipDataQuery: true, +}); + +config.panels['table'] = panelPlugin.meta; + +setPluginImportUtils({ + importPanelPlugin: () => Promise.resolve(panelPlugin), + getPanelPluginFromCache: () => undefined, +}); + +describe('Scopes', () => { + describe('Feature flag off', () => { + beforeAll(() => { + config.featureToggles.scopeFilters = false; + config.featureToggles.groupByVariable = true; + + initializeScopes(); + }); + + it('Does not initialize', () => { + const dashboardScene = buildTestScene(); + dashboardScene.activate(); + expect(scopesSelectorScene).toBeNull(); + }); + }); + + describe('Feature flag on', () => { + let dashboardScene: DashboardScene; + + beforeAll(() => { + config.featureToggles.scopeFilters = true; + config.featureToggles.groupByVariable = true; + }); + + beforeEach(() => { + jest.spyOn(console, 'error').mockImplementation(jest.fn()); + + fetchNodesSpy.mockClear(); + fetchScopeSpy.mockClear(); + fetchSelectedScopesSpy.mockClear(); + fetchDashboardsSpy.mockClear(); + getMock.mockClear(); + + initializeScopes(); + + dashboardScene = buildTestScene(); + + renderDashboard(dashboardScene); + }); + + afterEach(() => { + resetScenes(); + cleanup(); + }); + + describe('Tree', () => { + it('Navigates through scopes nodes', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsCloudExpand()); + await userEvents.click(getResultApplicationsExpand()); + }); + + it('Fetches scope details on select', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await waitFor(() => expect(fetchScopeSpy).toHaveBeenCalledTimes(1)); + }); + + it('Selects the proper scopes', async () => { + await act(async () => + scopesSelectorScene?.updateScopes([ + { scopeName: 'grafana', path: [] }, + { scopeName: 'mimir', path: [] }, + ]) + ); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + expect(getResultApplicationsGrafanaSelect()).toBeChecked(); + expect(getResultApplicationsMimirSelect()).toBeChecked(); + }); + + it('Can select scopes from same level', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getResultApplicationsCloudSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toBe('Grafana, Mimir, Cloud'); + }); + + it('Can select a node from an inner level', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getResultApplicationsCloudExpand()); + await userEvents.click(getResultApplicationsCloudDevSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toBe('Dev'); + }); + + it('Can select a node from an upper level', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultCloudSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toBe('Cloud'); + }); + + it('Respects only one select per container', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultCloudExpand()); + await userEvents.click(getResultCloudDevRadio()); + expect(getResultCloudDevRadio().checked).toBe(true); + expect(getResultCloudOpsRadio().checked).toBe(false); + await userEvents.click(getResultCloudOpsRadio()); + expect(getResultCloudDevRadio().checked).toBe(false); + expect(getResultCloudOpsRadio().checked).toBe(true); + }); + + it('Search works', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.type(getTreeSearch(), 'Cloud'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + expect(queryResultApplicationsGrafanaTitle()).not.toBeInTheDocument(); + expect(queryResultApplicationsMimirTitle()).not.toBeInTheDocument(); + expect(getResultApplicationsCloudSelect()).toBeInTheDocument(); + await userEvents.clear(getTreeSearch()); + await userEvents.type(getTreeSearch(), 'Grafana'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(4)); + expect(getResultApplicationsGrafanaSelect()).toBeInTheDocument(); + expect(queryResultApplicationsCloudTitle()).not.toBeInTheDocument(); + }); + + it('Opens to a selected scope', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultCloudExpand()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getSelectorInput()); + expect(queryResultApplicationsMimirTitle()).toBeInTheDocument(); + }); + + it('Persists a scope', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.type(getTreeSearch(), 'grafana'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + expect(getPersistedApplicationsMimirTitle()).toBeInTheDocument(); + expect(queryPersistedApplicationsGrafanaTitle()).not.toBeInTheDocument(); + expect(queryResultApplicationsMimirTitle()).not.toBeInTheDocument(); + expect(getResultApplicationsGrafanaTitle()).toBeInTheDocument(); + }); + + it('Does not persist a retrieved scope', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.type(getTreeSearch(), 'mimir'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + expect(queryPersistedApplicationsMimirTitle()).not.toBeInTheDocument(); + expect(getResultApplicationsMimirTitle()).toBeInTheDocument(); + }); + + it('Removes persisted nodes', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.type(getTreeSearch(), 'grafana'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + await userEvents.clear(getTreeSearch()); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(4)); + expect(queryPersistedApplicationsMimirTitle()).not.toBeInTheDocument(); + expect(queryPersistedApplicationsGrafanaTitle()).not.toBeInTheDocument(); + expect(getResultApplicationsMimirTitle()).toBeInTheDocument(); + expect(getResultApplicationsGrafanaTitle()).toBeInTheDocument(); + }); + + it('Persists nodes from search', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.type(getTreeSearch(), 'mimir'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.type(getTreeSearch(), 'unknown'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(4)); + expect(getPersistedApplicationsMimirTitle()).toBeInTheDocument(); + await userEvents.clear(getTreeSearch()); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(5)); + expect(getResultApplicationsMimirTitle()).toBeInTheDocument(); + expect(getResultApplicationsGrafanaTitle()).toBeInTheDocument(); + }); + + it('Selects a persisted scope', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.type(getTreeSearch(), 'grafana'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toBe('Mimir, Grafana'); + }); + + it('Deselects a persisted scope', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.type(getTreeSearch(), 'grafana'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toBe('Mimir, Grafana'); + await userEvents.click(getSelectorInput()); + await userEvents.click(getPersistedApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toBe('Grafana'); + }); + + it('Shows the proper headline', async () => { + await userEvents.click(getSelectorInput()); + expect(getTreeHeadline()).toHaveTextContent('Recommended'); + await userEvents.type(getTreeSearch(), 'Applications'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(2)); + expect(getTreeHeadline()).toHaveTextContent('Results'); + await userEvents.type(getTreeSearch(), 'unknown'); + await waitFor(() => expect(fetchNodesSpy).toHaveBeenCalledTimes(3)); + expect(getTreeHeadline()).toHaveTextContent('No results found for your query'); + }); + }); + + describe('Selector', () => { + it('Opens', async () => { + await userEvents.click(getSelectorInput()); + expect(getSelectorApply()).toBeInTheDocument(); + }); + + it('Fetches scope details on save', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultCloudSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => expect(fetchSelectedScopesSpy).toHaveBeenCalled()); + expect(getClosestScopesFacade(dashboardScene)?.value).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'cloud') + ); + }); + + it('Does not save the scopes on close', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultCloudSelect()); + await userEvents.click(getSelectorCancel()); + await waitFor(() => expect(fetchSelectedScopesSpy).not.toHaveBeenCalled()); + expect(getClosestScopesFacade(dashboardScene)?.value).toEqual([]); + }); + + it('Shows selected scopes', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultCloudSelect()); + await userEvents.click(getSelectorApply()); + expect(getSelectorInput().value).toEqual('Cloud'); + }); + }); + + describe('Dashboards list', () => { + it('Toggles expanded state', async () => { + await userEvents.click(getDashboardsExpand()); + expect(getNotFoundNoScopes()).toBeInTheDocument(); + }); + + it('Does not fetch dashboards list when the list is not expanded', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => expect(fetchDashboardsSpy).not.toHaveBeenCalled()); + }); + + it('Fetches dashboards list when the list is expanded', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => expect(fetchDashboardsSpy).toHaveBeenCalled()); + }); + + it('Fetches dashboards list when the list is expanded after scope selection', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardsExpand()); + await waitFor(() => expect(fetchDashboardsSpy).toHaveBeenCalled()); + }); + + it('Shows dashboards for multiple scopes', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardFolderExpand('General')); + await userEvents.click(getDashboardFolderExpand('Observability')); + await userEvents.click(getDashboardFolderExpand('Usage')); + expect(queryDashboardFolderExpand('Components')).not.toBeInTheDocument(); + expect(queryDashboardFolderExpand('Investigations')).not.toBeInTheDocument(); + expect(getDashboard('general-data-sources')).toBeInTheDocument(); + expect(getDashboard('general-usage')).toBeInTheDocument(); + expect(getDashboard('observability-backend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-backend-logs')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-logs')).toBeInTheDocument(); + expect(getDashboard('usage-data-sources')).toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(getDashboard('usage-usage-overview')).toBeInTheDocument(); + expect(getDashboard('frontend')).toBeInTheDocument(); + expect(getDashboard('overview')).toBeInTheDocument(); + expect(getDashboard('stats')).toBeInTheDocument(); + expect(queryDashboard('multiple3-datasource-errors')).not.toBeInTheDocument(); + expect(queryDashboard('multiple4-datasource-logs')).not.toBeInTheDocument(); + expect(queryDashboard('multiple0-ingester')).not.toBeInTheDocument(); + expect(queryDashboard('multiple1-distributor')).not.toBeInTheDocument(); + expect(queryDashboard('multiple2-compacter')).not.toBeInTheDocument(); + expect(queryDashboard('another-stats')).not.toBeInTheDocument(); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardFolderExpand('General')); + await userEvents.click(getDashboardFolderExpand('Observability')); + await userEvents.click(getDashboardFolderExpand('Usage')); + await userEvents.click(getDashboardFolderExpand('Components')); + await userEvents.click(getDashboardFolderExpand('Investigations')); + expect(getDashboard('general-data-sources')).toBeInTheDocument(); + expect(getDashboard('general-usage')).toBeInTheDocument(); + expect(getDashboard('observability-backend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-backend-logs')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-logs')).toBeInTheDocument(); + expect(getDashboard('usage-data-sources')).toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(getDashboard('usage-usage-overview')).toBeInTheDocument(); + expect(getDashboard('frontend')).toBeInTheDocument(); + expect(getDashboard('overview')).toBeInTheDocument(); + expect(getDashboard('stats')).toBeInTheDocument(); + expect(queryAllDashboard('multiple3-datasource-errors')).toHaveLength(2); + expect(queryAllDashboard('multiple4-datasource-logs')).toHaveLength(2); + expect(queryAllDashboard('multiple0-ingester')).toHaveLength(2); + expect(queryAllDashboard('multiple1-distributor')).toHaveLength(2); + expect(queryAllDashboard('multiple2-compacter')).toHaveLength(2); + expect(getDashboard('another-stats')).toBeInTheDocument(); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardFolderExpand('General')); + await userEvents.click(getDashboardFolderExpand('Observability')); + await userEvents.click(getDashboardFolderExpand('Usage')); + expect(queryDashboardFolderExpand('Components')).not.toBeInTheDocument(); + expect(queryDashboardFolderExpand('Investigations')).not.toBeInTheDocument(); + expect(getDashboard('general-data-sources')).toBeInTheDocument(); + expect(getDashboard('general-usage')).toBeInTheDocument(); + expect(getDashboard('observability-backend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-backend-logs')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-logs')).toBeInTheDocument(); + expect(getDashboard('usage-data-sources')).toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(getDashboard('usage-usage-overview')).toBeInTheDocument(); + expect(getDashboard('frontend')).toBeInTheDocument(); + expect(getDashboard('overview')).toBeInTheDocument(); + expect(getDashboard('stats')).toBeInTheDocument(); + expect(queryDashboard('multiple3-datasource-errors')).not.toBeInTheDocument(); + expect(queryDashboard('multiple4-datasource-logs')).not.toBeInTheDocument(); + expect(queryDashboard('multiple0-ingester')).not.toBeInTheDocument(); + expect(queryDashboard('multiple1-distributor')).not.toBeInTheDocument(); + expect(queryDashboard('multiple2-compacter')).not.toBeInTheDocument(); + expect(queryDashboard('another-stats')).not.toBeInTheDocument(); + }); + + it('Filters the dashboards list for dashboards', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardFolderExpand('General')); + await userEvents.click(getDashboardFolderExpand('Observability')); + await userEvents.click(getDashboardFolderExpand('Usage')); + expect(getDashboard('general-data-sources')).toBeInTheDocument(); + expect(getDashboard('general-usage')).toBeInTheDocument(); + expect(getDashboard('observability-backend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-backend-logs')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-logs')).toBeInTheDocument(); + expect(getDashboard('usage-data-sources')).toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(getDashboard('usage-usage-overview')).toBeInTheDocument(); + expect(getDashboard('frontend')).toBeInTheDocument(); + expect(getDashboard('overview')).toBeInTheDocument(); + expect(getDashboard('stats')).toBeInTheDocument(); + await userEvents.type(getDashboardsSearch(), 'Stats'); + await waitFor(() => { + expect(queryDashboard('general-data-sources')).not.toBeInTheDocument(); + expect(queryDashboard('general-usage')).not.toBeInTheDocument(); + expect(queryDashboard('observability-backend-errors')).not.toBeInTheDocument(); + expect(queryDashboard('observability-backend-logs')).not.toBeInTheDocument(); + expect(queryDashboard('observability-frontend-errors')).not.toBeInTheDocument(); + expect(queryDashboard('observability-frontend-logs')).not.toBeInTheDocument(); + expect(queryDashboard('usage-data-sources')).not.toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(queryDashboard('usage-usage-overview')).not.toBeInTheDocument(); + expect(queryDashboard('frontend')).not.toBeInTheDocument(); + expect(queryDashboard('overview')).not.toBeInTheDocument(); + expect(getDashboard('stats')).toBeInTheDocument(); + }); + }); + + it('Filters the dashboards list for folders', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardFolderExpand('General')); + await userEvents.click(getDashboardFolderExpand('Observability')); + await userEvents.click(getDashboardFolderExpand('Usage')); + expect(getDashboard('general-data-sources')).toBeInTheDocument(); + expect(getDashboard('general-usage')).toBeInTheDocument(); + expect(getDashboard('observability-backend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-backend-logs')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-errors')).toBeInTheDocument(); + expect(getDashboard('observability-frontend-logs')).toBeInTheDocument(); + expect(getDashboard('usage-data-sources')).toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(getDashboard('usage-usage-overview')).toBeInTheDocument(); + expect(getDashboard('frontend')).toBeInTheDocument(); + expect(getDashboard('overview')).toBeInTheDocument(); + expect(getDashboard('stats')).toBeInTheDocument(); + await userEvents.type(getDashboardsSearch(), 'Usage'); + await waitFor(() => { + expect(queryDashboard('general-data-sources')).not.toBeInTheDocument(); + expect(getDashboard('general-usage')).toBeInTheDocument(); + expect(queryDashboard('observability-backend-errors')).not.toBeInTheDocument(); + expect(queryDashboard('observability-backend-logs')).not.toBeInTheDocument(); + expect(queryDashboard('observability-frontend-errors')).not.toBeInTheDocument(); + expect(queryDashboard('observability-frontend-logs')).not.toBeInTheDocument(); + expect(getDashboard('usage-data-sources')).toBeInTheDocument(); + expect(getDashboard('usage-stats')).toBeInTheDocument(); + expect(getDashboard('usage-usage-overview')).toBeInTheDocument(); + expect(queryDashboard('frontend')).not.toBeInTheDocument(); + expect(queryDashboard('overview')).not.toBeInTheDocument(); + expect(queryDashboard('stats')).not.toBeInTheDocument(); + }); + }); + + it('Deduplicates the dashboards list', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsCloudExpand()); + await userEvents.click(getResultApplicationsCloudDevSelect()); + await userEvents.click(getResultApplicationsCloudOpsSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.click(getDashboardFolderExpand('Cardinality Management')); + await userEvents.click(getDashboardFolderExpand('Usage Insights')); + expect(queryAllDashboard('cardinality-management-labels')).toHaveLength(1); + expect(queryAllDashboard('cardinality-management-metrics')).toHaveLength(1); + expect(queryAllDashboard('cardinality-management-overview')).toHaveLength(1); + expect(queryAllDashboard('usage-insights-alertmanager')).toHaveLength(1); + expect(queryAllDashboard('usage-insights-data-sources')).toHaveLength(1); + expect(queryAllDashboard('usage-insights-metrics-ingestion')).toHaveLength(1); + expect(queryAllDashboard('usage-insights-overview')).toHaveLength(1); + expect(queryAllDashboard('usage-insights-query-errors')).toHaveLength(1); + expect(queryAllDashboard('billing-usage')).toHaveLength(1); + }); + + it('Shows a proper message when no scopes are selected', async () => { + await userEvents.click(getDashboardsExpand()); + expect(getNotFoundNoScopes()).toBeInTheDocument(); + expect(queryDashboardsSearch()).not.toBeInTheDocument(); + }); + + it('Does not show the input when there are no dashboards found for scope', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultCloudSelect()); + await userEvents.click(getSelectorApply()); + expect(getNotFoundForScope()).toBeInTheDocument(); + expect(queryDashboardsSearch()).not.toBeInTheDocument(); + }); + + it('Shows the input and a message when there are no dashboards found for filter', async () => { + await userEvents.click(getDashboardsExpand()); + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await userEvents.type(getDashboardsSearch(), 'unknown'); + await waitFor(() => { + expect(queryDashboardsSearch()).toBeInTheDocument(); + expect(getNotFoundForFilter()).toBeInTheDocument(); + }); + await userEvents.click(getNotFoundForFilterClear()); + await waitFor(() => { + expect(getDashboardsSearch().value).toBe(''); + }); + }); + }); + + describe('View mode', () => { + it('Enters view mode', async () => { + await act(async () => dashboardScene.onEnterEditMode()); + expect(scopesSelectorScene?.state?.isReadOnly).toEqual(true); + expect(scopesDashboardsScene?.state?.isPanelOpened).toEqual(false); + }); + + it('Closes selector on enter', async () => { + await userEvents.click(getSelectorInput()); + await act(async () => dashboardScene.onEnterEditMode()); + expect(querySelectorApply()).not.toBeInTheDocument(); + }); + + it('Closes dashboards list on enter', async () => { + await userEvents.click(getDashboardsExpand()); + await act(async () => dashboardScene.onEnterEditMode()); + expect(queryDashboardsContainer()).not.toBeInTheDocument(); + }); + + it('Does not open selector when view mode is active', async () => { + await act(async () => dashboardScene.onEnterEditMode()); + await userEvents.click(getSelectorInput()); + expect(querySelectorApply()).not.toBeInTheDocument(); + }); + + it('Disables the expand button when view mode is active', async () => { + await act(async () => dashboardScene.onEnterEditMode()); + expect(getDashboardsExpand()).toBeDisabled(); + }); + }); + + describe('Enrichers', () => { + it('Data requests', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => { + const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!; + expect(dashboardScene.enrichDataRequest(queryRunner).scopes).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'grafana') + ); + }); + + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => { + const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!; + expect(dashboardScene.enrichDataRequest(queryRunner).scopes).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'grafana' || name === 'mimir') + ); + }); + + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => { + const queryRunner = sceneGraph.findObject(dashboardScene, (o) => o.state.key === 'data-query-runner')!; + expect(dashboardScene.enrichDataRequest(queryRunner).scopes).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'mimir') + ); + }); + }); + + it('Filters requests', async () => { + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsExpand()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => { + expect(dashboardScene.enrichFiltersRequest().scopes).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'grafana') + ); + }); + + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsMimirSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => { + expect(dashboardScene.enrichFiltersRequest().scopes).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'grafana' || name === 'mimir') + ); + }); + + await userEvents.click(getSelectorInput()); + await userEvents.click(getResultApplicationsGrafanaSelect()); + await userEvents.click(getSelectorApply()); + await waitFor(() => { + expect(dashboardScene.enrichFiltersRequest().scopes).toEqual( + mocksScopes.filter(({ metadata: { name } }) => name === 'mimir') + ); + }); + }); + }); + }); +}); diff --git a/public/app/features/scopes/tests/utils.test.ts b/public/app/features/scopes/tests/utils.test.ts new file mode 100644 index 00000000000..31444bddcd7 --- /dev/null +++ b/public/app/features/scopes/tests/utils.test.ts @@ -0,0 +1,366 @@ +import { filterFolders, groupDashboards } from '../internal/utils'; + +import { + alternativeDashboardWithRootFolder, + alternativeDashboardWithTwoFolders, + dashboardWithOneFolder, + dashboardWithoutFolder, + dashboardWithRootFolder, + dashboardWithRootFolderAndOtherFolder, + dashboardWithTwoFolders, +} from './utils/mocks'; + +describe('Scopes', () => { + describe('Utils', () => { + describe('groupDashboards', () => { + it('Assigns dashboards without groups to root folder', () => { + expect(groupDashboards([dashboardWithoutFolder])).toEqual({ + '': { + title: '', + isExpanded: true, + folders: {}, + dashboards: { + [dashboardWithoutFolder.spec.dashboard]: { + dashboard: dashboardWithoutFolder.spec.dashboard, + dashboardTitle: dashboardWithoutFolder.spec.dashboardTitle, + items: [dashboardWithoutFolder], + }, + }, + }, + }); + }); + + it('Assigns dashboards with root group to root folder', () => { + expect(groupDashboards([dashboardWithRootFolder])).toEqual({ + '': { + title: '', + isExpanded: true, + folders: {}, + dashboards: { + [dashboardWithRootFolder.spec.dashboard]: { + dashboard: dashboardWithRootFolder.spec.dashboard, + dashboardTitle: dashboardWithRootFolder.spec.dashboardTitle, + items: [dashboardWithRootFolder], + }, + }, + }, + }); + }); + + it('Merges folders from multiple dashboards', () => { + expect(groupDashboards([dashboardWithOneFolder, dashboardWithTwoFolders])).toEqual({ + '': { + title: '', + isExpanded: true, + folders: { + 'Folder 1': { + title: 'Folder 1', + isExpanded: false, + folders: {}, + dashboards: { + [dashboardWithOneFolder.spec.dashboard]: { + dashboard: dashboardWithOneFolder.spec.dashboard, + dashboardTitle: dashboardWithOneFolder.spec.dashboardTitle, + items: [dashboardWithOneFolder], + }, + [dashboardWithTwoFolders.spec.dashboard]: { + dashboard: dashboardWithTwoFolders.spec.dashboard, + dashboardTitle: dashboardWithTwoFolders.spec.dashboardTitle, + items: [dashboardWithTwoFolders], + }, + }, + }, + 'Folder 2': { + title: 'Folder 2', + isExpanded: false, + folders: {}, + dashboards: { + [dashboardWithTwoFolders.spec.dashboard]: { + dashboard: dashboardWithTwoFolders.spec.dashboard, + dashboardTitle: dashboardWithTwoFolders.spec.dashboardTitle, + items: [dashboardWithTwoFolders], + }, + }, + }, + }, + dashboards: {}, + }, + }); + }); + + it('Merges scopes from multiple dashboards', () => { + expect(groupDashboards([dashboardWithTwoFolders, alternativeDashboardWithTwoFolders])).toEqual({ + '': { + title: '', + isExpanded: true, + folders: { + 'Folder 1': { + title: 'Folder 1', + isExpanded: false, + folders: {}, + dashboards: { + [dashboardWithTwoFolders.spec.dashboard]: { + dashboard: dashboardWithTwoFolders.spec.dashboard, + dashboardTitle: dashboardWithTwoFolders.spec.dashboardTitle, + items: [dashboardWithTwoFolders, alternativeDashboardWithTwoFolders], + }, + }, + }, + 'Folder 2': { + title: 'Folder 2', + isExpanded: false, + folders: {}, + dashboards: { + [dashboardWithTwoFolders.spec.dashboard]: { + dashboard: dashboardWithTwoFolders.spec.dashboard, + dashboardTitle: dashboardWithTwoFolders.spec.dashboardTitle, + items: [dashboardWithTwoFolders, alternativeDashboardWithTwoFolders], + }, + }, + }, + }, + dashboards: {}, + }, + }); + }); + + it('Matches snapshot', () => { + expect( + groupDashboards([ + dashboardWithoutFolder, + dashboardWithOneFolder, + dashboardWithTwoFolders, + alternativeDashboardWithTwoFolders, + dashboardWithRootFolder, + alternativeDashboardWithRootFolder, + dashboardWithRootFolderAndOtherFolder, + ]) + ).toEqual({ + '': { + dashboards: { + [dashboardWithRootFolderAndOtherFolder.spec.dashboard]: { + dashboard: dashboardWithRootFolderAndOtherFolder.spec.dashboard, + dashboardTitle: dashboardWithRootFolderAndOtherFolder.spec.dashboardTitle, + items: [dashboardWithRootFolderAndOtherFolder], + }, + [dashboardWithRootFolder.spec.dashboard]: { + dashboard: dashboardWithRootFolder.spec.dashboard, + dashboardTitle: dashboardWithRootFolder.spec.dashboardTitle, + items: [dashboardWithRootFolder, alternativeDashboardWithRootFolder], + }, + [dashboardWithoutFolder.spec.dashboard]: { + dashboard: dashboardWithoutFolder.spec.dashboard, + dashboardTitle: dashboardWithoutFolder.spec.dashboardTitle, + items: [dashboardWithoutFolder], + }, + }, + folders: { + 'Folder 1': { + dashboards: { + [dashboardWithOneFolder.spec.dashboard]: { + dashboard: dashboardWithOneFolder.spec.dashboard, + dashboardTitle: dashboardWithOneFolder.spec.dashboardTitle, + items: [dashboardWithOneFolder], + }, + [dashboardWithTwoFolders.spec.dashboard]: { + dashboard: dashboardWithTwoFolders.spec.dashboard, + dashboardTitle: dashboardWithTwoFolders.spec.dashboardTitle, + items: [dashboardWithTwoFolders, alternativeDashboardWithTwoFolders], + }, + }, + folders: {}, + isExpanded: false, + title: 'Folder 1', + }, + 'Folder 2': { + dashboards: { + [dashboardWithTwoFolders.spec.dashboard]: { + dashboard: dashboardWithTwoFolders.spec.dashboard, + dashboardTitle: dashboardWithTwoFolders.spec.dashboardTitle, + items: [dashboardWithTwoFolders, alternativeDashboardWithTwoFolders], + }, + }, + folders: {}, + isExpanded: false, + title: 'Folder 2', + }, + 'Folder 3': { + dashboards: { + [dashboardWithRootFolderAndOtherFolder.spec.dashboard]: { + dashboard: dashboardWithRootFolderAndOtherFolder.spec.dashboard, + dashboardTitle: dashboardWithRootFolderAndOtherFolder.spec.dashboardTitle, + items: [dashboardWithRootFolderAndOtherFolder], + }, + }, + folders: {}, + isExpanded: false, + title: 'Folder 3', + }, + }, + isExpanded: true, + title: '', + }, + }); + }); + }); + + describe('filterFolders', () => { + it('Shows folders matching criteria', () => { + expect( + filterFolders( + { + '': { + title: '', + isExpanded: true, + folders: { + 'Folder 1': { + title: 'Folder 1', + isExpanded: false, + folders: {}, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + 'Folder 2': { + title: 'Folder 2', + isExpanded: true, + folders: {}, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + }, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + }, + 'Folder' + ) + ).toEqual({ + '': { + title: '', + isExpanded: true, + folders: { + 'Folder 1': { + title: 'Folder 1', + isExpanded: true, + folders: {}, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + 'Folder 2': { + title: 'Folder 2', + isExpanded: true, + folders: {}, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + }, + dashboards: {}, + }, + }); + }); + + it('Shows dashboards matching criteria', () => { + expect( + filterFolders( + { + '': { + title: '', + isExpanded: true, + folders: { + 'Folder 1': { + title: 'Folder 1', + isExpanded: false, + folders: {}, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + 'Folder 2': { + title: 'Folder 2', + isExpanded: true, + folders: {}, + dashboards: { + 'Random ID': { + dashboard: 'Random ID', + dashboardTitle: 'Random Title', + items: [], + }, + }, + }, + }, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + 'Random ID': { + dashboard: 'Random ID', + dashboardTitle: 'Random Title', + items: [], + }, + }, + }, + }, + 'dash' + ) + ).toEqual({ + '': { + title: '', + isExpanded: true, + folders: { + 'Folder 1': { + title: 'Folder 1', + isExpanded: true, + folders: {}, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + }, + dashboards: { + 'Dashboard ID': { + dashboard: 'Dashboard ID', + dashboardTitle: 'Dashboard Title', + items: [], + }, + }, + }, + }); + }); + }); + }); +}); diff --git a/public/app/features/scopes/tests/utils/mocks.ts b/public/app/features/scopes/tests/utils/mocks.ts new file mode 100644 index 00000000000..4c7cac525b1 --- /dev/null +++ b/public/app/features/scopes/tests/utils/mocks.ts @@ -0,0 +1,446 @@ +import { Scope, ScopeDashboardBinding, ScopeNode } from '@grafana/data'; + +import * as api from '../../internal/api'; + +export const mocksScopes: Scope[] = [ + { + metadata: { name: 'cloud' }, + spec: { + title: 'Cloud', + type: 'indexHelper', + description: 'redundant label filter but makes queries faster', + category: 'indexHelpers', + filters: [{ key: 'cloud', value: '.*', operator: 'regex-match' }], + }, + }, + { + metadata: { name: 'dev' }, + spec: { + title: 'Dev', + type: 'cloud', + description: 'Dev', + category: 'cloud', + filters: [{ key: 'cloud', value: 'dev', operator: 'equals' }], + }, + }, + { + metadata: { name: 'ops' }, + spec: { + title: 'Ops', + type: 'cloud', + description: 'Ops', + category: 'cloud', + filters: [{ key: 'cloud', value: 'ops', operator: 'equals' }], + }, + }, + { + metadata: { name: 'prod' }, + spec: { + title: 'Prod', + type: 'cloud', + description: 'Prod', + category: 'cloud', + filters: [{ key: 'cloud', value: 'prod', operator: 'equals' }], + }, + }, + { + metadata: { name: 'grafana' }, + spec: { + title: 'Grafana', + type: 'app', + description: 'Grafana', + category: 'apps', + filters: [{ key: 'app', value: 'grafana', operator: 'equals' }], + }, + }, + { + metadata: { name: 'mimir' }, + spec: { + title: 'Mimir', + type: 'app', + description: 'Mimir', + category: 'apps', + filters: [{ key: 'app', value: 'mimir', operator: 'equals' }], + }, + }, + { + metadata: { name: 'loki' }, + spec: { + title: 'Loki', + type: 'app', + description: 'Loki', + category: 'apps', + filters: [{ key: 'app', value: 'loki', operator: 'equals' }], + }, + }, + { + metadata: { name: 'tempo' }, + spec: { + title: 'Tempo', + type: 'app', + description: 'Tempo', + category: 'apps', + filters: [{ key: 'app', value: 'tempo', operator: 'equals' }], + }, + }, +] as const; + +const dashboardBindingsGenerator = ( + scopes: string[], + dashboards: Array<{ dashboardTitle: string; dashboardKey?: string; groups?: string[] }> +) => + scopes.reduce((scopeAcc, scopeTitle) => { + const scope = scopeTitle.toLowerCase().replaceAll(' ', '-').replaceAll('/', '-'); + + return [ + ...scopeAcc, + ...dashboards.reduce((acc, { dashboardTitle, groups, dashboardKey }, idx) => { + dashboardKey = dashboardKey ?? dashboardTitle.toLowerCase().replaceAll(' ', '-').replaceAll('/', '-'); + const group = !groups + ? '' + : groups.length === 1 + ? groups[0] === '' + ? '' + : `${groups[0].toLowerCase().replaceAll(' ', '-').replaceAll('/', '-')}-` + : `multiple${idx}-`; + const dashboard = `${group}${dashboardKey}`; + + return [ + ...acc, + { + metadata: { name: `${scope}-${dashboard}` }, + spec: { + dashboard, + dashboardTitle, + scope, + groups, + }, + }, + ]; + }, []), + ]; + }, []); + +export const mocksScopeDashboardBindings: ScopeDashboardBinding[] = [ + ...dashboardBindingsGenerator( + ['Grafana'], + [ + { dashboardTitle: 'Data Sources', groups: ['General'] }, + { dashboardTitle: 'Usage', groups: ['General'] }, + { dashboardTitle: 'Frontend Errors', groups: ['Observability'] }, + { dashboardTitle: 'Frontend Logs', groups: ['Observability'] }, + { dashboardTitle: 'Backend Errors', groups: ['Observability'] }, + { dashboardTitle: 'Backend Logs', groups: ['Observability'] }, + { dashboardTitle: 'Usage Overview', groups: ['Usage'] }, + { dashboardTitle: 'Data Sources', groups: ['Usage'] }, + { dashboardTitle: 'Stats', groups: ['Usage'] }, + { dashboardTitle: 'Overview', groups: [''] }, + { dashboardTitle: 'Frontend' }, + { dashboardTitle: 'Stats' }, + ] + ), + ...dashboardBindingsGenerator( + ['Loki', 'Tempo', 'Mimir'], + [ + { dashboardTitle: 'Ingester', groups: ['Components', 'Investigations'] }, + { dashboardTitle: 'Distributor', groups: ['Components', 'Investigations'] }, + { dashboardTitle: 'Compacter', groups: ['Components', 'Investigations'] }, + { dashboardTitle: 'Datasource Errors', groups: ['Observability', 'Investigations'] }, + { dashboardTitle: 'Datasource Logs', groups: ['Observability', 'Investigations'] }, + { dashboardTitle: 'Overview' }, + { dashboardTitle: 'Stats', dashboardKey: 'another-stats' }, + ] + ), + ...dashboardBindingsGenerator( + ['Dev', 'Ops', 'Prod'], + [ + { dashboardTitle: 'Overview', groups: ['Cardinality Management'] }, + { dashboardTitle: 'Metrics', groups: ['Cardinality Management'] }, + { dashboardTitle: 'Labels', groups: ['Cardinality Management'] }, + { dashboardTitle: 'Overview', groups: ['Usage Insights'] }, + { dashboardTitle: 'Data Sources', groups: ['Usage Insights'] }, + { dashboardTitle: 'Query Errors', groups: ['Usage Insights'] }, + { dashboardTitle: 'Alertmanager', groups: ['Usage Insights'] }, + { dashboardTitle: 'Metrics Ingestion', groups: ['Usage Insights'] }, + { dashboardTitle: 'Billing/Usage' }, + ] + ), +] as const; + +export const mocksNodes: Array = [ + { + parent: '', + metadata: { name: 'applications' }, + spec: { + nodeType: 'container', + title: 'Applications', + description: 'Application Scopes', + }, + }, + { + parent: '', + metadata: { name: 'cloud' }, + spec: { + nodeType: 'container', + title: 'Cloud', + description: 'Cloud Scopes', + disableMultiSelect: true, + linkType: 'scope', + linkId: 'cloud', + }, + }, + { + parent: 'applications', + metadata: { name: 'applications-grafana' }, + spec: { + nodeType: 'leaf', + title: 'Grafana', + description: 'Grafana', + linkType: 'scope', + linkId: 'grafana', + }, + }, + { + parent: 'applications', + metadata: { name: 'applications-mimir' }, + spec: { + nodeType: 'leaf', + title: 'Mimir', + description: 'Mimir', + linkType: 'scope', + linkId: 'mimir', + }, + }, + { + parent: 'applications', + metadata: { name: 'applications-loki' }, + spec: { + nodeType: 'leaf', + title: 'Loki', + description: 'Loki', + linkType: 'scope', + linkId: 'loki', + }, + }, + { + parent: 'applications', + metadata: { name: 'applications-tempo' }, + spec: { + nodeType: 'leaf', + title: 'Tempo', + description: 'Tempo', + linkType: 'scope', + linkId: 'tempo', + }, + }, + { + parent: 'applications', + metadata: { name: 'applications-cloud' }, + spec: { + nodeType: 'container', + title: 'Cloud', + description: 'Application/Cloud Scopes', + linkType: 'scope', + linkId: 'cloud', + }, + }, + { + parent: 'applications-cloud', + metadata: { name: 'applications-cloud-dev' }, + spec: { + nodeType: 'leaf', + title: 'Dev', + description: 'Dev', + linkType: 'scope', + linkId: 'dev', + }, + }, + { + parent: 'applications-cloud', + metadata: { name: 'applications-cloud-ops' }, + spec: { + nodeType: 'leaf', + title: 'Ops', + description: 'Ops', + linkType: 'scope', + linkId: 'ops', + }, + }, + { + parent: 'applications-cloud', + metadata: { name: 'applications-cloud-prod' }, + spec: { + nodeType: 'leaf', + title: 'Prod', + description: 'Prod', + linkType: 'scope', + linkId: 'prod', + }, + }, + { + parent: 'cloud', + metadata: { name: 'cloud-dev' }, + spec: { + nodeType: 'leaf', + title: 'Dev', + description: 'Dev', + linkType: 'scope', + linkId: 'dev', + }, + }, + { + parent: 'cloud', + metadata: { name: 'cloud-ops' }, + spec: { + nodeType: 'leaf', + title: 'Ops', + description: 'Ops', + linkType: 'scope', + linkId: 'ops', + }, + }, + { + parent: 'cloud', + metadata: { name: 'cloud-prod' }, + spec: { + nodeType: 'leaf', + title: 'Prod', + description: 'Prod', + linkType: 'scope', + linkId: 'prod', + }, + }, + { + parent: 'cloud', + metadata: { name: 'cloud-applications' }, + spec: { + nodeType: 'container', + title: 'Applications', + description: 'Cloud/Application Scopes', + }, + }, + { + parent: 'cloud-applications', + metadata: { name: 'cloud-applications-grafana' }, + spec: { + nodeType: 'leaf', + title: 'Grafana', + description: 'Grafana', + linkType: 'scope', + linkId: 'grafana', + }, + }, + { + parent: 'cloud-applications', + metadata: { name: 'cloud-applications-mimir' }, + spec: { + nodeType: 'leaf', + title: 'Mimir', + description: 'Mimir', + linkType: 'scope', + linkId: 'mimir', + }, + }, + { + parent: 'cloud-applications', + metadata: { name: 'cloud-applications-loki' }, + spec: { + nodeType: 'leaf', + title: 'Loki', + description: 'Loki', + linkType: 'scope', + linkId: 'loki', + }, + }, + { + parent: 'cloud-applications', + metadata: { name: 'cloud-applications-tempo' }, + spec: { + nodeType: 'leaf', + title: 'Tempo', + description: 'Tempo', + linkType: 'scope', + linkId: 'tempo', + }, + }, +] as const; + +export const fetchNodesSpy = jest.spyOn(api, 'fetchNodes'); +export const fetchScopeSpy = jest.spyOn(api, 'fetchScope'); +export const fetchSelectedScopesSpy = jest.spyOn(api, 'fetchSelectedScopes'); +export const fetchDashboardsSpy = jest.spyOn(api, 'fetchDashboards'); + +export const getMock = jest + .fn() + .mockImplementation((url: string, params: { parent: string; scope: string[]; query?: string }) => { + if (url.startsWith('/apis/scope.grafana.app/v0alpha1/namespaces/default/find/scope_node_children')) { + return { + items: mocksNodes.filter( + ({ parent, spec: { title } }) => + parent === params.parent && title.toLowerCase().includes((params.query ?? '').toLowerCase()) + ), + }; + } + + if (url.startsWith('/apis/scope.grafana.app/v0alpha1/namespaces/default/scopes/')) { + const name = url.replace('/apis/scope.grafana.app/v0alpha1/namespaces/default/scopes/', ''); + + return mocksScopes.find((scope) => scope.metadata.name.toLowerCase() === name.toLowerCase()) ?? {}; + } + + if (url.startsWith('/apis/scope.grafana.app/v0alpha1/namespaces/default/find/scope_dashboard_bindings')) { + return { + items: mocksScopeDashboardBindings.filter(({ spec: { scope: bindingScope } }) => + params.scope.includes(bindingScope) + ), + }; + } + + if (url.startsWith('/api/dashboards/uid/')) { + return {}; + } + + if (url.startsWith('/apis/dashboard.grafana.app/v0alpha1/namespaces/default/dashboards/')) { + return { + metadata: { + name: '1', + }, + }; + } + + return {}; + }); + +const generateScopeDashboardBinding = (dashboardTitle: string, groups?: string[], dashboardId?: string) => ({ + metadata: { name: `${dashboardTitle}-name` }, + spec: { + dashboard: `${dashboardId ?? dashboardTitle}-dashboard`, + dashboardTitle, + scope: `${dashboardTitle}-scope`, + groups, + }, +}); + +export const dashboardWithoutFolder: ScopeDashboardBinding = generateScopeDashboardBinding('Without Folder'); +export const dashboardWithOneFolder: ScopeDashboardBinding = generateScopeDashboardBinding('With one folder', [ + 'Folder 1', +]); +export const dashboardWithTwoFolders: ScopeDashboardBinding = generateScopeDashboardBinding('With two folders', [ + 'Folder 1', + 'Folder 2', +]); +export const alternativeDashboardWithTwoFolders: ScopeDashboardBinding = generateScopeDashboardBinding( + 'Alternative with two folders', + ['Folder 1', 'Folder 2'], + 'With two folders' +); +export const dashboardWithRootFolder: ScopeDashboardBinding = generateScopeDashboardBinding('With root folder', ['']); +export const alternativeDashboardWithRootFolder: ScopeDashboardBinding = generateScopeDashboardBinding( + 'Alternative With root folder', + [''], + 'With root folder' +); +export const dashboardWithRootFolderAndOtherFolder: ScopeDashboardBinding = generateScopeDashboardBinding( + 'With root folder and other folder', + ['', 'Folder 3'] +); diff --git a/public/app/features/scopes/tests/utils/render.tsx b/public/app/features/scopes/tests/utils/render.tsx new file mode 100644 index 00000000000..51986d242e1 --- /dev/null +++ b/public/app/features/scopes/tests/utils/render.tsx @@ -0,0 +1,92 @@ +import { KBarProvider } from 'kbar'; +import { render } from 'test/test-utils'; + +import { + AdHocFiltersVariable, + behaviors, + GroupByVariable, + sceneGraph, + SceneGridItem, + SceneGridLayout, + SceneQueryRunner, + SceneTimeRange, + SceneVariableSet, + VizPanel, +} from '@grafana/scenes'; +import { AppChrome } from 'app/core/components/AppChrome/AppChrome'; +import { DashboardControls } from 'app/features/dashboard-scene/scene//DashboardControls'; +import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene'; + +import { ScopesFacade } from '../../ScopesFacadeScene'; +import { scopesDashboardsScene, scopesSelectorScene } from '../../instance'; +import { getInitialDashboardsState } from '../../internal/ScopesDashboardsScene'; +import { initialSelectorState } from '../../internal/ScopesSelectorScene'; +import { DASHBOARDS_OPENED_KEY } from '../../internal/const'; + +export function buildTestScene(overrides: Partial = {}) { + return new DashboardScene({ + title: 'hello', + uid: 'dash-1', + description: 'hello description', + tags: ['tag1', 'tag2'], + editable: true, + $timeRange: new SceneTimeRange({ + timeZone: 'browser', + }), + controls: new DashboardControls({}), + $behaviors: [ + new behaviors.CursorSync({}), + new ScopesFacade({ + handler: (facade) => sceneGraph.getTimeRange(facade).onRefresh(), + }), + ], + $variables: new SceneVariableSet({ + variables: [ + new AdHocFiltersVariable({ + name: 'adhoc', + datasource: { uid: 'my-ds-uid' }, + }), + new GroupByVariable({ + name: 'groupby', + datasource: { uid: 'my-ds-uid' }, + }), + ], + }), + body: new SceneGridLayout({ + children: [ + new SceneGridItem({ + key: 'griditem-1', + x: 0, + y: 0, + width: 300, + height: 300, + body: new VizPanel({ + title: 'Panel A', + key: 'panel-1', + pluginId: 'table', + $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }), + }), + }), + ], + }), + ...overrides, + }); +} + +export function renderDashboard(dashboardScene: DashboardScene) { + return render( + + + + + + ); +} + +export function resetScenes() { + scopesSelectorScene?.setState(initialSelectorState); + + localStorage.removeItem(DASHBOARDS_OPENED_KEY); + + scopesDashboardsScene?.setState(getInitialDashboardsState()); +} diff --git a/public/app/features/scopes/tests/utils/selectors.ts b/public/app/features/scopes/tests/utils/selectors.ts new file mode 100644 index 00000000000..5ca61c056f6 --- /dev/null +++ b/public/app/features/scopes/tests/utils/selectors.ts @@ -0,0 +1,92 @@ +import { screen } from '@testing-library/react'; + +const selectors = { + tree: { + search: 'scopes-tree-search', + headline: 'scopes-tree-headline', + select: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-checkbox`, + radio: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-radio`, + expand: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-expand`, + title: (nodeId: string, type: 'result' | 'persisted') => `scopes-tree-${type}-${nodeId}-title`, + }, + selector: { + input: 'scopes-selector-input', + container: 'scopes-selector-container', + loading: 'scopes-selector-loading', + apply: 'scopes-selector-apply', + cancel: 'scopes-selector-cancel', + }, + dashboards: { + expand: 'scopes-dashboards-expand', + container: 'scopes-dashboards-container', + search: 'scopes-dashboards-search', + loading: 'scopes-dashboards-loading', + dashboard: (uid: string) => `scopes-dashboards-${uid}`, + dashboardExpand: (uid: string) => `scopes-dashboards-${uid}-expand`, + notFoundNoScopes: 'scopes-dashboards-notFoundNoScopes', + notFoundForScope: 'scopes-dashboards-notFoundForScope', + notFoundForFilter: 'scopes-dashboards-notFoundForFilter', + notFoundForFilterClear: 'scopes-dashboards-notFoundForFilter-clear', + }, +}; + +export const getSelectorInput = () => screen.getByTestId(selectors.selector.input); +export const querySelectorApply = () => screen.queryByTestId(selectors.selector.apply); +export const getSelectorApply = () => screen.getByTestId(selectors.selector.apply); +export const getSelectorCancel = () => screen.getByTestId(selectors.selector.cancel); + +export const getDashboardsExpand = () => screen.getByTestId(selectors.dashboards.expand); +export const queryDashboardsContainer = () => screen.queryByTestId(selectors.dashboards.container); +export const queryDashboardsSearch = () => screen.queryByTestId(selectors.dashboards.search); +export const getDashboardsSearch = () => screen.getByTestId(selectors.dashboards.search); +export const queryDashboardFolderExpand = (uid: string) => + screen.queryByTestId(selectors.dashboards.dashboardExpand(uid)); +export const getDashboardFolderExpand = (uid: string) => screen.getByTestId(selectors.dashboards.dashboardExpand(uid)); +export const queryAllDashboard = (uid: string) => screen.queryAllByTestId(selectors.dashboards.dashboard(uid)); +export const queryDashboard = (uid: string) => screen.queryByTestId(selectors.dashboards.dashboard(uid)); +export const getDashboard = (uid: string) => screen.getByTestId(selectors.dashboards.dashboard(uid)); +export const getNotFoundNoScopes = () => screen.getByTestId(selectors.dashboards.notFoundNoScopes); +export const getNotFoundForScope = () => screen.getByTestId(selectors.dashboards.notFoundForScope); +export const getNotFoundForFilter = () => screen.getByTestId(selectors.dashboards.notFoundForFilter); +export const getNotFoundForFilterClear = () => screen.getByTestId(selectors.dashboards.notFoundForFilterClear); + +export const getTreeSearch = () => screen.getByTestId(selectors.tree.search); +export const getTreeHeadline = () => screen.getByTestId(selectors.tree.headline); +export const getResultApplicationsExpand = () => screen.getByTestId(selectors.tree.expand('applications', 'result')); +export const queryResultApplicationsGrafanaTitle = () => + screen.queryByTestId(selectors.tree.title('applications-grafana', 'result')); +export const getResultApplicationsGrafanaTitle = () => + screen.getByTestId(selectors.tree.title('applications-grafana', 'result')); +export const getResultApplicationsGrafanaSelect = () => + screen.getByTestId(selectors.tree.select('applications-grafana', 'result')); +export const queryPersistedApplicationsGrafanaTitle = () => + screen.queryByTestId(selectors.tree.title('applications-grafana', 'persisted')); +export const queryResultApplicationsMimirTitle = () => + screen.queryByTestId(selectors.tree.title('applications-mimir', 'result')); +export const getResultApplicationsMimirTitle = () => + screen.getByTestId(selectors.tree.title('applications-mimir', 'result')); +export const getResultApplicationsMimirSelect = () => + screen.getByTestId(selectors.tree.select('applications-mimir', 'result')); +export const queryPersistedApplicationsMimirTitle = () => + screen.queryByTestId(selectors.tree.title('applications-mimir', 'persisted')); +export const getPersistedApplicationsMimirTitle = () => + screen.getByTestId(selectors.tree.title('applications-mimir', 'persisted')); +export const getPersistedApplicationsMimirSelect = () => + screen.getByTestId(selectors.tree.select('applications-mimir', 'persisted')); +export const queryResultApplicationsCloudTitle = () => + screen.queryByTestId(selectors.tree.title('applications-cloud', 'result')); +export const getResultApplicationsCloudSelect = () => + screen.getByTestId(selectors.tree.select('applications-cloud', 'result')); +export const getResultApplicationsCloudExpand = () => + screen.getByTestId(selectors.tree.expand('applications-cloud', 'result')); +export const getResultApplicationsCloudDevSelect = () => + screen.getByTestId(selectors.tree.select('applications-cloud-dev', 'result')); +export const getResultApplicationsCloudOpsSelect = () => + screen.getByTestId(selectors.tree.select('applications-cloud-ops', 'result')); + +export const getResultCloudSelect = () => screen.getByTestId(selectors.tree.select('cloud', 'result')); +export const getResultCloudExpand = () => screen.getByTestId(selectors.tree.expand('cloud', 'result')); +export const getResultCloudDevRadio = () => + screen.getByTestId(selectors.tree.radio('cloud-dev', 'result')); +export const getResultCloudOpsRadio = () => + screen.getByTestId(selectors.tree.radio('cloud-ops', 'result')); diff --git a/public/app/features/trails/MetricSelect/MetricSelectScene.tsx b/public/app/features/trails/MetricSelect/MetricSelectScene.tsx index d2bc0e63e54..b629f1f9b7e 100644 --- a/public/app/features/trails/MetricSelect/MetricSelectScene.tsx +++ b/public/app/features/trails/MetricSelect/MetricSelectScene.tsx @@ -29,7 +29,6 @@ import { import { Alert, Field, Icon, IconButton, InlineSwitch, Input, Select, Tooltip, useStyles2 } from '@grafana/ui'; import { Trans } from 'app/core/internationalization'; -import { DataTrail } from '../DataTrail'; import { MetricScene } from '../MetricScene'; import { StatusWrapper } from '../StatusWrapper'; import { Node, Parser } from '../groop/parser'; @@ -214,10 +213,20 @@ export class MetricSelectScene extends SceneObjectBase i try { const response = await getMetricNames(datasourceUid, timeRange, match, MAX_METRIC_NAMES); const searchRegex = createJSRegExpFromSearchTerms(getMetricSearch(this)); - const metricNames = searchRegex + let metricNames = searchRegex ? response.data.filter((metric) => !searchRegex || searchRegex.test(metric)) : response.data; + // use this to generate groups for metric prefix + const filteredMetricNames = metricNames; + + // filter the remaining metrics with the metric prefix + const metricPrefix = this.state.metricPrefix; + if (metricPrefix && metricPrefix !== 'all') { + const prefixRegex = new RegExp(`(^${metricPrefix}.*)`, 'igy'); + metricNames = metricNames.filter((metric) => !prefixRegex || prefixRegex.test(metric)); + } + const metricNamesWarning = response.limitReached ? `This feature will only return up to ${MAX_METRIC_NAMES} metric names for performance reasons. ` + `This limit is being exceeded for the current data source. ` + @@ -225,7 +234,11 @@ export class MetricSelectScene extends SceneObjectBase i : undefined; let bodyLayout = this.state.body; - const rootGroupNode = await this.generateGroups(metricNames); + + let rootGroupNode = this.state.rootGroup; + + // generate groups based on the search metrics input + rootGroupNode = await this.generateGroups(filteredMetricNames); this.setState({ metricNames, @@ -311,6 +324,21 @@ export class MetricSelectScene extends SceneObjectBase i this.buildLayout(); } + private sortedPreviewMetrics() { + return Object.values(this.previewCache).sort((a, b) => { + if (a.isEmpty && b.isEmpty) { + return a.index - b.index; + } + if (a.isEmpty) { + return 1; + } + if (b.isEmpty) { + return -1; + } + return a.index - b.index; + }); + } + private async buildLayout() { // Temp hack when going back to select metric scene and variable updates if (this.ignoreNextUpdate) { @@ -318,67 +346,32 @@ export class MetricSelectScene extends SceneObjectBase i return; } - if (!this.state.rootGroup) { - const rootGroupNode = await this.generateGroups(this.state.metricNames); - this.setState({ rootGroup: rootGroupNode }); - } + const children: SceneFlexItem[] = []; - const children = await this.populateFilterableViewLayout(); - const rowTemplate = this.state.showPreviews ? ROW_PREVIEW_HEIGHT : ROW_CARD_HEIGHT; - this.state.body.setState({ children, autoRows: rowTemplate }); - } - - private async populateFilterableViewLayout() { const trail = getTrailFor(this); + + const metricsList = this.sortedPreviewMetrics(); + // Get the current filters to determine the count of them // Which is required for `getPreviewPanelFor` const filters = getFilters(this); - - let rootGroupNode = this.state.rootGroup; - if (!rootGroupNode) { - rootGroupNode = await this.generateGroups(this.state.metricNames); - this.setState({ rootGroup: rootGroupNode }); - } - - const children: SceneFlexItem[] = []; - - for (const [groupKey, groupNode] of rootGroupNode.groups) { - if (this.state.metricPrefix !== METRIC_PREFIX_ALL && this.state.metricPrefix !== groupKey) { - continue; - } - - for (const [_, value] of groupNode.groups) { - const panels = await this.populatePanels(trail, filters, value.values); - children.push(...panels); - } - - const morePanelsMaybe = await this.populatePanels(trail, filters, groupNode.values); - children.push(...morePanelsMaybe); - } - - return children; - } - - private async populatePanels(trail: DataTrail, filters: ReturnType, values: string[]) { const currentFilterCount = filters?.length || 0; - const previewPanelLayoutItems: SceneFlexItem[] = []; - for (let index = 0; index < values.length; index++) { - const metricName = values[index]; - const metric: MetricPanel = this.previewCache[metricName] ?? { name: metricName, index, loaded: false }; - const metadata = await trail.getMetricMetadata(metricName); + for (let index = 0; index < metricsList.length; index++) { + const metric = metricsList[index]; + const metadata = await trail.getMetricMetadata(metric.name); const description = getMetricDescription(metadata); if (this.state.showPreviews) { if (metric.itemRef && metric.isPanel) { - previewPanelLayoutItems.push(metric.itemRef.resolve()); + children.push(metric.itemRef.resolve()); continue; } const panel = getPreviewPanelFor(metric.name, index, currentFilterCount, description); metric.itemRef = panel.getRef(); metric.isPanel = true; - previewPanelLayoutItems.push(panel); + children.push(panel); } else { const panel = new SceneCSSGridItem({ $variables: new SceneVariableSet({ @@ -388,11 +381,13 @@ export class MetricSelectScene extends SceneObjectBase i }); metric.itemRef = panel.getRef(); metric.isPanel = false; - previewPanelLayoutItems.push(panel); + children.push(panel); } } - return previewPanelLayoutItems; + const rowTemplate = this.state.showPreviews ? ROW_PREVIEW_HEIGHT : ROW_CARD_HEIGHT; + + this.state.body.setState({ children, autoRows: rowTemplate }); } public updateMetricPanel = (metric: string, isLoaded?: boolean, isEmpty?: boolean) => { @@ -416,7 +411,7 @@ export class MetricSelectScene extends SceneObjectBase i public onPrefixFilterChange = (val: SelectableValue) => { this.setState({ metricPrefix: val.value }); - this.buildLayout(); + this._refreshMetricNames(); }; public reportPrefixFilterInteraction = (isMenuOpen: boolean) => { diff --git a/public/app/features/variables/guard.test.ts b/public/app/features/variables/guard.test.ts index cd65f21e621..7e57f8422ad 100644 --- a/public/app/features/variables/guard.test.ts +++ b/public/app/features/variables/guard.test.ts @@ -23,6 +23,7 @@ import { createIntervalVariable, createOrgVariable, createQueryVariable, + createSnapshotVariable, createTextBoxVariable, createUserVariable, } from './state/__tests__/fixtures'; @@ -163,18 +164,19 @@ describe('type guards', () => { type ExtraVariableTypes = 'org' | 'dashboard' | 'user'; // prettier-ignore const variableFactsObj: Record = { - query: { variable: createQueryVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, - adhoc: { variable: createAdhocVariable(), isMulti: false, hasOptions: false, hasCurrent: false }, - groupby: { variable: createGroupByVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, - constant: { variable: createConstantVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, - datasource: { variable: createDatasourceVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, - interval: { variable: createIntervalVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, - textbox: { variable: createTextBoxVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, - system: { variable: createUserVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, - user: { variable: createUserVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, - org: { variable: createOrgVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, - dashboard: { variable: createDashboardVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, - custom: { variable: createCustomVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, + query: { variable: createQueryVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, + adhoc: { variable: createAdhocVariable(), isMulti: false, hasOptions: false, hasCurrent: false }, + groupby: { variable: createGroupByVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, + constant: { variable: createConstantVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, + datasource: { variable: createDatasourceVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, + interval: { variable: createIntervalVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, + textbox: { variable: createTextBoxVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, + system: { variable: createUserVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, + user: { variable: createUserVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, + org: { variable: createOrgVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, + dashboard: { variable: createDashboardVariable(), isMulti: false, hasOptions: false, hasCurrent: true }, + custom: { variable: createCustomVariable(), isMulti: true, hasOptions: true, hasCurrent: true }, + snapshot: { variable: createSnapshotVariable(), isMulti: false, hasOptions: true, hasCurrent: true }, }; const variableFacts = Object.values(variableFactsObj); diff --git a/public/app/features/variables/state/__tests__/fixtures.ts b/public/app/features/variables/state/__tests__/fixtures.ts index d30052bc886..f72326cd79b 100644 --- a/public/app/features/variables/state/__tests__/fixtures.ts +++ b/public/app/features/variables/state/__tests__/fixtures.ts @@ -10,6 +10,7 @@ import { LoadingState, OrgVariableModel, QueryVariableModel, + SnapshotVariableModel, TextBoxVariableModel, UserVariableModel, VariableHide, @@ -198,3 +199,13 @@ export function createCustomVariable(input: Partial = {}): ...input, }; } + +export function createSnapshotVariable(input: Partial = {}): SnapshotVariableModel { + return { + ...createBaseVariableModel('snapshot'), + query: '', + current: createVariableOption('prom-prod', { text: 'Prometheus (main)', selected: true }), + options: [], + ...input, + }; +} diff --git a/public/app/features/variables/state/actions.ts b/public/app/features/variables/state/actions.ts index e7ea07df89e..2e1ea5ba255 100644 --- a/public/app/features/variables/state/actions.ts +++ b/public/app/features/variables/state/actions.ts @@ -20,7 +20,7 @@ import { VariableRefresh, VariableWithOptions, } from '@grafana/data'; -import { config, locationService } from '@grafana/runtime'; +import { config, locationService, logWarning } from '@grafana/runtime'; import { notifyApp } from 'app/core/actions'; import { contextSrv } from 'app/core/services/context_srv'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; @@ -579,7 +579,14 @@ export const createGraph = (variables: TypedVariableModel[]) => { } if (variableAdapters.get(v1.type).dependsOn(v1, v2)) { - g.link(v1.name, v2.name); + try { + // link might fail if it would create a circular dependency + g.link(v1.name, v2.name); + } catch (error) { + // Catch the exception and return partially linked graph. The caller will handle the case of partial linking and display errors + const errorMessage = error instanceof Error ? error.message : 'Unknown error'; + logWarning('Error linking variables', { error: errorMessage }); + } } }); }); diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index c1e83fcddd4..80006510346 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", "@grafana/schema": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", @@ -39,7 +39,7 @@ "@types/testing-library__jest-dom": "5.14.9", "react-select-event": "5.5.1", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index 3cd909c0991..0f45a1b69ca 100644 --- a/public/app/plugins/datasource/cloud-monitoring/package.json +++ b/public/app/plugins/datasource/cloud-monitoring/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/google-sdk": "0.1.2", "@grafana/runtime": "11.3.0-pre", "@grafana/schema": "11.3.0-pre", @@ -43,7 +43,7 @@ "react-select-event": "5.5.1", "react-test-renderer": "18.2.0", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json index dfb43583ab6..e3a8a14681c 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", "@grafana/sql": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", @@ -26,7 +26,7 @@ "@types/react": "18.3.3", "@types/testing-library__jest-dom": "5.14.9", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index c3a27ed1751..eb87f0e6199 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json @@ -36,7 +36,7 @@ "jest": "29.7.0", "style-loader": "4.0.0", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index e52ba2d21e9..16ac300c7f6 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", "@grafana/schema": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", @@ -36,7 +36,7 @@ "@types/testing-library__jest-dom": "5.14.9", "@types/uuid": "9.0.8", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index d177f63fdd1..40fffa54700 100644 --- a/public/app/plugins/datasource/jaeger/package.json +++ b/public/app/plugins/datasource/jaeger/package.json @@ -7,7 +7,7 @@ "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/o11y-ds-frontend": "workspace:*", "@grafana/runtime": "workspace:*", "@grafana/ui": "workspace:*", @@ -37,7 +37,7 @@ "@types/react-window": "1.8.8", "@types/uuid": "9.0.8", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/loki/LanguageProvider.test.ts b/public/app/plugins/datasource/loki/LanguageProvider.test.ts index 5a63f43c2e2..9371a451e37 100644 --- a/public/app/plugins/datasource/loki/LanguageProvider.test.ts +++ b/public/app/plugins/datasource/loki/LanguageProvider.test.ts @@ -268,6 +268,24 @@ describe('Language completion provider', () => { end: expect.any(Number), }); }); + + it('should use a single promise to resolve values', async () => { + const datasource = setup({ testkey: ['label1_val1', 'label1_val2'], label2: [] }); + const provider = await getLanguageProvider(datasource); + const requestSpy = jest.spyOn(provider, 'request'); + const promise1 = provider.fetchLabelValues('testkey'); + const promise2 = provider.fetchLabelValues('testkey'); + const promise3 = provider.fetchLabelValues('testkeyNOPE'); + expect(requestSpy).toHaveBeenCalledTimes(2); + + const values1 = await promise1; + const values2 = await promise2; + const values3 = await promise3; + + expect(values1).toStrictEqual(values2); + expect(values2).not.toStrictEqual(values3); + expect(requestSpy).toHaveBeenCalledTimes(2); + }); }); describe('fetchLabels', () => { diff --git a/public/app/plugins/datasource/loki/LanguageProvider.ts b/public/app/plugins/datasource/loki/LanguageProvider.ts index b833308422d..20f79dfa375 100644 --- a/public/app/plugins/datasource/loki/LanguageProvider.ts +++ b/public/app/plugins/datasource/loki/LanguageProvider.ts @@ -31,6 +31,7 @@ export default class LokiLanguageProvider extends LanguageProvider { */ private seriesCache = new LRUCache>({ max: 10 }); private labelsCache = new LRUCache({ max: 10 }); + private labelsPromisesCache = new LRUCache>({ max: 10 }); constructor(datasource: LokiDatasource, initialValues?: any) { super(); @@ -272,18 +273,34 @@ export default class LokiLanguageProvider extends LanguageProvider { const cacheKey = this.generateCacheKey(url, start, end, paramCacheKey); - let labelValues = this.labelsCache.get(cacheKey); - if (!labelValues) { - // Clear value when requesting new one. Empty object being truthy also makes sure we don't request twice. - this.labelsCache.set(cacheKey, []); - const res = await this.request(url, params); - if (Array.isArray(res)) { - labelValues = res.slice().sort(); - this.labelsCache.set(cacheKey, labelValues); - } + // Values in cache, return + const labelValues = this.labelsCache.get(cacheKey); + if (labelValues) { + return labelValues; } - return labelValues ?? []; + // Promise in cache, return + let labelValuesPromise = this.labelsPromisesCache.get(cacheKey); + if (labelValuesPromise) { + return labelValuesPromise; + } + + labelValuesPromise = new Promise(async (resolve) => { + try { + const data = await this.request(url, params); + if (Array.isArray(data)) { + const labelValues = data.slice().sort(); + this.labelsCache.set(cacheKey, labelValues); + this.labelsPromisesCache.delete(cacheKey); + resolve(labelValues); + } + } catch (error) { + console.error(error); + resolve([]); + } + }); + this.labelsPromisesCache.set(cacheKey, labelValuesPromise); + return labelValuesPromise; } /** diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 7fb44ddaf39..926436df970 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -31,6 +31,7 @@ import { setBackendSrv, TemplateSrv, } from '@grafana/runtime'; +import { DashboardSrv, setDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; import { LokiVariableSupport } from './LokiVariableSupport'; import { createLokiDatasource } from './__mocks__/datasource'; @@ -1529,6 +1530,7 @@ describe('LokiDatasource', () => { queryType: 'range', refId: 'log-sample-A', maxLines: 20, + supportingQueryType: SupportingQueryType.LogsSample, }); }); @@ -1547,6 +1549,7 @@ describe('LokiDatasource', () => { queryType: LokiQueryType.Range, refId: 'log-sample-A', maxLines: 20, + supportingQueryType: SupportingQueryType.LogsSample, }); }); @@ -1564,6 +1567,7 @@ describe('LokiDatasource', () => { expr: '{label="value"}', queryType: LokiQueryType.Range, refId: 'log-sample-A', + supportingQueryType: SupportingQueryType.LogsSample, maxLines: 5, }); }); @@ -1698,6 +1702,46 @@ describe('LokiDatasource', () => { }); }); + describe('query', () => { + let featureToggleVal = config.featureToggles.lokiSendDashboardPanelNames; + beforeEach(() => { + setDashboardSrv({ + getCurrent: () => ({ + title: 'dashboard_title', + panels: [{ title: 'panel_title', id: 0 }], + }), + } as unknown as DashboardSrv); + const fetchMock = jest.fn().mockReturnValue(of({ data: testLogsResponse })); + setBackendSrv({ ...origBackendSrv, fetch: fetchMock }); + config.featureToggles.lokiSendDashboardPanelNames = true; + }); + afterEach(() => { + config.featureToggles.lokiSendDashboardPanelNames = featureToggleVal; + }); + + it('adds dashboard headers', async () => { + const ds = createLokiDatasource(templateSrvStub); + jest.spyOn(ds, 'runQuery'); + const query: DataQueryRequest = { + ...baseRequestOptions, + panelId: 0, + targets: [{ expr: '{a="b"}', refId: 'A' }], + app: CoreApp.Dashboard, + }; + + await expect(ds.query(query)).toEmitValuesWith(() => { + expect(ds.runQuery).toHaveBeenCalledWith( + expect.objectContaining({ + headers: expect.objectContaining({ + 'X-Dashboard-Title': 'dashboard_title', + 'X-Panel-Title': 'panel_title', + }), + }) + ); + }); + }); + }); + describe('getQueryStats', () => { let ds: LokiDatasource; let query: LokiQuery; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 80a95dda5a5..ed4c01f5d5b 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -46,6 +46,7 @@ import { import { Duration } from '@grafana/lezer-logql'; import { BackendSrvRequest, config, DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime'; import { DataQuery } from '@grafana/schema'; +import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; import LanguageProvider from './LanguageProvider'; import { LiveStreams, LokiLiveTarget } from './LiveStreams'; @@ -242,6 +243,7 @@ export class LokiDatasource refId: `${REF_ID_STARTER_LOG_SAMPLE}${normalizedQuery.refId}`, expr: getLogQueryFromMetricsQuery(expr), maxLines: Number.isNaN(Number(options.limit)) ? this.maxLines : Number(options.limit), + supportingQueryType: SupportingQueryType.LogsSample, }; default: @@ -288,6 +290,33 @@ export class LokiDatasource return { ...logsSampleRequest, targets }; } + private getQueryHeaders(request: DataQueryRequest): Record { + const headers: Record = {}; + if (!config.featureToggles.lokiSendDashboardPanelNames) { + return headers; + } + // only add headers if we are in the context of a dashboard + if ( + [CoreApp.Dashboard.toString(), CoreApp.PanelEditor.toString(), CoreApp.PanelViewer.toString()].includes( + request.app + ) === false + ) { + return headers; + } + + const dashboard = getDashboardSrv().getCurrent(); + const dashboardTitle = dashboard?.title; + const panelTitle = dashboard?.panels.find((p) => p.id === request?.panelId)?.title; + if (dashboardTitle) { + headers['X-Dashboard-Title'] = dashboardTitle; + } + if (panelTitle) { + headers['X-Panel-Title'] = panelTitle; + } + + return headers; + } + /** * Required by DataSourceApi. It executes queries based on the provided DataQueryRequest. * @returns An Observable of DataQueryResponse containing the query results. @@ -302,6 +331,8 @@ export class LokiDatasource targets: queries, }; + fixedRequest.headers = this.getQueryHeaders(request); + const streamQueries = fixedRequest.targets.filter((q) => q.queryType === LokiQueryType.Stream); if ( config.featureToggles.lokiExperimentalStreaming && diff --git a/public/app/plugins/datasource/mssql/CHANGELOG.md b/public/app/plugins/datasource/mssql/CHANGELOG.md new file mode 100644 index 00000000000..825c32f0d03 --- /dev/null +++ b/public/app/plugins/datasource/mssql/CHANGELOG.md @@ -0,0 +1 @@ +# Changelog diff --git a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx index 54ff2af3ae5..607dc32f114 100644 --- a/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx +++ b/public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx @@ -11,7 +11,9 @@ import { updateDatasourcePluginResetOption, } from '@grafana/data'; import { ConfigSection, ConfigSubSection, DataSourceDescription } from '@grafana/experimental'; +import { config } from '@grafana/runtime'; import { ConnectionLimits, useMigrateDatabaseFields } from '@grafana/sql'; +import { NumberInput } from '@grafana/sql/src/components/configuration/NumberInput'; import { Alert, FieldSet, @@ -25,8 +27,6 @@ import { Field, Switch, } from '@grafana/ui'; -import { NumberInput } from 'app/core/components/OptionsUI/NumberInput'; -import { config } from 'app/core/config'; import { AzureAuthSettings } from '../azureauth/AzureAuthSettings'; import { @@ -92,7 +92,10 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps { - updateDatasourcePluginJsonDataOption(props, 'connectionTimeout', connectionTimeout ?? 0); + if (connectionTimeout && connectionTimeout < 0) { + connectionTimeout = 0; + } + updateDatasourcePluginJsonDataOption(props, 'connectionTimeout', connectionTimeout); }; const buildAuthenticationOptions = (): Array> => { @@ -366,9 +369,8 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json new file mode 100644 index 00000000000..7a0a8f22570 --- /dev/null +++ b/public/app/plugins/datasource/mssql/package.json @@ -0,0 +1,41 @@ +{ + "name": "@grafana-plugins/mssql", + "description": "MSSQL data source plugin", + "private": true, + "version": "11.3.0-pre", + "dependencies": { + "@emotion/css": "11.11.2", + "@grafana/data": "workspace:*", + "@grafana/experimental": "1.7.12", + "@grafana/runtime": "11.3.0-pre", + "@grafana/sql": "11.3.0-pre", + "@grafana/ui": "11.3.0-pre", + "lodash": "4.17.21", + "react": "18.2.0", + "rxjs": "7.8.1", + "tslib": "2.6.3" + }, + "devDependencies": { + "@grafana/e2e-selectors": "workspace:*", + "@grafana/plugin-configs": "workspace:*", + "@testing-library/react": "15.0.2", + "@testing-library/user-event": "14.5.2", + "@types/jest": "29.5.12", + "@types/lodash": "4.17.4", + "@types/node": "20.14.2", + "@types/react": "18.3.3", + "@types/testing-library__jest-dom": "5.14.9", + "ts-node": "10.9.2", + "typescript": "5.4.5", + "webpack": "5.91.0" + }, + "peerDependencies": { + "@grafana/runtime": "*" + }, + "scripts": { + "build": "webpack -c ./webpack.config.ts --env production", + "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)", + "dev": "webpack -w -c ./webpack.config.ts --env development" + }, + "packageManager": "yarn@4.4.0" +} diff --git a/public/app/plugins/datasource/mssql/plugin.json b/public/app/plugins/datasource/mssql/plugin.json index 2c34f139b1b..97b6ab1f967 100644 --- a/public/app/plugins/datasource/mssql/plugin.json +++ b/public/app/plugins/datasource/mssql/plugin.json @@ -2,6 +2,7 @@ "type": "datasource", "name": "Microsoft SQL Server", "id": "mssql", + "executable": "gpx_mssql", "category": "sql", "info": { @@ -13,7 +14,11 @@ "logos": { "small": "img/sql_server_logo.svg", "large": "img/sql_server_logo.svg" - } + }, + "version": "%VERSION%" + }, + "dependencies": { + "grafanaDependency": ">=10.4.0" }, "alerting": true, diff --git a/public/app/plugins/datasource/mssql/tsconfig.json b/public/app/plugins/datasource/mssql/tsconfig.json new file mode 100644 index 00000000000..7daf2ee8aba --- /dev/null +++ b/public/app/plugins/datasource/mssql/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "@grafana/plugin-configs/tsconfig.json", + "include": ["."] +} diff --git a/public/app/plugins/datasource/mssql/webpack.config.ts b/public/app/plugins/datasource/mssql/webpack.config.ts new file mode 100644 index 00000000000..55a880fef5c --- /dev/null +++ b/public/app/plugins/datasource/mssql/webpack.config.ts @@ -0,0 +1,4 @@ +import config from '@grafana/plugin-configs/webpack.config'; + +// eslint-disable-next-line no-barrel-files/no-barrel-files +export default config; diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json index 8019a660388..746e4edcacd 100644 --- a/public/app/plugins/datasource/mysql/package.json +++ b/public/app/plugins/datasource/mysql/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "11.3.0-pre", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", "@grafana/sql": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", @@ -26,7 +26,7 @@ "@types/react": "18.3.3", "@types/testing-library__jest-dom": "5.14.9", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index 4c961caa2e9..7babfd2fba1 100644 --- a/public/app/plugins/datasource/parca/package.json +++ b/public/app/plugins/datasource/parca/package.json @@ -27,7 +27,7 @@ "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index da5624e717c..c0569302261 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -7,7 +7,7 @@ "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/lezer-logql": "0.2.6", "@grafana/lezer-traceql": "0.0.18", "@grafana/monaco-logql": "^0.0.7", @@ -55,7 +55,7 @@ "glob": "10.4.1", "react-select-event": "5.5.1", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index 34f8d08f539..a0f74197dd2 100644 --- a/public/app/plugins/datasource/zipkin/package.json +++ b/public/app/plugins/datasource/zipkin/package.json @@ -7,7 +7,7 @@ "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "1.7.13", + "@grafana/experimental": "1.8.0", "@grafana/o11y-ds-frontend": "workspace:*", "@grafana/runtime": "workspace:*", "@grafana/ui": "workspace:*", @@ -29,7 +29,7 @@ "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "ts-node": "10.9.2", - "typescript": "5.4.5", + "typescript": "5.5.4", "webpack": "5.91.0" }, "peerDependencies": { diff --git a/public/app/plugins/panel/logs/LogsPanel.test.tsx b/public/app/plugins/panel/logs/LogsPanel.test.tsx index 7b7a034f35e..12520a140a6 100644 --- a/public/app/plugins/panel/logs/LogsPanel.test.tsx +++ b/public/app/plugins/panel/logs/LogsPanel.test.tsx @@ -481,6 +481,33 @@ describe('LogsPanel', () => { expect(screen.getByText('logline text')).toBeInTheDocument(); }); + it('updates the provided fields instead of the log line', async () => { + const { rerender, props } = setup({ + data: { + series, + }, + options: { + showLabels: false, + showTime: false, + wrapLogMessage: false, + showCommonLabels: false, + prettifyLogMessage: false, + sortOrder: LogsSortOrder.Descending, + dedupStrategy: LogsDedupStrategy.none, + enableLogDetails: true, + onClickHideField: undefined, + onClickShowField: undefined, + }, + }); + + expect(await screen.findByRole('row')).toBeInTheDocument(); + expect(screen.getByText('logline text')).toBeInTheDocument(); + + rerender(); + + expect(screen.getByText('app=common_app')).toBeInTheDocument(); + }); + it('enables the behavior with a default implementation', async () => { setup({ data: { diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx index f9a78596387..b1269af69c0 100644 --- a/public/app/plugins/panel/logs/LogsPanel.tsx +++ b/public/app/plugins/panel/logs/LogsPanel.tsx @@ -1,5 +1,5 @@ import { css, cx } from '@emotion/css'; -import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'; +import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import * as React from 'react'; import { @@ -305,6 +305,12 @@ export const LogsPanel = ({ [displayedFields] ); + useEffect(() => { + if (options.displayedFields) { + setDisplayedFields(options.displayedFields); + } + }, [options.displayedFields]); + if (!data || logRows.length === 0) { return ; } diff --git a/public/app/plugins/panel/logs/panelcfg.cue b/public/app/plugins/panel/logs/panelcfg.cue index d66b2d7c07b..f843bdb5706 100644 --- a/public/app/plugins/panel/logs/panelcfg.cue +++ b/public/app/plugins/panel/logs/panelcfg.cue @@ -41,8 +41,8 @@ composableKinds: PanelCfg: { isFilterLabelActive?: _ onClickFilterString?: _ onClickFilterOutString?: _ - onClickShowField?: _ - onClickHideField?: _ + onClickShowField?: _ + onClickHideField?: _ displayedFields?: [...string] } @cuetsy(kind="interface") } diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx index a52aafa5eeb..8bf3abb4f6f 100644 --- a/public/app/routes/routes.tsx +++ b/public/app/routes/routes.tsx @@ -298,7 +298,11 @@ export function getAppRoutes(): RouteDescriptor[] { }, { path: '/admin/authentication/ldap', - component: LdapPage, + component: config.featureToggles.ssoSettingsLDAP + ? SafeDynamicImport( + () => import(/* webpackChunkName: "LdapSettingsPage" */ 'app/features/admin/ldap/LdapSettingsPage') + ) + : LdapPage, }, { path: '/admin/authentication/:provider', diff --git a/public/app/types/alerting.ts b/public/app/types/alerting.ts index 4f4fee28e19..3d86f9e3d5b 100644 --- a/public/app/types/alerting.ts +++ b/public/app/types/alerting.ts @@ -56,7 +56,8 @@ export type GrafanaNotifierType = | 'pushover' | 'LINE' | 'kafka' - | 'wecom'; + | 'wecom' + | 'mqtt'; export type CloudNotifierType = | 'oncall' // Only FE implementation for now diff --git a/public/app/types/ldap.ts b/public/app/types/ldap.ts index eecc12fe01a..0b094320613 100644 --- a/public/app/types/ldap.ts +++ b/public/app/types/ldap.ts @@ -64,6 +64,46 @@ export interface LdapServerInfo { error: string; } +export interface GroupMapping { + group_dn?: string; + org_id?: number; + org_role?: string; + grafana_admin?: boolean; +} + +export interface LdapAttributes { + email?: string; + member_of?: string; + name?: string; + surname?: string; + username?: string; +} + +export interface LdapServerConfig { + attributes: LdapAttributes; + bind_dn: string; + bind_password?: string; + client_cert: string; + client_key: string; + group_mappings: GroupMapping[]; + group_search_base_dns: string[]; + group_search_filter: string; + group_search_filter_user_attribute: string; + host: string; + min_tls_version?: string; + port: number; + root_ca_cert: string; + search_base_dns: string[]; + search_filter: string; + skip_org_role_sync: boolean; + ssl_skip_verify: boolean; + start_tls: boolean; + timeout: number; + tls_ciphers: string[]; + tls_skip_verify: boolean; + use_ssl: boolean; +} + export type LdapConnectionInfo = LdapServerInfo[]; export interface LdapState { @@ -73,4 +113,25 @@ export interface LdapState { connectionError?: LdapError; userError?: LdapError; ldapError?: LdapError; + ldapSsoSettings?: LdapServerConfig; +} + +export interface LdapConfig { + servers: LdapServerConfig[]; +} + +export interface LdapSettings { + activeSyncEnabled: boolean; + allowSignUp: boolean; + config: LdapConfig; + enabled: boolean; + skipOrgRoleSync: boolean; + syncCron: string; +} + +export interface LdapPayload { + id: string; + provider: string; + settings: LdapSettings; + source: string; } diff --git a/public/app/types/unified-alerting-dto.ts b/public/app/types/unified-alerting-dto.ts index 663a128b726..dd69743f700 100644 --- a/public/app/types/unified-alerting-dto.ts +++ b/public/app/types/unified-alerting-dto.ts @@ -1,6 +1,7 @@ // Prometheus API DTOs, possibly to be autogenerated from openapi spec in the near future import { DataQuery, RelativeTimeRange } from '@grafana/data'; +import { ExpressionQuery } from 'app/features/expressions/types'; import { AlertGroupTotals } from './unified-alerting'; @@ -202,12 +203,12 @@ export interface AlertDataQuery extends DataQuery { expression?: string; } -export interface AlertQuery { +export interface AlertQuery { refId: string; queryType: string; relativeTimeRange?: RelativeTimeRange; datasourceUid: string; - model: AlertDataQuery; + model: T; } export interface GrafanaNotificationSettings { diff --git a/public/app/types/unified-alerting.ts b/public/app/types/unified-alerting.ts index 64082751f1b..338fa189fc9 100644 --- a/public/app/types/unified-alerting.ts +++ b/public/app/types/unified-alerting.ts @@ -182,7 +182,15 @@ export interface PrometheusRuleIdentifier { ruleHash: string; } -export type RuleIdentifier = CloudRuleIdentifier | GrafanaRuleIdentifier | PrometheusRuleIdentifier; +export type RuleIdentifier = EditableRuleIdentifier | PrometheusRuleIdentifier; + +/** + * This type is a union of all rule identifiers that should have a ruler API + * + * We do not support PrometheusRuleIdentifier because vanilla Prometheus has no ruler API + */ +export type EditableRuleIdentifier = CloudRuleIdentifier | GrafanaRuleIdentifier; + export interface FilterState { queryString?: string; dataSource?: string; diff --git a/public/img/plugins/aurora.svg b/public/img/plugins/aurora.svg new file mode 100644 index 00000000000..3897e3b5b07 --- /dev/null +++ b/public/img/plugins/aurora.svg @@ -0,0 +1,10 @@ + + + Icon-Architecture/16/Arch_Amazon-Aurora_16 + + + + + + + \ No newline at end of file diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index eab5ecd0bb6..0df4ec38e38 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -203,6 +203,9 @@ "recording-rule": "Recording rule" }, "rules": { + "add-rule": { + "success": "Rule added successfully" + }, "delete-rule": { "success": "Rule successfully deleted" }, @@ -211,6 +214,9 @@ }, "resume-rule": { "success": "Rule evaluation resumed" + }, + "update-rule": { + "success": "Rule updated successfully" } } }, @@ -345,6 +351,7 @@ } }, "common": { + "cancel": "Cancel", "locale": { "default": "Default" }, @@ -977,6 +984,139 @@ "refresh": "Refresh" } }, + "ldap-drawer": { + "attributes-section": { + "description": "Specify the LDAP attributes that map to the user‘s given name, surname, and email address, ensuring the application correctly retrieves and displays user information.", + "email": { + "label": "Email" + }, + "label": "Attributes", + "member-of": { + "label": "Member Of" + }, + "name": { + "label": "Name" + }, + "surname": { + "label": "Surname" + }, + "username": { + "label": "Username" + } + }, + "extra-security-section": { + "label": "Extra security measures", + "min-tls-version": { + "description": "This is the minimum TLS version allowed. Accepted values are: TLS1.2, TLS1.3.", + "label": "Min TLS version" + }, + "start-tls": { + "description": "If set to true, use LDAP with STARTTLS instead of LDAPS", + "label": "Start TLS" + }, + "tls-ciphers": { + "description": "List of comma- or space-separated ciphers", + "label": "TLS ciphers", + "placeholder": "e.g. [\"TLS_AES_256_GCM_SHA384\"]" + }, + "use-ssl": { + "description": "Set to true if LDAP server should use TLS connection (either with STARTTLS or LDAPS)", + "label": "Use SSL", + "tooltip": "For a complete list of supported ciphers and TLS versions, refer to: {\n \n https://go.dev/src/crypto/tls/cipher_suites.go\n }" + } + }, + "group-mapping-section": { + "description": "Map LDAP groups to Grafana org roles", + "group-search-base-dns": { + "description": "Separate by commas or spaces", + "label": "Group search base DNS" + }, + "group-search-filter": { + "description": "Used to filter and identify group entries within the directory", + "label": "Group search filter" + }, + "group-search-filter-user-attribute": { + "description": "Identifies users within group entries for filtering purposes", + "label": "Group name attribute" + }, + "label": "Group mapping", + "skip-org-role-sync": { + "description": "Prevent synchronizing users’ organization roles from your IdP", + "label": "Skip organization role sync" + } + }, + "misc-section": { + "allow-sign-up": { + "descrition": "If not enabled, only existing Grafana users can log in using LDAP", + "label": "Allow sign up" + }, + "label": "Misc", + "port": { + "description": "Default port is 389 without SSL or 636 with SSL", + "label": "Port" + }, + "timeout": { + "description": "Timeout in seconds for the connection to the LDAP server", + "label": "Timeout" + } + }, + "title": "Advanced settings" + }, + "ldap-settings-page": { + "advanced-settings-section": { + "edit": { + "button": "Edit" + }, + "subtitle": "Mappings, extra security measures, and more.", + "title": "Advanced Settings" + }, + "alert": { + "discard-success": "LDAP settings discarded", + "error-fetching": "Error fetching LDAP settings", + "error-saving": "Error saving LDAP settings", + "error-update": "Error updating LDAP settings", + "error-validate-form": "Error validating LDAP settings", + "feature-flag-disabled": "This page is only accessible by enabling the <1>ssoSettingsLDAP feature flag.", + "saved": "LDAP settings saved" + }, + "bind-dn": { + "description": "Distinguished name of the account used to bind and authenticate to the LDAP server.", + "label": "Bind DN", + "placeholder": "example: cn=admin,dc=grafana,dc=org" + }, + "bind-password": { + "label": "Bind password" + }, + "buttons-section": { + "discard": { + "button": "Discard" + }, + "save": { + "button": "Save" + }, + "save-and-enable": { + "button": "Save and enable" + } + }, + "documentation": "documentation", + "host": { + "description": "Hostname or IP address of the LDAP server you wish to connect to.", + "label": "Server host", + "placeholder": "example: 127.0.0.1" + }, + "search_filter": { + "description": "LDAP search filter used to locate specific entries within the directory.", + "label": "Search filter*", + "placeholder": "example: cn=%s" + }, + "search-base-dns": { + "description": "An array of base dns to search through; separate by commas or spaces.", + "label": "Search base DNS *", + "placeholder": "example: \"dc=grafana.dc=org\"" + }, + "subtitle": "The LDAP integration in Grafana allows your Grafana users to log in with their LDAP credentials. Find out more in our {documentation}.", + "title": "Basic Settings" + }, "library-panel": { "add-modal": { "cancel": "Cancel", @@ -1938,6 +2078,8 @@ "title": "Permanently Delete Dashboards" }, "restore-modal": { + "folder-picker-text_one": "Please choose a folder where your dashboard will be restored.", + "folder-picker-text_other": "Please choose a folder where your dashboards will be restored.", "restore-button": "Restore", "restore-loading": "Restoring...", "text_one": "This action will restore {{numberOfDashboards}} dashboard.", @@ -1987,6 +2129,8 @@ }, "scopes": { "dashboards": { + "collapse": "Collapse", + "expand": "Expand", "loading": "Loading dashboards", "noResultsForFilter": "No results found for your query", "noResultsForFilterClear": "Clear search", @@ -2154,14 +2298,20 @@ }, "share-panel": { "drawer": { + "new-library-panel-title": "New library panel", "share-embed-title": "Share embed", "share-link-title": "Link settings", "share-snapshot-title": "Share snapshot" }, "menu": { + "new-library-panel-title": "New library panel", "share-embed-title": "Share embed", "share-link-title": "Share link", "share-snapshot-title": "Share snapshot" + }, + "new-library-panel": { + "cancel-button": "Cancel", + "create-button": "Create library panel" } }, "share-playlist": { @@ -2200,6 +2350,10 @@ "revoke-button-tooltip": "Revoke access", "view-button-tooltip": "View shared dashboard" }, + "empty-state": { + "message": "You haven't created any shared dashboards yet", + "more-info": "Create a shared dashboard from any existing dashboard through the <1>Share modal. <4>Learn more" + }, "toggle": { "pause-sharing-toggle-text": "Pause access" } diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json index c0b22d9ccbf..bda49fe87ed 100644 --- a/public/locales/pseudo-LOCALE/grafana.json +++ b/public/locales/pseudo-LOCALE/grafana.json @@ -203,6 +203,9 @@ "recording-rule": "Ŗęčőřđįʼnģ řūľę" }, "rules": { + "add-rule": { + "success": "Ŗūľę äđđęđ şūččęşşƒūľľy" + }, "delete-rule": { "success": "Ŗūľę şūččęşşƒūľľy đęľęŧęđ" }, @@ -211,6 +214,9 @@ }, "resume-rule": { "success": "Ŗūľę ęväľūäŧįőʼn řęşūmęđ" + }, + "update-rule": { + "success": "Ŗūľę ūpđäŧęđ şūččęşşƒūľľy" } } }, @@ -345,6 +351,7 @@ } }, "common": { + "cancel": "Cäʼnčęľ", "locale": { "default": "Đęƒäūľŧ" }, @@ -977,6 +984,139 @@ "refresh": "Ŗęƒřęşĥ" } }, + "ldap-drawer": { + "attributes-section": { + "description": "Ŝpęčįƒy ŧĥę ĿĐÅP äŧŧřįþūŧęş ŧĥäŧ mäp ŧő ŧĥę ūşęř&ľşqūő;ş ģįvęʼn ʼnämę, şūřʼnämę, äʼnđ ęmäįľ äđđřęşş, ęʼnşūřįʼnģ ŧĥę äppľįčäŧįőʼn čőřřęčŧľy řęŧřįęvęş äʼnđ đįşpľäyş ūşęř įʼnƒőřmäŧįőʼn.", + "email": { + "label": "Ēmäįľ" + }, + "label": "Åŧŧřįþūŧęş", + "member-of": { + "label": "Męmþęř ؃" + }, + "name": { + "label": "Ńämę" + }, + "surname": { + "label": "Ŝūřʼnämę" + }, + "username": { + "label": "Ůşęřʼnämę" + } + }, + "extra-security-section": { + "label": "Ēχŧřä şęčūřįŧy męäşūřęş", + "min-tls-version": { + "description": "Ŧĥįş įş ŧĥę mįʼnįmūm ŦĿŜ vęřşįőʼn äľľőŵęđ. Åččępŧęđ väľūęş äřę: ŦĿŜ1.2, ŦĿŜ1.3.", + "label": "Mįʼn ŦĿŜ vęřşįőʼn" + }, + "start-tls": { + "description": "Ĩƒ şęŧ ŧő ŧřūę, ūşę ĿĐÅP ŵįŧĥ ŜŦÅŖŦŦĿŜ įʼnşŧęäđ őƒ ĿĐÅPŜ", + "label": "Ŝŧäřŧ ŦĿŜ" + }, + "tls-ciphers": { + "description": "Ŀįşŧ őƒ čőmmä- őř şpäčę-şępäřäŧęđ čįpĥęřş", + "label": "ŦĿŜ čįpĥęřş", + "placeholder": "ę.ģ. [\"ŦĿŜ_ÅĒŜ_256_ĞCM_ŜĦÅ384\"]" + }, + "use-ssl": { + "description": "Ŝęŧ ŧő ŧřūę įƒ ĿĐÅP şęřvęř şĥőūľđ ūşę ŦĿŜ čőʼnʼnęčŧįőʼn (ęįŧĥęř ŵįŧĥ ŜŦÅŖŦŦĿŜ őř ĿĐÅPŜ)", + "label": "Ůşę ŜŜĿ", + "tooltip": "Főř ä čőmpľęŧę ľįşŧ őƒ şūppőřŧęđ čįpĥęřş äʼnđ ŦĿŜ vęřşįőʼnş, řęƒęř ŧő: {\n <ŦęχŧĿįʼnĸ şŧyľę={{ fontSize: 'inherit' }} ĥřęƒ=\"ĥŧŧpş://ģő.đęv/şřč/čřypŧő/ŧľş/čįpĥęř_şūįŧęş.ģő\" ęχŧęřʼnäľ>\n ĥŧŧpş://ģő.đęv/şřč/čřypŧő/ŧľş/čįpĥęř_şūįŧęş.ģő\n }" + } + }, + "group-mapping-section": { + "description": "Mäp ĿĐÅP ģřőūpş ŧő Ğřäƒäʼnä őřģ řőľęş", + "group-search-base-dns": { + "description": "Ŝępäřäŧę þy čőmmäş őř şpäčęş", + "label": "Ğřőūp şęäřčĥ þäşę ĐŃŜ" + }, + "group-search-filter": { + "description": "Ůşęđ ŧő ƒįľŧęř äʼnđ įđęʼnŧįƒy ģřőūp ęʼnŧřįęş ŵįŧĥįʼn ŧĥę đįřęčŧőřy", + "label": "Ğřőūp şęäřčĥ ƒįľŧęř" + }, + "group-search-filter-user-attribute": { + "description": "Ĩđęʼnŧįƒįęş ūşęřş ŵįŧĥįʼn ģřőūp ęʼnŧřįęş ƒőř ƒįľŧęřįʼnģ pūřpőşęş", + "label": "Ğřőūp ʼnämę äŧŧřįþūŧę" + }, + "label": "Ğřőūp mäppįʼnģ", + "skip-org-role-sync": { + "description": "Přęvęʼnŧ şyʼnčĥřőʼnįžįʼnģ ūşęřş’ őřģäʼnįžäŧįőʼn řőľęş ƒřőm yőūř ĨđP", + "label": "Ŝĸįp őřģäʼnįžäŧįőʼn řőľę şyʼnč" + } + }, + "misc-section": { + "allow-sign-up": { + "descrition": "Ĩƒ ʼnőŧ ęʼnäþľęđ, őʼnľy ęχįşŧįʼnģ Ğřäƒäʼnä ūşęřş čäʼn ľőģ įʼn ūşįʼnģ ĿĐÅP", + "label": "Åľľőŵ şįģʼn ūp" + }, + "label": "Mįşč", + "port": { + "description": "Đęƒäūľŧ pőřŧ įş 389 ŵįŧĥőūŧ ŜŜĿ őř 636 ŵįŧĥ ŜŜĿ", + "label": "Pőřŧ" + }, + "timeout": { + "description": "Ŧįmęőūŧ įʼn şęčőʼnđş ƒőř ŧĥę čőʼnʼnęčŧįőʼn ŧő ŧĥę ĿĐÅP şęřvęř", + "label": "Ŧįmęőūŧ" + } + }, + "title": "Åđväʼnčęđ şęŧŧįʼnģş" + }, + "ldap-settings-page": { + "advanced-settings-section": { + "edit": { + "button": "Ēđįŧ" + }, + "subtitle": "Mäppįʼnģş, ęχŧřä şęčūřįŧy męäşūřęş, äʼnđ mőřę.", + "title": "Åđväʼnčęđ Ŝęŧŧįʼnģş" + }, + "alert": { + "discard-success": "ĿĐÅP şęŧŧįʼnģş đįşčäřđęđ", + "error-fetching": "Ēřřőř ƒęŧčĥįʼnģ ĿĐÅP şęŧŧįʼnģş", + "error-saving": "Ēřřőř şävįʼnģ ĿĐÅP şęŧŧįʼnģş", + "error-update": "Ēřřőř ūpđäŧįʼnģ ĿĐÅP şęŧŧįʼnģş", + "error-validate-form": "Ēřřőř väľįđäŧįʼnģ ĿĐÅP şęŧŧįʼnģş", + "feature-flag-disabled": "Ŧĥįş päģę įş őʼnľy äččęşşįþľę þy ęʼnäþľįʼnģ ŧĥę <1>şşőŜęŧŧįʼnģşĿĐÅP ƒęäŧūřę ƒľäģ.", + "saved": "ĿĐÅP şęŧŧįʼnģş şävęđ" + }, + "bind-dn": { + "description": "Đįşŧįʼnģūįşĥęđ ʼnämę őƒ ŧĥę äččőūʼnŧ ūşęđ ŧő þįʼnđ äʼnđ äūŧĥęʼnŧįčäŧę ŧő ŧĥę ĿĐÅP şęřvęř.", + "label": "ßįʼnđ ĐŃ", + "placeholder": "ęχämpľę: čʼn=äđmįʼn,đč=ģřäƒäʼnä,đč=őřģ" + }, + "bind-password": { + "label": "ßįʼnđ päşşŵőřđ" + }, + "buttons-section": { + "discard": { + "button": "Đįşčäřđ" + }, + "save": { + "button": "Ŝävę" + }, + "save-and-enable": { + "button": "Ŝävę äʼnđ ęʼnäþľę" + } + }, + "documentation": "đőčūmęʼnŧäŧįőʼn", + "host": { + "description": "Ħőşŧʼnämę őř ĨP äđđřęşş őƒ ŧĥę ĿĐÅP şęřvęř yőū ŵįşĥ ŧő čőʼnʼnęčŧ ŧő.", + "label": "Ŝęřvęř ĥőşŧ", + "placeholder": "ęχämpľę: 127.0.0.1" + }, + "search_filter": { + "description": "ĿĐÅP şęäřčĥ ƒįľŧęř ūşęđ ŧő ľőčäŧę şpęčįƒįč ęʼnŧřįęş ŵįŧĥįʼn ŧĥę đįřęčŧőřy.", + "label": "Ŝęäřčĥ ƒįľŧęř*", + "placeholder": "ęχämpľę: čʼn=%ş" + }, + "search-base-dns": { + "description": "Åʼn äřřäy őƒ þäşę đʼnş ŧő şęäřčĥ ŧĥřőūģĥ; şępäřäŧę þy čőmmäş őř şpäčęş.", + "label": "Ŝęäřčĥ þäşę ĐŃŜ *", + "placeholder": "ęχämpľę: \"đč=ģřäƒäʼnä.đč=őřģ\"" + }, + "subtitle": "Ŧĥę ĿĐÅP įʼnŧęģřäŧįőʼn įʼn Ğřäƒäʼnä äľľőŵş yőūř Ğřäƒäʼnä ūşęřş ŧő ľőģ įʼn ŵįŧĥ ŧĥęįř ĿĐÅP čřęđęʼnŧįäľş. Fįʼnđ őūŧ mőřę įʼn őūř {đőčūmęʼnŧäŧįőʼn}.", + "title": "ßäşįč Ŝęŧŧįʼnģş" + }, "library-panel": { "add-modal": { "cancel": "Cäʼnčęľ", @@ -1938,6 +2078,8 @@ "title": "Pęřmäʼnęʼnŧľy Đęľęŧę Đäşĥþőäřđş" }, "restore-modal": { + "folder-picker-text_one": "Pľęäşę čĥőőşę ä ƒőľđęř ŵĥęřę yőūř đäşĥþőäřđ ŵįľľ þę řęşŧőřęđ.", + "folder-picker-text_other": "Pľęäşę čĥőőşę ä ƒőľđęř ŵĥęřę yőūř đäşĥþőäřđş ŵįľľ þę řęşŧőřęđ.", "restore-button": "Ŗęşŧőřę", "restore-loading": "Ŗęşŧőřįʼnģ...", "text_one": "Ŧĥįş äčŧįőʼn ŵįľľ řęşŧőřę {{numberOfDashboards}} đäşĥþőäřđ.", @@ -1987,6 +2129,8 @@ }, "scopes": { "dashboards": { + "collapse": "Cőľľäpşę", + "expand": "Ēχpäʼnđ", "loading": "Ŀőäđįʼnģ đäşĥþőäřđş", "noResultsForFilter": "Ńő řęşūľŧş ƒőūʼnđ ƒőř yőūř qūęřy", "noResultsForFilterClear": "Cľęäř şęäřčĥ", @@ -2154,14 +2298,20 @@ }, "share-panel": { "drawer": { + "new-library-panel-title": "Ńęŵ ľįþřäřy päʼnęľ", "share-embed-title": "Ŝĥäřę ęmþęđ", "share-link-title": "Ŀįʼnĸ şęŧŧįʼnģş", "share-snapshot-title": "Ŝĥäřę şʼnäpşĥőŧ" }, "menu": { + "new-library-panel-title": "Ńęŵ ľįþřäřy päʼnęľ", "share-embed-title": "Ŝĥäřę ęmþęđ", "share-link-title": "Ŝĥäřę ľįʼnĸ", "share-snapshot-title": "Ŝĥäřę şʼnäpşĥőŧ" + }, + "new-library-panel": { + "cancel-button": "Cäʼnčęľ", + "create-button": "Cřęäŧę ľįþřäřy päʼnęľ" } }, "share-playlist": { @@ -2200,6 +2350,10 @@ "revoke-button-tooltip": "Ŗęvőĸę äččęşş", "view-button-tooltip": "Vįęŵ şĥäřęđ đäşĥþőäřđ" }, + "empty-state": { + "message": "Ÿőū ĥävęʼn'ŧ čřęäŧęđ äʼny şĥäřęđ đäşĥþőäřđş yęŧ", + "more-info": "Cřęäŧę ä şĥäřęđ đäşĥþőäřđ ƒřőm äʼny ęχįşŧįʼnģ đäşĥþőäřđ ŧĥřőūģĥ ŧĥę <1>Ŝĥäřę mőđäľ. <4>Ŀęäřʼn mőřę" + }, "toggle": { "pause-sharing-toggle-text": "Päūşę äččęşş" } diff --git a/public/openapi3.json b/public/openapi3.json index f703e5e0bbb..3eccd8eda54 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -3614,7 +3614,7 @@ "Policies": { "description": "Policies contains all policy identifiers included in the certificate.\nIn Go 1.22, encoding/gob cannot handle and ignores this field.", "items": { - "$ref": "#/components/schemas/OID" + "type": "string" }, "type": "array" }, @@ -3898,6 +3898,9 @@ "example": "PE1C5CBDA0504A6A3", "type": "string" }, + "type": { + "$ref": "#/components/schemas/CorrelationType" + }, "uid": { "description": "Unique identifier of the correlation", "example": "50xhMlg9k", @@ -3926,19 +3929,15 @@ "$ref": "#/components/schemas/Transformations" }, "type": { - "$ref": "#/components/schemas/CorrelationConfigType" + "$ref": "#/components/schemas/CorrelationType" } }, "required": [ "field", - "type", "target" ], "type": "object" }, - "CorrelationConfigType": { - "type": "string" - }, "CorrelationConfigUpdateDTO": { "properties": { "field": { @@ -3971,13 +3970,13 @@ "$ref": "#/components/schemas/Transformation" }, "type": "array" - }, - "type": { - "$ref": "#/components/schemas/CorrelationConfigType" } }, "type": "object" }, + "CorrelationType": { + "type": "string" + }, "CounterResetHint": { "description": "or alternatively that we are dealing with a gauge histogram, where counter resets do not apply.", "format": "uint8", @@ -4013,9 +4012,12 @@ "type": "boolean" }, "targetUID": { - "description": "Target data source UID to which the correlation is created. required if config.type = query", + "description": "Target data source UID to which the correlation is created. required if type = query", "example": "PE1C5CBDA0504A6A3", "type": "string" + }, + "type": { + "$ref": "#/components/schemas/CorrelationType" } }, "type": "object" @@ -5614,14 +5616,6 @@ "title": "Frames is a slice of Frame pointers.", "type": "array" }, - "GenericPublicError": { - "properties": { - "body": { - "$ref": "#/components/schemas/PublicError" - } - }, - "type": "object" - }, "GetAccessTokenResponseDTO": { "properties": { "createdAt": { @@ -7398,10 +7392,6 @@ "title": "OAuth2 is the oauth2 client configuration.", "type": "object" }, - "OID": { - "title": "An OID represents an ASN.1 OBJECT IDENTIFIER.", - "type": "object" - }, "ObjectIdentifier": { "items": { "format": "int64", @@ -8482,7 +8472,8 @@ "type": "string" }, "for": { - "$ref": "#/components/schemas/Duration" + "format": "duration", + "type": "string" }, "id": { "format": "int64", @@ -11481,6 +11472,9 @@ "description": "Optional label identifying the correlation", "example": "My label", "type": "string" + }, + "type": { + "$ref": "#/components/schemas/CorrelationType" } }, "type": "object" @@ -12033,7 +12027,7 @@ }, "ValidationError": { "properties": { - "msg": { + "message": { "example": "error message", "type": "string" } @@ -12228,7 +12222,6 @@ "type": "object" }, "alertGroups": { - "description": "AlertGroups alert groups", "items": { "$ref": "#/components/schemas/alertGroup" }, @@ -12417,7 +12410,6 @@ "type": "object" }, "gettableAlerts": { - "description": "GettableAlerts gettable alerts", "items": { "$ref": "#/components/schemas/gettableAlert" }, @@ -12541,7 +12533,6 @@ "type": "object" }, "gettableSilences": { - "description": "GettableSilences gettable silences", "items": { "$ref": "#/components/schemas/gettableSilence" }, @@ -25449,11 +25440,11 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GenericPublicError" + "$ref": "#/components/schemas/PublicError" } } }, - "description": "GenericPublicError" + "description": "PublicError" } }, "summary": "Delete a mute timing.", @@ -25549,11 +25540,11 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GenericPublicError" + "$ref": "#/components/schemas/PublicError" } } }, - "description": "GenericPublicError" + "description": "PublicError" } }, "summary": "Replace an existing mute timing.", @@ -25878,11 +25869,11 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GenericPublicError" + "$ref": "#/components/schemas/PublicError" } } }, - "description": "GenericPublicError" + "description": "PublicError" } }, "summary": "Delete a template.", @@ -25918,11 +25909,11 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GenericPublicError" + "$ref": "#/components/schemas/PublicError" } } }, - "description": "GenericPublicError" + "description": "PublicError" } }, "summary": "Get a notification template.", @@ -25975,21 +25966,21 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GenericPublicError" + "$ref": "#/components/schemas/PublicError" } } }, - "description": "GenericPublicError" + "description": "PublicError" }, "409": { "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GenericPublicError" + "$ref": "#/components/schemas/PublicError" } } }, - "description": "GenericPublicError" + "description": "PublicError" } }, "summary": "Updates an existing notification template.", diff --git a/public/sass/_angular.scss b/public/sass/_angular.scss index d6e75e4d31b..b5a5605fedf 100644 --- a/public/sass/_angular.scss +++ b/public/sass/_angular.scss @@ -2312,3 +2312,42 @@ div.flot-text { color: $text-color; } } + +.clearfix { + &::after { + content: ''; + display: table; + clear: both; + } +} + +// Close icons +// -------------------------------------------------- +.close { + opacity: 0.2; + float: right; + font-size: 20px; + font-weight: bold; + line-height: $line-height-base; + color: $black; + text-shadow: 0 1px 0 rgba(255, 255, 255, 1); + + &:hover, + &:focus { + color: $black; + text-decoration: none; + cursor: pointer; + opacity: 0.4; + } +} + +// Additional properties for button version +// iOS requires the button element instead of an anchor tag. +// If you want the anchor version, it requires `href="#"`. +button.close { + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; +} diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index 127d6ead988..cd1f36c9bfc 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -5,11 +5,9 @@ @import 'base/font_awesome'; // UTILS -@import 'utils/utils'; @import 'utils/widths'; // COMPONENTS -@import 'components/buttons'; @import 'components/dropdown'; // ANGULAR diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss deleted file mode 100644 index 5af22a2a797..00000000000 --- a/public/sass/components/_buttons.scss +++ /dev/null @@ -1,415 +0,0 @@ -@use 'sass:color'; -@use 'sass:map'; - -// Gradient Bar Colors for buttons and alerts -@mixin gradientBar($primaryColor, $secondaryColor, $text-color: #fff, $textShadow: 0 -1px 0 rgba(0, 0, 0, 0.25)) { - background-color: color.mix($primaryColor, $secondaryColor, 60%); - background-image: linear-gradient(to bottom, $primaryColor, $secondaryColor); // Standard, IE10 - background-repeat: repeat-x; - color: $text-color; - text-shadow: $textShadow; - border-color: $primaryColor; -} - -@mixin hover { - @if $enable-hover-media-query { - // See Media Queries Level 4: http://drafts.csswg.org/mediaqueries/#hover - // Currently shimmed by https://github.com/twbs/mq4-hover-shim - @media (hover: hover) { - &:hover { - @content; - } - } - } @else { - &:hover { - @content; - } - } -} - -@mixin hover-focus { - @if $enable-hover-media-query { - &:focus { - @content; - } - @include hover { - @content; - } - } @else { - &:focus, - &:hover { - @content; - } - } -} - -// Button backgrounds -// ------------------ -@mixin buttonBackground($startColor, $endColor, $text-color: #fff, $textShadow: 0px 1px 0 rgba(0, 0, 0, 0.1)) { - // gradientBar will set the background to a pleasing blend of these, to support IE<=9 - @include gradientBar($startColor, $endColor, $text-color, $textShadow); - - // in these cases the gradient won't cover the background, so we override - &:hover, - &:focus, - &:active, - &.active, - &.disabled, - &[disabled] { - color: $text-color; - background-image: none; - background-color: $startColor; - } -} - -// Button sizes -@mixin button-size($padding-y, $padding-x, $font-size, $border-radius) { - padding: $padding-y $padding-x; - font-size: $font-size; - //box-shadow: inset 0 (-$padding-y/3) rgba(0,0,0,0.15); - - border-radius: $border-radius; -} - -@mixin button-outline-variant($color) { - color: $white; - background-image: none; - background-color: transparent; - border: 1px solid $white; - - @include hover { - color: $white; - background-color: $color; - } - - &:focus, - &.focus { - color: $white; - background-color: $color; - } - - &:active, - &.active, - .open > &.dropdown-toggle { - color: $white; - background-color: $color; - - &:hover, - &:focus, - &.focus { - color: $white; - background-color: color.adjust($color, $lightness: -17%); - border-color: color.adjust($color, $lightness: -25%); - } - } - - &.disabled, - &:disabled { - &:focus, - &.focus { - border-color: color.adjust($color, $lightness: 20%); - } - @include hover { - border-color: color.adjust($color, $lightness: 20%); - } - } -} - -// -// Buttons -// -------------------------------------------------- - -// Base styles -// -------------------------------------------------- - -// Core -.btn { - display: inline-flex; - align-items: center; - justify-content: center; - font-weight: $btn-font-weight; - line-height: $btn-line-height; - font-size: $font-size-base; - text-align: center; - vertical-align: middle; - cursor: pointer; - border: none; - height: $height-md + px; - - @include button-size($btn-padding-y, $space-md, $font-size-base, $border-radius-sm); - - &, - &:active, - &.active { - &:focus, - &.focus { - outline: none; - } - } - - @include hover-focus { - text-decoration: none; - } - &.focus { - text-decoration: none; - } - - &:active, - &.active { - background-image: none; - outline: 0; - } - - &.disabled, - &[disabled], - &:disabled { - cursor: $cursor-disabled; - opacity: 0.65; - box-shadow: none; - pointer-events: none; - } - - &--radius-left-0 { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - - &--radius-right-0 { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } -} - -// Button Sizes -// -------------------------------------------------- - -// Large -.btn-large { - @include button-size($btn-padding-y-lg, $space-lg, $font-size-lg, $border-radius-sm); - font-weight: normal; - height: $height-lg + px; - - .gicon { - //font-size: 31px; - margin-right: $space-sm; - filter: brightness(100); - } -} - -.btn-small { - @include button-size($btn-padding-y-sm, $space-sm, $font-size-sm, $border-radius-sm); - height: $height-sm + px; -} - -// Deprecated, only used by old plugins -.btn-mini { - @include button-size($btn-padding-y-sm, $space-sm, $font-size-sm, $border-radius-sm); - height: #{height-sm}px; -} - -.btn-link { - color: $btn-link-color; - background: transparent; -} - -// Set the backgrounds -// ------------------------- -.btn-success, -.btn-primary { - @include buttonBackground($btn-primary-bg, $btn-primary-bg-hl); -} - -.btn-secondary { - @include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl); -} - -// Danger and error appear as red -.btn-danger { - @include buttonBackground($btn-danger-bg, $btn-danger-bg-hl); -} - -// Info appears as a neutral blue -.btn-secondary { - @include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl, $text-color); - // Inverse appears as dark gray -} -.btn-inverse { - @include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color, $btn-inverse-text-shadow); - //background: $card-background; - /* stylelint-disable-next-line */ - & { - box-shadow: $card-shadow; - } - //border: 1px solid $tight-form-func-highlight-bg; -} - -.btn-transparent { - background-color: transparent; -} - -.btn-outline-primary { - @include button-outline-variant($btn-primary-bg); -} -.btn-outline-secondary { - @include button-outline-variant($btn-secondary-bg-hl); -} -.btn-outline-inverse { - @include button-outline-variant($btn-inverse-bg); -} -.btn-outline-danger { - @include button-outline-variant($btn-danger-bg); -} - -.btn-outline-disabled { - @include button-outline-variant($gray-1); - /* stylelint-disable-next-line */ - & { - box-shadow: none; - cursor: default; - } - - &:hover, - &:active, - &:active:hover, - &:focus { - color: $gray-1; - background-color: transparent; - border-color: $gray-1; - } -} - -// Extra padding -.btn-p-x-2 { - padding-left: 20px; - padding-right: 20px; -} - -// No horizontal padding -.btn-p-x-0 { - padding-left: 0; - padding-right: 0; -} - -// External services -// Usage: -// - -$btn-service-icon-width: 35px; -.btn-service { - position: relative; -} - -@each $service, $data in $external-services { - $serviceBgColor: map.get($data, bgColor); - $serviceBorderColor: map.get($data, borderColor); - - .btn-service--#{$service} { - background-color: $serviceBgColor; - border: 1px solid $serviceBorderColor; - - .btn-service-icon { - font-size: 24px; // Override - border-right: 1px solid $serviceBorderColor; - } - } -} - -.btn-service-icon { - position: absolute; - left: 0; - height: 100%; - top: 0; - padding-left: $space-sm; - padding-right: $space-sm; - width: $btn-service-icon-width; - text-align: center; - - &::before { - position: relative; - top: 4px; - } -} - -.btn-service--grafanacom { - .btn-service-icon { - background-image: url(../img/grafana_mask_icon_white.svg); - background-repeat: no-repeat; - background-position: 50%; - background-size: 60%; - } -} - -.btn-service--azuread { - .btn-service-icon { - background-image: url(../img/microsoft_auth_icon.svg); - background-repeat: no-repeat; - background-position: 50%; - background-size: 60%; - } -} - -.btn-service--okta { - .btn-service-icon { - background-image: url(../img/okta_logo_white.png); - background-repeat: no-repeat; - background-position: 50%; - background-size: 60%; - } -} - -//Toggle button - -.toggle-btn { - background: $input-label-bg; - color: $text-color-weak; - box-shadow: $card-shadow; - - &:first-child { - border-radius: 2px 0 0 2px; - margin: 0; - } - &:last-child { - border-radius: 0 2px 2px 0; - margin-left: 0 !important; - } - - &.active { - background-color: color.adjust($input-label-bg, $lightness: 5%); - color: $link-color; - &:hover { - cursor: default; - } - } -} - -//Button animations - -.btn-loading span { - animation-name: blink; - animation-duration: 1.4s; - animation-iteration-count: infinite; - animation-fill-mode: both; -} - -.btn-loading span:nth-child(2) { - animation-delay: 0.2s; -} - -.btn-loading span:nth-child(3) { - animation-delay: 0.4s; -} - -@keyframes blink { - 0% { - opacity: 0.2; - font-size: 14; - } - 20% { - opacity: 1; - font-size: 18; - } - 100% { - opacity: 0.2; - font-size: 14; - } -} diff --git a/public/sass/utils/_utils.scss b/public/sass/utils/_utils.scss deleted file mode 100644 index 586cce5dc0b..00000000000 --- a/public/sass/utils/_utils.scss +++ /dev/null @@ -1,119 +0,0 @@ -.clearfix { - &::after { - content: ''; - display: table; - clear: both; - } -} - -.highlight-word { - color: $brand-primary; -} - -.emphasis-word { - font-weight: $font-weight-semi-bold; - color: $text-color-emphasis; -} - -// Close icons -// -------------------------------------------------- -.close { - opacity: 0.2; - float: right; - font-size: 20px; - font-weight: bold; - line-height: $line-height-base; - color: $black; - text-shadow: 0 1px 0 rgba(255, 255, 255, 1); - - &:hover, - &:focus { - color: $black; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - } -} - -// Additional properties for button version -// iOS requires the button element instead of an anchor tag. -// If you want the anchor version, it requires `href="#"`. -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -// -// Utility classes -// -------------------------------------------------- - -// Quick floats -.pull-right { - float: right !important; -} - -.pull-left { - float: left !important; -} - -// Toggling content -.hide { - display: none; -} - -.show { - display: block; -} - -// Visibility -.invisible { - visibility: hidden !important; -} - -// For Affix plugin -.affix { - position: fixed; -} - -.d-inline-block { - display: inline-block; -} - -.absolute { - position: absolute; -} - -.flex-grow-1 { - flex-grow: 1; -} - -.flex-shrink-1 { - flex-shrink: 1; -} - -.flex-shrink-0 { - flex-shrink: 0; -} - -.flex-flow-column-nowrap { - display: flex; - flex-flow: column nowrap; -} - -.center-vh { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - justify-items: center; -} - -.align-items-center { - display: flex; - flex-direction: row nowrap; - align-items: center; -} diff --git a/public/test/helpers/TestProvider.tsx b/public/test/helpers/TestProvider.tsx index 7fc3861693c..2e7f21043dc 100644 --- a/public/test/helpers/TestProvider.tsx +++ b/public/test/helpers/TestProvider.tsx @@ -2,6 +2,7 @@ import { Store } from '@reduxjs/toolkit'; import * as React from 'react'; import { Provider } from 'react-redux'; import { Router } from 'react-router-dom'; +import { CompatRouter } from 'react-router-dom-v5-compat'; import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock'; import { locationService } from '@grafana/runtime'; @@ -35,8 +36,10 @@ export function TestProvider(props: Props) { - {children} - + + {children} + + diff --git a/public/test/test-utils.tsx b/public/test/test-utils.tsx index 1e6e5cee3b0..2dbc22267d5 100644 --- a/public/test/test-utils.tsx +++ b/public/test/test-utils.tsx @@ -6,6 +6,7 @@ import { Fragment, PropsWithChildren } from 'react'; import * as React from 'react'; import { Provider } from 'react-redux'; import { Router } from 'react-router-dom'; +import { CompatRouter } from 'react-router-dom-v5-compat'; import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock'; import { HistoryWrapper, LocationServiceProvider, setLocationService } from '@grafana/runtime'; @@ -49,10 +50,6 @@ const getWrapper = ({ grafanaContext?: Partial; }) => { const reduxStore = store || configureStore(); - /** - * Conditional router - either a MemoryRouter or just a Fragment - */ - const PotentialRouter = renderWithRouter ? Router : Fragment; // Create a fresh location service for each test - otherwise we run the risk // of it being stateful in between runs @@ -60,6 +57,15 @@ const getWrapper = ({ const locationService = new HistoryWrapper(history); setLocationService(locationService); + /** + * Conditional router - either a MemoryRouter or just a Fragment + */ + const PotentialRouter = renderWithRouter + ? ({ children }: PropsWithChildren) => {children} + : ({ children }: PropsWithChildren) => {children}; + + const PotentialCompatRouter = renderWithRouter ? CompatRouter : Fragment; + const context = { ...getGrafanaContextMock(), ...grafanaContext, @@ -73,9 +79,11 @@ const getWrapper = ({ return ( - + - {children} + + {children} + diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star index c28a734330a..722e2ca1136 100644 --- a/scripts/drone/pipelines/build.star +++ b/scripts/drone/pipelines/build.star @@ -4,6 +4,7 @@ load( "scripts/drone/steps/lib.star", "build_frontend_package_step", "build_storybook_step", + "build_test_plugins_step", "cloud_plugins_e2e_tests_step", "compile_build_cmd", "download_grabpl_step", @@ -93,6 +94,7 @@ def build_e2e(trigger, ver_mode): build_steps.extend( [ + build_test_plugins_step(), grafana_server_step(), e2e_tests_step("dashboards-suite"), e2e_tests_step("scenes/dashboards-suite"), diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index e07ae798698..80756682c3b 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -470,6 +470,26 @@ def build_frontend_step(): ], } +def build_test_plugins_step(): + """Build the test plugins used in e2e tests + + Returns: + Drone step. + """ + return { + "name": "build-test-plugins", + "image": images["node"], + "environment": { + "NODE_OPTIONS": "--max_old_space_size=8192", + }, + "depends_on": [ + "yarn-install", + ], + "commands": [ + "yarn e2e:plugin:build", + ], + } + def update_package_json_version(): """Updates the packages/ to use a version that has the build ID in it: 10.0.0pre -> 10.0.0-5432pre @@ -773,6 +793,7 @@ def e2e_tests_step(suite, port = 3001, tries = None): "image": images["cypress"], "depends_on": [ "grafana-server", + "build-test-plugins", ], "environment": { "HOST": "grafana-server", @@ -872,6 +893,7 @@ def playwright_e2e_tests_step(): "image": images["node_deb"], "depends_on": [ "grafana-server", + "build-test-plugins", ], "commands": [ "npx wait-on@7.0.1 http://$HOST:$PORT", diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index ec757c4a76f..a213e08c62c 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -22,7 +22,7 @@ images = { "plugins_slack": "plugins/slack", "python": "python:3.8", "postgres_alpine": "postgres:12.3-alpine", - "mimir": "grafana/mimir-alpine:r295-a23e559", + "mimir": "grafana/mimir-alpine:r304-3872ccb", "mysql5": "mysql:5.7.39", "mysql8": "mysql:8.0.32", "redis_alpine": "redis:6.2.11-alpine", diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index b6559555890..6dcc72a7a1b 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.0.50" -golang_version = "1.22.4" +golang_version = "1.23.0" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0" diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index 4e238661615..1003029a81f 100644 --- a/scripts/go-workspace/go.mod +++ b/scripts/go-workspace/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/go-workspace -go 1.22.4 +go 1.23.0 require golang.org/x/mod v0.20.0 diff --git a/scripts/go-workspace/main.go b/scripts/go-workspace/main.go index d25ab44214f..149b117952d 100644 --- a/scripts/go-workspace/main.go +++ b/scripts/go-workspace/main.go @@ -19,6 +19,8 @@ func main() { switch os.Args[1] { case "list-submodules": err = listSubmodules() + case "validate-dockerfile": + err = validateDockerfile() default: printUsage() } @@ -40,7 +42,9 @@ func listSubmodules() error { delimiter := fs.String("delimiter", "\n", "Delimiter to use when printing paths") skip := fs.String("skip", "", "Skip submodules with this comment tag") help := fs.Bool("help", false, "Print help message") - fs.Parse(os.Args[2:]) + if err := fs.Parse(os.Args[2:]); err != nil { + return err + } if *help { fs.Usage() @@ -60,6 +64,41 @@ func listSubmodules() error { return nil } +func validateDockerfile() error { + fs := flag.NewFlagSet("validate-dockerfile", flag.ExitOnError) + workPath := fs.String("path", "go.work", "Path to go.work") + dockerfilePath := fs.String("dockerfile-path", "Dockerfile", "Path to Dockerfile") + skip := fs.String("skip", "", "Skip submodules with this comment tag") + if err := fs.Parse(os.Args[2:]); err != nil { + return err + } + + dockerFileRaw, err := os.ReadFile(*dockerfilePath) + if err != nil { + return err + } + dockerFile := string(dockerFileRaw) + + workfile, err := parseGoWork(*workPath) + if err != nil { + return err + } + + paths := getSubmodulePaths(workfile, *skip) + for _, p := range paths { + path := strings.TrimPrefix(p, "./") + if path == "" || path == "." { + continue + } + if !strings.Contains(dockerFile, path) { + return fmt.Errorf("the Dockerfile is missing `COPY %s/go.* %s` for the related module. Please add it and commit the change.", path, path) + } + } + + fmt.Println("All submodules are included in the Dockerfile.") + return nil +} + func getSubmodulePaths(wf *modfile.WorkFile, skip string) []string { var paths []string for _, d := range wf.Use { diff --git a/scripts/go-workspace/validate-dockerfile.sh b/scripts/go-workspace/validate-dockerfile.sh new file mode 100755 index 00000000000..17ee08b6a51 --- /dev/null +++ b/scripts/go-workspace/validate-dockerfile.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. +go run scripts/go-workspace/main.go validate-dockerfile --path "${REPO_ROOT}/go.work" --dockerfile-path "${REPO_ROOT}/Dockerfile" \ No newline at end of file diff --git a/scripts/grafana-server/custom.ini b/scripts/grafana-server/custom.ini index 8a45c8ed2fb..5d09d40ac63 100644 --- a/scripts/grafana-server/custom.ini +++ b/scripts/grafana-server/custom.ini @@ -1,3 +1,4 @@ + [security] content_security_policy = true content_security_policy_template = """require-trusted-types-for 'script'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';""" @@ -5,6 +6,9 @@ content_security_policy_template = """require-trusted-types-for 'script'; script [feature_toggles] enable = publicDashboards +[plugins] +allow_loading_unsigned_plugins=grafana-extensionstest-app,grafana-extensionexample1-app,grafana-extensionexample2-app, + [database] type=sqlite3 wal=true diff --git a/scripts/grafana-server/start-server b/scripts/grafana-server/start-server index 83e74b7508a..a4e9be7f2bd 100755 --- a/scripts/grafana-server/start-server +++ b/scripts/grafana-server/start-server @@ -23,8 +23,9 @@ fi echo starting server cp -r ./bin $RUNDIR -cp -r ./public $RUNDIR cp -r ./tools $RUNDIR +ln -s $(realpath ./public) $RUNDIR + mkdir $RUNDIR/conf mkdir $PROV_DIR @@ -39,12 +40,12 @@ cp ./conf/defaults.ini $RUNDIR/conf/defaults.ini echo -e "Copying custom plugins from e2e tests" mkdir -p "$RUNDIR/data/plugins" -# when running in a local computer -if [ -d "./e2e/custom-plugins" ]; then - cp -r "./e2e/custom-plugins" "$RUNDIR/data/plugins" + +if [ -d "./e2e/test-plugins" ]; then + ln -s $(realpath ./e2e/test-plugins/*) "$RUNDIR/data/plugins" # when running in CI -elif [ -d "../e2e/custom-plugins" ]; then - cp -r "../e2e/custom-plugins" "$RUNDIR/data/plugins" +elif [ -d "../e2e/test-plugins" ]; then + cp -r "../e2e/test-plugins" "$RUNDIR/data/plugins" fi echo -e "Copy provisioning setup from devenv" diff --git a/scripts/levitate-show-affected-plugins.js b/scripts/levitate-show-affected-plugins.js index 85e3eeab560..bf7bc7b6b50 100644 --- a/scripts/levitate-show-affected-plugins.js +++ b/scripts/levitate-show-affected-plugins.js @@ -79,7 +79,7 @@ function makeQuery(section) { } return ` - SELECT + SELECT DISTINCT property_name, package_name, plugin_id @@ -159,6 +159,12 @@ function printAffectedPluginsSection(data) { } } catch (error) { markdown += `

Error generating detailed report ${error}

`; + if (error.stdout) { + markdown += `
Error stdout ${error.stdout}
`; + } + if (error.stderr) { + markdown += `
Error stderr ${error.stderr}
`; + } } return markdown; diff --git a/yarn.lock b/yarn.lock index de44a6f730a..d81f9448b32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -92,10 +92,10 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2": - version: 7.25.2 - resolution: "@babel/compat-data@npm:7.25.2" - checksum: 10/fd61de9303db3177fc98173571f81f3f551eac5c9f839c05ad02818b11fe77a74daa632abebf7f423fbb4a29976ae9141e0d2bd7517746a0ff3d74cb659ad33a +"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2, @babel/compat-data@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/compat-data@npm:7.25.4" + checksum: 10/d37a8936cc355a9ca3050102e03d179bdae26bd2e5c99a977637376c192b23637a039795f153c849437a086727628c9860e2c6af92d7151396e2362c09176337 languageName: node linkType: hard @@ -122,15 +122,15 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.22.9, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2": - version: 7.25.0 - resolution: "@babel/generator@npm:7.25.0" +"@babel/generator@npm:^7.22.9, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4, @babel/generator@npm:^7.7.2": + version: 7.25.4 + resolution: "@babel/generator@npm:7.25.4" dependencies: - "@babel/types": "npm:^7.25.0" + "@babel/types": "npm:^7.25.4" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10/de3ce2ae7aa0c9585260556ca5a81ce2ce6b8269e3260d7bb4e47a74661af715184ca6343e9906c22e4dd3eed5ce39977dfaf6cded4d2d8968fa096c7cf66697 + checksum: 10/35b05e1f230649469c64971e034b5101079c37d23f8cc658323f1209e39daf58d29ec4ce6de1d6d31dacddd39ffbf6b7e9a2b124d4f6b360a5f7046ae10fbaf4 languageName: node linkType: hard @@ -166,26 +166,24 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.24.5, @babel/helper-create-class-features-plugin@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7" +"@babel/helper-create-class-features-plugin@npm:^7.24.5, @babel/helper-create-class-features-plugin@npm:^7.24.7, @babel/helper-create-class-features-plugin@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/helper-create-class-features-plugin@npm:7.25.4" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.24.7" - "@babel/helper-environment-visitor": "npm:^7.24.7" - "@babel/helper-function-name": "npm:^7.24.7" - "@babel/helper-member-expression-to-functions": "npm:^7.24.7" + "@babel/helper-member-expression-to-functions": "npm:^7.24.8" "@babel/helper-optimise-call-expression": "npm:^7.24.7" - "@babel/helper-replace-supers": "npm:^7.24.7" + "@babel/helper-replace-supers": "npm:^7.25.0" "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7" - "@babel/helper-split-export-declaration": "npm:^7.24.7" + "@babel/traverse": "npm:^7.25.4" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/8ecb1c2acc808e1e0c21dccc7ea6899de9a140cb1856946800176b4784de6fccd575661fbff7744bb895d01aa6956ce963446b8577c4c2334293ba5579d5cdb9 + checksum: 10/47218da9fd964af30d41f0635d9e33eed7518e03aa8f10c3eb8a563bb2c14f52be3e3199db5912ae0e26058c23bb511c811e565c55ecec09427b04b867ed13c2 languageName: node linkType: hard -"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0": +"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0, @babel/helper-create-regexp-features-plugin@npm:^7.25.2": version: 7.25.2 resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.2" dependencies: @@ -198,9 +196,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.6.1": - version: 0.6.1 - resolution: "@babel/helper-define-polyfill-provider@npm:0.6.1" +"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2": + version: 0.6.2 + resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2" dependencies: "@babel/helper-compilation-targets": "npm:^7.22.6" "@babel/helper-plugin-utils": "npm:^7.22.5" @@ -209,20 +207,11 @@ __metadata: resolve: "npm:^1.14.2" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 10/316e7c0f05d2ae233d5fbb622c6339436da8d2b2047be866b64a16e6996c078a23b4adfebbdb33bc6a9882326a6cc20b95daa79a5e0edc92e9730e36d45fa523 + checksum: 10/bb32ec12024d3f16e70641bc125d2534a97edbfdabbc9f69001ec9c4ce46f877c7a224c566aa6c8c510c3b0def2e43dc4433bf6a40896ba5ce0cef4ea5ccbcff languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-environment-visitor@npm:7.24.7" - dependencies: - "@babel/types": "npm:^7.24.7" - checksum: 10/079d86e65701b29ebc10baf6ed548d17c19b808a07aa6885cc141b690a78581b180ee92b580d755361dc3b16adf975b2d2058b8ce6c86675fcaf43cf22f2f7c6 - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.0.0, @babel/helper-function-name@npm:^7.24.7": +"@babel/helper-function-name@npm:^7.0.0": version: 7.24.7 resolution: "@babel/helper-function-name@npm:7.24.7" dependencies: @@ -232,7 +221,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.0.0, @babel/helper-member-expression-to-functions@npm:^7.24.7, @babel/helper-member-expression-to-functions@npm:^7.24.8": +"@babel/helper-member-expression-to-functions@npm:^7.0.0, @babel/helper-member-expression-to-functions@npm:^7.24.8": version: 7.24.8 resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8" dependencies: @@ -328,15 +317,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-split-export-declaration@npm:7.24.7" - dependencies: - "@babel/types": "npm:^7.24.7" - checksum: 10/ff04a3071603c87de0d6ee2540b7291ab36305b329bd047cdbb6cbd7db335a12f9a77af1cf708779f75f13c4d9af46093c00b34432e50b2411872c658d1a2e5e - languageName: node - linkType: hard - "@babel/helper-string-parser@npm:^7.24.8": version: 7.24.8 resolution: "@babel/helper-string-parser@npm:7.24.8" @@ -391,14 +371,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3": - version: 7.25.3 - resolution: "@babel/parser@npm:7.25.3" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/parser@npm:7.25.4" dependencies: - "@babel/types": "npm:^7.25.2" + "@babel/types": "npm:^7.25.4" bin: parser: ./bin/babel-parser.js - checksum: 10/7bd57e89110bdc9cffe0ef2f2286f1cfb9bbb3aa1d9208c287e0bf6a1eb4cfe6ab33958876ebc59aafcbe3e2381c4449240fc7cc2ff32b79bc9db89cd52fc779 + checksum: 10/343b8a76c43549e370fe96f4f6d564382a6cdff60e9c3b8a594c51e4cefd58ec9945e82e8c4dfbf15ac865a04e4b29806531440760748e28568e6aec21bc9cb5 languageName: node linkType: hard @@ -736,17 +716,17 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.0" +"@babel/plugin-transform-async-generator-functions@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.24.8" "@babel/helper-remap-async-to-generator": "npm:^7.25.0" "@babel/plugin-syntax-async-generators": "npm:^7.8.4" - "@babel/traverse": "npm:^7.25.0" + "@babel/traverse": "npm:^7.25.4" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/c65757490005234719a9614dbaf5004ca815612eff251edf95d4149fb74f42ebf91ff079f6b3594b6aa93eec6f4b6d2cda9f2c924f6217bb0422896be58ed0fe + checksum: 10/0004d910bbec3ef916acf5c7cf8b11671e65d2dd425a82f1101838b9b6243bfdf9578335584d9dedd20acc162796b687930e127c6042484e05b758af695e6cb8 languageName: node linkType: hard @@ -785,15 +765,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-class-properties@npm:^7.22.5, @babel/plugin-transform-class-properties@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-class-properties@npm:7.24.7" +"@babel/plugin-transform-class-properties@npm:^7.22.5, @babel/plugin-transform-class-properties@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/plugin-transform-class-properties@npm:7.25.4" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-class-features-plugin": "npm:^7.25.4" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/1c6f645dd3889257028f27bfbb04526ac7676763a923fc8203aa79aa5232820e0201cb858c73b684b1922327af10304121ac013c7b756876d54560a9c1a7bc79 + checksum: 10/203a21384303d66fb5d841b77cba8b8994623ff4d26d208e3d05b36858c4919626a8d74871fa4b9195310c2e7883bf180359c4f5a76481ea55190c224d9746f4 languageName: node linkType: hard @@ -810,19 +790,19 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/plugin-transform-classes@npm:7.25.0" +"@babel/plugin-transform-classes@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/plugin-transform-classes@npm:7.25.4" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.24.7" - "@babel/helper-compilation-targets": "npm:^7.24.8" + "@babel/helper-compilation-targets": "npm:^7.25.2" "@babel/helper-plugin-utils": "npm:^7.24.8" "@babel/helper-replace-supers": "npm:^7.25.0" - "@babel/traverse": "npm:^7.25.0" + "@babel/traverse": "npm:^7.25.4" globals: "npm:^11.1.0" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/59aeb33b91e462a9b01cc9691c6a27e6601c5b76d83e3e4f95fef4086c6561e3557597847fe5243006542723fe4288d8fa6824544b1d94bb3104438f4fd96ebc + checksum: 10/17db5889803529bec366c6f0602687fdd605c2fec8cb6fe918261cb55cd89e9d8c9aa2aa6f3fd64d36492ce02d7d0752b09a284b0f833c1185f7dad9b9506310 languageName: node linkType: hard @@ -1163,15 +1143,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-private-methods@npm:^7.22.5, @babel/plugin-transform-private-methods@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-private-methods@npm:7.24.7" +"@babel/plugin-transform-private-methods@npm:^7.22.5, @babel/plugin-transform-private-methods@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/plugin-transform-private-methods@npm:7.25.4" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-class-features-plugin": "npm:^7.25.4" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/5338df2aae53c43e6a7ea0c44f20a1100709778769c7e42d4901a61945c3200ba0e7fca83832f48932423a68528219fbea233cb5b8741a2501fdecbacdc08292 + checksum: 10/d5c29ba121d6ce40e8055a632c32e69006c513607145a29701f93b416a8c53a60e53565df417218e2d8b7f1ba73adb837601e8e9d0a3215da50e4c9507f9f1fa languageName: node linkType: hard @@ -1377,15 +1357,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7" +"@babel/plugin-transform-unicode-sets-regex@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.25.4" dependencies: - "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7" - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-create-regexp-features-plugin": "npm:^7.25.2" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/183b72d5987dc93f9971667ce3f26d28b0e1058e71b129733dd9d5282aecba4c062b67c9567526780d2defd2bfbf950ca58d8306dc90b2761fd1e960d867ddb7 + checksum: 10/d5d07d17932656fa4d62fd67ecaa1a5e4c2e92365a924f1a2a8cf8108762f137a30cd55eb3a7d0504258f27a19ad0decca6b62a5c37a5aada709cbb46c4a871f languageName: node linkType: hard @@ -1399,11 +1379,11 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.25.3, @babel/preset-env@npm:^7.24.4": - version: 7.25.3 - resolution: "@babel/preset-env@npm:7.25.3" +"@babel/preset-env@npm:7.25.4, @babel/preset-env@npm:^7.24.4": + version: 7.25.4 + resolution: "@babel/preset-env@npm:7.25.4" dependencies: - "@babel/compat-data": "npm:^7.25.2" + "@babel/compat-data": "npm:^7.25.4" "@babel/helper-compilation-targets": "npm:^7.25.2" "@babel/helper-plugin-utils": "npm:^7.24.8" "@babel/helper-validator-option": "npm:^7.24.8" @@ -1432,13 +1412,13 @@ __metadata: "@babel/plugin-syntax-top-level-await": "npm:^7.14.5" "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6" "@babel/plugin-transform-arrow-functions": "npm:^7.24.7" - "@babel/plugin-transform-async-generator-functions": "npm:^7.25.0" + "@babel/plugin-transform-async-generator-functions": "npm:^7.25.4" "@babel/plugin-transform-async-to-generator": "npm:^7.24.7" "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7" "@babel/plugin-transform-block-scoping": "npm:^7.25.0" - "@babel/plugin-transform-class-properties": "npm:^7.24.7" + "@babel/plugin-transform-class-properties": "npm:^7.25.4" "@babel/plugin-transform-class-static-block": "npm:^7.24.7" - "@babel/plugin-transform-classes": "npm:^7.25.0" + "@babel/plugin-transform-classes": "npm:^7.25.4" "@babel/plugin-transform-computed-properties": "npm:^7.24.7" "@babel/plugin-transform-destructuring": "npm:^7.24.8" "@babel/plugin-transform-dotall-regex": "npm:^7.24.7" @@ -1466,7 +1446,7 @@ __metadata: "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7" "@babel/plugin-transform-optional-chaining": "npm:^7.24.8" "@babel/plugin-transform-parameters": "npm:^7.24.7" - "@babel/plugin-transform-private-methods": "npm:^7.24.7" + "@babel/plugin-transform-private-methods": "npm:^7.25.4" "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7" "@babel/plugin-transform-property-literals": "npm:^7.24.7" "@babel/plugin-transform-regenerator": "npm:^7.24.7" @@ -1479,16 +1459,16 @@ __metadata: "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7" "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7" "@babel/plugin-transform-unicode-regex": "npm:^7.24.7" - "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7" + "@babel/plugin-transform-unicode-sets-regex": "npm:^7.25.4" "@babel/preset-modules": "npm:0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2: "npm:^0.4.10" - babel-plugin-polyfill-corejs3: "npm:^0.10.4" + babel-plugin-polyfill-corejs3: "npm:^0.10.6" babel-plugin-polyfill-regenerator: "npm:^0.6.1" core-js-compat: "npm:^3.37.1" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/293c32dee33f138d22cea0c0e163b6d79ef3860ac269921a438edb4adbfa53976ce2cd3f7a79408c8e52c852b5feda45abdbc986a54e9d9aa0b6680d7a371a58 + checksum: 10/45ca65bdc7fa11ca51167804052460eda32bf2e6620c7ba998e2d95bc867595913532ee7d748e97e808eabcc66aabe796bd75c59014d996ec8183fa5a7245862 languageName: node linkType: hard @@ -1581,12 +1561,12 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.25.0, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.24.5, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": - version: 7.25.0 - resolution: "@babel/runtime@npm:7.25.0" +"@babel/runtime@npm:7.25.4, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.24.5, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": + version: 7.25.4 + resolution: "@babel/runtime@npm:7.25.4" dependencies: regenerator-runtime: "npm:^0.14.0" - checksum: 10/6870e9e0e9125075b3aeba49a266f442b10820bfc693019eb6c1785c5a0edbe927e98b8238662cdcdba17842107c040386c3b69f39a0a3b217f9d00ffe685b27 + checksum: 10/70d2a420c24a3289ea6c4addaf3a1c4186bc3d001c92445faa3cd7601d7d2fbdb32c63b3a26b9771e20ff2f511fa76b726bf256f823cdb95bc37b8eadbd02f70 languageName: node linkType: hard @@ -1601,29 +1581,29 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3": - version: 7.25.3 - resolution: "@babel/traverse@npm:7.25.3" +"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.25.4": + version: 7.25.4 + resolution: "@babel/traverse@npm:7.25.4" dependencies: "@babel/code-frame": "npm:^7.24.7" - "@babel/generator": "npm:^7.25.0" - "@babel/parser": "npm:^7.25.3" + "@babel/generator": "npm:^7.25.4" + "@babel/parser": "npm:^7.25.4" "@babel/template": "npm:^7.25.0" - "@babel/types": "npm:^7.25.2" + "@babel/types": "npm:^7.25.4" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10/fba34f323e17fa83372fc290bc12413a50e2f780a86c7d8b1875c594b6be2857867804de5d52ab10a78a9cae29e1b09ea15d85ad63671ce97d79c40650282bb9 + checksum: 10/a85c16047ab8e454e2e758c75c31994cec328bd6d8b4b22e915fa7393a03b3ab96d1218f43dc7ef77c957cc488dc38100bdf504d08a80a131e89b2e49cfa2be5 languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.5, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4": - version: 7.25.2 - resolution: "@babel/types@npm:7.25.2" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.5, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4": + version: 7.25.4 + resolution: "@babel/types@npm:7.25.4" dependencies: "@babel/helper-string-parser": "npm:^7.24.8" "@babel/helper-validator-identifier": "npm:^7.24.7" to-fast-properties: "npm:^2.0.0" - checksum: 10/ccf5399db1dcd6dd87b84a6f7bc8dd241e04a326f4f038c973c26ccb69cd360c8f2276603f584c58fd94da95229313060b27baceb0d9b18a435742d3f616afd1 + checksum: 10/d4a1194612d0a2a6ce9a0be325578b43d74e5f5278c67409468ba0a924341f0ad349ef0245ee8a36da3766efe5cc59cd6bb52547674150f97d8dc4c8cfa5d6b8 languageName: node linkType: hard @@ -1824,38 +1804,38 @@ __metadata: languageName: node linkType: hard -"@csstools/css-parser-algorithms@npm:^2.7.1": - version: 2.7.1 - resolution: "@csstools/css-parser-algorithms@npm:2.7.1" +"@csstools/css-parser-algorithms@npm:^3.0.0": + version: 3.0.1 + resolution: "@csstools/css-parser-algorithms@npm:3.0.1" peerDependencies: - "@csstools/css-tokenizer": ^2.4.1 - checksum: 10/939b23652c970dc4af8c20776e5da9e592cae4a590025f07ddb3263799076d4b6cf1bf8c4de97b29780bfa169177a31945effe94d2a11e0972138b5ff7d93654 + "@csstools/css-tokenizer": ^3.0.1 + checksum: 10/02649a70ab7bab1fd000ca1d196ffb93ad3e2e0f36b4aa064f7973cd31edc5f7e63f8eaf7b94d801a0bfd207386b8b23cbe40be6e871c27042b084c3a717349e languageName: node linkType: hard -"@csstools/css-tokenizer@npm:^2.4.1": - version: 2.4.1 - resolution: "@csstools/css-tokenizer@npm:2.4.1" - checksum: 10/a368e5c96d3b11e147f95951e336105480acfa457cdbc6fdf97e8873ff92ab9ee6b4b6224ac1b263f08798802f6b29b8977a502d070f9ab695c9b9905b964198 +"@csstools/css-tokenizer@npm:^3.0.0": + version: 3.0.1 + resolution: "@csstools/css-tokenizer@npm:3.0.1" + checksum: 10/81ae01b2d3ec40ed3dc78f8507cbfdfe1dbc4ae3f8c8e29b8bb4414216a8c7a7a936fa0faa3d11a1e49ad72209aec7c05ad8450a4ffc30ba288aa074b4a0e3b3 languageName: node linkType: hard -"@csstools/media-query-list-parser@npm:^2.1.13": - version: 2.1.13 - resolution: "@csstools/media-query-list-parser@npm:2.1.13" +"@csstools/media-query-list-parser@npm:^3.0.0": + version: 3.0.1 + resolution: "@csstools/media-query-list-parser@npm:3.0.1" peerDependencies: - "@csstools/css-parser-algorithms": ^2.7.1 - "@csstools/css-tokenizer": ^2.4.1 - checksum: 10/4a771d94eb01a23279d493cd668c71ae230b660c1e6ebcff1bec6e959eae6987ece7ce01b094b44afbae8695dc98d8617580d488db16de9ec4a7378ed5adf57f + "@csstools/css-parser-algorithms": ^3.0.1 + "@csstools/css-tokenizer": ^3.0.1 + checksum: 10/794344c67b126ad93d516ab3f01254d44cfa794c3401e34e8cc62ddc7fc13c9ab6c76cb517b643dbda47b57f2eb578c6a11c4a9a4b516d88e260a4016b64ce7f languageName: node linkType: hard -"@csstools/selector-specificity@npm:^3.1.1": - version: 3.1.1 - resolution: "@csstools/selector-specificity@npm:3.1.1" +"@csstools/selector-specificity@npm:^4.0.0": + version: 4.0.0 + resolution: "@csstools/selector-specificity@npm:4.0.0" peerDependencies: - postcss-selector-parser: ^6.0.13 - checksum: 10/3786a6afea97b08ad739ee8f4004f7e0a9e25049cee13af809dbda6462090744012a54bd9275a44712791e8f103f85d21641f14e81799f9dab946b0459a5e1ef + postcss-selector-parser: ^6.1.0 + checksum: 10/7076c1d8af0fba94f06718f87fba5bfea583f39089efa906ae38b5ecd6912d3d5865f7047a871ac524b1057e4c970622b2ade456b90d69fb9393902250057994 languageName: node linkType: hard @@ -2213,6 +2193,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/aix-ppc64@npm:0.23.1" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/android-arm64@npm:0.20.2" @@ -2227,6 +2214,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-arm64@npm:0.23.1" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/android-arm@npm:0.20.2" @@ -2241,6 +2235,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-arm@npm:0.23.1" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/android-x64@npm:0.20.2" @@ -2255,6 +2256,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-x64@npm:0.23.1" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/darwin-arm64@npm:0.20.2" @@ -2269,6 +2277,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/darwin-arm64@npm:0.23.1" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/darwin-x64@npm:0.20.2" @@ -2283,6 +2298,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/darwin-x64@npm:0.23.1" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/freebsd-arm64@npm:0.20.2" @@ -2297,6 +2319,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/freebsd-arm64@npm:0.23.1" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/freebsd-x64@npm:0.20.2" @@ -2311,6 +2340,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/freebsd-x64@npm:0.23.1" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-arm64@npm:0.20.2" @@ -2325,6 +2361,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-arm64@npm:0.23.1" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-arm@npm:0.20.2" @@ -2339,6 +2382,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-arm@npm:0.23.1" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-ia32@npm:0.20.2" @@ -2353,6 +2403,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-ia32@npm:0.23.1" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-loong64@npm:0.20.2" @@ -2367,6 +2424,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-loong64@npm:0.23.1" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-mips64el@npm:0.20.2" @@ -2381,6 +2445,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-mips64el@npm:0.23.1" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-ppc64@npm:0.20.2" @@ -2395,6 +2466,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-ppc64@npm:0.23.1" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-riscv64@npm:0.20.2" @@ -2409,6 +2487,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-riscv64@npm:0.23.1" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-s390x@npm:0.20.2" @@ -2423,6 +2508,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-s390x@npm:0.23.1" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/linux-x64@npm:0.20.2" @@ -2437,6 +2529,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-x64@npm:0.23.1" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/netbsd-x64@npm:0.20.2" @@ -2451,6 +2550,20 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/netbsd-x64@npm:0.23.1" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/openbsd-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/openbsd-arm64@npm:0.23.1" + conditions: os=openbsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/openbsd-x64@npm:0.20.2" @@ -2465,6 +2578,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/openbsd-x64@npm:0.23.1" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/sunos-x64@npm:0.20.2" @@ -2479,6 +2599,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/sunos-x64@npm:0.23.1" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/win32-arm64@npm:0.20.2" @@ -2493,6 +2620,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-arm64@npm:0.23.1" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/win32-ia32@npm:0.20.2" @@ -2507,6 +2641,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-ia32@npm:0.23.1" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.20.2": version: 0.20.2 resolution: "@esbuild/win32-x64@npm:0.20.2" @@ -2521,6 +2662,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-x64@npm:0.23.1" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" @@ -2762,7 +2910,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/schema": "npm:11.3.0-pre" @@ -2792,7 +2940,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -2806,7 +2954,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/sql": "npm:11.3.0-pre" @@ -2823,7 +2971,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -2864,7 +3012,7 @@ __metadata: style-loader: "npm:4.0.0" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -2878,7 +3026,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/schema": "npm:11.3.0-pre" @@ -2904,7 +3052,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uuid: "npm:9.0.1" webpack: "npm:5.91.0" peerDependencies: @@ -2919,7 +3067,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/o11y-ds-frontend": "workspace:*" "@grafana/plugin-configs": "workspace:*" "@grafana/runtime": "workspace:*" @@ -2946,7 +3094,7 @@ __metadata: stream-browserify: "npm:3.0.0" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uuid: "npm:9.0.1" webpack: "npm:5.91.0" peerDependencies: @@ -2954,6 +3102,37 @@ __metadata: languageName: unknown linkType: soft +"@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql": + version: 0.0.0-use.local + resolution: "@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql" + dependencies: + "@emotion/css": "npm:11.11.2" + "@grafana/data": "workspace:*" + "@grafana/e2e-selectors": "workspace:*" + "@grafana/experimental": "npm:1.7.12" + "@grafana/plugin-configs": "workspace:*" + "@grafana/runtime": "npm:11.3.0-pre" + "@grafana/sql": "npm:11.3.0-pre" + "@grafana/ui": "npm:11.3.0-pre" + "@testing-library/react": "npm:15.0.2" + "@testing-library/user-event": "npm:14.5.2" + "@types/jest": "npm:29.5.12" + "@types/lodash": "npm:4.17.4" + "@types/node": "npm:20.14.2" + "@types/react": "npm:18.3.3" + "@types/testing-library__jest-dom": "npm:5.14.9" + lodash: "npm:4.17.21" + react: "npm:18.2.0" + rxjs: "npm:7.8.1" + ts-node: "npm:10.9.2" + tslib: "npm:2.6.3" + typescript: "npm:5.4.5" + webpack: "npm:5.91.0" + peerDependencies: + "@grafana/runtime": "*" + languageName: unknown + linkType: soft + "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql": version: 0.0.0-use.local resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql" @@ -2961,7 +3140,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/sql": "npm:11.3.0-pre" @@ -2978,7 +3157,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -3010,7 +3189,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -3024,7 +3203,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/google-sdk": "npm:0.1.2" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" @@ -3058,7 +3237,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -3072,7 +3251,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/lezer-logql": "npm:0.2.6" "@grafana/lezer-traceql": "npm:0.0.18" "@grafana/monaco-logql": "npm:^0.0.7" @@ -3117,7 +3296,7 @@ __metadata: string_decoder: "npm:1.3.0" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uuid: "npm:9.0.1" webpack: "npm:5.91.0" peerDependencies: @@ -3132,7 +3311,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/o11y-ds-frontend": "workspace:*" "@grafana/plugin-configs": "workspace:*" "@grafana/runtime": "workspace:*" @@ -3152,7 +3331,7 @@ __metadata: rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" peerDependencies: "@grafana/runtime": "*" @@ -3231,7 +3410,7 @@ __metadata: string-hash: "npm:^1.1.3" tinycolor2: "npm:1.6.0" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uplot: "npm:1.6.30" xss: "npm:^1.0.14" peerDependencies: @@ -3254,7 +3433,7 @@ __metadata: rollup-plugin-esbuild: "npm:5.0.0" rollup-plugin-node-externals: "npm:^5.0.0" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" languageName: unknown linkType: soft @@ -3328,9 +3507,9 @@ __metadata: languageName: node linkType: hard -"@grafana/experimental@npm:1.7.13": - version: 1.7.13 - resolution: "@grafana/experimental@npm:1.7.13" +"@grafana/experimental@npm:1.8.0": + version: 1.8.0 + resolution: "@grafana/experimental@npm:1.8.0" dependencies: "@hello-pangea/dnd": "npm:^16.6.0" "@types/uuid": "npm:^8.3.3" @@ -3350,7 +3529,7 @@ __metadata: react-dom: 17.0.2 react-select: ^5.2.1 rxjs: 7.8.0 - checksum: 10/f1d7699dc4f31b551240017c62f49fad5b11ebede1e8197c7a7d09e77ebe47cf75bcb777f94dd545d8fa066b0d8eb3cb233243fe11a56746d7bb567b10bb4b72 + checksum: 10/a58d66254e9220f27580fcf42f3a0507c4e48da0cc9a26bcf110c37f16bef282a5c53119afa6f5588712c38bdcf113dd98a01fcf275917288a52cd88fcaae317 languageName: node linkType: hard @@ -3400,7 +3579,7 @@ __metadata: resolution: "@grafana/flamegraph@workspace:packages/grafana-flamegraph" dependencies: "@babel/core": "npm:7.25.2" - "@babel/preset-env": "npm:7.25.3" + "@babel/preset-env": "npm:7.25.4" "@babel/preset-react": "npm:7.24.7" "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" @@ -3436,7 +3615,7 @@ __metadata: ts-jest: "npm:29.2.4" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 @@ -3489,7 +3668,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/schema": "npm:11.3.0-pre" "@grafana/tsconfig": "npm:^2.0.0" @@ -3511,7 +3690,7 @@ __metadata: ts-jest: "npm:29.2.4" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 @@ -3533,21 +3712,21 @@ __metadata: replace-in-file-webpack-plugin: "npm:1.0.6" swc-loader: "npm:0.2.6" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" webpack: "npm:5.91.0" languageName: unknown linkType: soft -"@grafana/plugin-e2e@npm:1.6.1": - version: 1.6.1 - resolution: "@grafana/plugin-e2e@npm:1.6.1" +"@grafana/plugin-e2e@npm:1.7.1": + version: 1.7.1 + resolution: "@grafana/plugin-e2e@npm:1.7.1" dependencies: semver: "npm:^7.5.4" uuid: "npm:^9.0.1" yaml: "npm:^2.3.4" peerDependencies: "@playwright/test": ^1.41.2 - checksum: 10/bab48ec87d9d0d7a4534e029ef3730bb0a54656f1ec08ca1029eb8904a9b2d8eedf92310dc762f443cfeda6bddc2e859381fa99079083ba510e58f1a2bcd31b7 + checksum: 10/56ac84b46b4d019b9b7503bec973dbbc2e5ceec3989c7e0aae2353940a31413cef1089bdde4ab600291d9742b310332a1249e6297c5da55c077c20386def494a languageName: node linkType: hard @@ -3560,7 +3739,7 @@ __metadata: "@floating-ui/react": "npm:0.26.22" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/faro-web-sdk": "npm:1.9.0" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/schema": "npm:11.3.0-pre" @@ -3569,9 +3748,9 @@ __metadata: "@hello-pangea/dnd": "npm:16.6.0" "@leeoniya/ufuzzy": "npm:1.0.14" "@lezer/common": "npm:1.2.1" - "@lezer/highlight": "npm:1.2.0" + "@lezer/highlight": "npm:1.2.1" "@lezer/lr": "npm:1.4.2" - "@prometheus-io/lezer-promql": "npm:0.53.1" + "@prometheus-io/lezer-promql": "npm:0.53.2" "@reduxjs/toolkit": "npm:2.2.7" "@rollup/plugin-image": "npm:3.0.3" "@rollup/plugin-node-resolve": "npm:15.2.3" @@ -3651,7 +3830,7 @@ __metadata: testing-library-selector: "npm:0.3.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uuid: "npm:9.0.1" webpack: "npm:5.91.0" webpack-cli: "npm:5.1.4" @@ -3697,7 +3876,7 @@ __metadata: rollup-plugin-sourcemaps: "npm:0.6.3" rxjs: "npm:7.8.1" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 @@ -3732,16 +3911,16 @@ __metadata: rollup-plugin-esbuild: "npm:5.0.0" rollup-plugin-node-externals: "npm:5.0.0" ts-node: "npm:10.9.2" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" peerDependencies: react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 languageName: unknown linkType: soft -"@grafana/scenes@npm:^5.8.0": - version: 5.8.0 - resolution: "@grafana/scenes@npm:5.8.0" +"@grafana/scenes@npm:^5.10.1": + version: 5.10.1 + resolution: "@grafana/scenes@npm:5.10.1" dependencies: "@grafana/e2e-selectors": "npm:^11.0.0" "@leeoniya/ufuzzy": "npm:^1.0.14" @@ -3756,7 +3935,7 @@ __metadata: "@grafana/ui": ">=10.4" react: ^18.0.0 react-dom: ^18.0.0 - checksum: 10/1c550dd5256371de0849ae64d167c4a9dbd99be0c03f15116ac213d3a9e2ec4b5248331086ca9d6616b5ad8f2be5be503772ac38a853e32da57f485ef3addb41 + checksum: 10/81397b728344952f55f61254b76a840440fcf85614d309c54f13c00c7e5c1eeb49a95a8229e223bb7730f59e1c1cc7cc149bf6ebbb6e9ad7304e49e3daeda524 languageName: node linkType: hard @@ -3774,7 +3953,7 @@ __metadata: rollup-plugin-esbuild: "npm:5.0.0" rollup-plugin-node-externals: "npm:^5.0.0" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" languageName: unknown linkType: soft @@ -3785,11 +3964,11 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/runtime": "npm:11.3.0-pre" "@grafana/tsconfig": "npm:^2.0.0" "@grafana/ui": "npm:11.3.0-pre" - "@react-awesome-query-builder/ui": "npm:6.6.2" + "@react-awesome-query-builder/ui": "npm:6.6.3" "@testing-library/dom": "npm:10.0.0" "@testing-library/jest-dom": "npm:^6.1.2" "@testing-library/react": "npm:15.0.2" @@ -3817,7 +3996,7 @@ __metadata: ts-jest: "npm:29.2.4" ts-node: "npm:10.9.2" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uuid: "npm:9.0.1" peerDependencies: "@grafana/runtime": 10.4.0-pre @@ -3856,10 +4035,10 @@ __metadata: "@leeoniya/ufuzzy": "npm:1.0.14" "@monaco-editor/react": "npm:4.6.0" "@popperjs/core": "npm:2.11.8" - "@react-aria/dialog": "npm:3.5.16" - "@react-aria/focus": "npm:3.18.1" - "@react-aria/overlays": "npm:3.23.1" - "@react-aria/utils": "npm:3.25.1" + "@react-aria/dialog": "npm:3.5.17" + "@react-aria/focus": "npm:3.18.2" + "@react-aria/overlays": "npm:3.23.2" + "@react-aria/utils": "npm:3.25.2" "@rollup/plugin-node-resolve": "npm:15.2.3" "@storybook/addon-a11y": "npm:^8.1.6" "@storybook/addon-actions": "npm:^8.1.6" @@ -3900,7 +4079,7 @@ __metadata: "@types/react-router-dom": "npm:5.3.3" "@types/react-table": "npm:7.7.20" "@types/react-test-renderer": "npm:18.3.0" - "@types/react-transition-group": "npm:4.4.10" + "@types/react-transition-group": "npm:4.4.11" "@types/react-window": "npm:1.8.8" "@types/slate": "npm:0.47.11" "@types/slate-plain-serializer": "npm:0.7.5" @@ -3913,7 +4092,7 @@ __metadata: chance: "npm:1.1.12" classnames: "npm:2.5.1" common-tags: "npm:1.8.2" - core-js: "npm:3.38.0" + core-js: "npm:3.38.1" css-loader: "npm:7.1.2" csstype: "npm:3.1.3" d3: "npm:7.9.0" @@ -3976,7 +4155,7 @@ __metadata: style-loader: "npm:4.0.0" tinycolor2: "npm:1.6.0" tslib: "npm:2.6.3" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uplot: "npm:1.6.30" uuid: "npm:9.0.1" webpack: "npm:5.91.0" @@ -4618,12 +4797,12 @@ __metadata: languageName: node linkType: hard -"@lezer/highlight@npm:1.2.0": - version: 1.2.0 - resolution: "@lezer/highlight@npm:1.2.0" +"@lezer/highlight@npm:1.2.1": + version: 1.2.1 + resolution: "@lezer/highlight@npm:1.2.1" dependencies: "@lezer/common": "npm:^1.0.0" - checksum: 10/14a80cbfb0cd1ce716decb4f3a045d42e7146f539cfd483b62ce46c4586a26d2f4fbdc35ace1cad81645304be4d30eafb95a2b057c34dfd471d56c7fbd82df3a + checksum: 10/fec3082419ee87fb265039b680fbac6796f862d8e3042dcb860e8c5a34291503a74927302b568ff1a626f0d2b5cf8dae02a51cfd200084eb329e5fd1236c3163 languageName: node linkType: hard @@ -4861,38 +5040,38 @@ __metadata: languageName: node linkType: hard -"@msagl/core@npm:^1.1.19": - version: 1.1.20 - resolution: "@msagl/core@npm:1.1.20" +"@msagl/core@npm:^1.1.19, @msagl/core@npm:^1.1.22": + version: 1.1.22 + resolution: "@msagl/core@npm:1.1.22" dependencies: linked-list-typed: "npm:^1.52.0" queue-typescript: "npm:^1.0.1" reliable-random: "npm:^0.0.1" stack-typescript: "npm:^1.0.4" typescript-string-operations: "npm:^1.4.1" - checksum: 10/0a365c6b7495008b3ee01f8a20f417c5fe4c65fdc1d6598cbafe25d0c1ca325cd1e6ff54d719332e891e35299f9e75029a448c05a6ab8faedf98a50012d5f34b + checksum: 10/10f42d0566bb0cd0a72c8d0021a8318bf2efece351f0b0082ccbfd67c28ab35697b74581ee1becfa752bf3dca76280250434b9db7d2f9c71b0ade788b3742145 languageName: node linkType: hard -"@msagl/drawing@npm:^1.1.19": - version: 1.1.19 - resolution: "@msagl/drawing@npm:1.1.19" +"@msagl/drawing@npm:^1.1.22": + version: 1.1.22 + resolution: "@msagl/drawing@npm:1.1.22" dependencies: - "@msagl/core": "npm:^1.1.19" - checksum: 10/b8963ab6f8dd7943a10d950abe11030996e12cd74503c6d704678dce54c1fd0f5ee1570cc893027e24150e475294d09a4ae4ac3be8f9e9f8d7382d7b7c5303a9 + "@msagl/core": "npm:^1.1.22" + checksum: 10/8027476475b6da6494f5034fe483c6508e2ec638abac504e879a2e0276bc86b22b5f7f11bcb20338a3339da609832ad577b896906a79397825ae1fc5823754f8 languageName: node linkType: hard "@msagl/parser@npm:^1.1.19": - version: 1.1.19 - resolution: "@msagl/parser@npm:1.1.19" + version: 1.1.22 + resolution: "@msagl/parser@npm:1.1.22" dependencies: - "@msagl/core": "npm:^1.1.19" - "@msagl/drawing": "npm:^1.1.19" + "@msagl/core": "npm:^1.1.22" + "@msagl/drawing": "npm:^1.1.22" "@types/parse-color": "npm:^1.0.1" dotparser: "npm:^1.1.1" parse-color: "npm:^1.0.0" - checksum: 10/349dcd57a3365628699b45172359363b86a1b27f8300b5b7fde97ba65eb512191a7433b72908a544fbbdc1d91bcaa9ca498faef345078367529820a47af38609 + checksum: 10/87e13379d99be4327c3101708ae0c3fb2c52c07cdc19db19e2abc3d20453522298af2f7c2e6ae366883227e191cf07913f91eaaf473012d0fe858b4acd2c735b languageName: node linkType: hard @@ -5793,14 +5972,14 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.46.0": - version: 1.46.0 - resolution: "@playwright/test@npm:1.46.0" +"@playwright/test@npm:1.46.1": + version: 1.46.1 + resolution: "@playwright/test@npm:1.46.1" dependencies: - playwright: "npm:1.46.0" + playwright: "npm:1.46.1" bin: playwright: cli.js - checksum: 10/710bf451555e67476bf6e911a07ec0e011474f769a10f8073b3b22fe9b81086a83b6821da354900a6d6d14d60e4320b2c9f7249cc5480e3923de56a8501b7ffe + checksum: 10/09e2c28574402f14e2d6f6843022c5778382dc7f703bae931dd531fc0fc1b725a862d3b52932bd6912cb13cbaed54822af33eb3d70134d93b0f1c10ec3fb0756 languageName: node linkType: hard @@ -5855,13 +6034,13 @@ __metadata: languageName: node linkType: hard -"@prometheus-io/lezer-promql@npm:0.53.1": - version: 0.53.1 - resolution: "@prometheus-io/lezer-promql@npm:0.53.1" +"@prometheus-io/lezer-promql@npm:0.53.2": + version: 0.53.2 + resolution: "@prometheus-io/lezer-promql@npm:0.53.2" peerDependencies: "@lezer/highlight": ^1.1.2 "@lezer/lr": ^1.2.3 - checksum: 10/ebb506155f6343277e7bafc7342af3b8c0f162eda08c380f680f8c526878211a17be92e75b5d5de69cbf344f50a76221472b50533dde152ea396e148278c2d77 + checksum: 10/dcf094b29cca967a79f8a5f6a9f7006d84efe03465d0eba177bd42cb5d340e4e8d2dbd718e2220fbf19cab5bd831ec4c882b629ad69dd72297fa1d37fb9c18c2 languageName: node linkType: hard @@ -6264,81 +6443,81 @@ __metadata: languageName: node linkType: hard -"@react-aria/dialog@npm:3.5.16": - version: 3.5.16 - resolution: "@react-aria/dialog@npm:3.5.16" +"@react-aria/dialog@npm:3.5.17": + version: 3.5.17 + resolution: "@react-aria/dialog@npm:3.5.17" dependencies: - "@react-aria/focus": "npm:^3.18.1" - "@react-aria/overlays": "npm:^3.23.1" - "@react-aria/utils": "npm:^3.25.1" + "@react-aria/focus": "npm:^3.18.2" + "@react-aria/overlays": "npm:^3.23.2" + "@react-aria/utils": "npm:^3.25.2" "@react-types/dialog": "npm:^3.5.12" "@react-types/shared": "npm:^3.24.1" "@swc/helpers": "npm:^0.5.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/10373652d60b232152b2d6f55cda2e40f0f2d08c0f8ee578256708305fe571e69109fede0d9979c7722096a51beb9e676e983a6cc2fa022fd4c12da3384a5103 + checksum: 10/dd4fd27e1c44633e1d84cfc506eaa4d1af11bf5643f8fbe265e42ed4ea293452056040940ef1f72e70d3eb12712c27e5400b3e80444d2151c1bcf54a717315af languageName: node linkType: hard -"@react-aria/focus@npm:3.18.1, @react-aria/focus@npm:^3.18.1": - version: 3.18.1 - resolution: "@react-aria/focus@npm:3.18.1" +"@react-aria/focus@npm:3.18.2, @react-aria/focus@npm:^3.18.2": + version: 3.18.2 + resolution: "@react-aria/focus@npm:3.18.2" dependencies: - "@react-aria/interactions": "npm:^3.22.1" - "@react-aria/utils": "npm:^3.25.1" + "@react-aria/interactions": "npm:^3.22.2" + "@react-aria/utils": "npm:^3.25.2" "@react-types/shared": "npm:^3.24.1" "@swc/helpers": "npm:^0.5.0" clsx: "npm:^2.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/b8b764f0a43d34bee7c89f3510ccfecc0b3408f2418e30aa2a2ead54d5e94034fc2bc05c6469d4be9b27b7f1f78bfc9207bcb6dbe96bd11380cab243bb30d4be + checksum: 10/4243764952737ec33f463534e69c7d581073d5531ae87504d574083a4d9a08a9e3b5a8e2b69a936bf6476a35eb8cf38db751d52629e66451be58a6c635ce9449 languageName: node linkType: hard -"@react-aria/i18n@npm:^3.12.1": - version: 3.12.1 - resolution: "@react-aria/i18n@npm:3.12.1" +"@react-aria/i18n@npm:^3.12.2": + version: 3.12.2 + resolution: "@react-aria/i18n@npm:3.12.2" dependencies: "@internationalized/date": "npm:^3.5.5" "@internationalized/message": "npm:^3.1.4" "@internationalized/number": "npm:^3.5.3" "@internationalized/string": "npm:^3.2.3" "@react-aria/ssr": "npm:^3.9.5" - "@react-aria/utils": "npm:^3.25.1" + "@react-aria/utils": "npm:^3.25.2" "@react-types/shared": "npm:^3.24.1" "@swc/helpers": "npm:^0.5.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/febf909303725b2c9d8f44ba8743d7abd62c71c7347752619e3bccf9a309b0bb0454e92b2943b041f0bde0fd9a0586bc68930906fc9ab5222f7fcf8232f3d848 + checksum: 10/46f6ea24d366e7efd3360fb6042c18592a33e09f5c8603544d3899dbf344cedae6dcf7c5a1f2fb97abbef56d930934477b37699da76625eeda65fe74ccddc669 languageName: node linkType: hard -"@react-aria/interactions@npm:^3.22.1": - version: 3.22.1 - resolution: "@react-aria/interactions@npm:3.22.1" +"@react-aria/interactions@npm:^3.22.2": + version: 3.22.2 + resolution: "@react-aria/interactions@npm:3.22.2" dependencies: "@react-aria/ssr": "npm:^3.9.5" - "@react-aria/utils": "npm:^3.25.1" + "@react-aria/utils": "npm:^3.25.2" "@react-types/shared": "npm:^3.24.1" "@swc/helpers": "npm:^0.5.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/6947a1904777a0adf7746631461928385524d901eefdd428f8e79f0c184904f48190f259fb8096dc683f4ba7ed5dd263e49f3cc511563f4462a124d4f27894b4 + checksum: 10/df0ce7d438b6f9d04774120ed6a3b66ef928e8e8ce97af42b12a5feabcd8d6cdd858e14cd6ccf602bbe8c0dbb620ce94bd974f1e2b832f497c7125647f8be471 languageName: node linkType: hard -"@react-aria/overlays@npm:3.23.1, @react-aria/overlays@npm:^3.23.1": - version: 3.23.1 - resolution: "@react-aria/overlays@npm:3.23.1" +"@react-aria/overlays@npm:3.23.2, @react-aria/overlays@npm:^3.23.2": + version: 3.23.2 + resolution: "@react-aria/overlays@npm:3.23.2" dependencies: - "@react-aria/focus": "npm:^3.18.1" - "@react-aria/i18n": "npm:^3.12.1" - "@react-aria/interactions": "npm:^3.22.1" + "@react-aria/focus": "npm:^3.18.2" + "@react-aria/i18n": "npm:^3.12.2" + "@react-aria/interactions": "npm:^3.22.2" "@react-aria/ssr": "npm:^3.9.5" - "@react-aria/utils": "npm:^3.25.1" - "@react-aria/visually-hidden": "npm:^3.8.14" - "@react-stately/overlays": "npm:^3.6.9" + "@react-aria/utils": "npm:^3.25.2" + "@react-aria/visually-hidden": "npm:^3.8.15" + "@react-stately/overlays": "npm:^3.6.10" "@react-types/button": "npm:^3.9.6" "@react-types/overlays": "npm:^3.8.9" "@react-types/shared": "npm:^3.24.1" @@ -6346,7 +6525,7 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/24aff9357b0ccdb412c8712fa3afdee281215b4054a652abbd086f898f037c375a2d254ec45776172e76f78db6b310fa3015d124de8c642e6b497a1396ccbef9 + checksum: 10/2d0b68c5d5eb38e4728193525c658c48cb2e27bd8abb4a3655ebf6e99d7d6f5c27aa1c4e21caf5258783a8aece2eaea4c6e6416c0871c8f5975444d209e48c82 languageName: node linkType: hard @@ -6361,38 +6540,38 @@ __metadata: languageName: node linkType: hard -"@react-aria/utils@npm:3.25.1, @react-aria/utils@npm:^3.25.1": - version: 3.25.1 - resolution: "@react-aria/utils@npm:3.25.1" +"@react-aria/utils@npm:3.25.2, @react-aria/utils@npm:^3.25.2": + version: 3.25.2 + resolution: "@react-aria/utils@npm:3.25.2" dependencies: "@react-aria/ssr": "npm:^3.9.5" - "@react-stately/utils": "npm:^3.10.2" + "@react-stately/utils": "npm:^3.10.3" "@react-types/shared": "npm:^3.24.1" "@swc/helpers": "npm:^0.5.0" clsx: "npm:^2.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/477b945ebdbda4200415dbc040d89658e58eb48e3d158a54a0d07c89d5605c1e3b51c21d2058b5346f8be2cab43c0f8d705f999b71712b96aa33546c0560cb47 + checksum: 10/c0dbbff1f93b3f275e6db2f01c7a09ffd96da57fd373a8b3b3cb5dbb0aca99d721c2453fbd742800d0df2fbb0ffa5f3052669bbb2998db753b1090f573d5ef7b languageName: node linkType: hard -"@react-aria/visually-hidden@npm:^3.8.14": - version: 3.8.14 - resolution: "@react-aria/visually-hidden@npm:3.8.14" +"@react-aria/visually-hidden@npm:^3.8.15": + version: 3.8.15 + resolution: "@react-aria/visually-hidden@npm:3.8.15" dependencies: - "@react-aria/interactions": "npm:^3.22.1" - "@react-aria/utils": "npm:^3.25.1" + "@react-aria/interactions": "npm:^3.22.2" + "@react-aria/utils": "npm:^3.25.2" "@react-types/shared": "npm:^3.24.1" "@swc/helpers": "npm:^0.5.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/8d2f81d68c9b4326347ae875c1da353ae410e736aa5a0854253c1c2d2a00c638d670f2b0666706bb4dc84ef12e9ee114816ee818928a332ac7375917230b720d + checksum: 10/5923eebcaa1873503f9c19bcdea5d6f6d5051583d0076aadbb627886608ef7f0b7ef96eff5ac794afe099cfeb0479fbb2bc54c40b5375b8b1ae1b53e67e12e2b languageName: node linkType: hard -"@react-awesome-query-builder/core@npm:^6.6.2": - version: 6.6.2 - resolution: "@react-awesome-query-builder/core@npm:6.6.2" +"@react-awesome-query-builder/core@npm:^6.6.3": + version: 6.6.3 + resolution: "@react-awesome-query-builder/core@npm:6.6.3" dependencies: "@babel/runtime": "npm:^7.24.5" clone: "npm:^2.1.2" @@ -6403,15 +6582,15 @@ __metadata: moment: "npm:^2.30.1" spel2js: "npm:^0.2.8" sqlstring: "npm:^2.3.3" - checksum: 10/9b959833923bc736dea491137ee1b04ec0f9432076b1df9ce7a5cf517834bae4a2361fb83241976c56646020c8a9e60b02e91901b43ee313fd7efbafd04f5e73 + checksum: 10/33c8703e4df6b315105c9ec5f8af0430326a82ea3f57544c3baecbe4c6b041fb65c8b785504ee59e3e464a9af1b5e2c9681584d1dd1355a370123ada1df5ec42 languageName: node linkType: hard -"@react-awesome-query-builder/ui@npm:6.6.2": - version: 6.6.2 - resolution: "@react-awesome-query-builder/ui@npm:6.6.2" +"@react-awesome-query-builder/ui@npm:6.6.3": + version: 6.6.3 + resolution: "@react-awesome-query-builder/ui@npm:6.6.3" dependencies: - "@react-awesome-query-builder/core": "npm:^6.6.2" + "@react-awesome-query-builder/core": "npm:^6.6.3" classnames: "npm:^2.5.1" lodash: "npm:^4.17.21" prop-types: "npm:^15.8.1" @@ -6420,31 +6599,31 @@ __metadata: peerDependencies: react: ^16.8.4 || ^17.0.1 || ^18.0.0 react-dom: ^16.8.4 || ^17.0.1 || ^18.0.0 - checksum: 10/29246a9f6ccce54b6caf141bc1fe8856c0de07f4cdfddfb04e17eb544abf280979074145e27bbd7ae4fa874b4d0adad379ecbb0c211101a4ce8a2924bd3c3118 + checksum: 10/095fd1921e384c24e7895405234c1a09c2365002411be745b1af68e857364c74fb0bc82b5a4ce6a222cabeb0079e390bb3cd04cad4a16b0d095998e88020fda4 languageName: node linkType: hard -"@react-stately/overlays@npm:^3.6.9": - version: 3.6.9 - resolution: "@react-stately/overlays@npm:3.6.9" +"@react-stately/overlays@npm:^3.6.10": + version: 3.6.10 + resolution: "@react-stately/overlays@npm:3.6.10" dependencies: - "@react-stately/utils": "npm:^3.10.2" + "@react-stately/utils": "npm:^3.10.3" "@react-types/overlays": "npm:^3.8.9" "@swc/helpers": "npm:^0.5.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/00844cad963c65d23063f4eb2bceff40308f009dcf06e8e4186b8cbe4db2b8b6d5214be3b6bdbc201346c56d0abce1d9d7744d89167430db75fe4e9d15ed9ec3 + checksum: 10/80dda26b348a2dcae737e3b570d0985b26700cfe86bc248aa56ac0091842379f234d8a236cf33625b4afa36646a115d8dda309a0159cb6eb1df1fdd1e57b0874 languageName: node linkType: hard -"@react-stately/utils@npm:^3.10.2": - version: 3.10.2 - resolution: "@react-stately/utils@npm:3.10.2" +"@react-stately/utils@npm:^3.10.3": + version: 3.10.3 + resolution: "@react-stately/utils@npm:3.10.3" dependencies: "@swc/helpers": "npm:^0.5.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0 - checksum: 10/ba71e6c4dccf11e66d6ddeb06a53046a46fa282039e6af8723e851285ea25db0f0c5632527a3dd1a37a968e8b0001dc0f0414bac85dec750ae455b263f2ed1a4 + checksum: 10/0ac737e678d949787d05889bfd67047ed0ee91d93a8d727c89d7a7568a027d0cf4a53cebad13e6526c2322f51069bbaa40d5912364230e6b9374cf653683a73d languageName: node linkType: hard @@ -6530,6 +6709,13 @@ __metadata: languageName: node linkType: hard +"@remix-run/router@npm:1.19.1": + version: 1.19.1 + resolution: "@remix-run/router@npm:1.19.1" + checksum: 10/2800c2f6567a982fe942aacc4cb5b170e7cc89bd455960e3bea2424161ff7dac32d01886322d88dd19b88d1bea711f39566d17f02b73eeb74999affb471f8f52 + languageName: node + linkType: hard + "@rollup/plugin-image@npm:3.0.3": version: 3.0.3 resolution: "@rollup/plugin-image@npm:3.0.3" @@ -8648,6 +8834,39 @@ __metadata: languageName: node linkType: hard +"@test-plugins/extensions-test-app@workspace:e2e/test-plugins/grafana-extensionstest-app": + version: 0.0.0-use.local + resolution: "@test-plugins/extensions-test-app@workspace:e2e/test-plugins/grafana-extensionstest-app" + dependencies: + "@emotion/css": "npm:11.11.2" + "@grafana/data": "workspace:*" + "@grafana/eslint-config": "npm:7.0.0" + "@grafana/plugin-configs": "npm:11.3.0-pre" + "@grafana/runtime": "workspace:*" + "@grafana/schema": "workspace:*" + "@grafana/ui": "workspace:*" + "@types/lodash": "npm:4.17.7" + "@types/node": "npm:20.14.14" + "@types/prismjs": "npm:1.26.4" + "@types/react": "npm:18.3.3" + "@types/react-dom": "npm:18.2.25" + "@types/semver": "npm:7.5.8" + "@types/uuid": "npm:9.0.8" + glob: "npm:10.4.1" + react: "npm:18.2.0" + react-dom: "npm:18.2.0" + react-router-dom: "npm:^6.22.0" + rxjs: "npm:7.8.1" + ts-node: "npm:10.9.2" + tslib: "npm:2.6.3" + typescript: "npm:5.5.4" + webpack: "npm:5.91.0" + webpack-merge: "npm:5.10.0" + peerDependencies: + "@grafana/runtime": "*" + languageName: unknown + linkType: soft + "@testing-library/dom@npm:10.0.0, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^10.0.0": version: 10.0.0 resolution: "@testing-library/dom@npm:10.0.0" @@ -9514,9 +9733,9 @@ __metadata: linkType: hard "@types/ini@npm:^4": - version: 4.1.0 - resolution: "@types/ini@npm:4.1.0" - checksum: 10/43dc756f60a4b2e828371baa0c5db006f3d31a2d58877f88ff15a58815aa804a612eea35adfc2c0e99ba09632b7a96bdf4a55ccaf5f164598f9ee314ad1171a1 + version: 4.1.1 + resolution: "@types/ini@npm:4.1.1" + checksum: 10/5d17a4af098bcf0263c767515a3856ebdd61a84ba78bd132e1cf7d05ed29a928af4ea80657a1226b39a4c9b3d5e1349a2bbaaa0c5c7ec068034ba7ae768f63cf languageName: node linkType: hard @@ -9633,6 +9852,13 @@ __metadata: languageName: node linkType: hard +"@types/lodash@npm:4.17.4": + version: 4.17.4 + resolution: "@types/lodash@npm:4.17.4" + checksum: 10/3ec19f9fc48200006e71733e08bcb1478b0398673657fcfb21a8643d41a80bcce09a01000077c3b23a3c6d86b9b314abe0672a8fdfc0fd66b893bd41955cfab8 + languageName: node + linkType: hard + "@types/logfmt@npm:^1.2.3": version: 1.2.6 resolution: "@types/logfmt@npm:1.2.6" @@ -9744,6 +9970,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:20.14.2": + version: 20.14.2 + resolution: "@types/node@npm:20.14.2" + dependencies: + undici-types: "npm:~5.26.4" + checksum: 10/c38e47b190fa0a8bdfde24b036dddcf9401551f2fb170a90ff33625c7d6f218907e81c74e0fa6e394804a32623c24c60c50e249badc951007830f0d02c48ee0f + languageName: node + linkType: hard + "@types/node@npm:^18.0.0": version: 18.19.33 resolution: "@types/node@npm:18.19.33" @@ -9956,12 +10191,12 @@ __metadata: languageName: node linkType: hard -"@types/react-transition-group@npm:4.4.10, @types/react-transition-group@npm:^4.4.0": - version: 4.4.10 - resolution: "@types/react-transition-group@npm:4.4.10" +"@types/react-transition-group@npm:4.4.11, @types/react-transition-group@npm:^4.4.0": + version: 4.4.11 + resolution: "@types/react-transition-group@npm:4.4.11" dependencies: "@types/react": "npm:*" - checksum: 10/b429f3bd54d9aea6c0395943ce2dda6b76fb458e902365bd91fd99bf72064fb5d59e2b74e78d10f2871908501d350da63e230d81bda2b616c967cab8dc51bd16 + checksum: 10/a7f4de6e5f57d9fcdea027e22873c633f96a803c96d422db8b99a45c36a9cceb7882d152136bbc31c7158fc1827e37aea5070d369724bb71dd11b5687332bc4d languageName: node linkType: hard @@ -12066,15 +12301,15 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs3@npm:^0.10.4": - version: 0.10.4 - resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4" +"babel-plugin-polyfill-corejs3@npm:^0.10.6": + version: 0.10.6 + resolution: "babel-plugin-polyfill-corejs3@npm:0.10.6" dependencies: - "@babel/helper-define-polyfill-provider": "npm:^0.6.1" - core-js-compat: "npm:^3.36.1" + "@babel/helper-define-polyfill-provider": "npm:^0.6.2" + core-js-compat: "npm:^3.38.0" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 10/a69ed5a95bb55e9b7ea37307d56113f7e24054d479c15de6d50fa61388b5334bed1f9b6414cde6c575fa910a4de4d1ab4f2d22720967d57c4fec9d1b8f61b355 + checksum: 10/360ac9054a57a18c540059dc627ad5d84d15f79790cb3d84d19a02eec7188c67d08a07db789c3822d6f5df22d918e296d1f27c4055fec2e287d328f09ea8a78a languageName: node linkType: hard @@ -12450,7 +12685,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3": +"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3": version: 4.23.3 resolution: "browserslist@npm:4.23.3" dependencies: @@ -12889,18 +13124,22 @@ __metadata: languageName: node linkType: hard -"cheerio@npm:^1.0.0-rc.2": - version: 1.0.0-rc.12 - resolution: "cheerio@npm:1.0.0-rc.12" +"cheerio@npm:^1.0.0": + version: 1.0.0 + resolution: "cheerio@npm:1.0.0" dependencies: cheerio-select: "npm:^2.1.0" dom-serializer: "npm:^2.0.0" domhandler: "npm:^5.0.3" - domutils: "npm:^3.0.1" - htmlparser2: "npm:^8.0.1" - parse5: "npm:^7.0.0" + domutils: "npm:^3.1.0" + encoding-sniffer: "npm:^0.2.0" + htmlparser2: "npm:^9.1.0" + parse5: "npm:^7.1.2" parse5-htmlparser2-tree-adapter: "npm:^7.0.0" - checksum: 10/812fed61aa4b669bbbdd057d0d7f73ba4649cabfd4fc3a8f1d5c7499e4613b430636102716369cbd6bbed8f1bdcb06387ae8342289fb908b2743184775f94f18 + parse5-parser-stream: "npm:^7.1.2" + undici: "npm:^6.19.5" + whatwg-mimetype: "npm:^4.0.0" + checksum: 10/b535070add0f86b0a1f234274ad3ffb2c1c375c05b322d8057e89c3c797b3b4d2f05826c34a04df218bec9abf21b9f0d0bd71974a8dfe28b943fb87ab0170c38 languageName: node linkType: hard @@ -13678,12 +13917,12 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.36.1, core-js-compat@npm:^3.37.1": - version: 3.37.1 - resolution: "core-js-compat@npm:3.37.1" +"core-js-compat@npm:^3.37.1, core-js-compat@npm:^3.38.0": + version: 3.38.1 + resolution: "core-js-compat@npm:3.38.1" dependencies: - browserslist: "npm:^4.23.0" - checksum: 10/30c6fdbd9ff179cc53951814689b8aabec106e5de6cddfa7a7feacc96b66d415b8eebcf5ec8f7c68ef35c552fe7d39edb8b15b1ce0f27379a272295b6e937061 + browserslist: "npm:^4.23.3" + checksum: 10/4e2f219354fd268895f79486461a12df96f24ed307321482fe2a43529c5a64e7c16bcba654980ba217d603444f5141d43a79058aeac77511085f065c5da72207 languageName: node linkType: hard @@ -13694,10 +13933,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.38.0, core-js@npm:^3.6.0, core-js@npm:^3.8.3": - version: 3.38.0 - resolution: "core-js@npm:3.38.0" - checksum: 10/95f5c768ee14aaf79e8fece9e58023a5a6367186184c92e825a842f271d3d91c559cfadee9c75712c463f248c61d636ed5a31a1fff1c904d4f5a2ed69b23f0c2 +"core-js@npm:3.38.1, core-js@npm:^3.6.0, core-js@npm:^3.8.3": + version: 3.38.1 + resolution: "core-js@npm:3.38.1" + checksum: 10/3c25fdf0b2595ed37ceb305213a61e2cf26185f628455e99d1c736dda5f69e2de4de7126e6a1da136f54260c4fcc982c4215e37b5a618790a597930f854c0a37 languageName: node linkType: hard @@ -15339,7 +15578,7 @@ __metadata: languageName: node linkType: hard -"domhandler@npm:^5.0.1, domhandler@npm:^5.0.2, domhandler@npm:^5.0.3": +"domhandler@npm:^5.0.2, domhandler@npm:^5.0.3": version: 5.0.3 resolution: "domhandler@npm:5.0.3" dependencies: @@ -15380,14 +15619,14 @@ __metadata: languageName: node linkType: hard -"domutils@npm:^3.0.1": - version: 3.0.1 - resolution: "domutils@npm:3.0.1" +"domutils@npm:^3.0.1, domutils@npm:^3.1.0": + version: 3.1.0 + resolution: "domutils@npm:3.1.0" dependencies: dom-serializer: "npm:^2.0.0" domelementtype: "npm:^2.3.0" - domhandler: "npm:^5.0.1" - checksum: 10/c0031e4bf89bf701c552c6aa7937262351ae863d5bb0395ebae9cdb23eb3de0077343ca0ddfa63861d98c31c02bbabe4c6e0e11be87b04a090a4d5dbb75197dc + domhandler: "npm:^5.0.3" + checksum: 10/9a169a6e57ac4c738269a73ab4caf785114ed70e46254139c1bbc8144ac3102aacb28a6149508395ae34aa5d6a40081f4fa5313855dc8319c6d8359866b6dfea languageName: node linkType: hard @@ -15432,8 +15671,8 @@ __metadata: linkType: hard "downshift@npm:^9.0.6": - version: 9.0.7 - resolution: "downshift@npm:9.0.7" + version: 9.0.8 + resolution: "downshift@npm:9.0.8" dependencies: "@babel/runtime": "npm:^7.24.5" compute-scroll-into-view: "npm:^3.1.0" @@ -15442,7 +15681,7 @@ __metadata: tslib: "npm:^2.6.2" peerDependencies: react: ">=16.12.0" - checksum: 10/d4adf8e0c36b911d751aaca01ca517c4f8c467f50f4340cc92a491153ada54da613a44cccb6c942fb95f38a75bbb6172c52c5ffc8935ea9ee2a97599563ed6fe + checksum: 10/9dc4577e780c54742ba4dde11f481f0d839f001b309200fbe4db112385b227ccd9cd2ef97d9e995379fa70249f0664a562240e415b9966f18c8a5cb7ce435f2c languageName: node linkType: hard @@ -15600,6 +15839,16 @@ __metadata: languageName: node linkType: hard +"encoding-sniffer@npm:^0.2.0": + version: 0.2.0 + resolution: "encoding-sniffer@npm:0.2.0" + dependencies: + iconv-lite: "npm:^0.6.3" + whatwg-encoding: "npm:^3.1.1" + checksum: 10/fe61a759dbef4d94ddc6f4fa645459897f4275eba04f0135d0459099b5f62fbba8a7ae57d23c9ec9b118c4c39ce056b51f1b8e62ad73a8ab365699448d655f4c + languageName: node + linkType: hard + "encoding@npm:^0.1.12, encoding@npm:^0.1.13": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -15629,7 +15878,7 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.16.0": +"enhanced-resolve@npm:^5.16.0, enhanced-resolve@npm:^5.17.1": version: 5.17.1 resolution: "enhanced-resolve@npm:5.17.1" dependencies: @@ -15662,10 +15911,10 @@ __metadata: languageName: node linkType: hard -"entities@npm:^4.2.0, entities@npm:^4.4.0": - version: 4.4.0 - resolution: "entities@npm:4.4.0" - checksum: 10/b627cb900e901cc7817037b83bf993a1cbf6a64850540f7526af7bcf9c7d09ebc671198e6182cfae4680f733799e2852e6a1c46aa62ff36eb99680057a038df5 +"entities@npm:^4.2.0, entities@npm:^4.4.0, entities@npm:^4.5.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 10/ede2a35c9bce1aeccd055a1b445d41c75a14a2bb1cd22e242f20cf04d236cdcd7f9c859eb83f76885327bfae0c25bf03303665ee1ce3d47c5927b98b0e3e3d48 languageName: node linkType: hard @@ -15932,7 +16181,7 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:0.20.2, esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0, esbuild@npm:^0.20.1": +"esbuild@npm:0.20.2, esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0": version: 0.20.2 resolution: "esbuild@npm:0.20.2" dependencies: @@ -16092,6 +16341,89 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:^0.23.0": + version: 0.23.1 + resolution: "esbuild@npm:0.23.1" + dependencies: + "@esbuild/aix-ppc64": "npm:0.23.1" + "@esbuild/android-arm": "npm:0.23.1" + "@esbuild/android-arm64": "npm:0.23.1" + "@esbuild/android-x64": "npm:0.23.1" + "@esbuild/darwin-arm64": "npm:0.23.1" + "@esbuild/darwin-x64": "npm:0.23.1" + "@esbuild/freebsd-arm64": "npm:0.23.1" + "@esbuild/freebsd-x64": "npm:0.23.1" + "@esbuild/linux-arm": "npm:0.23.1" + "@esbuild/linux-arm64": "npm:0.23.1" + "@esbuild/linux-ia32": "npm:0.23.1" + "@esbuild/linux-loong64": "npm:0.23.1" + "@esbuild/linux-mips64el": "npm:0.23.1" + "@esbuild/linux-ppc64": "npm:0.23.1" + "@esbuild/linux-riscv64": "npm:0.23.1" + "@esbuild/linux-s390x": "npm:0.23.1" + "@esbuild/linux-x64": "npm:0.23.1" + "@esbuild/netbsd-x64": "npm:0.23.1" + "@esbuild/openbsd-arm64": "npm:0.23.1" + "@esbuild/openbsd-x64": "npm:0.23.1" + "@esbuild/sunos-x64": "npm:0.23.1" + "@esbuild/win32-arm64": "npm:0.23.1" + "@esbuild/win32-ia32": "npm:0.23.1" + "@esbuild/win32-x64": "npm:0.23.1" + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-arm64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: 10/f55fbd0bfb0f86ce67a6d2c6f6780729d536c330999ecb9f5a38d578fb9fda820acbbc67d6d1d377eed8fed50fc38f14ff9cb014f86dafab94269a7fb2177018 + languageName: node + linkType: hard + "escalade@npm:^3.1.1, escalade@npm:^3.1.2": version: 3.1.2 resolution: "escalade@npm:3.1.2" @@ -18131,8 +18463,8 @@ __metadata: resolution: "grafana@workspace:." dependencies: "@babel/core": "npm:7.25.2" - "@babel/preset-env": "npm:7.25.3" - "@babel/runtime": "npm:7.25.0" + "@babel/preset-env": "npm:7.25.4" + "@babel/runtime": "npm:7.25.4" "@betterer/betterer": "npm:5.4.0" "@betterer/cli": "npm:5.4.0" "@betterer/eslint": "npm:5.4.0" @@ -18150,7 +18482,7 @@ __metadata: "@grafana/e2e-selectors": "workspace:*" "@grafana/eslint-config": "npm:7.0.0" "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules" - "@grafana/experimental": "npm:1.7.13" + "@grafana/experimental": "npm:1.8.0" "@grafana/faro-core": "npm:^1.3.6" "@grafana/faro-web-sdk": "npm:^1.3.6" "@grafana/faro-web-tracing": "npm:^1.8.2" @@ -18159,11 +18491,11 @@ __metadata: "@grafana/lezer-logql": "npm:0.2.6" "@grafana/monaco-logql": "npm:^0.0.7" "@grafana/o11y-ds-frontend": "workspace:*" - "@grafana/plugin-e2e": "npm:1.6.1" + "@grafana/plugin-e2e": "npm:1.7.1" "@grafana/prometheus": "workspace:*" "@grafana/runtime": "workspace:*" "@grafana/saga-icons": "workspace:*" - "@grafana/scenes": "npm:^5.8.0" + "@grafana/scenes": "npm:^5.10.1" "@grafana/schema": "workspace:*" "@grafana/sql": "workspace:*" "@grafana/tsconfig": "npm:^2.0.0" @@ -18172,7 +18504,7 @@ __metadata: "@kusto/monaco-kusto": "npm:^10.0.0" "@leeoniya/ufuzzy": "npm:1.0.14" "@lezer/common": "npm:1.2.1" - "@lezer/highlight": "npm:1.2.0" + "@lezer/highlight": "npm:1.2.1" "@lezer/lr": "npm:1.3.3" "@locker/near-membrane-dom": "npm:0.13.6" "@locker/near-membrane-shared": "npm:0.13.6" @@ -18183,14 +18515,14 @@ __metadata: "@opentelemetry/api": "npm:1.9.0" "@opentelemetry/exporter-collector": "npm:0.25.0" "@opentelemetry/semantic-conventions": "npm:1.25.1" - "@playwright/test": "npm:1.46.0" + "@playwright/test": "npm:1.46.1" "@pmmmwh/react-refresh-webpack-plugin": "npm:0.5.15" "@popperjs/core": "npm:2.11.8" - "@react-aria/dialog": "npm:3.5.16" - "@react-aria/focus": "npm:3.18.1" - "@react-aria/overlays": "npm:3.23.1" - "@react-aria/utils": "npm:3.25.1" - "@react-awesome-query-builder/ui": "npm:6.6.2" + "@react-aria/dialog": "npm:3.5.17" + "@react-aria/focus": "npm:3.18.2" + "@react-aria/overlays": "npm:3.23.2" + "@react-aria/utils": "npm:3.25.2" + "@react-awesome-query-builder/ui": "npm:6.6.3" "@react-types/button": "npm:3.9.6" "@react-types/menu": "npm:3.9.11" "@react-types/overlays": "npm:3.8.9" @@ -18245,7 +18577,7 @@ __metadata: "@types/react-router-dom": "npm:5.3.3" "@types/react-table": "npm:7.7.20" "@types/react-test-renderer": "npm:18.3.0" - "@types/react-transition-group": "npm:4.4.10" + "@types/react-transition-group": "npm:4.4.11" "@types/react-virtualized-auto-sizer": "npm:1.0.4" "@types/react-window": "npm:1.8.8" "@types/react-window-infinite-loader": "npm:^1" @@ -18290,7 +18622,7 @@ __metadata: comlink: "npm:4.4.1" common-tags: "npm:1.8.2" copy-webpack-plugin: "npm:12.0.2" - core-js: "npm:3.38.0" + core-js: "npm:3.38.1" css-loader: "npm:7.1.2" css-minimizer-webpack-plugin: "npm:6.0.0" cypress: "npm:13.10.0" @@ -18332,7 +18664,7 @@ __metadata: http-server: "npm:14.1.1" i18next: "npm:^23.0.0" i18next-browser-languagedetector: "npm:^7.0.2" - i18next-parser: "npm:9.0.1" + i18next-parser: "npm:9.0.2" immer: "npm:10.1.1" immutable: "npm:4.3.7" ini: "npm:^4.1.3" @@ -18361,7 +18693,7 @@ __metadata: marked: "npm:12.0.2" memoize-one: "npm:6.0.0" micro-memoize: "npm:^4.1.2" - mini-css-extract-plugin: "npm:2.9.0" + mini-css-extract-plugin: "npm:2.9.1" ml-regression-polynomial: "npm:^3.0.0" ml-regression-simple-linear: "npm:^3.0.0" moment: "npm:2.30.1" @@ -18376,7 +18708,7 @@ __metadata: node-notifier: "npm:10.0.1" nx: "npm:19.2.0" ol: "npm:7.4.0" - ol-ext: "npm:4.0.21" + ol-ext: "npm:4.0.23" pluralize: "npm:^8.0.0" postcss: "npm:8.4.41" postcss-loader: "npm:8.1.1" @@ -18427,7 +18759,7 @@ __metadata: regenerator-runtime: "npm:0.14.1" reselect: "npm:5.1.1" rimraf: "npm:5.0.7" - rudder-sdk-js: "npm:2.48.15" + rudder-sdk-js: "npm:2.48.16" rxjs: "npm:7.8.1" sass: "npm:1.77.8" sass-loader: "npm:14.2.1" @@ -18438,7 +18770,7 @@ __metadata: slate-react: "npm:0.22.10" smtp-tester: "npm:^2.1.0" style-loader: "npm:4.0.0" - stylelint: "npm:16.8.1" + stylelint: "npm:16.8.2" stylelint-config-sass-guidelines: "npm:11.1.0" swagger-ui-react: "npm:5.17.14" symbol-observable: "npm:4.0.0" @@ -18454,7 +18786,7 @@ __metadata: tslib: "npm:2.6.3" tween-functions: "npm:^1.2.0" type-fest: "npm:^4.18.2" - typescript: "npm:5.4.5" + typescript: "npm:5.5.4" uplot: "npm:1.6.30" uuid: "npm:9.0.1" visjs-network: "npm:4.25.0" @@ -18966,7 +19298,7 @@ __metadata: languageName: node linkType: hard -"htmlparser2@npm:^8.0.1, htmlparser2@npm:^8.0.2": +"htmlparser2@npm:^8.0.2": version: 8.0.2 resolution: "htmlparser2@npm:8.0.2" dependencies: @@ -18978,6 +19310,18 @@ __metadata: languageName: node linkType: hard +"htmlparser2@npm:^9.1.0": + version: 9.1.0 + resolution: "htmlparser2@npm:9.1.0" + dependencies: + domelementtype: "npm:^2.3.0" + domhandler: "npm:^5.0.3" + domutils: "npm:^3.1.0" + entities: "npm:^4.5.0" + checksum: 10/6352fa2a5495781fa9a02c9049908334cd068ff36d753870d30cd13b841e99c19646717567a2f9e9c44075bbe43d364e102f9d013a731ce962226d63746b794f + languageName: node + linkType: hard + "http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" @@ -19192,17 +19536,17 @@ __metadata: languageName: node linkType: hard -"i18next-parser@npm:9.0.1": - version: 9.0.1 - resolution: "i18next-parser@npm:9.0.1" +"i18next-parser@npm:9.0.2": + version: 9.0.2 + resolution: "i18next-parser@npm:9.0.2" dependencies: "@babel/runtime": "npm:^7.23.2" broccoli-plugin: "npm:^4.0.7" - cheerio: "npm:^1.0.0-rc.2" + cheerio: "npm:^1.0.0" colors: "npm:1.4.0" commander: "npm:~12.1.0" eol: "npm:^0.9.1" - esbuild: "npm:^0.20.1" + esbuild: "npm:^0.23.0" fs-extra: "npm:^11.1.0" gulp-sort: "npm:^2.0.0" i18next: "npm:^23.5.1" @@ -19215,7 +19559,7 @@ __metadata: vinyl-fs: "npm:^4.0.0" bin: i18next: bin/cli.js - checksum: 10/d6f13c6cdc98f853b5cc433fb0853a996e9a88f83e9fe26974b4b6649a01713ec09f567869c57f21e57a7efcb731d50f296373f9647deef7a73d0d76fda63388 + checksum: 10/37c1ae7917f2c1b2ce91e27cb911aee2a5c3cc8a70ce0c40b2771c787376fcbda539293d835f1ae19222f5c1223027142567869d37eeae7a32cf71417a097405 languageName: node linkType: hard @@ -19278,10 +19622,10 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1": - version: 5.3.1 - resolution: "ignore@npm:5.3.1" - checksum: 10/0a884c2fbc8c316f0b9f92beaf84464253b73230a4d4d286697be45fca081199191ca33e1c2e82d9e5f851f5e9a48a78e25a35c951e7eb41e59f150db3530065 +"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.2": + version: 5.3.2 + resolution: "ignore@npm:5.3.2" + checksum: 10/cceb6a457000f8f6a50e1196429750d782afce5680dd878aa4221bd79972d68b3a55b4b1458fc682be978f4d3c6a249046aa0880637367216444ab7b014cfc98 languageName: node linkType: hard @@ -21334,12 +21678,13 @@ __metadata: linkType: hard "knip@npm:^5.10.0": - version: 5.27.0 - resolution: "knip@npm:5.27.0" + version: 5.27.3 + resolution: "knip@npm:5.27.3" dependencies: "@nodelib/fs.walk": "npm:1.2.8" "@snyk/github-codeowners": "npm:1.1.0" easy-table: "npm:1.2.0" + enhanced-resolve: "npm:^5.17.1" fast-glob: "npm:^3.3.2" jiti: "npm:^1.21.6" js-yaml: "npm:^4.1.0" @@ -21347,7 +21692,6 @@ __metadata: picocolors: "npm:^1.0.0" picomatch: "npm:^4.0.1" pretty-ms: "npm:^9.0.0" - resolve: "npm:^1.22.8" smol-toml: "npm:^1.1.4" strip-json-comments: "npm:5.0.1" summary: "npm:2.1.0" @@ -21359,7 +21703,7 @@ __metadata: bin: knip: bin/knip.js knip-bun: bin/knip-bun.js - checksum: 10/0b48a4789b9d9a4444bf6914ff2f71f6e5a926219287b170f2919fe2dc0f1bdb5ee11e1e15f511337684ab1883cb9cde8ea6c5226926f54c382072e139dd388b + checksum: 10/b043e5d6e77d32c078961d33f734040082092e14a06e525efba27cfa893d6ce2251c0951245806151203ee32461d2c50cfea2f9b4a5d9bd9fcf1755f2cdef438 languageName: node linkType: hard @@ -22863,12 +23207,12 @@ __metadata: linkType: hard "micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:^4.0.7": - version: 4.0.7 - resolution: "micromatch@npm:4.0.7" + version: 4.0.8 + resolution: "micromatch@npm:4.0.8" dependencies: braces: "npm:^3.0.3" picomatch: "npm:^2.3.1" - checksum: 10/a11ed1cb67dcbbe9a5fc02c4062cf8bb0157d73bf86956003af8dcfdf9b287f9e15ec0f6d6925ff6b8b5b496202335e497b01de4d95ef6cf06411bc5e5c474a0 + checksum: 10/6bf2a01672e7965eb9941d1f02044fad2bd12486b5553dc1116ff24c09a8723157601dc992e74c911d896175918448762df3b3fd0a6b61037dd1a9766ddfbf58 languageName: node linkType: hard @@ -22931,15 +23275,15 @@ __metadata: languageName: node linkType: hard -"mini-css-extract-plugin@npm:2.9.0": - version: 2.9.0 - resolution: "mini-css-extract-plugin@npm:2.9.0" +"mini-css-extract-plugin@npm:2.9.1": + version: 2.9.1 + resolution: "mini-css-extract-plugin@npm:2.9.1" dependencies: schema-utils: "npm:^4.0.0" tapable: "npm:^2.2.1" peerDependencies: webpack: ^5.0.0 - checksum: 10/4c9ee9c0c6160a64a4884d5a92a1a5c0b68d556cd00f975cf6c8a79b51ac90e6130a37b3832b17d377d0cb1b31c0313c8c023458d4f69e95fe3424a8b43d834f + checksum: 10/a4a0c73a054254784b9d39a3a4f117691600355125242dfc46ced0912b4937050823478bdbf403b5392c21e2fb2203902b41677d67c7d668f77b985b594e94c6 languageName: node linkType: hard @@ -24226,12 +24570,12 @@ __metadata: languageName: node linkType: hard -"ol-ext@npm:4.0.21": - version: 4.0.21 - resolution: "ol-ext@npm:4.0.21" +"ol-ext@npm:4.0.23": + version: 4.0.23 + resolution: "ol-ext@npm:4.0.23" peerDependencies: ol: ">= 5.3.0" - checksum: 10/b09b0837b69f85bb366bd97698246d38878e8e50a632699596606a7c16778223c9bb88f332f13c4a17ee0b55dd6e00206bc75979615cd72365824890d4f18c35 + checksum: 10/035aaad001191db3f8146d2b2a2f44c9e4ba86b1592d90d0c8d9b38404a7cbb37a94876cd98f212b2e61f114b059a8cd9cdce967d820ae1964560310975d8657 languageName: node linkType: hard @@ -24766,6 +25110,15 @@ __metadata: languageName: node linkType: hard +"parse5-parser-stream@npm:^7.1.2": + version: 7.1.2 + resolution: "parse5-parser-stream@npm:7.1.2" + dependencies: + parse5: "npm:^7.0.0" + checksum: 10/75b232d460bce6bd0e35012750a78ef034f40ccf550b7c6cec3122395af6b4553202ad3663ad468cf537ead5a2e13b6727670395fd0ff548faccad1dc2dc93cf + languageName: node + linkType: hard + "parse5@npm:^7.0.0, parse5@npm:^7.1.1, parse5@npm:^7.1.2": version: 7.1.2 resolution: "parse5@npm:7.1.2" @@ -25057,27 +25410,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.46.0": - version: 1.46.0 - resolution: "playwright-core@npm:1.46.0" +"playwright-core@npm:1.46.1": + version: 1.46.1 + resolution: "playwright-core@npm:1.46.1" bin: playwright-core: cli.js - checksum: 10/1fd237d01380be0d650ae7df73fb796eae9c208e0746bb110db270139f1d2a96bf3b8856c394a48720b30e145614a10f275ab08627d0c95ba2160dc0402a90cb + checksum: 10/950aa935bba0b67ed289e07f31a52104c2b2ff9e39c46cda70b83f0b327e8114bcbcdeb4e8f94333ec941f9cd49cfac3af4cad91e247206ce927283482f24d91 languageName: node linkType: hard -"playwright@npm:1.46.0": - version: 1.46.0 - resolution: "playwright@npm:1.46.0" +"playwright@npm:1.46.1": + version: 1.46.1 + resolution: "playwright@npm:1.46.1" dependencies: fsevents: "npm:2.3.2" - playwright-core: "npm:1.46.0" + playwright-core: "npm:1.46.1" dependenciesMeta: fsevents: optional: true bin: playwright: cli.js - checksum: 10/e06f3b53faaf4edf4fcf636b43004dd0db1e45dbdcb2b59037a9810dfce3a59f0386d4826ba7de42f98fe525539fa20dd8f8c46acd1f8e5c57dcb5c1d8d536ce + checksum: 10/17b0e7495a663dccbda4baf4953823a133af0b7cd4a5978bd2f40768a23e1a92d3659d7b48289a5160c9fa6269d8b9bbf5e2040aa4a63a3dd5f29475343ad3f2 languageName: node linkType: hard @@ -25479,10 +25832,10 @@ __metadata: languageName: node linkType: hard -"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.4": - version: 0.1.4 - resolution: "postcss-resolve-nested-selector@npm:0.1.4" - checksum: 10/c53a1aa453690dacb9a34d60afb994c828779ad20d0abb8d7b37639f1144c0fd34f91e112cb7061f606d0459371c12463dae5777d465d4418fd20db054deb465 +"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.6": + version: 0.1.6 + resolution: "postcss-resolve-nested-selector@npm:0.1.6" + checksum: 10/85453901afe2a4db497b4e0d2c9cf2a097a08fa5d45bc646547025176217050334e423475519a1e6c74a1f31ade819d16bb37a39914e5321e250695ee3feea14 languageName: node linkType: hard @@ -25504,13 +25857,13 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.1": - version: 6.1.1 - resolution: "postcss-selector-parser@npm:6.1.1" +"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.2": + version: 6.1.2 + resolution: "postcss-selector-parser@npm:6.1.2" dependencies: cssesc: "npm:^3.0.0" util-deprecate: "npm:^1.0.2" - checksum: 10/ce2af36b56d9333a6873498d3b6ee858466ceb3e9560f998eeaf294e5c11cafffb122d307f3c2904ee8f87d12c71c5ab0b26ca4228b97b6c70b7d1e7cd9b5737 + checksum: 10/190034c94d809c115cd2f32ee6aade84e933450a43ec3899c3e78e7d7b33efd3a2a975bb45d7700b6c5b196c06a7d9acf3f1ba6f1d87032d9675a29d8bca1dd3 languageName: node linkType: hard @@ -25544,7 +25897,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.41, postcss@npm:^8.4.33, postcss@npm:^8.4.40": +"postcss@npm:8.4.41, postcss@npm:^8.4.33, postcss@npm:^8.4.41": version: 8.4.41 resolution: "postcss@npm:8.4.41" dependencies: @@ -27020,6 +27373,19 @@ __metadata: languageName: node linkType: hard +"react-router-dom@npm:^6.22.0": + version: 6.26.1 + resolution: "react-router-dom@npm:6.26.1" + dependencies: + "@remix-run/router": "npm:1.19.1" + react-router: "npm:6.26.1" + peerDependencies: + react: ">=16.8" + react-dom: ">=16.8" + checksum: 10/1bd255d1ff88f477699c72656e7c07702a907e644388a1bea1c648f2df0c3c86db2e90bea945b1d43eaf84ebab194f3868f3788502965ad5f20c508c6874f1fe + languageName: node + linkType: hard + "react-router@npm:5.3.3": version: 5.3.3 resolution: "react-router@npm:5.3.3" @@ -27051,6 +27417,17 @@ __metadata: languageName: node linkType: hard +"react-router@npm:6.26.1": + version: 6.26.1 + resolution: "react-router@npm:6.26.1" + dependencies: + "@remix-run/router": "npm:1.19.1" + peerDependencies: + react: ">=16.8" + checksum: 10/b3761515c75da65a1678f005d08a6285ceccd9df7237ae6fdd9ab2ab816ef328435b75610f705ecd9ecd41c6878fd22eb9b44c5391cdef2e1ed99ddbc78de8a4 + languageName: node + linkType: hard + "react-select-event@npm:5.5.1, react-select-event@npm:^5.1.0": version: 5.5.1 resolution: "react-select-event@npm:5.5.1" @@ -28220,10 +28597,10 @@ __metadata: languageName: node linkType: hard -"rudder-sdk-js@npm:2.48.15": - version: 2.48.15 - resolution: "rudder-sdk-js@npm:2.48.15" - checksum: 10/b4c01e1fc3beec5c96a982e443e65ad4a68fe47fff911e5b8f799325ca3994d154019a2512a6969b296079f87a825ccade1c7a7ed7196c5ac31db472d1bb3b6a +"rudder-sdk-js@npm:2.48.16": + version: 2.48.16 + resolution: "rudder-sdk-js@npm:2.48.16" + checksum: 10/849b5d07ce4931b64ca42b36c9c6f701784d210dcdbe284b57bb50f4f7ecf38808ae7b7b227d82a35ed92cb05d9f0f4e4fc003b4d134f5f2e64ea1a21e8c2c1b languageName: node linkType: hard @@ -29875,14 +30252,14 @@ __metadata: languageName: node linkType: hard -"stylelint@npm:16.8.1": - version: 16.8.1 - resolution: "stylelint@npm:16.8.1" +"stylelint@npm:16.8.2": + version: 16.8.2 + resolution: "stylelint@npm:16.8.2" dependencies: - "@csstools/css-parser-algorithms": "npm:^2.7.1" - "@csstools/css-tokenizer": "npm:^2.4.1" - "@csstools/media-query-list-parser": "npm:^2.1.13" - "@csstools/selector-specificity": "npm:^3.1.1" + "@csstools/css-parser-algorithms": "npm:^3.0.0" + "@csstools/css-tokenizer": "npm:^3.0.0" + "@csstools/media-query-list-parser": "npm:^3.0.0" + "@csstools/selector-specificity": "npm:^4.0.0" "@dual-bundle/import-meta-resolve": "npm:^4.1.0" balanced-match: "npm:^2.0.0" colord: "npm:^2.9.3" @@ -29897,7 +30274,7 @@ __metadata: globby: "npm:^11.1.0" globjoin: "npm:^0.1.4" html-tags: "npm:^3.3.1" - ignore: "npm:^5.3.1" + ignore: "npm:^5.3.2" imurmurhash: "npm:^0.1.4" is-plain-object: "npm:^5.0.0" known-css-properties: "npm:^0.34.0" @@ -29906,10 +30283,10 @@ __metadata: micromatch: "npm:^4.0.7" normalize-path: "npm:^3.0.0" picocolors: "npm:^1.0.1" - postcss: "npm:^8.4.40" - postcss-resolve-nested-selector: "npm:^0.1.4" + postcss: "npm:^8.4.41" + postcss-resolve-nested-selector: "npm:^0.1.6" postcss-safe-parser: "npm:^7.0.0" - postcss-selector-parser: "npm:^6.1.1" + postcss-selector-parser: "npm:^6.1.2" postcss-value-parser: "npm:^4.2.0" resolve-from: "npm:^5.0.0" string-width: "npm:^4.2.3" @@ -29920,7 +30297,7 @@ __metadata: write-file-atomic: "npm:^5.0.1" bin: stylelint: bin/stylelint.mjs - checksum: 10/834d10490866b8472047938790f68cdc5bd298057ef7bfcf3be2e56259a8d3d05cbb66eefa235d603652fee92126e74d737ad40012721556c54d707407cbf7f1 + checksum: 10/143103ad0e7c4a10a1d8914c92f1275bdb3b809ca49bd9b0d7206325bdaf36d4c2e8fba30f805b0cb7dfbb2d59cf6090a701918ee998032e43eff7cd1dc8af1c languageName: node linkType: hard @@ -31108,7 +31485,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.4.5, typescript@npm:>=2.7, typescript@npm:>=3 < 6, typescript@npm:^5.0.0, typescript@npm:^5.0.4, typescript@npm:^5.2.2": +"typescript@npm:5.4.5": version: 5.4.5 resolution: "typescript@npm:5.4.5" bin: @@ -31118,6 +31495,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:5.5.4, typescript@npm:>=2.7, typescript@npm:>=3 < 6, typescript@npm:^5.0.0, typescript@npm:^5.0.4, typescript@npm:^5.2.2": + version: 5.5.4 + resolution: "typescript@npm:5.5.4" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/1689ccafef894825481fc3d856b4834ba3cc185a9c2878f3c76a9a1ef81af04194849840f3c69e7961e2312771471bb3b460ca92561e1d87599b26c37d0ffb6f + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A5.2.2#optional!builtin": version: 5.2.2 resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" @@ -31128,7 +31515,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.4.5#optional!builtin, typescript@patch:typescript@npm%3A>=2.7#optional!builtin, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin, typescript@patch:typescript@npm%3A^5.0.0#optional!builtin, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin": +"typescript@patch:typescript@npm%3A5.4.5#optional!builtin": version: 5.4.5 resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: @@ -31138,6 +31525,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A5.5.4#optional!builtin, typescript@patch:typescript@npm%3A>=2.7#optional!builtin, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin, typescript@patch:typescript@npm%3A^5.0.0#optional!builtin, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin": + version: 5.5.4 + resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin::version=5.5.4&hash=379a07" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/746fdd0865c5ce4f15e494c57ede03a9e12ede59cfdb40da3a281807853fe63b00ef1c912d7222143499aa82f18b8b472baa1830df8804746d09b55f6cf5b1cc + languageName: node + linkType: hard + "ua-parser-js@npm:^1.0.32": version: 1.0.33 resolution: "ua-parser-js@npm:1.0.33" @@ -31190,6 +31587,13 @@ __metadata: languageName: node linkType: hard +"undici@npm:^6.19.5": + version: 6.19.8 + resolution: "undici@npm:6.19.8" + checksum: 10/19ae4ba38b029a664d99fd330935ef59136cf99edb04ed821042f27b5a9e84777265fb744c8a7abc83f2059afb019446c69a4ebef07bbc0ed6b2de8d67ef4090 + languageName: node + linkType: hard + "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0" @@ -32188,6 +32592,15 @@ __metadata: languageName: node linkType: hard +"whatwg-encoding@npm:^3.1.1": + version: 3.1.1 + resolution: "whatwg-encoding@npm:3.1.1" + dependencies: + iconv-lite: "npm:0.6.3" + checksum: 10/bbef815eb67f91487c7f2ef96329743f5fd8357d7d62b1119237d25d41c7e452dff8197235b2d3c031365a17f61d3bb73ca49d0ed1582475aa4a670815e79534 + languageName: node + linkType: hard + "whatwg-fetch@npm:3.6.20": version: 3.6.20 resolution: "whatwg-fetch@npm:3.6.20" @@ -32202,6 +32615,13 @@ __metadata: languageName: node linkType: hard +"whatwg-mimetype@npm:^4.0.0": + version: 4.0.0 + resolution: "whatwg-mimetype@npm:4.0.0" + checksum: 10/894a618e2d90bf444b6f309f3ceb6e58cf21b2beaa00c8b333696958c4076f0c7b30b9d33413c9ffff7c5832a0a0c8569e5bb347ef44beded72aeefd0acd62e8 + languageName: node + linkType: hard + "whatwg-url@npm:^11.0.0": version: 11.0.0 resolution: "whatwg-url@npm:11.0.0"