Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { Health } from '@kubernetes/client-node';
import { beforeEach, describe, expect, test, vi } from 'vitest';

import { ContextHealthChecker } from './context-health-checker.js';
import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

vi.mock('@kubernetes/client-node');

Expand Down
6 changes: 3 additions & 3 deletions packages/extension/src/manager/context-health-checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import { Health } from '@kubernetes/client-node';
import type { Disposable } from '@podman-desktop/api';

import type { Event } from '../types/emitter.js';
import { Emitter } from '../types/emitter.js';
import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { Event } from '/@/types/emitter.js';
import { Emitter } from '/@/types/emitter.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

export interface ContextHealthState {
kubeConfig: KubeConfigSingleContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';

import type { ContextPermissionResult, ContextResourcePermission } from './context-permissions-checker.js';
import { ContextPermissionsChecker } from './context-permissions-checker.js';
import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

describe('ContextPermissionsChecker is built with a non recursive request', async () => {
let permissionsChecker: ContextPermissionsChecker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import type {
import { AuthorizationV1Api } from '@kubernetes/client-node';
import type { Disposable } from '@podman-desktop/api';

import type { Event } from '../types/emitter.js';
import { Emitter } from '../types/emitter.js';
import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { Event } from '/@/types/emitter.js';
import { Emitter } from '/@/types/emitter.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

export interface ContextPermissionsRequest {
// the request to send
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { KubeConfig } from '@kubernetes/client-node';
import { beforeEach, expect, test, vi } from 'vitest';

import { ContextsDispatcher } from './contexts-dispatcher.js';
import { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

const contexts = [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/extension/src/manager/contexts-dispatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import type { KubeConfig } from '@kubernetes/client-node';

import type { Event } from '../types/emitter.js';
import { Emitter } from '../types/emitter.js';
import { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { Event } from '/@/types/emitter.js';
import { Emitter } from '/@/types/emitter.js';
import { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

export interface DispatcherEvent {
contextName: string;
Expand Down
8 changes: 4 additions & 4 deletions packages/extension/src/manager/contexts-manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import {
type ContextResourcePermission,
} from './context-permissions-checker.js';
import { ContextsManager } from './contexts-manager.js';
import { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { ResourceFactory } from '../resources/resource-factory.js';
import { ResourceFactoryBase } from '../resources/resource-factory.js';
import type { CacheUpdatedEvent, OfflineEvent, ResourceInformer } from '../types/resource-informer.js';
import { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from '/@/resources/resource-factory.js';
import { ResourceFactoryBase } from '/@/resources/resource-factory.js';
import type { CacheUpdatedEvent, OfflineEvent, ResourceInformer } from '/@/types/resource-informer.js';

const onCacheUpdatedMock = vi.fn<Event<CacheUpdatedEvent>>();
const onOfflineMock = vi.fn<Event<OfflineEvent>>();
Expand Down
36 changes: 18 additions & 18 deletions packages/extension/src/manager/contexts-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ import type { ResourceCount } from '/@common/model/kubernetes-resource-count.js'
import type { KubernetesContextResources } from '/@common/model/kubernetes-resources.js';
import type { KubernetesTroubleshootingInformation } from '/@common/model/kubernetes-troubleshooting.js';

import type { Event } from '../types/emitter.js';
import { Emitter } from '../types/emitter.js';
import { ConfigmapsResourceFactory } from '../resources/configmaps-resource-factory.js';
import type { Event } from '/@/types/emitter.js';
import { Emitter } from '/@/types/emitter.js';
import { ConfigmapsResourceFactory } from '/@/resources/configmaps-resource-factory.js';
import type { ContextHealthState } from './context-health-checker.js';
import { ContextHealthChecker } from './context-health-checker.js';
import type { ContextPermissionResult } from './context-permissions-checker.js';
import { ContextPermissionsChecker } from './context-permissions-checker.js';
import { ContextResourceRegistry } from '../registry/context-resource-registry.js';
import { ContextResourceRegistry } from '/@/registry/context-resource-registry.js';
import type { CurrentChangeEvent, DispatcherEvent } from './contexts-dispatcher.js';
import { ContextsDispatcher } from './contexts-dispatcher.js';
import { CronjobsResourceFactory } from '../resources/cronjobs-resource-factory.js';
import { DeploymentsResourceFactory } from '../resources/deployments-resource-factory.js';
import { EventsResourceFactory } from '../resources/events-resource-factory.js';
import { IngressesResourceFactory } from '../resources/ingresses-resource-factory.js';
import { JobsResourceFactory } from '../resources/jobs-resource-factory.js';
import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import { NodesResourceFactory } from '../resources/nodes-resource-factory.js';
import { PodsResourceFactory } from '../resources/pods-resource-factory.js';
import { PVCsResourceFactory } from '../resources/pvcs-resource-factory.js';
import type { ResourceFactory } from '../resources/resource-factory.js';
import { CronjobsResourceFactory } from '/@/resources/cronjobs-resource-factory.js';
import { DeploymentsResourceFactory } from '/@/resources/deployments-resource-factory.js';
import { EventsResourceFactory } from '/@/resources/events-resource-factory.js';
import { IngressesResourceFactory } from '/@/resources/ingresses-resource-factory.js';
import { JobsResourceFactory } from '/@/resources/jobs-resource-factory.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import { NodesResourceFactory } from '/@/resources/nodes-resource-factory.js';
import { PodsResourceFactory } from '/@/resources/pods-resource-factory.js';
import { PVCsResourceFactory } from '/@/resources/pvcs-resource-factory.js';
import type { ResourceFactory } from '/@/resources/resource-factory.js';
import { ResourceFactoryHandler } from './resource-factory-handler.js';
import type { CacheUpdatedEvent, OfflineEvent, ResourceInformer } from '../types/resource-informer.js';
import { RoutesResourceFactory } from '../resources/routes-resource-factory.js';
import { SecretsResourceFactory } from '../resources/secrets-resource-factory.js';
import { ServicesResourceFactory } from '../resources/services-resource-factory.js';
import type { CacheUpdatedEvent, OfflineEvent, ResourceInformer } from '/@/types/resource-informer.js';
import { RoutesResourceFactory } from '/@/resources/routes-resource-factory.js';
import { SecretsResourceFactory } from '/@/resources/secrets-resource-factory.js';
import { ServicesResourceFactory } from '/@/resources/services-resource-factory.js';

const HEALTH_CHECK_TIMEOUT_MS = 5_000;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import { expect, test, vi } from 'vitest';

import type { IDisposable } from '../types/disposable.js';
import type { IDisposable } from '/@/types/disposable.js';
import type { ContextPermission } from '/@common/model/kubernetes-contexts-permissions.js';

import type { ApiSenderType } from '/@common/model/api-sender.js';
Expand All @@ -27,7 +27,7 @@ import type { ContextPermissionResult } from './context-permissions-checker.js';
import type { DispatcherEvent } from './contexts-dispatcher.js';
import type { ContextsManager } from './contexts-manager.js';
import { ContextsStatesDispatcher } from './contexts-states-dispatcher.js';
import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';

test('ContextsStatesDispatcher should call updateHealthStates when onContextHealthStateChange event is fired', () => {
const manager: ContextsManager = {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/manager/resource-factory-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import util from 'node:util';

import type { ContextPermissionsRequest } from './context-permissions-checker.js';
import type { ResourceFactory } from '../resources/resource-factory.js';
import { isResourceFactoryWithPermissions } from '../resources/resource-factory.js';
import type { ResourceFactory } from '/@/resources/resource-factory.js';
import { isResourceFactoryWithPermissions } from '/@/resources/resource-factory.js';

export class ResourceFactoryHandler {
#resourceFactories: ResourceFactory[] = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1ConfigMap, V1ConfigMapList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class ConfigmapsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1CronJob, V1CronJobList } from '@kubernetes/client-node';
import { BatchV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class CronjobsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Deployment, V1DeploymentList } from '@kubernetes/client-node';
import { AppsV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class DeploymentsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/events-resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { CoreV1Event, CoreV1EventList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class EventsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Ingress, V1IngressList } from '@kubernetes/client-node';
import { NetworkingV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class IngressesResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/jobs-resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Job, V1JobList } from '@kubernetes/client-node';
import { BatchV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class JobsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/nodes-resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Node, V1NodeList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class NodesResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/pods-resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Pod, V1PodList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class PodsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/pvcs-resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1PersistentVolumeClaim, V1PersistentVolumeClaimList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class PVCsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { expect, test } from 'vitest';
import { DeploymentsResourceFactory } from './deployments-resource-factory.js';
import { PodsResourceFactory } from './pods-resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceFactoryHandler } from '../manager/resource-factory-handler.js';
import { ResourceFactoryHandler } from '/@/manager/resource-factory-handler.js';

test('with 1 level and same request', () => {
const factoryHandler = new ResourceFactoryHandler();
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/resource-factory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import type { V1Pod } from '@kubernetes/client-node';
import { expect, test } from 'vitest';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import { isResourceFactoryWithPermissions, ResourceFactoryBase } from './resource-factory.js';
import type { ResourceInformer } from '../types/resource-informer.js';
import type { ResourceInformer } from '/@/types/resource-informer.js';

test('ResourceFactoryBase set permissions', () => {
const factory = new ResourceFactoryBase({ resource: 'resource1' });
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
***********************************************************************/
import type { KubernetesObject, V1ResourceAttributes } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { ResourceInformer } from '../types/resource-informer.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceInformer } from '/@/types/resource-informer.js';

export interface ResourcePermissionsFactory {
get permissionsRequests(): V1ResourceAttributes[];
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/resources/routes-resource-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import { CustomObjectsApi } from '@kubernetes/client-node';

import type { V1Route } from '/@common/model/openshift-types.js';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class RoutesResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Secret, V1SecretList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class SecretsResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import type { V1Service, V1ServiceList } from '@kubernetes/client-node';
import { CoreV1Api } from '@kubernetes/client-node';

import type { KubeConfigSingleContext } from '../types/kubeconfig-single-context.js';
import type { KubeConfigSingleContext } from '/@/types/kubeconfig-single-context.js';
import type { ResourceFactory } from './resource-factory.js';
import { ResourceFactoryBase } from './resource-factory.js';
import { ResourceInformer } from '../types/resource-informer.js';
import { ResourceInformer } from '/@/types/resource-informer.js';

export class ServicesResourceFactory extends ResourceFactoryBase implements ResourceFactory {
constructor() {
Expand Down