From 691cec2f96b414f40f02592855754918b3f47629 Mon Sep 17 00:00:00 2001 From: Marco Nelles Date: Wed, 4 Oct 2023 09:11:51 +0200 Subject: [PATCH 1/3] * upgrade JS libs to 7.5.25 * change golang version to 1.21.1 --- .github/workflows/unit-test-backend.yml | 2 +- CHANGELOG.md | 8 ++++++++ Dockerfile | 2 +- lerna.json | 2 +- package.json | 2 +- packages/jaeger-ui-components/package.json | 2 +- packages/plutono-data/package.json | 2 +- packages/plutono-e2e-selectors/package.json | 2 +- packages/plutono-e2e/package.json | 4 ++-- packages/plutono-runtime/package.json | 6 +++--- packages/plutono-toolkit/package.json | 6 +++--- packages/plutono-ui/package.json | 6 +++--- plugins-bundled/internal/input-datasource/package.json | 8 ++++---- 13 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/workflows/unit-test-backend.yml b/.github/workflows/unit-test-backend.yml index 4f3ea3f0cc..f8c36030fa 100644 --- a/.github/workflows/unit-test-backend.yml +++ b/.github/workflows/unit-test-backend.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.21.0 + go-version: 1.21.1 cache: true cache-dependency-path: | **/go.sum diff --git a/CHANGELOG.md b/CHANGELOG.md index c67ab10f70..9c24e798f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + + +# 7.5.25 (2023-10-04) + +- Upgrade Go to 1.21.0 + + + # 7.5.24 (2023-09-05) diff --git a/Dockerfile b/Dockerfile index 25766b057a..f94629bfbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ENV NODE_ENV=production \ RUN yarn build # Backend builder stage -FROM docker.io/library/golang:1.21.0-alpine3.18 as go-builder +FROM docker.io/library/golang:1.21.1-alpine3.18 as go-builder RUN apk add --no-cache gcc g++ diff --git a/lerna.json b/lerna.json index e00ed58983..537e1c4aac 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "packages": [ "packages/*" ], - "version": "7.5.24" + "version": "7.5.25" } diff --git a/package.json b/package.json index 0fa48c10b2..7469cf48d8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "private": true, "name": "plutono", - "version": "7.5.24", + "version": "7.5.25", "repository": "github:credativ/plutono", "scripts": { "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js", diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index 49b46eef93..6d770e4d50 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@jaegertracing/jaeger-ui-components", - "version": "7.5.24", + "version": "7.5.25", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", diff --git a/packages/plutono-data/package.json b/packages/plutono-data/package.json index d38f40675a..aa383ed351 100644 --- a/packages/plutono-data/package.json +++ b/packages/plutono-data/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-data", - "version": "7.5.24", + "version": "7.5.25", "description": "Plutono Data Library", "keywords": [ "typescript" diff --git a/packages/plutono-e2e-selectors/package.json b/packages/plutono-e2e-selectors/package.json index bedd9792a0..9e7e26cc68 100644 --- a/packages/plutono-e2e-selectors/package.json +++ b/packages/plutono-e2e-selectors/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-e2e-selectors", - "version": "7.5.24", + "version": "7.5.25", "description": "Plutono End-to-End Test Selectors Library", "keywords": [ "cli", diff --git a/packages/plutono-e2e/package.json b/packages/plutono-e2e/package.json index d5e1e53137..74b0994258 100644 --- a/packages/plutono-e2e/package.json +++ b/packages/plutono-e2e/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-e2e", - "version": "7.5.24", + "version": "7.5.25", "description": "Plutono End-to-End Test Library", "keywords": [ "cli", @@ -43,7 +43,7 @@ }, "types": "src/index.ts", "dependencies": { - "@credativ/plutono-e2e-selectors": "7.5.24", + "@credativ/plutono-e2e-selectors": "7.5.25", "@cypress/webpack-preprocessor": "4.1.3", "@grafana/tsconfig": "^1.0.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", diff --git a/packages/plutono-runtime/package.json b/packages/plutono-runtime/package.json index 71955777d9..fd2d18d0d3 100644 --- a/packages/plutono-runtime/package.json +++ b/packages/plutono-runtime/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-runtime", - "version": "7.5.24", + "version": "7.5.25", "description": "Plutono Runtime Library", "keywords": [ "plutono", @@ -22,8 +22,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@credativ/plutono-data": "7.5.24", - "@credativ/plutono-ui": "7.5.24", + "@credativ/plutono-data": "7.5.25", + "@credativ/plutono-ui": "7.5.25", "systemjs": "0.20.19", "systemjs-plugin-css": "0.1.37" }, diff --git a/packages/plutono-toolkit/package.json b/packages/plutono-toolkit/package.json index 8cd6b2b224..4cd5c40d82 100644 --- a/packages/plutono-toolkit/package.json +++ b/packages/plutono-toolkit/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-toolkit", - "version": "7.5.24", + "version": "7.5.25", "description": "Plutono Toolkit", "keywords": [ "plutono", @@ -28,8 +28,8 @@ "dependencies": { "@babel/core": "7.9.0", "@babel/preset-env": "7.9.0", - "@credativ/plutono-data": "7.5.24", - "@credativ/plutono-ui": "7.5.24", + "@credativ/plutono-data": "7.5.25", + "@credativ/plutono-ui": "7.5.25", "@grafana/eslint-config": "2.3.0", "@grafana/tsconfig": "^1.0.0-rc1", "@types/command-exists": "^1.2.0", diff --git a/packages/plutono-ui/package.json b/packages/plutono-ui/package.json index 4e3cd85676..07ff53f718 100644 --- a/packages/plutono-ui/package.json +++ b/packages/plutono-ui/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-ui", - "version": "7.5.24", + "version": "7.5.25", "description": "Plutono Components Library", "keywords": [ "plutono", @@ -27,8 +27,8 @@ }, "dependencies": { "@credativ/plutono-aws-sdk": "0.0.4", - "@credativ/plutono-data": "7.5.24", - "@credativ/plutono-e2e-selectors": "7.5.24", + "@credativ/plutono-data": "7.5.25", + "@credativ/plutono-e2e-selectors": "7.5.25", "@emotion/core": "10.0.27", "@grafana/tsconfig": "^1.0.0-rc1", "@iconscout/react-unicons": "1.1.4", diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json index 0e0fe85762..5e33e3c135 100644 --- a/plugins-bundled/internal/input-datasource/package.json +++ b/plugins-bundled/internal/input-datasource/package.json @@ -1,6 +1,6 @@ { "name": "@credativ/plutono-plugins-input-datasource", - "version": "7.5.24", + "version": "7.5.25", "description": "Input Datasource", "private": true, "repository": { @@ -16,9 +16,9 @@ "author": "Plutono Team", "license": "Apache-2.0", "devDependencies": { - "@credativ/plutono-data": "7.5.24", - "@credativ/plutono-toolkit": "7.5.24", - "@credativ/plutono-ui": "7.5.24" + "@credativ/plutono-data": "7.5.25", + "@credativ/plutono-toolkit": "7.5.25", + "@credativ/plutono-ui": "7.5.25" }, "volta": { "node": "12.16.2" From a017faeec62da7caac771e3e9ac55d1ecdb6378f Mon Sep 17 00:00:00 2001 From: Jan Bolle <117356303+ntap-jbolle@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:10:46 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c24e798f8..1afd900feb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ # 7.5.25 (2023-10-04) -- Upgrade Go to 1.21.0 +- Upgrade Go to 1.21.1 From eca0b827a0ea69c1efa59891e578836a57a92659 Mon Sep 17 00:00:00 2001 From: Marco Nelles Date: Wed, 4 Oct 2023 11:20:58 +0200 Subject: [PATCH 3/3] bump vali changes --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1084993c05..ed2f49f923 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/centrifugal/centrifuge v0.13.0 github.com/cortexproject/cortex v1.8.1 - github.com/credativ/vali v0.0.0-20230615101115-0ba0e095fc0a + github.com/credativ/vali v0.0.0-20231004075841-dd1155be2fce github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce github.com/davecgh/go-spew v1.1.1 github.com/denisenkom/go-mssqldb v0.0.0-20200910202707-1e08a3fab204 diff --git a/go.sum b/go.sum index ee193e4bac..7276f62e33 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/credativ/vali v0.0.0-20230615101115-0ba0e095fc0a h1:iakhN29LzpuyDgbjuQZeXlj3v5DIvBf1oSh2678p5GA= -github.com/credativ/vali v0.0.0-20230615101115-0ba0e095fc0a/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA= +github.com/credativ/vali v0.0.0-20231004075841-dd1155be2fce h1:7b6ILcHEyGOFfEkEn5lm0okBsMvo7vr/2ZV9y6XiLt8= +github.com/credativ/vali v0.0.0-20231004075841-dd1155be2fce/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce h1:pAuTpLhCqC20s2RLhUirfw606jReW+8z2U5EvG+0S7E= github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce/go.mod h1:/gCaeLf13J8/621RNZ6TaExji/8xCWcn6UmdJ57wURQ=