From 4ac8063bda8f0bf3ab9a115d4ff45084a0dac672 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:44:35 +0200 Subject: [PATCH] Scopes: Add redirectUrl to ScopeNode (#112699) * Scopes: Add redirectUrl to ScopeNode * Update go mod --- apps/iam/go.mod | 2 +- apps/iam/go.sum | 4 ++-- apps/scope/README.md | 11 +++++++++++ apps/scope/pkg/apis/scope/v0alpha1/types.go | 3 +++ .../pkg/apis/scope/v0alpha1/zz_generated.openapi.go | 7 +++++++ 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 apps/scope/README.md diff --git a/apps/iam/go.mod b/apps/iam/go.mod index 6144c7e3543..cd46e92a15f 100644 --- a/apps/iam/go.mod +++ b/apps/iam/go.mod @@ -295,7 +295,7 @@ require ( github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect - github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/mattn/go-sqlite3 v1.14.32 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mdlayher/socket v0.4.1 // indirect github.com/mdlayher/vsock v1.2.1 // indirect diff --git a/apps/iam/go.sum b/apps/iam/go.sum index a37c9beae48..704a0c2efe7 100644 --- a/apps/iam/go.sum +++ b/apps/iam/go.sum @@ -1124,8 +1124,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= -github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs= +github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= diff --git a/apps/scope/README.md b/apps/scope/README.md new file mode 100644 index 00000000000..034ae1eda36 --- /dev/null +++ b/apps/scope/README.md @@ -0,0 +1,11 @@ +# Updating OpenAPI spec + +Change the desired types, then run these commands, with the linked Enterprise repo: + +``` +go test --tags "pro" -timeout 30s -run ^TestIntegrationOpenAPIs$ github.com/grafana/grafana/pkg/extensions/apiserver/tests -count=1 +``` + +``` +./hack/update-codegen.sh scope +``` diff --git a/apps/scope/pkg/apis/scope/v0alpha1/types.go b/apps/scope/pkg/apis/scope/v0alpha1/types.go index fcd7812c8da..f4c18dbb729 100644 --- a/apps/scope/pkg/apis/scope/v0alpha1/types.go +++ b/apps/scope/pkg/apis/scope/v0alpha1/types.go @@ -153,6 +153,9 @@ type ScopeNodeSpec struct { LinkType LinkType `json:"linkType,omitempty"` // scope (later more things) LinkID string `json:"linkId,omitempty"` // the k8s name // ?? should this be a slice of links + + // Redirect to a specific URL when this node is selected. + RedirectUrl string `json:"redirectUrl,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/apps/scope/pkg/apis/scope/v0alpha1/zz_generated.openapi.go b/apps/scope/pkg/apis/scope/v0alpha1/zz_generated.openapi.go index 3f31343d82a..7cd7d1287b2 100644 --- a/apps/scope/pkg/apis/scope/v0alpha1/zz_generated.openapi.go +++ b/apps/scope/pkg/apis/scope/v0alpha1/zz_generated.openapi.go @@ -866,6 +866,13 @@ func schema_pkg_apis_scope_v0alpha1_ScopeNodeSpec(ref common.ReferenceCallback) Format: "", }, }, + "redirectUrl": { + SchemaProps: spec.SchemaProps{ + Description: "Redirect to a specific URL when this node is selected.", + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"nodeType", "title", "disableMultiSelect"}, },