Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump devfile/api to 2.3.0; bump devworkspace generator #1156

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore: bump devfile/api to 2.3.0; bump devworkspace generator #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1955b9b
chore: bump devfile/api to 2.3.0; bump devworkspace generator
svor Jul 31, 2024
62dbb4d
fix dependencies check
svor Jul 31, 2024
444aba1
update description of devfile/api in excluded list
svor Jul 31, 2024
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
1 change: 1 addition & 0 deletions .deps/EXCLUDED/dev.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ This file contains a manual contribution to .deps/dev.md and it's needed because
| `fsevents@2.3.3` | transitive dependency |
| `node-gyp@10.1.0` | transitive dependency |
| `nx@19.0.7` | transitive dependency |
| `@devfile/api@2.3.0-1721400636` | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/@devfile/api/2.3.0-1721400636) |
24 changes: 12 additions & 12 deletions .deps/dev.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
| [`@csstools/css-tokenizer@2.2.1`](https://github.com/csstools/postcss-plugins.git) | MIT | clearlydefined |
| [`@csstools/media-query-list-parser@2.1.5`](https://github.com/csstools/postcss-plugins.git) | MIT | clearlydefined |
| [`@csstools/selector-specificity@3.0.0`](https://github.com/csstools/postcss-plugins.git) | MIT-0 | transitive dependency |
| [`@devfile/api@2.2.2-1715367693`](https://github.com/GIT_USER_ID/GIT_REPO_ID.git) | Apache-2.0 | clearlydefined |
| [`@devfile/api@2.3.0-1721400636`](https://github.com/GIT_USER_ID/GIT_REPO_ID.git) | Apache-2.0 | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/@devfile/api/2.3.0-1721400636) |
| [`@discoveryjs/json-ext@0.5.7`](https://github.com/discoveryjs/json-ext.git) | MIT | clearlydefined |
| `@eclipse-che/api@7.86.0` | EPL-2.0 | ecd.che |
| [`@eslint-community/eslint-utils@4.4.0`](https://github.com/eslint-community/eslint-utils) | MIT | #8032 |
| [`@eslint-community/eslint-utils@4.4.0`](https://github.com/eslint-community/eslint-utils) | MIT | #15285 |
| [`@eslint-community/regexpp@4.10.0`](https://github.com/eslint-community/regexpp) | MIT | clearlydefined |
| [`@eslint/eslintrc@2.1.3`](https://github.com/eslint/eslintrc.git) | MIT | #9908 |
| [`@eslint/js@8.53.0`](https://github.com/eslint/eslint.git) | MIT | #11438 |
Expand Down Expand Up @@ -303,7 +303,7 @@
| [`char-regex@1.0.2`](https://github.com/Richienb/char-regex.git) | MIT | clearlydefined |
| [`chardet@0.7.0`](git@github.com:runk/node-chardet.git) | MIT | clearlydefined |
| [`chownr@2.0.0`](git://github.com/isaacs/chownr.git) | ISC | clearlydefined |
| [`chrome-trace-event@1.0.3`](https://github.com/samccone/chrome-trace-event.git) | MIT | #2414 |
| [`chrome-trace-event@1.0.3`](https://github.com/samccone/chrome-trace-event.git) | MIT | #15406 |
| [`ci-info@3.9.0`](https://github.com/watson/ci-info.git) | MIT | clearlydefined |
| [`cjs-module-lexer@1.2.3`](git+https://github.com/nodejs/cjs-module-lexer.git) | MIT | #9069 |
| [`clean-css@5.3.2`](https://github.com/clean-css/clean-css.git) | MIT | clearlydefined |
Expand Down Expand Up @@ -387,7 +387,7 @@
| [`detect-newline@3.1.0`](https://github.com/sindresorhus/detect-newline.git) | MIT | clearlydefined |
| [`diff-sequences@29.6.3`](https://github.com/jestjs/jest.git) | MIT | clearlydefined |
| [`dir-glob@3.0.1`](https://github.com/kevva/dir-glob.git) | MIT | clearlydefined |
| [`doctrine@2.1.0`](https://github.com/eslint/doctrine.git) | Apache-2.0 | #1987 |
| [`doctrine@2.1.0`](https://github.com/eslint/doctrine.git) | Apache-2.0 | #15247 |
| [`dom-accessibility-api@0.5.16`](https://github.com/eps1lon/dom-accessibility-api.git) | MIT | clearlydefined |
| [`dom-converter@0.2.0`](https://github.com/AriaMinaei/dom-converter) | MIT | clearlydefined |
| [`dom-serializer@1.4.1`](git://github.com/cheeriojs/dom-renderer.git) | MIT | clearlydefined |
Expand Down Expand Up @@ -430,10 +430,10 @@
| [`eslint-plugin-react@7.33.2`](https://github.com/jsx-eslint/eslint-plugin-react) | MIT | #9877 |
| [`eslint-plugin-simple-import-sort@10.0.0`](https://github.com/lydell/eslint-plugin-simple-import-sort.git) | MIT | clearlydefined |
| [`eslint-scope@5.1.1`](https://github.com/eslint/eslint-scope.git) | BSD-2-Clause | clearlydefined |
| [`eslint-visitor-keys@3.4.3`](https://github.com/eslint/eslint-visitor-keys.git) | Apache-2.0 | #7729 |
| [`eslint-visitor-keys@3.4.3`](https://github.com/eslint/eslint-visitor-keys.git) | Apache-2.0 | #15274 |
| [`eslint-webpack-plugin@4.0.1`](https://github.com/webpack-contrib/eslint-webpack-plugin.git) | MIT | clearlydefined |
| [`eslint@8.53.0`](https://github.com/eslint/eslint.git) | MIT | #11437 |
| [`espree@9.6.1`](https://github.com/eslint/espree.git) | BSD-2-Clause | #9308 |
| [`espree@9.6.1`](https://github.com/eslint/espree.git) | BSD-2-Clause | #15293 |
| [`esprima@4.0.1`](https://github.com/jquery/esprima.git) | BSD-2-Clause | #995 |
| [`esquery@1.5.0`](https://github.com/estools/esquery.git) | BSD-3-Clause | #7469 |
| [`esrecurse@4.3.0`](https://github.com/estools/esrecurse.git) | BSD-2-Clause | clearlydefined |
Expand All @@ -452,7 +452,7 @@
| [`fast-diff@1.3.0`](https://github.com/jhchen/fast-diff) | Apache-2.0 | clearlydefined |
| [`fast-glob@3.3.2`](https://github.com/mrmlnc/fast-glob.git) | MIT | #9307 |
| [`fast-json-stable-stringify@2.1.0`](git://github.com/epoberezkin/fast-json-stable-stringify.git) | MIT | clearlydefined |
| [`fast-levenshtein@2.0.6`](https://github.com/hiddentao/fast-levenshtein.git) | MIT | #2428 |
| [`fast-levenshtein@2.0.6`](https://github.com/hiddentao/fast-levenshtein.git) | MIT | #15236 |
| [`fastest-levenshtein@1.0.16`](git+https://github.com/ka-weihe/fastest-levenshtein.git) | MIT | clearlydefined |
| [`fb-watchman@2.0.2`](git@github.com:facebook/watchman.git) | Apache-2.0 | #5379 |
| [`figures@3.2.0`](https://github.com/sindresorhus/figures.git) | MIT | clearlydefined |
Expand All @@ -466,7 +466,7 @@
| [`find-up@4.1.0`](https://github.com/sindresorhus/find-up.git) | MIT | clearlydefined |
| [`flat-cache@3.1.1`](https://github.com/jaredwray/flat-cache.git) | MIT | clearlydefined |
| [`flat@5.0.2`](git://github.com/hughsk/flat.git) | BSD-3-Clause | clearlydefined |
| [`flatted@3.2.9`](git+https://github.com/WebReflection/flatted.git) | ISC | #2430 |
| [`flatted@3.2.9`](git+https://github.com/WebReflection/flatted.git) | ISC | #15360 |
| [`for-each@0.3.3`](git://github.com/Raynos/for-each.git) | MIT | clearlydefined |
| [`foreground-child@3.1.1`](git+https://github.com/tapjs/foreground-child.git) | ISC | #8232 |
| [`forever-agent@0.6.1`](https://github.com/mikeal/forever-agent) | Apache-2.0 | clearlydefined |
Expand Down Expand Up @@ -645,7 +645,7 @@
| [`json-stable-stringify-without-jsonify@1.0.1`](git://github.com/samn/json-stable-stringify.git) | MIT | clearlydefined |
| [`json-stringify-nice@1.1.4`](https://github.com/isaacs/json-stringify-nice) | ISC | clearlydefined |
| [`json-stringify-safe@5.0.1`](git://github.com/isaacs/json-stringify-safe) | ISC | clearlydefined |
| [`json5@2.2.3`](git+https://github.com/json5/json5.git) | MIT | #2126 |
| [`json5@2.2.3`](git+https://github.com/json5/json5.git) | MIT | #15226 |
| [`jsonc-parser@3.2.0`](https://github.com/microsoft/node-jsonc-parser) | MIT | #12891 |
| [`jsonfile@6.1.0`](git@github.com:jprichardson/node-jsonfile.git) | MIT | clearlydefined |
| [`jsonparse@1.3.1`](http://github.com/creationix/jsonparse.git) | MIT | clearlydefined |
Expand Down Expand Up @@ -742,7 +742,7 @@
| [`oauth-sign@0.9.0`](https://github.com/mikeal/oauth-sign) | Apache-2.0 | clearlydefined |
| [`object-hash@2.2.0`](https://github.com/puleos/object-hash) | MIT | clearlydefined |
| [`object-keys@1.1.1`](git://github.com/ljharb/object-keys.git) | MIT | clearlydefined |
| [`object.assign@4.1.4`](git://github.com/ljharb/object.assign.git) | MIT | #3232 |
| [`object.assign@4.1.4`](git://github.com/ljharb/object.assign.git) | MIT | #15306 |
| [`object.entries@1.1.7`](git://github.com/es-shims/Object.entries.git) | MIT | #4671 |
| [`object.fromentries@2.0.7`](git://github.com/es-shims/Object.fromEntries.git) | MIT | #4600 |
| [`object.hasown@1.1.3`](https://github.com/es-shims/Object.hasOwn.git) | MIT | #4667 |
Expand Down Expand Up @@ -866,7 +866,7 @@
| [`resolve-cwd@3.0.0`](https://github.com/sindresorhus/resolve-cwd.git) | MIT | clearlydefined |
| [`resolve-from@5.0.0`](https://github.com/sindresorhus/resolve-from.git) | MIT | clearlydefined |
| [`resolve.exports@2.0.2`](https://github.com/lukeed/resolve.exports.git) | MIT | clearlydefined |
| [`resolve@1.22.8`](git://github.com/browserify/resolve.git) | MIT | #2409 |
| [`resolve@1.22.8`](git://github.com/browserify/resolve.git) | MIT | #15315 |
| [`restore-cursor@3.1.0`](https://github.com/sindresorhus/restore-cursor.git) | MIT | clearlydefined |
| [`retry@0.12.0`](git://github.com/tim-kos/node-retry.git) | MIT | clearlydefined |
| [`reusify@1.0.4`](git+https://github.com/mcollina/reusify.git) | MIT | clearlydefined |
Expand Down Expand Up @@ -996,7 +996,7 @@
| [`uri-js@4.4.1`](http://github.com/garycourt/uri-js) | BSD-2-Clause | #1086 |
| [`url-parse@1.5.10`](https://github.com/unshiftio/url-parse.git) | MIT | clearlydefined |
| [`utila@0.4.0`](https://github.com/AriaMinaei/utila.git) | MIT | clearlydefined |
| [`uuid@8.3.2`](https://github.com/uuidjs/uuid.git) | MIT | #2438 |
| [`uuid@8.3.2`](https://github.com/uuidjs/uuid.git) | MIT | #15399 |
| [`v8-compile-cache@2.3.0`](https://github.com/zertosh/v8-compile-cache.git) | MIT | clearlydefined |
| [`v8-to-istanbul@9.1.3`](https://github.com/istanbuljs/v8-to-istanbul.git) | ISC | clearlydefined |
| [`validate-npm-package-license@3.0.4`](https://github.com/kemitchell/validate-npm-package-license.js.git) | Apache-2.0 | #2562 |
Expand Down
9 changes: 5 additions & 4 deletions .deps/prod.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
| Packages | License | Resolved CQs |
| --- | --- | --- |
| [`@babel/runtime@7.23.2`](https://github.com/babel/babel.git) | MIT | #10718 |
| [`@eclipse-che/common@7.88.0-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che |
| [`@eclipse-che/dashboard-backend@7.88.0-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che |
| [`@eclipse-che/dashboard-frontend@7.88.0-next`](git://github.com/eclipse/che-dashboard.git) | EPL-2.0 | ecd.che |
| [`@eclipse-che/common@7.90.0-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che |
| [`@eclipse-che/dashboard-backend@7.90.0-next`](https://github.com/eclipse-che/che-dashboard) | EPL-2.0 | ecd.che |
| [`@eclipse-che/dashboard-frontend@7.90.0-next`](git://github.com/eclipse/che-dashboard.git) | EPL-2.0 | ecd.che |
| [`@patternfly/react-core@4.278.0`](https://github.com/patternfly/patternfly-react.git) | MIT | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/@patternfly/react-core/4.278.0) |
| [`@patternfly/react-icons@4.93.7`](https://github.com/patternfly/patternfly-react.git) | MIT | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/@patternfly/react-icons/4.93.7) |
| `@patternfly/react-styles@4.92.8` | MIT | clearlydefined |
Expand Down Expand Up @@ -98,6 +98,7 @@
| [`mime-types@2.1.35`](https://github.com/jshttp/mime-types.git) | MIT | clearlydefined |
| [`minimalistic-assert@1.0.1`](https://github.com/calvinmetcalf/minimalistic-assert.git) | ISC | clearlydefined |
| [`minimalistic-crypto-utils@1.0.1`](git+ssh://git@github.com/indutny/minimalistic-crypto-utils.git) | MIT | clearlydefined |
| [`multi-ini@2.3.2`](git://github.com/evangelion1204/multi-ini.git) | MIT | clearlydefined |
| [`nanoid@3.3.7`](https://github.com/ai/nanoid.git) | MIT | #7571 |
| [`object-assign@4.1.1`](https://github.com/sindresorhus/object-assign.git) | MIT | clearlydefined |
| [`object-inspect@1.13.1`](git://github.com/inspect-js/object-inspect.git) | MIT | #11078 |
Expand Down Expand Up @@ -146,7 +147,7 @@
| [`set-function-length@1.2.2`](git+https://github.com/ljharb/set-function-length.git) | MIT | #12772 |
| [`sha.js@2.4.11`](git://github.com/crypto-browserify/sha.js.git) | (MIT AND BSD-3-Clause) | #1031 |
| [`side-channel@1.0.6`](git+https://github.com/ljharb/side-channel.git) | MIT | clearlydefined |
| [`source-map-js@1.0.2`](https://github.com/7rulnik/source-map-js.git) | BSD-3-Clause | #2412 |
| [`source-map-js@1.0.2`](https://github.com/7rulnik/source-map-js.git) | BSD-3-Clause | #15401 |
| [`stream-browserify@3.0.0`](git://github.com/browserify/stream-browserify.git) | MIT | clearlydefined |
| [`string_decoder@1.3.0`](git://github.com/nodejs/string_decoder.git) | MIT | clearlydefined |
| [`tabbable@5.3.3`](git+https://github.com/focus-trap/tabbable.git) | MIT | clearlydefined |
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test:watch": "yarn test --watch"
},
"devDependencies": {
"@devfile/api": "2.2.2-1715367693",
"@devfile/api": "2.3.0-1721400636",
"@kubernetes/client-node": "^0.21.0",
"@types/jest": "^29.5.3",
"@typescript-eslint/eslint-plugin": "^6.3.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/common/src/dto/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import {
V1alpha2DevWorkspace,
V222Devfile,
V222DevfileComponents,
V230Devfile,
V230DevfileComponents,
} from '@devfile/api';
import { CoreV1EventList, V1PodList } from '@kubernetes/client-node';
import * as webSocket from './webSocket';
Expand Down Expand Up @@ -108,7 +108,7 @@ export interface IServerConfig {
};
defaults: {
editor: string | undefined;
components: V222DevfileComponents[];
components: V230DevfileComponents[];
plugins: IWorkspacesDefaultPlugins[];
pvcStrategy: string | undefined;
};
Expand Down Expand Up @@ -160,7 +160,7 @@ export interface IDevWorkspacePreferences {
[key: string]: string | string[];
}

export type IEditors = Array<V222Devfile>;
export type IEditors = Array<V230Devfile>;

export type IEventList = CoreV1EventList;
export type IPodList = V1PodList;
Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
],
"license": "EPL-2.0",
"dependencies": {
"@devfile/api": "2.2.2-1715367693",
"@eclipse-che/che-devworkspace-generator": "7.88.0-next-a2e5c63",
"@devfile/api": "2.3.0-1721400636",
"@eclipse-che/che-devworkspace-generator": "7.89.0-next-784dff2",
"@eclipse-che/common": "file:../common",
"@fastify/cors": "^9.0.1",
"@fastify/error": "^3.4.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/dashboard-backend/src/devworkspaceClient/services/__tests__/editorsApi.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Red Hat, Inc. - initial API and implementation
*/

import { V222Devfile } from '@devfile/api';
import { V230Devfile } from '@devfile/api';
import { V1ConfigMapList } from '@kubernetes/client-node/dist/gen/model/v1ConfigMapList';
import http from 'http';
import * as yaml from 'js-yaml';
Expand Down Expand Up @@ -70,7 +70,7 @@ describe('EditorsApiService', () => {
(yaml.load as jest.Mock).mockReturnValue({ schemaVersion: '2.2.2' });

const result = await editorsApiService.list();
expect(result).toEqual([{ schemaVersion: '2.2.2' } as V222Devfile]);
expect(result).toEqual([{ schemaVersion: '2.2.2' } as V230Devfile]);
expect(coreV1API.listNamespacedConfigMap).toHaveBeenCalledWith(
'test-namespace',
undefined,
Expand Down Expand Up @@ -166,7 +166,7 @@ describe('EditorsApiService', () => {
version: 'insiders',
},
},
} as V222Devfile);
} as V230Devfile);
});

it('should return matching editor yaml when provided with editorId when multiple editors exist', async () => {
Expand Down Expand Up @@ -232,7 +232,7 @@ describe('EditorsApiService', () => {
version: 'latest',
},
},
} as V222Devfile);
} as V230Devfile);
});

it('should throw exception if no matching editor exists', async () => {
Expand Down
10 changes: 5 additions & 5 deletions packages/dashboard-backend/src/devworkspaceClient/services/editorsApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Red Hat, Inc. - initial API and implementation
*/

import { V222Devfile } from '@devfile/api';
import { V230Devfile } from '@devfile/api';
import { V1ConfigMapList } from '@kubernetes/client-node/dist/gen/model/v1ConfigMapList';
import http from 'http';
import * as yaml from 'js-yaml';
Expand Down Expand Up @@ -50,7 +50,7 @@ export class EditorsApiService implements IEditorsApi {
};
}

async list(): Promise<V222Devfile[]> {
async list(): Promise<V230Devfile[]> {
if (!this.env.NAMESPACE) {
logger.warn('Mandatory environment variables are not defined: $CHECLUSTER_CR_NAMESPACE');
return [];
Expand All @@ -71,7 +71,7 @@ export class EditorsApiService implements IEditorsApi {
throw createError(error, API_ERROR_LABEL, additionalMessage);
}

const editors: V222Devfile[] = [];
const editors: V230Devfile[] = [];

for (const cm of response.body.items) {
if (cm.data === undefined) {
Expand All @@ -80,7 +80,7 @@ export class EditorsApiService implements IEditorsApi {

for (const key in cm.data) {
try {
const editor = yaml.load(cm.data[key]) as V222Devfile;
const editor = yaml.load(cm.data[key]) as V230Devfile;
editors.push(editor);
} catch (error) {
logger.error(
Expand All @@ -96,7 +96,7 @@ export class EditorsApiService implements IEditorsApi {
return editors;
}

async get(id: string): Promise<V222Devfile> {
async get(id: string): Promise<V230Devfile> {
const editors = await this.list();
const matches = editors.filter(editor => {
const currId =
Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard-backend/src/devworkspaceClient/services/serverConfigApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Red Hat, Inc. - initial API and implementation
*/

import { V222DevfileComponents } from '@devfile/api';
import { V230DevfileComponents } from '@devfile/api';
import { api } from '@eclipse-che/common';
import * as k8s from '@kubernetes/client-node';
import { readFileSync } from 'fs';
Expand Down Expand Up @@ -131,7 +131,7 @@ export class ServerConfigApiService implements IServerConfigApi {
);
}

getDefaultComponents(cheCustomResource: CheClusterCustomResource): V222DevfileComponents[] {
getDefaultComponents(cheCustomResource: CheClusterCustomResource): V230DevfileComponents[] {
if (cheCustomResource.spec.devEnvironments?.defaultComponents) {
return cheCustomResource.spec.devEnvironments.defaultComponents;
}
Expand Down
12 changes: 6 additions & 6 deletions packages/dashboard-backend/src/devworkspaceClient/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import {
V1alpha2DevWorkspace,
V1alpha2DevWorkspaceTemplate,
V222DevfileComponents,
V230DevfileComponents,
} from '@devfile/api';
import { V222Devfile } from '@devfile/api';
import { V230Devfile } from '@devfile/api';
import { api } from '@eclipse-che/common';
import * as k8s from '@kubernetes/client-node';
import { IncomingHttpHeaders } from 'http';
Expand Down Expand Up @@ -150,7 +150,7 @@ export type CheClusterCustomResourceSpecDevEnvironments = {
containerBuildConfiguration?: {
openShiftSecurityContextConstraint?: string;
};
defaultComponents?: V222DevfileComponents[];
defaultComponents?: V230DevfileComponents[];
defaultNamespace?: {
autoProvision?: boolean;
template?: string;
Expand Down Expand Up @@ -280,7 +280,7 @@ export interface IServerConfigApi {
* Returns the default components applied to DevWorkspaces.
* These default components are meant to be used when a Devfile does not contain any components.
*/
getDefaultComponents(cheCustomResource: CheClusterCustomResource): V222DevfileComponents[];
getDefaultComponents(cheCustomResource: CheClusterCustomResource): V230DevfileComponents[];
/**
* Returns the plugin registry.
*/
Expand Down Expand Up @@ -456,14 +456,14 @@ export interface IEditorsApi {
/**
* Reads all Editors from ConfigMaps.
*/
list(): Promise<Array<V222Devfile>>;
list(): Promise<Array<V230Devfile>>;

/**
* Returns an Editor from ConfigMap by its editorId.
* @param id editorId in the format of publisher/name/version
* @throws EditorNotFoundError if editor is not found
*/
get(id: string): Promise<V222Devfile>;
get(id: string): Promise<V230Devfile>;
}

export interface IShhKeysApi {
Expand Down
8 changes: 4 additions & 4 deletions packages/dashboard-backend/src/routes/api/helpers/__mocks__/getDevWorkspaceClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import {
V1alpha2DevWorkspace,
V1alpha2DevWorkspaceTemplate,
V222Devfile,
V222DevfileComponents,
V230Devfile,
V230DevfileComponents,
} from '@devfile/api';
import { api } from '@eclipse-che/common';
import { IncomingHttpHeaders } from 'http';
Expand All @@ -43,7 +43,7 @@ export const stubContainerBuild = {
disableContainerBuildCapabilities: true,
};
export const stubDashboardWarning = 'Dashboard warning';
export const stubDefaultComponents: V222DevfileComponents[] = [];
export const stubDefaultComponents: V230DevfileComponents[] = [];
export const stubDefaultEditor = undefined;
export const stubDefaultPlugins: api.IWorkspacesDefaultPlugins[] = [];
export const stubPluginRegistry = { openVSXURL: 'openvsx-url' };
Expand Down Expand Up @@ -103,7 +103,7 @@ export const stubEventsList: api.IEventList = {
items: [],
};

export const editorsArray: V222Devfile[] = [
export const editorsArray: V230Devfile[] = [
{
schemaVersion: '2.2.2',
metadata: {
Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"stream-browserify": "^3.0.0"
},
"devDependencies": {
"@devfile/api": "2.2.2-1715367693",
"@devfile/api": "2.3.0-1721400636",
"@eclipse-che/api": "^7.86.0",
"@kubernetes/client-node": "^0.21.0",
"@react-mock/state": "^0.1.8",
Expand Down
Loading
Loading