Skip to content
New issue

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

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

Already on GitHub? # to your account

Bump forklift type version #1184

Merged
merged 1 commit into from
Jun 2, 2024
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
7,739 changes: 5,420 additions & 2,319 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 1 addition & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,9 @@
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/jsdom": "^21.1.1",
"@types/node": "^20.1.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"concurrently": "^8.2.0",
"copyfiles": "^2.4.1",
"crdtoapi": "^0.0.14",
"cypress": "^12.8.1",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -74,8 +70,6 @@
"i18next-parser": "^6.5.0",
"jest": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"jsdom": "^22.0.0",
"jsonc-parser": "^3.2.0",
"prettier": "^2.7.1",
"prettier-stylelint": "^0.4.2",
"rollup-plugin-analyzer": "^4.0.0",
Expand All @@ -85,10 +79,7 @@
"stylelint-config-standard": "^26.0.0",
"ts-jest": "^28.0.7",
"ts-node": "^10.9.1",
"tsc-alias": "^1.8.6",
"type-fest": "^3.10.0",
"typescript": "^4.7.4",
"webpack": "^5.79.0",
"webpack-merge": "^5.8.0"
"webpack": "^5.79.0"
}
}
3 changes: 1 addition & 2 deletions packages/forklift-console-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"jsonpath": "^1.1.1",
"jsrsasign": "11.1.0",
"luxon": "^3.3.0",
"streamsaver": "^2.0.6",
"use-immer": "^0.9.0"
},
"peerDependencies": {
Expand All @@ -45,7 +44,7 @@
"react-router-dom": "5.3.x"
},
"devDependencies": {
"@kubev2v/types": "0.0.15",
"@kubev2v/types": "0.0.16",
"@kubev2v/webpack": "*",
"@openshift-console/dynamic-plugin-sdk-webpack": "0.0.11",
"@types/react": "^17.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ describe('Provider Utils', () => {
kind: '',
spec: {
type: 'openshift',
secret: undefined,
},
};

Expand All @@ -55,6 +56,7 @@ describe('Provider Utils', () => {
kind: '',
spec: {
type: 'nonTargetType',
secret: undefined,
},
};

Expand All @@ -70,6 +72,7 @@ describe('Provider Utils', () => {
kind: '',
spec: {
type: 'vsphere',
secret: undefined,
},
};

Expand All @@ -83,6 +86,7 @@ describe('Provider Utils', () => {
kind: '',
spec: {
type: 'nonSourceType',
secret: undefined,
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export function providerAndSecretValidator(
secret: IoK8sApiCoreV1Secret,
): ValidationMsg {
const type = provider?.spec?.type || '';
const subType = provider?.spec?.settings?.['sdkEndpoint'] || '';
const subTypeString = provider?.spec?.settings?.['sdkEndpoint'] || '';
const subType = subTypeString === 'esxi' ? 'esxi' : 'vcenter';

const secretValidation = secretValidator(type, subType, secret);
const providerValidation = providerValidator(provider);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ export const planTemplate: V1beta1Plan = {
namespace: undefined,
},
spec: {
map: {},
map: {
network: undefined,
storage: undefined,
},
targetNamespace: '',
provider: undefined,
vms: [],
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export const CredentialsSection: React.FC<CredentialsProps> = (props) => {
const { provider } = data;

const type = provider?.spec?.type;
const subType = provider?.spec?.settings?.['sdkEndpoint'] || '';
const subTypeString = provider?.spec?.settings?.['sdkEndpoint'] || '';
const subType = subTypeString === 'esxi' ? 'esxi' : 'vcenter';

if (!provider?.spec?.secret?.name || !provider?.spec?.secret?.namespace) {
return (
Expand Down