Skip to content

Commit b21137d

Browse files
committed
Update samples and tests for removing plugin
Signed-off-by: Maysun J Faisal <[email protected]>
1 parent 13683f3 commit b21137d

18 files changed

+8
-250
lines changed

Diff for: generator/schemas/gen.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ import (
3535
// GenerateJSONSchema drives whether a Json schema should be generated from this GO Struct type
3636
type GenerateJSONSchema struct {
3737

38-
// OmitCustomUnionMembers indicates that the Json schema gnerated from this type should omit Custom component union members.
38+
// OmitCustomUnionMembers indicates that the Json schema generated from this type should omit Custom union members.
3939
OmitCustomUnionMembers bool `marker:",optional"`
4040

41-
// OmitPluginUnionMembers indicates that the Json schema gnerated from this type should omit Plugin component union members.
41+
// OmitPluginUnionMembers indicates that the Json schema generated from this type should omit Plugin component union members.
4242
OmitPluginUnionMembers bool `marker:",optional"`
4343

4444
// Title indicates the content ot the Json Schema `title` attribute

Diff for: generator/schemas/zz_generated.markerhelp.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: samples/devfiles/job-apply-example.devfile.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ components:
1919
command: ["some", "command", "with", "parameters"]
2020
restartPolicy: Never
2121
backoffLimit: 4
22-
- name: go-support
23-
plugin:
24-
id: ms-vscode/go/latest
25-
- name: editor
26-
plugin:
27-
id: eclipse/che-theia/latest
2822
commands:
2923
- id: cleanup-job
3024
apply:

Diff for: samples/devfiles/nodejs-stack.devfile.yaml

-13
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@ projects:
77
remotes:
88
origin: "https://github.com/che-samples/web-nodejs-sample.git"
99
components:
10-
- name: editor
11-
plugin:
12-
id: eclipse/che-theia/7.1.0
13-
- name: terminal
14-
plugin:
15-
id: eclipse/che-machine-exec-plugin/7.1.0
16-
- name: typescript-plugin
17-
plugin:
18-
id: che-incubator/typescript/1.30.2
19-
components:
20-
- name: "somename"
21-
container:
22-
memoryLimit: 512Mi
2310
- name: nodejs
2411
container:
2512
image: quay.io/eclipse/che-nodejs10-ubi:nightly

Diff for: samples/devfiles/sample-devfile.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,6 @@ projects:
1111
revision: "main"
1212
remote: origin
1313
components:
14-
- name: editor
15-
attributes:
16-
kjkh: "128M"
17-
kjhkjh:
18-
"": ""
19-
plugin:
20-
id: eclipse/che-theia/latest
21-
- name: "ownplugin"
22-
plugin:
23-
id: acme/newPlugin/latest
24-
registryUrl: "https://acme.com/registry/"
25-
- name: "myplugin"
26-
plugin:
27-
uri: "https://github.com/johndoe/che-plugins/blob/master/cool-plugin/0.0.1/meta.yaml"
2814
- name: "mycontainer"
2915
container:
3016
image: "busybox"

Diff for: samples/devfiles/simple-devfile.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ events:
3434
postStart:
3535
- "build-schema-and-open-devfile"
3636
components:
37-
- name: yaml-support
38-
plugin:
39-
id: redhat/vscode-yaml/latest
40-
- name: go-support
41-
plugin:
42-
id: ms-vscode/go/latest
43-
- name: editor
44-
plugin:
45-
id: eclipse/che-theia/latest
46-
registryUrl: "external-registry-url"
4737
- name: "build-tools"
4838
container:
4939
image: some container image with required build tools

Diff for: samples/devfiles/spring-boot-http-booster-devfile.yaml

+4-14
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,7 @@ projects:
1111
checkoutFrom:
1212
revision: master
1313
components:
14-
- name: java-support
15-
plugin:
16-
id: redhat/java8/latest
17-
components:
18-
- name: vscode-java
19-
container:
20-
memoryLimit: 2Gi
21-
- name: m2
22-
volume:
23-
size: 2G
24-
- name: dependency-analytics
25-
plugin:
26-
id: redhat/dependency-analytics/latest
27-
- name: maven-tooling
14+
- name: maven
2815
container:
2916
image: registry.redhat.io/codeready-workspaces/stacks-java-rhel8:2.1
3017
mountSources: true
@@ -45,6 +32,9 @@ components:
4532
volumeMounts:
4633
- name: m2
4734
path: /home/jboss/.m2
35+
- name: m2
36+
volume:
37+
size: 2G
4838
commands:
4939
- id: build
5040
exec:

Diff for: test/v200/devfiles/components/pluginAll.yaml

-43
This file was deleted.

Diff for: test/v200/devfiles/components/pluginContainsPlugin.yaml

-8
This file was deleted.

Diff for: test/v200/devfiles/components/pluginIdAndKubernetes.yaml

-4
This file was deleted.

Diff for: test/v200/devfiles/components/pluginIdAndUri.yaml

-4
This file was deleted.

Diff for: test/v200/devfiles/components/pluginMinimum.yaml

-10
This file was deleted.

Diff for: test/v200/devfiles/components/pluginMissingIdUriAndKubernetes.yaml

-3
This file was deleted.

Diff for: test/v200/devfiles/components/pluginMixedCaseName.yaml

-3
This file was deleted.

Diff for: test/v200/devfiles/components/pluginNoName.yaml

-2
This file was deleted.

Diff for: test/v200/devfiles/components/pluginUriAndKubernetes.yaml

-4
This file was deleted.

Diff for: test/v200/json/component-parent-tests.json

-54
Original file line numberDiff line numberDiff line change
@@ -231,60 +231,6 @@
231231
"Files": ["devfiles/components/componentStart.yaml",
232232
"devfiles/components/openshiftBothInlinedAndUri.yaml"]
233233
},
234-
{
235-
"FileName" : "componentPluginAll.yaml",
236-
"ExpectOutcome" : "PASS",
237-
"Files": ["devfiles/components/componentStart.yaml",
238-
"devfiles/components/pluginAll.yaml"]
239-
},
240-
{
241-
"FileName" : "componentPluginMinimum.yaml",
242-
"ExpectOutcome" : "PASS",
243-
"Files": ["devfiles/components/componentStart.yaml",
244-
"devfiles/components/pluginMinimum.yaml"]
245-
},
246-
{
247-
"FileName" : "componentPluginNoName.yaml",
248-
"ExpectOutcome" : "missing properties: \"name\"",
249-
"Files": ["devfiles/components/componentStart.yaml",
250-
"devfiles/components/pluginNoName.yaml"]
251-
},
252-
{
253-
"FileName" : "componentPluginMixedCaseName.yaml",
254-
"ExpectOutcome" : "does not match pattern",
255-
"Files": ["devfiles/components/componentStart.yaml",
256-
"devfiles/components/pluginMixedCaseName.yaml"]
257-
},
258-
{
259-
"FileName" : "componentPluginContainsPlugin.yaml",
260-
"ExpectOutcome" : "oneOf failed",
261-
"Files": ["devfiles/components/componentStart.yaml",
262-
"devfiles/components/pluginContainsPlugin.yaml"]
263-
},
264-
{
265-
"FileName" : "componentPluginIdAndKubernetes.yaml",
266-
"ExpectOutcome" : "valid against schemas at indexes 1 and 2",
267-
"Files": ["devfiles/components/componentStart.yaml",
268-
"devfiles/components/pluginIdAndKubernetes.yaml"]
269-
},
270-
{
271-
"FileName" : "componentPluginIdAndUri.yaml",
272-
"ExpectOutcome" : "valid against schemas at indexes 0 and 1",
273-
"Files": ["devfiles/components/componentStart.yaml",
274-
"devfiles/components/pluginIdAndUri.yaml"]
275-
},
276-
{
277-
"FileName" : "componentPluginUriAndKubernetes.yaml",
278-
"ExpectOutcome" : "valid against schemas at indexes 0 and 2",
279-
"Files": ["devfiles/components/componentStart.yaml",
280-
"devfiles/components/pluginUriAndKubernetes.yaml"]
281-
},
282-
{
283-
"FileName" : "componentPluginMissingIdUriAndKubernetes.yaml",
284-
"ExpectOutcome" : "oneOf failed",
285-
"Files": ["devfiles/components/componentStart.yaml",
286-
"devfiles/components/pluginMissingIdUriAndKubernetes.yaml"]
287-
},
288234
{
289235
"FileName" : "componentVolumeAll",
290236
"ExpectOutcome" : "PASS",

Diff for: test/v200/json/component-tests.json

-54
Original file line numberDiff line numberDiff line change
@@ -261,60 +261,6 @@
261261
"Files": ["devfiles/components/componentStart.yaml",
262262
"devfiles/components/openshiftBothInlinedAndUri.yaml"]
263263
},
264-
{
265-
"FileName" : "componentPluginAll.yaml",
266-
"ExpectOutcome" : "PASS",
267-
"Files": ["devfiles/components/componentStart.yaml",
268-
"devfiles/components/pluginAll.yaml"]
269-
},
270-
{
271-
"FileName" : "componentPluginMinimum.yaml",
272-
"ExpectOutcome" : "PASS",
273-
"Files": ["devfiles/components/componentStart.yaml",
274-
"devfiles/components/pluginMinimum.yaml"]
275-
},
276-
{
277-
"FileName" : "componentPluginNoName.yaml",
278-
"ExpectOutcome" : "missing properties: \"name\"",
279-
"Files": ["devfiles/components/componentStart.yaml",
280-
"devfiles/components/pluginNoName.yaml"]
281-
},
282-
{
283-
"FileName" : "componentPluginMixedCaseName.yaml",
284-
"ExpectOutcome" : "does not match pattern",
285-
"Files": ["devfiles/components/componentStart.yaml",
286-
"devfiles/components/pluginMixedCaseName.yaml"]
287-
},
288-
{
289-
"FileName" : "componentPluginContainsPlugin.yaml",
290-
"ExpectOutcome" : "oneOf failed",
291-
"Files": ["devfiles/components/componentStart.yaml",
292-
"devfiles/components/pluginContainsPlugin.yaml"]
293-
},
294-
{
295-
"FileName" : "componentPluginIdAndKubernetes.yaml",
296-
"ExpectOutcome" : "valid against schemas at indexes 1 and 2",
297-
"Files": ["devfiles/components/componentStart.yaml",
298-
"devfiles/components/pluginIdAndKubernetes.yaml"]
299-
},
300-
{
301-
"FileName" : "componentPluginIdAndUri.yaml",
302-
"ExpectOutcome" : "valid against schemas at indexes 0 and 1",
303-
"Files": ["devfiles/components/componentStart.yaml",
304-
"devfiles/components/pluginIdAndUri.yaml"]
305-
},
306-
{
307-
"FileName" : "componentPluginUriAndKubernetes.yaml",
308-
"ExpectOutcome" : "valid against schemas at indexes 0 and 2",
309-
"Files": ["devfiles/components/componentStart.yaml",
310-
"devfiles/components/pluginUriAndKubernetes.yaml"]
311-
},
312-
{
313-
"FileName" : "componentPluginMissingIdUriAndKubernetes.yaml",
314-
"ExpectOutcome" : "oneOf failed",
315-
"Files": ["devfiles/components/componentStart.yaml",
316-
"devfiles/components/pluginMissingIdUriAndKubernetes.yaml"]
317-
},
318264
{
319265
"FileName" : "componentVolumeAll",
320266
"ExpectOutcome" : "PASS",

0 commit comments

Comments
 (0)