From b1573104d4caabd8271b7eb5f9492d2e72536127 Mon Sep 17 00:00:00 2001 From: Alex Khomenko Date: Tue, 3 Jan 2023 14:10:32 +0200 Subject: [PATCH] Schema: Use the latest cuetsy version (#60696) * Schema: Use the latest cuetsy version * Schema: Update Permission * Use latest cuetsy --- go.mod | 2 +- go.sum | 4 ++-- kinds/structured/team/team_kind.cue | 2 +- .../src/raw/dashboard/x/dashboard_types.gen.ts | 18 +++++++++--------- .../src/raw/team/x/team_types.gen.ts | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 696862d7f5f..cf719c1267e 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/google/wire v0.5.0 github.com/gorilla/websocket v1.5.0 github.com/grafana/alerting v0.0.0-20221221211348-c5ab25d1cb8a - github.com/grafana/cuetsy v0.1.1 + github.com/grafana/cuetsy v0.1.5 github.com/grafana/grafana-aws-sdk v0.11.0 github.com/grafana/grafana-azure-sdk-go v1.5.1 github.com/grafana/grafana-plugin-sdk-go v0.147.0 diff --git a/go.sum b/go.sum index d9b7067ec2f..dc0308f71d5 100644 --- a/go.sum +++ b/go.sum @@ -1363,8 +1363,8 @@ github.com/grafana/alerting v0.0.0-20221221211348-c5ab25d1cb8a h1:Ros/f8x4rPGiOy github.com/grafana/alerting v0.0.0-20221221211348-c5ab25d1cb8a/go.mod h1:A+ko8Ui4Ojw9oTi1WMCPH937mFUozN8Y41cqrOfNuy8= github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw= github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s= -github.com/grafana/cuetsy v0.1.1 h1:+1jaDDYCpvKlcOWJgBRbkc5+VZIClCEn5mbI+4PLZqM= -github.com/grafana/cuetsy v0.1.1/go.mod h1:4KWkUOslwvRTpEv7wdQG0jDFTuJmU+0L9x0h4kWxa2A= +github.com/grafana/cuetsy v0.1.5 h1:mnFwAXdbqCsyL8r7kkdUMJ4kOAR26cxIPmrZj7JzTeY= +github.com/grafana/cuetsy v0.1.5/go.mod h1:4KWkUOslwvRTpEv7wdQG0jDFTuJmU+0L9x0h4kWxa2A= github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f h1:FvvSVEbnGeM2bUivGmsiXTi8URJyBU7TcFEEoRe5wWI= github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM= github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 h1:GplhUk6Xes5JIhUUrggPcPBhOn+eT8+WsHiebvq7GgA= diff --git a/kinds/structured/team/team_kind.cue b/kinds/structured/team/team_kind.cue index b5469db4e56..c4ead8ceb29 100644 --- a/kinds/structured/team/team_kind.cue +++ b/kinds/structured/team/team_kind.cue @@ -27,7 +27,7 @@ lineage: seqs: [ // Updated indicates when the team was updated. updated: int64 @grafanamaturity(ToMetadata="sys") - #Permission: 1 | 2 | 4 @cuetsy(kind="enum",memberNames="viewer|editor|admin") + #Permission: 1 | 2 | 4 @cuetsy(kind="enum",memberNames="Viewer|Editor|Admin") }, ] }, diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts index 96650fde5cd..884165728ee 100644 --- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts +++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts @@ -102,9 +102,9 @@ export const defaultVariableModel: Partial = { }; export enum VariableHide { - DontHide = 0, - HideLabel = 1, - HideVariable = 2, + dontHide = 0, + hideLabel = 1, + hideVariable = 2, } export enum LoadingState { @@ -287,7 +287,7 @@ export enum MappingType { * TODO docs */ export interface ValueMap { - options: Record; + options: Record; type: MappingType.ValueToText; } @@ -447,7 +447,7 @@ export interface Panel { /** * TODO docs - seems to be an old field from old dashboard alerts? */ - thresholds?: Array; + thresholds?: Array; /** * TODO docs * TODO tighter constraint @@ -456,7 +456,7 @@ export interface Panel { /** * TODO docs */ - timeRegions?: Array; + timeRegions?: Array; /** * TODO docs * TODO tighter constraint @@ -494,7 +494,7 @@ export interface FieldConfigSource { matcher: MatcherConfig; properties: Array<{ id: string; - value?: any; + value?: unknown; }>; }>; } @@ -505,7 +505,7 @@ export const defaultFieldConfigSource: Partial = { export interface MatcherConfig { id: string; - options?: any; + options?: unknown; } export const defaultMatcherConfig: Partial = { @@ -546,7 +546,7 @@ export interface FieldConfig { /** * The behavior when clicking on a result */ - links?: Array; + links?: Array; /** * Convert input values into a display string */ diff --git a/packages/grafana-schema/src/raw/team/x/team_types.gen.ts b/packages/grafana-schema/src/raw/team/x/team_types.gen.ts index 24bc4e83f6d..177c10168a5 100644 --- a/packages/grafana-schema/src/raw/team/x/team_types.gen.ts +++ b/packages/grafana-schema/src/raw/team/x/team_types.gen.ts @@ -18,7 +18,7 @@ export interface Team { /** * AccessControl metadata associated with a given resource. */ - accessControl?: Record; + accessControl?: Record; /** * AvatarUrl is the team's avatar URL. */