Bump build-container to 1.4.3

Bump version to 8.1.6
Fix static path matching issue in macaron
2021-10-05 14:25:53 +03:00 · 2021-09-21 12:47:05 +01:00 · 2021-09-21 12:46:39 +01:00
14 changed files with 207 additions and 196 deletions
--- a/.drone.yml
+++ b/.drone.yml
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
  "npmClient": "yarn",
  "useWorkspaces": true,
  "packages": ["packages/*"],
-  "version": "8.1.5"
+  "version": "8.1.6"
 }
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "grafana",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "repository": "github:grafana/grafana",
  "scripts": {
    "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/data",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e-selectors",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Grafana End-to-End Test Selectors Library",
  "keywords": [
    "cli",
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Grafana End-to-End Test Library",
  "keywords": [
    "cli",
@@ -45,7 +45,7 @@
  "types": "src/index.ts",
  "dependencies": {
    "@cypress/webpack-preprocessor": "5.9.0",
-    "@grafana/e2e-selectors": "8.1.5",
+    "@grafana/e2e-selectors": "8.1.6",
    "@grafana/tsconfig": "^1.0.0-rc1",
    "@mochajs/json-file-reporter": "^1.2.0",
    "blink-diff": "1.0.13",
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/runtime",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Grafana Runtime Library",
  "keywords": [
    "grafana",
@@ -22,9 +22,9 @@
    "typecheck": "tsc --noEmit"
  },
  "dependencies": {
-    "@grafana/data": "8.1.5",
-    "@grafana/e2e-selectors": "8.1.5",
-    "@grafana/ui": "8.1.5",
+    "@grafana/data": "8.1.6",
+    "@grafana/e2e-selectors": "8.1.6",
+    "@grafana/ui": "8.1.6",
    "history": "4.10.1",
    "systemjs": "0.20.19",
    "systemjs-plugin-css": "0.1.37"
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/toolkit",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Grafana Toolkit",
  "keywords": [
    "grafana",
@@ -28,10 +28,10 @@
  "dependencies": {
    "@babel/core": "7.13.14",
    "@babel/preset-env": "7.13.12",
-    "@grafana/data": "8.1.5",
+    "@grafana/data": "8.1.6",
    "@grafana/eslint-config": "2.5.0",
    "@grafana/tsconfig": "^1.0.0-rc1",
-    "@grafana/ui": "8.1.5",
+    "@grafana/ui": "8.1.6",
    "@types/command-exists": "^1.2.0",
    "@types/expect-puppeteer": "3.3.1",
    "@types/fs-extra": "^8.1.0",
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/ui",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Grafana Components Library",
  "keywords": [
    "grafana",
@@ -29,8 +29,8 @@
    "@emotion/css": "11.1.3",
    "@emotion/react": "11.1.5",
    "@grafana/aws-sdk": "0.0.3",
-    "@grafana/data": "8.1.5",
-    "@grafana/e2e-selectors": "8.1.5",
+    "@grafana/data": "8.1.6",
+    "@grafana/e2e-selectors": "8.1.6",
    "@grafana/slate-react": "0.22.10-grafana",
    "@grafana/tsconfig": "^1.0.0-rc1",
    "@monaco-editor/react": "4.1.1",
--- a/packages/jaeger-ui-components/package.json
+++ b/packages/jaeger-ui-components/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@jaegertracing/jaeger-ui-components",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -16,8 +16,8 @@
  "dependencies": {
    "@emotion/css": "11.1.3",
    "@emotion/react": "11.1.5",
-    "@grafana/data": "8.1.5",
-    "@grafana/ui": "8.1.5",
+    "@grafana/data": "8.1.6",
+    "@grafana/ui": "8.1.6",
    "@types/classnames": "^2.2.7",
    "@types/deep-freeze": "^0.1.1",
    "@types/hoist-non-react-statics": "^3.3.1",
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -146,6 +146,9 @@ func CreateDashboardSnapshot(c *models.ReqContext, cmd models.CreateDashboardSna
 // GET /api/snapshots/:key
 func GetDashboardSnapshot(c *models.ReqContext) response.Response {
 	key := c.Params(":key")
+	if len(key) == 0 {
+		return response.Error(404, "Snapshot not found", nil)
+	}
 	query := &models.GetDashboardSnapshotQuery{Key: key}

 	err := bus.Dispatch(query)
@@ -215,6 +218,9 @@ func deleteExternalDashboardSnapshot(externalUrl string) error {
 // GET /api/snapshots-delete/:deleteKey
 func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response {
 	key := c.Params(":deleteKey")
+	if len(key) == 0 {
+		return response.Error(404, "Snapshot not found", nil)
+	}

 	query := &models.GetDashboardSnapshotQuery{DeleteKey: key}

@@ -245,6 +251,9 @@ func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response
 // DELETE /api/snapshots/:key
 func DeleteDashboardSnapshot(c *models.ReqContext) response.Response {
 	key := c.Params(":key")
+	if len(key) == 0 {
+		return response.Error(404, "Snapshot not found", nil)
+	}

 	query := &models.GetDashboardSnapshotQuery{Key: key}

--- a/pkg/macaron/router.go
+++ b/pkg/macaron/router.go
@@ -289,10 +289,12 @@ func (r *Router) SetHandlerWrapper(f func(Handler) Handler) {
 func (r *Router) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	if t, ok := r.routers[req.Method]; ok {
 		// Fast match for static routes
-		leaf := r.getLeaf(req.Method, req.URL.Path)
-		if leaf != nil {
-			leaf.handle(rw, req, nil)
-			return
+		if !strings.ContainsAny(req.URL.Path, ":*") {
+			leaf := r.getLeaf(req.Method, req.URL.Path)
+			if leaf != nil {
+				leaf.handle(rw, req, nil)
+				return
+			}
 		}

 		h, p, ok := t.Match(req.URL.EscapedPath())
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@grafana-plugins/input-datasource",
-  "version": "8.1.5",
+  "version": "8.1.6",
  "description": "Input Datasource",
  "private": true,
  "repository": {
@@ -15,9 +15,9 @@
  },
  "author": "Grafana Labs",
  "devDependencies": {
-    "@grafana/data": "8.1.5",
-    "@grafana/toolkit": "8.1.5",
-    "@grafana/ui": "8.1.5"
+    "@grafana/data": "8.1.6",
+    "@grafana/toolkit": "8.1.6",
+    "@grafana/ui": "8.1.6"
  },
  "volta": {
    "extends": "../../../package.json"
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -1,7 +1,7 @@
 load('scripts/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token')

 grabpl_version = '2.3.4'
-build_image = 'grafana/build-container:1.4.1'
+build_image = 'grafana/build-container:1.4.3'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
Author	SHA1	Message	Date
dsotirakis	4a4083716c	Bump build-container to 1.4.3	2021-10-05 14:25:53 +03:00
dsotirakis	9888e06a1c	Bump version to 8.1.6	2021-09-21 12:47:05 +01:00
Kevin Minehart	2d456a6375	Fix static path matching issue in macaron	2021-09-21 12:46:39 +01:00