Skip to content

Commit

Permalink
Merge pull request #72 from credativ/7.5.30
Browse files Browse the repository at this point in the history
release 7.5.30
  • Loading branch information
BenSeym authored May 17, 2024
2 parents e9e6b22 + 12cc726 commit 3ca7b29
Show file tree
Hide file tree
Showing 16 changed files with 127 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.21.6
go-version: 1.22.3
cache: true
cache-dependency-path: |
**/go.sum
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<!-- 7.5.30 START -->

# 7.5.30 (2024-05-17)

- New release
- Upgrade Go to 1.22.3
- #63 - New Feature: Added the roleAttributePath to GitHub Social Authentication for automated permission provisioning based on GitHub team membership
- #66 - Bugfix: For the null pointer references when access /public/ context
- #71 - Security: Bump crewjam/saml to v0.4.14 (CVE-2022-41912)

<!-- 7.5.30 END -->

<!-- 7.5.29 START -->

# 7.5.29 (2024-02-06)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV NODE_ENV=production \
RUN yarn build

# Backend builder stage
FROM docker.io/library/golang:1.21.6-alpine3.19 as go-builder
FROM docker.io/library/golang:1.22.3-alpine3.19 as go-builder

RUN apk add --no-cache gcc g++

Expand Down
19 changes: 10 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ require (
github.com/BurntSushi/toml v0.3.1
github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f
github.com/aws/aws-sdk-go v1.37.20
github.com/beevik/etree v1.1.0
github.com/beevik/etree v1.4.0
github.com/benbjohnson/clock v1.0.3
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-20240206081004-953d526e4a01
github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce
github.com/credativ/vali v0.0.0-20240517084608-1003fffa2fe9
github.com/crewjam/saml v0.4.14
github.com/davecgh/go-spew v1.1.1
github.com/denisenkom/go-mssqldb v0.0.0-20200910202707-1e08a3fab204
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
Expand All @@ -41,7 +41,7 @@ require (
github.com/gobwas/glob v0.2.3
github.com/golang/mock v1.5.0
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.7
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.2.0
github.com/gosimple/slug v1.9.0
github.com/grafana/grafana-aws-sdk v0.4.0
Expand All @@ -54,6 +54,7 @@ require (
github.com/influxdata/influxdb-client-go/v2 v2.2.0
github.com/jaegertracing/jaeger v1.22.1-0.20210304164023-2fff3ca58910
github.com/jmespath/go-jmespath v0.4.0
github.com/jonboulle/clockwork v0.4.0 // indirect
github.com/json-iterator/go v1.1.12
github.com/jung-kurt/gofpdf v1.16.2
github.com/lib/pq v1.9.0
Expand All @@ -70,9 +71,9 @@ require (
github.com/prometheus/common v0.18.0
github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967
github.com/robfig/cron/v3 v3.0.1
github.com/russellhaering/goxmldsig v1.1.0
github.com/russellhaering/goxmldsig v1.4.0
github.com/smartystreets/goconvey v1.6.4
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.1
github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
github.com/timberio/go-datemath v0.1.1-0.20200323150745-74ddef604fff
github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329
Expand All @@ -83,10 +84,10 @@ require (
github.com/xorcare/pointer v1.1.0
github.com/yudai/gojsondiff v1.0.0
go.opentelemetry.io/collector v0.21.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
golang.org/x/crypto v0.23.0
golang.org/x/net v0.21.0
golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sync v0.1.0
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
gonum.org/v1/gonum v0.12.0
google.golang.org/api v0.40.0
Expand Down
108 changes: 79 additions & 29 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"packages": [
"packages/*"
],
"version": "7.5.29"
"version": "7.5.30"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "Apache-2.0",
"private": true,
"name": "plutono",
"version": "7.5.29",
"version": "7.5.30",
"repository": "github:credativ/plutono",
"scripts": {
"api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/jaeger-ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jaegertracing/jaeger-ui-components",
"version": "7.5.29",
"version": "7.5.30",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -14,8 +14,8 @@
"typescript": "4.1.2"
},
"dependencies": {
"@credativ/plutono-data": "7.5.24",
"@credativ/plutono-ui": "7.5.24",
"@credativ/plutono-data": "7.5.30",
"@credativ/plutono-ui": "7.5.30",
"@types/classnames": "^2.2.7",
"@types/deep-freeze": "^0.1.1",
"@types/hoist-non-react-statics": "^3.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/plutono-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-data",
"version": "7.5.29",
"version": "7.5.30",
"description": "Plutono Data Library",
"keywords": [
"typescript"
Expand Down
2 changes: 1 addition & 1 deletion packages/plutono-e2e-selectors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-e2e-selectors",
"version": "7.5.29",
"version": "7.5.30",
"description": "Plutono End-to-End Test Selectors Library",
"keywords": [
"cli",
Expand Down
4 changes: 2 additions & 2 deletions packages/plutono-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-e2e",
"version": "7.5.29",
"version": "7.5.30",
"description": "Plutono End-to-End Test Library",
"keywords": [
"cli",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"types": "src/index.ts",
"dependencies": {
"@credativ/plutono-e2e-selectors": "7.5.29",
"@credativ/plutono-e2e-selectors": "7.5.30",
"@cypress/webpack-preprocessor": "4.1.3",
"@grafana/tsconfig": "^1.0.0-rc1",
"@mochajs/json-file-reporter": "^1.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/plutono-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-runtime",
"version": "7.5.29",
"version": "7.5.30",
"description": "Plutono Runtime Library",
"keywords": [
"plutono",
Expand All @@ -22,8 +22,8 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@credativ/plutono-data": "7.5.29",
"@credativ/plutono-ui": "7.5.29",
"@credativ/plutono-data": "7.5.30",
"@credativ/plutono-ui": "7.5.30",
"systemjs": "0.20.19",
"systemjs-plugin-css": "0.1.37"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/plutono-toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-toolkit",
"version": "7.5.29",
"version": "7.5.30",
"description": "Plutono Toolkit",
"keywords": [
"plutono",
Expand All @@ -28,8 +28,8 @@
"dependencies": {
"@babel/core": "7.9.0",
"@babel/preset-env": "7.9.0",
"@credativ/plutono-data": "7.5.29",
"@credativ/plutono-ui": "7.5.29",
"@credativ/plutono-data": "7.5.30",
"@credativ/plutono-ui": "7.5.30",
"@grafana/eslint-config": "2.3.0",
"@grafana/tsconfig": "^1.0.0-rc1",
"@types/command-exists": "^1.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/plutono-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-ui",
"version": "7.5.29",
"version": "7.5.30",
"description": "Plutono Components Library",
"keywords": [
"plutono",
Expand All @@ -27,8 +27,8 @@
},
"dependencies": {
"@credativ/plutono-aws-sdk": "0.0.4",
"@credativ/plutono-data": "7.5.29",
"@credativ/plutono-e2e-selectors": "7.5.29",
"@credativ/plutono-data": "7.5.30",
"@credativ/plutono-e2e-selectors": "7.5.30",
"@emotion/core": "10.0.27",
"@grafana/tsconfig": "^1.0.0-rc1",
"@iconscout/react-unicons": "1.1.4",
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import (
"github.com/credativ/plutono/pkg/setting"
"github.com/credativ/plutono/pkg/util/errutil"

//nolint:staticcheck
"golang.org/x/crypto/openpgp"
//nolint:staticcheck
"golang.org/x/crypto/openpgp/clearsign"
)

Expand Down
8 changes: 4 additions & 4 deletions plugins-bundled/internal/input-datasource/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@credativ/plutono-plugins-input-datasource",
"version": "7.5.29",
"version": "7.5.30",
"description": "Input Datasource",
"private": true,
"repository": {
Expand All @@ -16,9 +16,9 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"devDependencies": {
"@credativ/plutono-data": "7.5.29",
"@credativ/plutono-toolkit": "7.5.29",
"@credativ/plutono-ui": "7.5.29"
"@credativ/plutono-data": "7.5.30",
"@credativ/plutono-toolkit": "7.5.30",
"@credativ/plutono-ui": "7.5.30"
},
"volta": {
"node": "12.16.2"
Expand Down

0 comments on commit 3ca7b29

Please sign in to comment.