@eclipse-che/che-devworkspace-generator 0.0.1-58f79fb → 0.0.1-602dcb4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/generate.d.ts +1 -0
- package/lib/generate.js +20 -2
- package/lib/generate.js.map +1 -1
- package/package.json +1 -1
- package/src/generate.ts +31 -2
package/lib/generate.d.ts
CHANGED
|
@@ -13,4 +13,5 @@ export declare class Generate {
|
|
|
13
13
|
private devContainerComponentFinder;
|
|
14
14
|
generate(devfileContent: string, editorContent: string, outputFile?: string, injectDefaultComponent?: string, defaultComponentImage?: string): Promise<DevfileContext>;
|
|
15
15
|
generateContent(devfileContent: string, editorContent: string, injectDefaultComponent?: string, defaultComponentImage?: string): Promise<DevfileContext>;
|
|
16
|
+
private createDevWorkspaceMetadata;
|
|
16
17
|
}
|
package/lib/generate.js
CHANGED
|
@@ -111,7 +111,7 @@ var Generate = /** @class */ (function () {
|
|
|
111
111
|
devfile = jsYaml.load(devfileContent);
|
|
112
112
|
suffix = devfile.metadata.name || '';
|
|
113
113
|
editorDevfile = jsYaml.load(editorContent);
|
|
114
|
-
metadata = editorDevfile
|
|
114
|
+
metadata = this.createDevWorkspaceMetadata(editorDevfile);
|
|
115
115
|
// add sufix
|
|
116
116
|
metadata.name = metadata.name + "-" + suffix;
|
|
117
117
|
delete editorDevfile.metadata;
|
|
@@ -122,7 +122,7 @@ var Generate = /** @class */ (function () {
|
|
|
122
122
|
metadata: metadata,
|
|
123
123
|
spec: editorDevfile
|
|
124
124
|
};
|
|
125
|
-
devfileMetadata = devfile
|
|
125
|
+
devfileMetadata = this.createDevWorkspaceMetadata(devfile, true);
|
|
126
126
|
devfileCopy = Object.assign({}, devfile);
|
|
127
127
|
delete devfileCopy.schemaVersion;
|
|
128
128
|
delete devfileCopy.metadata;
|
|
@@ -138,6 +138,7 @@ var Generate = /** @class */ (function () {
|
|
|
138
138
|
metadata: devfileMetadata,
|
|
139
139
|
spec: {
|
|
140
140
|
started: true,
|
|
141
|
+
routingClass: 'che',
|
|
141
142
|
template: devfileCopy,
|
|
142
143
|
contributions: [editorSpecContribution]
|
|
143
144
|
}
|
|
@@ -169,6 +170,23 @@ var Generate = /** @class */ (function () {
|
|
|
169
170
|
});
|
|
170
171
|
});
|
|
171
172
|
};
|
|
173
|
+
Generate.prototype.createDevWorkspaceMetadata = function (devfile, addDevfileContent) {
|
|
174
|
+
if (addDevfileContent === void 0) { addDevfileContent = false; }
|
|
175
|
+
var devWorkspaceMetadata = {};
|
|
176
|
+
var devfileMetadata = devfile.metadata;
|
|
177
|
+
if (devfileMetadata.name) {
|
|
178
|
+
devWorkspaceMetadata.name = devfileMetadata.name;
|
|
179
|
+
}
|
|
180
|
+
if (devfileMetadata.generateName) {
|
|
181
|
+
devWorkspaceMetadata.generateName = devfileMetadata.generateName;
|
|
182
|
+
}
|
|
183
|
+
if (addDevfileContent) {
|
|
184
|
+
devWorkspaceMetadata.annotations = {
|
|
185
|
+
'che.eclipse.org/devfile': jsYaml.dump(devfile)
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
return devWorkspaceMetadata;
|
|
189
|
+
};
|
|
172
190
|
var Generate_1;
|
|
173
191
|
Generate.MERGE_CONTRIBUTION = 'controller.devfile.io/merge-contribution';
|
|
174
192
|
__decorate([
|
package/lib/generate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/generate.ts
CHANGED
|
@@ -9,7 +9,10 @@
|
|
|
9
9
|
***********************************************************************/
|
|
10
10
|
|
|
11
11
|
import {
|
|
12
|
+
V221Devfile,
|
|
13
|
+
V221DevfileMetadata,
|
|
12
14
|
V1alpha2DevWorkspace,
|
|
15
|
+
V1alpha2DevWorkspaceMetadata,
|
|
13
16
|
V1alpha2DevWorkspaceSpecContributions,
|
|
14
17
|
V1alpha2DevWorkspaceSpecTemplateComponents,
|
|
15
18
|
V1alpha2DevWorkspaceTemplate,
|
|
@@ -21,6 +24,12 @@ import * as fs from 'fs-extra';
|
|
|
21
24
|
import { DevfileContext } from './api/devfile-context';
|
|
22
25
|
import { DevContainerComponentFinder } from './devfile/dev-container-component-finder';
|
|
23
26
|
|
|
27
|
+
type DevfileLike = V221Devfile & {
|
|
28
|
+
metadata: V221DevfileMetadata & {
|
|
29
|
+
generateName?: string;
|
|
30
|
+
};
|
|
31
|
+
};
|
|
32
|
+
|
|
24
33
|
@injectable()
|
|
25
34
|
export class Generate {
|
|
26
35
|
static readonly MERGE_CONTRIBUTION = 'controller.devfile.io/merge-contribution';
|
|
@@ -73,7 +82,7 @@ export class Generate {
|
|
|
73
82
|
const editorDevfile = jsYaml.load(editorContent);
|
|
74
83
|
|
|
75
84
|
// transform it into a devWorkspace template
|
|
76
|
-
const metadata = editorDevfile
|
|
85
|
+
const metadata = this.createDevWorkspaceMetadata(editorDevfile);
|
|
77
86
|
// add sufix
|
|
78
87
|
metadata.name = `${metadata.name}-${suffix}`;
|
|
79
88
|
delete editorDevfile.metadata;
|
|
@@ -86,7 +95,7 @@ export class Generate {
|
|
|
86
95
|
};
|
|
87
96
|
|
|
88
97
|
// transform it into a devWorkspace
|
|
89
|
-
const devfileMetadata = devfile
|
|
98
|
+
const devfileMetadata = this.createDevWorkspaceMetadata(devfile, true);
|
|
90
99
|
const devfileCopy = Object.assign({}, devfile);
|
|
91
100
|
delete devfileCopy.schemaVersion;
|
|
92
101
|
delete devfileCopy.metadata;
|
|
@@ -102,6 +111,7 @@ export class Generate {
|
|
|
102
111
|
metadata: devfileMetadata,
|
|
103
112
|
spec: {
|
|
104
113
|
started: true,
|
|
114
|
+
routingClass: 'che',
|
|
105
115
|
template: devfileCopy,
|
|
106
116
|
contributions: [editorSpecContribution],
|
|
107
117
|
},
|
|
@@ -137,4 +147,23 @@ export class Generate {
|
|
|
137
147
|
|
|
138
148
|
return context;
|
|
139
149
|
}
|
|
150
|
+
|
|
151
|
+
private createDevWorkspaceMetadata(devfile: DevfileLike, addDevfileContent = false): V1alpha2DevWorkspaceMetadata {
|
|
152
|
+
const devWorkspaceMetadata = {} as V1alpha2DevWorkspaceMetadata;
|
|
153
|
+
const devfileMetadata = devfile.metadata;
|
|
154
|
+
|
|
155
|
+
if (devfileMetadata.name) {
|
|
156
|
+
devWorkspaceMetadata.name = devfileMetadata.name;
|
|
157
|
+
}
|
|
158
|
+
if (devfileMetadata.generateName) {
|
|
159
|
+
devWorkspaceMetadata.generateName = devfileMetadata.generateName;
|
|
160
|
+
}
|
|
161
|
+
if (addDevfileContent) {
|
|
162
|
+
devWorkspaceMetadata.annotations = {
|
|
163
|
+
'che.eclipse.org/devfile': jsYaml.dump(devfile),
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
return devWorkspaceMetadata;
|
|
168
|
+
}
|
|
140
169
|
}
|