@cyclonedx/cdxgen 10.4.0 → 10.4.1
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/analyzer.js +1 -3
- package/docker.js +1 -1
- package/package.json +1 -1
- package/postgen.js +0 -3
- package/types/analyzer.d.ts.map +1 -1
- package/types/binary.d.ts.map +1 -1
- package/types/db.d.ts +2 -1
- package/types/db.d.ts.map +1 -1
- package/types/docker.d.ts +1 -1
- package/types/docker.d.ts.map +1 -1
- package/types/evinser.d.ts +12 -12
- package/types/evinser.d.ts.map +1 -1
- package/types/index.d.ts.map +1 -1
- package/types/postgen.d.ts.map +1 -1
- package/types/utils.d.ts +25 -1
- package/types/utils.d.ts.map +1 -1
- package/types/validator.d.ts.map +1 -1
- package/utils.js +6 -1
- package/utils.test.js +4 -0
package/analyzer.js
CHANGED
package/docker.js
CHANGED
|
@@ -381,7 +381,7 @@ export const getConnection = async (options, forRegistry) => {
|
|
|
381
381
|
return dockerConn;
|
|
382
382
|
};
|
|
383
383
|
|
|
384
|
-
export const makeRequest = async (path, method
|
|
384
|
+
export const makeRequest = async (path, method, forRegistry) => {
|
|
385
385
|
const client = await getConnection({}, forRegistry);
|
|
386
386
|
if (!client) {
|
|
387
387
|
return undefined;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cyclonedx/cdxgen",
|
|
3
|
-
"version": "10.4.
|
|
3
|
+
"version": "10.4.1",
|
|
4
4
|
"description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
|
|
5
5
|
"homepage": "http://github.com/cyclonedx/cdxgen",
|
|
6
6
|
"author": "Prabhu Subramanian <prabhu@appthreat.com>",
|
package/postgen.js
CHANGED
|
@@ -20,7 +20,6 @@ export const filterBom = (bomJson, options) => {
|
|
|
20
20
|
["optional", "excluded"].includes(comp.scope)
|
|
21
21
|
) {
|
|
22
22
|
filtered = true;
|
|
23
|
-
continue;
|
|
24
23
|
} else if (options.only && options.only.length) {
|
|
25
24
|
if (!Array.isArray(options.only)) {
|
|
26
25
|
options.only = [options.only];
|
|
@@ -33,7 +32,6 @@ export const filterBom = (bomJson, options) => {
|
|
|
33
32
|
) {
|
|
34
33
|
filtered = true;
|
|
35
34
|
purlfiltered = true;
|
|
36
|
-
continue;
|
|
37
35
|
}
|
|
38
36
|
}
|
|
39
37
|
if (!purlfiltered) {
|
|
@@ -65,7 +63,6 @@ export const filterBom = (bomJson, options) => {
|
|
|
65
63
|
) {
|
|
66
64
|
filtered = true;
|
|
67
65
|
purlfiltered = true;
|
|
68
|
-
continue;
|
|
69
66
|
}
|
|
70
67
|
}
|
|
71
68
|
}
|
package/types/analyzer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../analyzer.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../analyzer.js"],"names":[],"mappings":"AAgSO;;;GAkBN"}
|
package/types/binary.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../binary.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../binary.js"],"names":[],"mappings":"AAoRA,iDA8BC;AAED,wDAmBC;AAED;;;;;;;EAgVC;AAiCD,gDAgDC;AAED;;;;;;GAMG;AACH,qCAJW,MAAM,cACN,MAAM,WA2BhB;AAED;;;;;;;;GAQG;AACH,kCANW,MAAM,iBACN,MAAM,YACN,OAAO,GAEN,OAAO,CA8BlB"}
|
package/types/db.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export function createOrLoad(
|
|
|
8
8
|
Usages: typeof Usages;
|
|
9
9
|
DataFlows: typeof DataFlows;
|
|
10
10
|
}>;
|
|
11
|
-
import
|
|
11
|
+
import { Sequelize } from "sequelize";
|
|
12
12
|
declare class Namespaces extends Model<any, any> {
|
|
13
13
|
constructor(
|
|
14
14
|
values?: import("sequelize").Optional<any, string>,
|
|
@@ -28,4 +28,5 @@ declare class DataFlows extends Model<any, any> {
|
|
|
28
28
|
);
|
|
29
29
|
}
|
|
30
30
|
import { Model } from "sequelize";
|
|
31
|
+
export {};
|
|
31
32
|
//# sourceMappingURL=db.d.ts.map
|
package/types/db.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../db.js"],"names":[],"mappings":"AAQO;;;;;GAuEN;0BA9E2C,WAAW;AAGvD;
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../db.js"],"names":[],"mappings":"AAQO;;;;;GAuEN;0BA9E2C,WAAW;AAGvD;IA4E0k4F,4GAA8L;CA5Evu4F;AACjC;IA2E0k4F,4GAA8L;CA3E3u4F;AAC7B;IA0E0k4F,4GAA8L;CA1Exu4F;sBALY,WAAW"}
|
package/types/docker.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export function getOnlyDirs(srcpath: any, dirName: any): any;
|
|
|
9
9
|
export function getConnection(options: any, forRegistry: any): Promise<any>;
|
|
10
10
|
export function makeRequest(
|
|
11
11
|
path: any,
|
|
12
|
-
method:
|
|
12
|
+
method: any,
|
|
13
13
|
forRegistry: any,
|
|
14
14
|
): Promise<any>;
|
|
15
15
|
export function parseImageName(fullImageName: any): {
|
package/types/docker.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../docker.js"],"names":[],"mappings":"AA4BA,4BAA6C;AA+BtC,iCAHI,MAAM,WACN,MAAM,iDAehB;AAqBM,6DAmBN;
|
|
1
|
+
{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../docker.js"],"names":[],"mappings":"AA4BA,4BAA6C;AA+BtC,iCAHI,MAAM,WACN,MAAM,iDAehB;AAqBM,6DAmBN;AA+KM,4EA8FN;AAEM,oFAwBN;AAUM;;;;;;;;EAwEN;AAmBM,2DAiLN;AAEM,2EA+DN;AAMM;;;;;;;;;;;;;GAqDN;AAEM;;;;;;;GAsGN;AAMM,8DAuHN;AAKM,4EAmGN;AAEM,+EAMN;AAEM,4EAyCN;AAEM,iFA0BN"}
|
package/types/evinser.d.ts
CHANGED
|
@@ -86,7 +86,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
86
86
|
): Promise<any>;
|
|
87
87
|
equals(other: any): boolean;
|
|
88
88
|
equalsOneOf(others: readonly any[]): boolean;
|
|
89
|
-
toJSON<T>(): T;
|
|
89
|
+
toJSON<T extends any>(): T;
|
|
90
90
|
toJSON(): object;
|
|
91
91
|
isSoftDeleted(): boolean;
|
|
92
92
|
_model: import("sequelize").Model<any, any>;
|
|
@@ -372,7 +372,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
372
372
|
rows: M_17[];
|
|
373
373
|
count: import("sequelize").GroupedCountResultItem[];
|
|
374
374
|
}>;
|
|
375
|
-
max<T_3, M_18 extends import("sequelize").Model<any, any>>(
|
|
375
|
+
max<T_3 extends unknown, M_18 extends import("sequelize").Model<any, any>>(
|
|
376
376
|
this: import("sequelize").ModelStatic<M_18>,
|
|
377
377
|
field: keyof import("sequelize").Attributes<M_18>,
|
|
378
378
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -380,7 +380,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
380
380
|
import("sequelize").Attributes<M_18>
|
|
381
381
|
>,
|
|
382
382
|
): Promise<T_3>;
|
|
383
|
-
min<T_4, M_19 extends import("sequelize").Model<any, any>>(
|
|
383
|
+
min<T_4 extends unknown, M_19 extends import("sequelize").Model<any, any>>(
|
|
384
384
|
this: import("sequelize").ModelStatic<M_19>,
|
|
385
385
|
field: keyof import("sequelize").Attributes<M_19>,
|
|
386
386
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -388,7 +388,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
388
388
|
import("sequelize").Attributes<M_19>
|
|
389
389
|
>,
|
|
390
390
|
): Promise<T_4>;
|
|
391
|
-
sum<T_5, M_20 extends import("sequelize").Model<any, any>>(
|
|
391
|
+
sum<T_5 extends unknown, M_20 extends import("sequelize").Model<any, any>>(
|
|
392
392
|
this: import("sequelize").ModelStatic<M_20>,
|
|
393
393
|
field: keyof import("sequelize").Attributes<M_20>,
|
|
394
394
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -1200,7 +1200,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
1200
1200
|
): Promise<any>;
|
|
1201
1201
|
equals(other: any): boolean;
|
|
1202
1202
|
equalsOneOf(others: readonly any[]): boolean;
|
|
1203
|
-
toJSON<T>(): T;
|
|
1203
|
+
toJSON<T extends any>(): T;
|
|
1204
1204
|
toJSON(): object;
|
|
1205
1205
|
isSoftDeleted(): boolean;
|
|
1206
1206
|
_model: import("sequelize").Model<any, any>;
|
|
@@ -1486,7 +1486,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
1486
1486
|
rows: M_17[];
|
|
1487
1487
|
count: import("sequelize").GroupedCountResultItem[];
|
|
1488
1488
|
}>;
|
|
1489
|
-
max<T_3, M_18 extends import("sequelize").Model<any, any>>(
|
|
1489
|
+
max<T_3 extends unknown, M_18 extends import("sequelize").Model<any, any>>(
|
|
1490
1490
|
this: import("sequelize").ModelStatic<M_18>,
|
|
1491
1491
|
field: keyof import("sequelize").Attributes<M_18>,
|
|
1492
1492
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -1494,7 +1494,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
1494
1494
|
import("sequelize").Attributes<M_18>
|
|
1495
1495
|
>,
|
|
1496
1496
|
): Promise<T_3>;
|
|
1497
|
-
min<T_4, M_19 extends import("sequelize").Model<any, any>>(
|
|
1497
|
+
min<T_4 extends unknown, M_19 extends import("sequelize").Model<any, any>>(
|
|
1498
1498
|
this: import("sequelize").ModelStatic<M_19>,
|
|
1499
1499
|
field: keyof import("sequelize").Attributes<M_19>,
|
|
1500
1500
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -1502,7 +1502,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
1502
1502
|
import("sequelize").Attributes<M_19>
|
|
1503
1503
|
>,
|
|
1504
1504
|
): Promise<T_4>;
|
|
1505
|
-
sum<T_5, M_20 extends import("sequelize").Model<any, any>>(
|
|
1505
|
+
sum<T_5 extends unknown, M_20 extends import("sequelize").Model<any, any>>(
|
|
1506
1506
|
this: import("sequelize").ModelStatic<M_20>,
|
|
1507
1507
|
field: keyof import("sequelize").Attributes<M_20>,
|
|
1508
1508
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -2314,7 +2314,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
2314
2314
|
): Promise<any>;
|
|
2315
2315
|
equals(other: any): boolean;
|
|
2316
2316
|
equalsOneOf(others: readonly any[]): boolean;
|
|
2317
|
-
toJSON<T>(): T;
|
|
2317
|
+
toJSON<T extends any>(): T;
|
|
2318
2318
|
toJSON(): object;
|
|
2319
2319
|
isSoftDeleted(): boolean;
|
|
2320
2320
|
_model: import("sequelize").Model<any, any>;
|
|
@@ -2600,7 +2600,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
2600
2600
|
rows: M_17[];
|
|
2601
2601
|
count: import("sequelize").GroupedCountResultItem[];
|
|
2602
2602
|
}>;
|
|
2603
|
-
max<T_3, M_18 extends import("sequelize").Model<any, any>>(
|
|
2603
|
+
max<T_3 extends unknown, M_18 extends import("sequelize").Model<any, any>>(
|
|
2604
2604
|
this: import("sequelize").ModelStatic<M_18>,
|
|
2605
2605
|
field: keyof import("sequelize").Attributes<M_18>,
|
|
2606
2606
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -2608,7 +2608,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
2608
2608
|
import("sequelize").Attributes<M_18>
|
|
2609
2609
|
>,
|
|
2610
2610
|
): Promise<T_3>;
|
|
2611
|
-
min<T_4, M_19 extends import("sequelize").Model<any, any>>(
|
|
2611
|
+
min<T_4 extends unknown, M_19 extends import("sequelize").Model<any, any>>(
|
|
2612
2612
|
this: import("sequelize").ModelStatic<M_19>,
|
|
2613
2613
|
field: keyof import("sequelize").Attributes<M_19>,
|
|
2614
2614
|
options?: import("sequelize").AggregateOptions<
|
|
@@ -2616,7 +2616,7 @@ export function prepareDB(options: any): Promise<{
|
|
|
2616
2616
|
import("sequelize").Attributes<M_19>
|
|
2617
2617
|
>,
|
|
2618
2618
|
): Promise<T_4>;
|
|
2619
|
-
sum<T_5, M_20 extends import("sequelize").Model<any, any>>(
|
|
2619
|
+
sum<T_5 extends unknown, M_20 extends import("sequelize").Model<any, any>>(
|
|
2620
2620
|
this: import("sequelize").ModelStatic<M_20>,
|
|
2621
2621
|
field: keyof import("sequelize").Attributes<M_20>,
|
|
2622
2622
|
options?: import("sequelize").AggregateOptions<
|
package/types/evinser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evinser.d.ts","sourceRoot":"","sources":["../evinser.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"evinser.d.ts","sourceRoot":"","sources":["../evinser.js"],"names":[],"mappings":"AA0BO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEN;AAEM,6GAiDN;AAEM,gGAkCN;AAEM,wGAqBN;AAEM;;;;EAiEN;AAEM,iEAoBN;AAEM;;;EA8BN;AAQM;;;;;;;;;;;;GAgHN;AAEM,2JA4CN;AAcM,2CARI,MAAM,iHAkNhB;AAEM,sGAoEN;AASM,mDAJI,MAAM,wCA6DhB;AASM,gDAJI,MAAM,mDA8DhB;AAEM,wEAWN;AAEM,gEAmDN;AASM,yEAgJN;AAaM,gDAPI,MAAM,uHAyHhB;AAUM,iDAHI,MAAM;;;;;;;;;;;;;EAoFhB;AAQM,kDAaN;AAQM,2CAHI,MAAM,UAKhB;AAEM,oFAsCN"}
|
package/types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.js"],"names":[],"mappings":"AA0sBA;;;;;;;;GAQG;AACH,gFAFW,MAAM,SAchB;AA4TD;;;;;;;GAOG;AACH,mCALW,MAAM,qBAiEhB;AAED;;;;;GAKG;AACH,uCAHW,MAAM;;;;EAKhB;AAED;;;;;GAKG;AACH,sCAHW,MAAM;;;;EAkBhB;AAED;;;;;GAKG;AACH,oCAHW,MAAM,8BAwwBhB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,8BAkZhB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,8BAgWhB;AAED;;;;;GAKG;AACH,kCAHW,MAAM,8BAgThB;AAED;;;;;GAKG;AACH,oCAHW,MAAM,8BAiHhB;AAED;;;;;GAKG;AACH,oCAHW,MAAM,8BAgDhB;AAED;;;;;GAKG;AACH,mCAHW,MAAM,qBA+KhB;AAED;;;;;GAKG;AACH,uCAHW,MAAM,qBAqHhB;AAED;;;;;GAKG;AACH,uCAHW,MAAM,qBA2BhB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,qBA2BhB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,qBA2BhB;AAED;;;;;GAKG;AACH,0CAHW,MAAM,qBAuBhB;AAED;;;;;GAKG;AACH,kCAHW,MAAM,8BAqDhB;AAED;;;;;GAKG;AACH,uCAHW,MAAM,8BA4ChB;AAED;;;;;GAKG;AACH,oCAHW,MAAM,qBA2BhB;AAED;;;;;GAKG;AACH,qCAHW,MAAM,8BAwFhB;AAED;;;;;GAKG;AACH,iDAHW,MAAM,qBAkUhB;AAED;;;;;GAKG;AACH,mCAHW,MAAM,qBAwJhB;AAED;;;;;GAKG;AACH,oCAHW,MAAM,8BAmFhB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,8BA+RhB;AAED;;;;;GAKG;AACH,2CAHW,MAAM;;;;;;;;;;;;;;;;;;;;GAmChB;AAED;;;;;;;;KA+DC;AAED,uDAWC;AAED;;;;;;;;;GASG;AACH,2GA6BC;AAED;;;;;GAKG;AACH,0CAHW,MAAM,8BA0chB;AAED;;;;;GAKG;AACH,iCAHW,MAAM,8BA2UhB;AAED;;;;;GAKG;AACH,gCAHW,MAAM,qBAoRhB;AAED;;;;;GAKG;AACH,qEAyFC"}
|
package/types/postgen.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgen.d.ts","sourceRoot":"","sources":["../postgen.js"],"names":[],"mappings":"AAAO,+DAUN;AAEM,
|
|
1
|
+
{"version":3,"file":"postgen.d.ts","sourceRoot":"","sources":["../postgen.js"],"names":[],"mappings":"AAAO,+DAUN;AAEM,2DAsGN"}
|
package/types/utils.d.ts
CHANGED
|
@@ -21,13 +21,37 @@ export function getAllFilesWithIgnore(
|
|
|
21
21
|
pattern: string,
|
|
22
22
|
ignoreList: any[],
|
|
23
23
|
): string[];
|
|
24
|
+
/**
|
|
25
|
+
* Return the current timestamp in YYYY-MM-DDTHH:MM:SSZ format.
|
|
26
|
+
*
|
|
27
|
+
* @returns {string} ISO formatted timestamp, without milliseconds.
|
|
28
|
+
*/
|
|
29
|
+
export function getTimestamp(): string;
|
|
30
|
+
/**
|
|
31
|
+
* Method to determine if a license is a valid SPDX license expression
|
|
32
|
+
*
|
|
33
|
+
* @param {string} license License string
|
|
34
|
+
* @returns {boolean} true if the license is a valid SPDX license expression
|
|
35
|
+
* @see https://spdx.dev/learn/handling-license-info/
|
|
36
|
+
**/
|
|
37
|
+
export function isSpdxLicenseExpression(license: string): boolean;
|
|
38
|
+
/**
|
|
39
|
+
* Convert the array of licenses to a CycloneDX 1.5 compliant license array.
|
|
40
|
+
* This should return an array containing:
|
|
41
|
+
* - one or more SPDX license if no expression is present
|
|
42
|
+
* - the first license expression if at least one is present
|
|
43
|
+
*
|
|
44
|
+
* @param {Array} licenses Array of licenses
|
|
45
|
+
* @returns {Array} CycloneDX 1.5 compliant license array
|
|
46
|
+
*/
|
|
47
|
+
export function adjustLicenseInformation(licenses: any[]): any[];
|
|
24
48
|
/**
|
|
25
49
|
* Performs a lookup + validation of the license specified in the
|
|
26
50
|
* package. If the license is a valid SPDX license ID, set the 'id'
|
|
27
51
|
* and url of the license object, otherwise, set the 'name' of the license
|
|
28
52
|
* object.
|
|
29
53
|
*/
|
|
30
|
-
export function getLicenses(pkg: any): any;
|
|
54
|
+
export function getLicenses(pkg: any): any[];
|
|
31
55
|
/**
|
|
32
56
|
* Method to retrieve known license by known-licenses.json
|
|
33
57
|
*
|
package/types/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.js"],"names":[],"mappings":"AAuNA;;;;;GAKG;AACH,qCAHW,MAAM,WACN,MAAM,0BAmBhB;AAED;;;;;;GAMG;AACH,+CAJW,MAAM,WACN,MAAM,+BAoBhB;AAYD;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.js"],"names":[],"mappings":"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"}
|
package/types/validator.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../validator.js"],"names":[],"mappings":"AAmBO,qCAFI,MAAM,
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../validator.js"],"names":[],"mappings":"AAmBO,qCAFI,MAAM,WA6ChB;AAOM,0CAFI,MAAM,WAoDhB;AAOM,uCAFI,MAAM,WAgEhB;AA6BM,sCAFI,MAAM,WA2ChB"}
|
package/utils.js
CHANGED
|
@@ -5269,7 +5269,12 @@ export function recurseImageNameLookup(keyValueObj, pkgList, imgList) {
|
|
|
5269
5269
|
keyValueObj.packImage ||
|
|
5270
5270
|
keyValueObj.koImage ||
|
|
5271
5271
|
keyValueObj.kanikoImage;
|
|
5272
|
-
if (
|
|
5272
|
+
if (
|
|
5273
|
+
!imageLike &&
|
|
5274
|
+
keyValueObj.name &&
|
|
5275
|
+
typeof keyValueObj.name === "string" &&
|
|
5276
|
+
keyValueObj.name.includes("/")
|
|
5277
|
+
) {
|
|
5273
5278
|
imageLike = keyValueObj.name;
|
|
5274
5279
|
}
|
|
5275
5280
|
if (
|
package/utils.test.js
CHANGED
|
@@ -3377,6 +3377,10 @@ test("parse container spec like files", () => {
|
|
|
3377
3377
|
expect(dep_list[0]).toEqual({
|
|
3378
3378
|
image: "gcr.io/google-samples/microservices-demo/adservice",
|
|
3379
3379
|
});
|
|
3380
|
+
dep_list = parseContainerSpecData(
|
|
3381
|
+
readFileSync("./test/data/service.yaml", { encoding: "utf-8" }),
|
|
3382
|
+
);
|
|
3383
|
+
expect(dep_list.length).toEqual(0);
|
|
3380
3384
|
});
|
|
3381
3385
|
|
|
3382
3386
|
test("parse containerfiles / dockerfiles", () => {
|