Upgrade perses v0.54.0

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
@@ -86,7 +86,7 @@ jobs:
   #     GITHUB_TOKEN: ${{ github.TOKEN }}
   #   steps:
   #     - name: checkout
-  #       uses: actions/checkout@v6
+  #       uses: actions/checkout@v7
   #     - uses: perses/github-actions@v0.12.0
   #     - uses: ./.github/perses-ci/actions/setup_environment
   #       with:

.github/workflows/cue.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - main-logzio
   pull_request:
   merge_group:
   release:
@@ -20,32 +19,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true
           enable_cue: true
-          cue_version: 'v0.15.1'
+          cue_version: "v0.15.4"
       - name: check that CUE schemas evaluate correctly
         run: make cue-eval
       - name: run the unit tests for CUE schemas
         run: make cue-test
 
   publish-module:
-    name: 'publish CUE module to Central Registry'
-    needs: 'validate-schemas'
+    name: "publish CUE module to Central Registry"
+    needs: "validate-schemas"
     runs-on: ubuntu-latest
     if: ${{ github.event.release.tag_name }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true
           enable_cue: true
-          cue_version: 'v0.15.1'
+          cue_version: "v0.15.4"
       - name: Login to Central Registry # to allow publishing the module
         run: cue login --token=${{ secrets.CUE_REG_TOKEN }}
       - name: Publish the module

.github/workflows/go.yml

@@ -11,21 +11,21 @@
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' || github.ref_name != 'main' }}
 
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true
           enable_go_cache: false
           enable_npm: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9.2.1
+        uses: golangci/golangci-lint-action@v9.3.0
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v2.12.2
@@ -35,7 +35,7 @@
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: perses/github-actions@v0.12.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2025 The Perses Authors
+# Copyright The Perses Authors
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/client",
-  "version": "0.54.0-beta.3",
+  "version": "0.54.0",
   "description": "Functions as an API client or Data fetching Layer for interacting with a backend service",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
@@ -15,7 +15,7 @@
   "main": "dist/cjs/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@perses-dev/spec": "0.2.0-beta.2",
+    "@perses-dev/spec": "0.2.0",
     "zod": "^3.21.4"
   },
   "scripts": {

dashboards/src/model/DashboardResource.ts → client/src/model/dashboard.ts

@@ -11,25 +11,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { ProjectMetadata } from '@perses-dev/client';
 import { DashboardSpec } from '@perses-dev/spec';
 
 export type DashboardKind = 'Dashboard' | 'EphemeralDashboard';
 
-/* TODO: As discussed we can keep this intermediary type until we decide on a new location for it. */
-export type DashboardMetaData = {
-  name: string;
-  project: string;
-  createdAt?: string;
-  updatedAt?: string;
-  version?: number;
-};
-
-/* TODO: There is an open and ongoing issue whether the meta-data should be removed or not.
-   Such a decision would affect DashbaordProvider and buildDatasourceProxyUrl
-   https://github.com/perses/perses/issues/4016
-*/
 export interface DashboardResource {
   kind: DashboardKind;
   spec: DashboardSpec;
-  metadata: DashboardMetaData;
+  metadata: ProjectMetadata;
 }

client/src/model/ephemeralDashboard.ts

@@ -0,0 +1,29 @@
+// Copyright The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { ProjectMetadata } from '@perses-dev/client';
+import { DashboardSelector, DashboardSpec, DurationString } from '@perses-dev/spec';
+
+export interface EphemeralDashboardResource {
+  kind: 'EphemeralDashboard';
+  metadata: ProjectMetadata;
+  spec: EphemeralDashboardSpec;
+}
+
+export interface EphemeralDashboardSpec extends DashboardSpec {
+  ttl: DurationString;
+}
+
+export interface EphemeralDashboardInfo extends DashboardSelector {
+  ttl: DurationString;
+}

plugin-system/src/runtime/QueryCountProvider.tsx → client/src/model/folder.ts

@@ -11,19 +11,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { createContext, useContext, ReactNode } from 'react';
+import { ProjectMetadata } from './resource';
 
-interface QueryCountProviderProps {
-  queryCount: number;
-  children: ReactNode;
+export interface FolderDisplay {
+  name?: string;
 }
 
-const QueryCountContext = createContext<number>(0);
+export interface FolderSpec {
+  display?: FolderDisplay;
+  items?: FolderItem[];
+}
 
-export const QueryCountProvider: React.FC<QueryCountProviderProps> = ({ queryCount, children }) => {
-  return <QueryCountContext.Provider value={queryCount}>{children}</QueryCountContext.Provider>;
-};
+export interface FolderItem {
+  kind: 'Folder' | 'Dashboard';
+  name: string;
+  items?: FolderItem[];
+}
 
-export const useQueryCountContext = (): number => {
-  return useContext(QueryCountContext);
-};
+export interface FolderResource {
+  kind: 'Folder';
+  metadata: ProjectMetadata;
+  spec: FolderSpec;
+}

client/src/model/http.ts

@@ -11,10 +11,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { HTTPProxy } from '@perses-dev/spec';
-
 export type RequestHeaders = Record<string, string>;
-export interface HTTPDatasourceSpec {
-  directUrl?: string;
-  proxy?: HTTPProxy;
-}

client/src/model/index.ts

@@ -12,7 +12,15 @@
 // limitations under the License.
 
 export * from './datasource';
+export * from './folder';
 export * from './kind';
 export * from './resource';
 export * from './datasource-api';
 export * from './http';
+export * from './secret';
+export * from './role';
+export * from './roleBindings';
+export * from './user';
+export * from './ephemeralDashboard';
+export * from './variable';
+export * from './dashboard';

client/src/model/resource.ts

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Display } from '@perses-dev/spec';
 import { Kind } from './kind';
 
 export function isProjectMetadata(metadata: Metadata | ProjectMetadata): metadata is ProjectMetadata {
@@ -36,6 +37,16 @@ export interface Resource {
   spec?: any;
 }
 
+export interface ProjectResource {
+  kind: 'Project';
+  metadata: Metadata;
+  spec?: ProjectSpec;
+}
+
+export interface ProjectSpec {
+  display?: Display;
+}
+
 export function getMetadataProject(metadata: ProjectMetadata | Metadata): string | undefined {
   return 'project' in metadata ? metadata.project : undefined;
 }

client/src/model/role.ts

@@ -0,0 +1,68 @@
+// Copyright The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Kind, Metadata, ProjectMetadata } from '@perses-dev/client';
+
+export type Action = 'create' | 'read' | 'update' | 'delete' | '*';
+export const ACTIONS = ['*', 'create', 'read', 'update', 'delete'];
+export type Scope = Kind | '*';
+export const PROJECT_SCOPES = [
+  '*',
+  'Dashboard',
+  'Datasource',
+  'EphemeralDashboard',
+  'Folder',
+  'Project',
+  'Role',
+  'RoleBinding',
+  'Secret',
+  'Variable',
+];
+
+export const GLOBAL_SCOPES = [
+  'GlobalDatasource',
+  'GlobalRole',
+  'GlobalRoleBinding',
+  'GlobalSecret',
+  'GlobalVariable',
+  'User',
+];
+
+export interface Permission {
+  actions: Action[];
+  scopes: Scope[];
+}
+
+export interface RoleSpec {
+  permissions: Permission[];
+}
+
+/**
+ * A role that belongs to a project.
+ */
+export interface RoleResource {
+  kind: 'Role';
+  metadata: ProjectMetadata;
+  spec: RoleSpec;
+}
+
+/**
+ * A global role that doesn´t belong to a project.
+ */
+export interface GlobalRoleResource {
+  kind: 'GlobalRole';
+  metadata: Metadata;
+  spec: RoleSpec;
+}
+
+export type Role = RoleResource | GlobalRoleResource;