Chore: Use getNextRefId instead of deprecated getNextRefIdChar #87460

kaydelaney · 2024-05-07T17:03:19Z

No description provided.

gelicia · 2024-05-07T17:57:35Z

public/app/core/utils/query.ts

-import { DataQuery, DataSourceRef } from '@grafana/data';
-
-// @deprecated use the `getNextRefId` function from grafana/data instead
-export const getNextRefIdChar = (queries: DataQuery[]): string => {


In case anyone wants to check, this is a 1-1 with grafana/data

https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/query/refId.ts#L6

gelicia · 2024-05-07T18:15:48Z

/deploy-to-hg

ephemeral-instances-bot · 2024-05-07T18:25:54Z

Error building instance: Contact #proj-ephemeral-hg-instances if it is not a compile error. Logs

Error message

handling pull request comment event: running grafana-build deb: executing command: stdout= stderr=go: downloading dagger.io/dagger v0.11.0
go: downloading github.com/urfave/cli/v2 v2.27.1
go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0
go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0
go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0
go: downloading go.opentelemetry.io/otel v1.25.0
go: downloading go.opentelemetry.io/otel/sdk v1.25.0
go: downloading go.opentelemetry.io/otel/trace v1.25.0
go: downloading golang.org/x/sync v0.6.0
go: downloading github.com/Khan/genqlient v0.6.0
go: downloading github.com/vektah/gqlparser/v2 v2.5.6
go: downloading github.com/go-logr/logr v1.4.1
go: downloading go.opentelemetry.io/otel/metric v1.25.0
go: downloading go.opentelemetry.io/proto/otlp v1.1.0
go: downloading google.golang.org/protobuf v1.33.0
go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda
go: downloading google.golang.org/grpc v1.63.0
go: downloading golang.org/x/sys v0.18.0
go: downloading github.com/adrg/xdg v0.4.0
go: downloading github.com/mitchellh/go-homedir v1.1.0
go: downloading github.com/99designs/gqlgen v0.17.31
go: downloading golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
go: downloading github.com/cpuguy83/go-md2man/v2 v2.0.2
go: downloading github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
go: downloading github.com/go-logr/stdr v1.2.2
go: downloading github.com/cenkalti/backoff/v4 v4.3.0
go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0
go: downloading golang.org/x/net v0.23.0
go: downloading github.com/Masterminds/semver v1.5.0
go: downloading github.com/russross/blackfriday/v2 v2.1.0
go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de
go: downloading golang.org/x/text v0.14.0
2024/05/07 18:17:35 OTEL_EXPORTER_OTLP_ENDPOINT not set. Disabling tracing.
time=2024-05-07T18:17:43.447Z level=INFO msg="Initializing tar.gz artifact with options" name=grafana-pro "build ID"=12345 version=10.1.0 distro=linux/amd64/dynamic static=false enterprise=true
2024/05/07 18:17:43 if git -C src checkout next-ref-id; then echo "checked out next-ref-id"; else exit 3; fi
2024/05/07 18:20:25 if git -C src checkout main; then echo "checked out main"; else exit 3; fi
time=2024-05-07T18:20:29.379Z level=INFO msg="Initializing backend artifact with options" static=false version=10.1.0 name=grafana-pro distro=linux/amd64/dynamic
2024/05/07 18:20:29 if git -C src checkout next-ref-id; then echo "checked out next-ref-id"; else exit 3; fi
time=2024-05-07T18:20:29.401Z level=INFO msg="Adding artifact to dag..." filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb artifact=deb:pro:linux/amd64/dynamic
time=2024-05-07T18:20:29.401Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler count=1
time=2024-05-07T18:20:29.401Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler count=5
time=2024-05-07T18:20:29.401Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler count=0
time=2024-05-07T18:20:29.401Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
2024/05/07 18:20:29 Building with command 'if [ -d pkg/cmd/grafana ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana -trimpath -tags=osusergo,pro ./pkg/cmd/grafana; fi'
2024/05/07 18:20:29 Building with command 'if [ -d pkg/cmd/grafana-server ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana-server -trimpath -tags=osusergo,pro ./pkg/cmd/grafana-server; fi'
2024/05/07 18:20:29 Building with command 'if [ -d pkg/cmd/grafana-cli ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana-cli -trimpath -tags=osusergo,pro ./pkg/cmd/grafana-cli; fi'
2024/05/07 18:20:29 Building with command 'if [ -d pkg/cmd/grafana-example-apiserver ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana-example-apiserver -trimpath -tags=osusergo,pro ./pkg/cmd/grafana-example-apiserver; fi'
time=2024-05-07T18:20:29.401Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="getting dependencies..." artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-05-07T18:20:29.401Z level=INFO msg="got dependencies" artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler count=0
time=2024-05-07T18:20:29.401Z level=INFO msg="getting builder..." artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-05-07T18:21:12.618Z level=INFO msg="got builder" artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-05-07T18:21:12.618Z level=INFO msg="building directory..." artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-05-07T18:21:12.618Z level=INFO msg="done building directory" artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-05-07T18:21:12.618Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-05-07T18:21:12.618Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler count=0
time=2024-05-07T18:21:12.618Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-05-07T18:21:12.644Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-05-07T18:21:12.644Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-05-07T18:21:12.644Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-05-07T18:21:12.644Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-05-07T18:21:12.644Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler count=0
time=2024-05-07T18:21:12.644Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-05-07T18:21:12.695Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-05-07T18:21:12.695Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-05-07T18:21:12.695Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-05-07T18:21:12.695Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-05-07T18:21:12.695Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler count=0
time=2024-05-07T18:21:12.695Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="building file..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="done building file" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="building file..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="done building file" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-05-07T18:21:12.718Z level=INFO msg="Done adding artifact" filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb artifact=deb:pro:linux/amd64/dynamic
time=2024-05-07T18:21:12.718Z level=INFO msg="Exporting artifacts..."
time=2024-05-07T18:21:12.718Z level=INFO msg="Started exporting artifact..." artifact=deb:pro:linux/amd64/dynamic action=export
time=2024-05-07T18:21:12.718Z level=INFO msg="Acquiring semaphore" artifact=deb:pro:linux/amd64/dynamic action=export
time=2024-05-07T18:21:12.718Z level=INFO msg="Acquired semaphore" artifact=deb:pro:linux/amd64/dynamic action=export
time=2024-05-07T18:21:12.718Z level=INFO msg="Exporting artifact" artifact=deb:pro:linux/amd64/dynamic action=export
error exporting artifact 'grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb': input: container.from.withExec.withExec.withExec.withExec.withExec.withExec.withExec.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withDirectory.withDirectory.withDirectory.withDirectory.withFile.withDirectory.withDirectory.withDirectory.withFile.withFile.withWorkdir.withFile.withMountedCache.withFile.withFile.withFile.withExec.withExec.withExec.withExec.directory resolve: process "/bin/sh -c if [ -d pkg/cmd/grafana ]; then go build -ldflags="-X \"main.version=10.1.0\" -X \"main.commit=$(cat ./.buildinfo.commit)\" -X \"main.buildBranch=$(cat ./.buildinfo.branch)\" -X \"main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)\" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana -trimpath -tags=osusergo,pro ./pkg/cmd/grafana; fi" did not complete successfully: exit code: 1

Stderr:

github.com/grafana/grafana/pkg/extensions/accesscontrol/acimpl

pkg/extensions/accesscontrol/acimpl/service.go:82:84: too many arguments in call to acimpl.ProvideOSSService
have (*"github.com/grafana/grafana/pkg/setting".Cfg, "github.com/grafana/grafana/pkg/extensions/accesscontrol".Store, localcache.CacheService, featuremgmt.FeatureToggles, "github.com/grafana/grafana/pkg/infra/tracing".Tracer)
want ("github.com/grafana/grafana/pkg/setting".Cfg, "github.com/grafana/grafana/pkg/services/accesscontrol".Store, *localcache.CacheService, featuremgmt.FeatureToggles)
pkg/extensions/accesscontrol/acimpl/service.go:319:30: e.store.GetBasicRolesPermissions undefined (type "github.com/grafana/grafana/pkg/extensions/accesscontrol".Store has no field or method GetBasicRolesPermissions)
pkg/extensions/accesscontrol/acimpl/service.go:330:34: e.store.GetTeamsPermissions undefined (type "github.com/grafana/grafana/pkg/extensions/accesscontrol".Store has no field or method GetTeamsPermissions)

github.com/grafana/grafana/pkg/extensions/apiserver/standalone/auth

pkg/extensions/apiserver/standalone/auth/authOptions.go:16:35: undefined: authn.VerifierConfig
pkg/extensions/apiserver/standalone/auth/authOptions.go:17:35: undefined: authn.VerifierConfig
pkg/extensions/apiserver/standalone/auth/fakes.go:9:28: undefined: authn.AccessTokenClaims
pkg/extensions/apiserver/standalone/auth/fakes.go:12:37: undefined: authn.AccessTokenClaims
pkg/extensions/apiserver/standalone/auth/fakes.go:15:98: undefined: authn.AccessTokenClaims
pkg/extensions/apiserver/standalone/auth/fakes.go:19:28: undefined: authn.IDTokenClaims
pkg/extensions/apiserver/standalone/auth/fakes.go:22:37: undefined: authn.IDTokenClaims
pkg/extensions/apiserver/standalone/auth/fakes.go:25:94: undefined: authn.IDTokenClaims
pkg/extensions/apiserver/standalone/auth/tokenAuthenticator.go:34:43: undefined: authn.AccessTokenClaims
pkg/extensions/apiserver/standalone/auth/tokenAuthenticator.go:35:43: undefined: authn.IDTokenClaims
pkg/extensions/apiserver/standalone/auth/fakes.go:25:94: too many errors

github.com/grafana/grafana/pkg/extensions/auth/idimpl

pkg/extensions/auth/idimpl/signer.go:68:21: claims.Rest undefined (type *"github.com/grafana/grafana/pkg/services/auth".IDClaims has no field or method Rest)
pkg/extensions/auth/idimpl/signer.go:69:14: cannot use claims.Claims (variable of type "github.com/go-jose/go-jose/v3/jwt".Claims) as *"github.com/go-jose/go-jose/v3/jwt".Claims value in struct literal
pkg/extensions/auth/idimpl/signer.go:111:35: claims.Rest undefined (type *"github.com/grafana/grafana/pkg/services/auth".IDClaims has no field or method Rest)
exit status 1
exit status 1

Sergej-Vlasov

LGTM! ✅

…-tracker * gops-configuration-tracker: (56 commits) SAML: add referemce to azure ad limitations (#87571) Update dependency glob to v10.3.14 Chore: Updated go.work.sum file (#87622) Update dependency @types/lodash to v4.17.1 (#87419) AdHocFilters: Use queries in ad hoc filters api calls (#87624) TimeSeries: Improve keyboard focus and fix spacebar override (#86848) Dropdown: Fixes double call to onVisibilityChange (#87607) [DOC] Adds missing link to Pyroscope core data source (#85493) Docs: Add Configuring Elasticsearch documentation for required privileges (#87593) Update dependency eslint-plugin-jsdoc to v48.2.4 Chore: Add login protection when user is trying different uppercase letters (#87588) Explore: lookup datasource by name when present in legacy URLs (#85222) Update dependency @prometheus-io/lezer-promql to v0.52.0 (#87554) Update dependency systemjs to v6.15.1 (#87594) Chore: Remove deprecated re-exported template variable types (#87459) Chore: Use getNextRefId instead of deprecated getNextRefIdChar (#87460) Chore: Remove use of deprecated method in AC code (#87541) Chore:: Update authlib version (#87603) Alerting: Reduce number of request fetching rules in the dashboard view using rtkq (#86991) refactor: rename variable ...

Chore: Use getNextRefId instead of deprecated getNextRefIdChar

8fd76ec

kaydelaney added type/chore area/frontend type/debt technical debt no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes labels May 7, 2024

kaydelaney self-assigned this May 7, 2024

kaydelaney requested review from a team as code owners May 7, 2024 17:03

kaydelaney requested review from axelavargas, ivanortegaalba, joshhunt, JoaoSilvaGrafana, gillesdemey, tomratcliffe, konrad147 and soniaAguilarPeiron and removed request for a team May 7, 2024 17:03

grafana-delivery-bot bot added this to the 11.1.x milestone May 7, 2024

grafana-pr-automation bot added the area/explore label May 7, 2024

gelicia reviewed May 7, 2024

View reviewed changes

grafana deleted a comment from ephemeral-instances-bot bot May 7, 2024

Merge remote-tracking branch 'origin/main' into next-ref-id

528a8f8

kaydelaney requested a review from gelicia May 8, 2024 17:01

Sergej-Vlasov approved these changes May 10, 2024

View reviewed changes

kaydelaney merged commit cbe868b into main May 10, 2024
14 checks passed

kaydelaney deleted the next-ref-id branch May 10, 2024 11:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore: Use getNextRefId instead of deprecated getNextRefIdChar #87460

Chore: Use getNextRefId instead of deprecated getNextRefIdChar #87460

kaydelaney commented May 7, 2024

gelicia May 7, 2024

gelicia commented May 7, 2024

ephemeral-instances-bot bot commented May 7, 2024

github.com/grafana/grafana/pkg/extensions/accesscontrol/acimpl

github.com/grafana/grafana/pkg/extensions/apiserver/standalone/auth

github.com/grafana/grafana/pkg/extensions/auth/idimpl

Sergej-Vlasov left a comment

Chore: Use getNextRefId instead of deprecated getNextRefIdChar #87460

Chore: Use getNextRefId instead of deprecated getNextRefIdChar #87460

Conversation

kaydelaney commented May 7, 2024

gelicia May 7, 2024

Choose a reason for hiding this comment

gelicia commented May 7, 2024

ephemeral-instances-bot bot commented May 7, 2024

github.com/grafana/grafana/pkg/extensions/accesscontrol/acimpl

github.com/grafana/grafana/pkg/extensions/apiserver/standalone/auth

github.com/grafana/grafana/pkg/extensions/auth/idimpl

Sergej-Vlasov left a comment

Choose a reason for hiding this comment