hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Bump @types/js-yaml from 4.0.2 to 4.0.4 (#4124)

Browse Source 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
dependabot[bot] 2021-10-25 16:53:35 -04:00 committed by GitHub
parent 88f7f46ea5
commit 25c7c1a496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -276,7 +276,7 @@
"@types/html-webpack-plugin": "^3.2.6", "@types/html-webpack-plugin": "^3.2.6",
"@types/http-proxy": "^1.17.7", "@types/http-proxy": "^1.17.7",
"@types/jest": "^26.0.24", "@types/jest": "^26.0.24",
"@types/js-yaml": "^4.0.2", "@types/js-yaml": "^4.0.4",
"@types/jsdom": "^16.2.13", "@types/jsdom": "^16.2.13",
"@types/jsonpath": "^0.2.0", "@types/jsonpath": "^0.2.0",
"@types/lodash": "^4.14.155", "@types/lodash": "^4.14.155",

28
src/common/k8s/resource-stack.ts
View File

@ -121,30 +121,32 @@ export class ResourceStack {
for(const filename of files) { for(const filename of files) {
const file = path.join(folderPath, filename); const file = path.join(folderPath, filename);
const raw = await fse.readFile(file); const raw = await fse.readFile(file);
let resourceData: string; const data = (
filename.endsWith(".hb")
? hb.compile(raw.toString())(templateContext)
: raw.toString()
).trim();
if (filename.endsWith(".hb")) { if (!data) {
const template = hb.compile(raw.toString()); continue;
resourceData = template(templateContext);
} else {
resourceData = raw.toString();
} }
if (!resourceData.trim()) continue; for (const entry of yaml.loadAll(data)) {
if (typeof entry !== "object" || !entry) {
continue;
}
const resourceArray = yaml.loadAll(resourceData.toString()); const resource = entry as Record<string, any>;
resourceArray.forEach((resource) => { if (typeof resource.metadata === "object") {
if (resource?.metadata) { resource.metadata.labels ??= {};
resource.metadata.labels ||= {};
resource.metadata.labels["app.kubernetes.io/name"] = this.name; resource.metadata.labels["app.kubernetes.io/name"] = this.name;
resource.metadata.labels["app.kubernetes.io/managed-by"] = productName; resource.metadata.labels["app.kubernetes.io/managed-by"] = productName;
resource.metadata.labels["app.kubernetes.io/created-by"] = "resource-stack"; resource.metadata.labels["app.kubernetes.io/created-by"] = "resource-stack";
} }
resources.push(yaml.dump(resource)); resources.push(yaml.dump(resource));
}); }
} }
return resources; return resources;

8
yarn.lock
View File

@ -1596,10 +1596,10 @@
jest-diff "^26.0.0" jest-diff "^26.0.0"
pretty-format "^26.0.0" pretty-format "^26.0.0"
"@types/js-yaml@^4.0.1", "@types/js-yaml@^4.0.2": "@types/js-yaml@^4.0.1", "@types/js-yaml@^4.0.4":
version "4.0.2" version "4.0.4"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.2.tgz#4117a7a378593a218e9d6f0ef44ce6d5d9edf7fa" resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.4.tgz#cc38781257612581a1a0eb25f1709d2b06812fce"
integrity sha512-KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA== integrity sha512-AuHubXUmg0AzkXH0Mx6sIxeY/1C110mm/EkE/gB1sTRz3h2dao2W/63q42SlVST+lICxz5Oki2hzYA6+KnnieQ==
"@types/jsdom@^16.2.13": "@types/jsdom@^16.2.13":
version "16.2.13" version "16.2.13"