@lage-run/cache 0.1.18 → 0.1.20
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/CHANGELOG.json +37 -1
- package/CHANGELOG.md +19 -2
- package/lib/TargetHasher.js +2 -1
- package/lib/TargetHasher.js.map +1 -1
- package/lib/providers/BackfillCacheProvider.d.ts +2 -0
- package/lib/providers/BackfillCacheProvider.js +18 -2
- package/lib/providers/BackfillCacheProvider.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,43 @@
|
|
|
2
2
|
"name": "@lage-run/cache",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Thu, 20 Oct 2022 00:22:08 GMT",
|
|
6
|
+
"tag": "@lage-run/cache_v0.1.20",
|
|
7
|
+
"version": "0.1.20",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "kchau@microsoft.com",
|
|
12
|
+
"package": "@lage-run/cache",
|
|
13
|
+
"commit": "9b6f27c0d2684f5bdcba0591ca2eb323e00c5529",
|
|
14
|
+
"comment": "Allows for target specific environmentGlob override"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@lage-run/cache",
|
|
19
|
+
"comment": "Bump @lage-run/target-graph to v0.4.3",
|
|
20
|
+
"commit": "9b6f27c0d2684f5bdcba0591ca2eb323e00c5529"
|
|
21
|
+
}
|
|
22
|
+
]
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"date": "Thu, 06 Oct 2022 16:07:29 GMT",
|
|
27
|
+
"tag": "@lage-run/cache_v0.1.19",
|
|
28
|
+
"version": "0.1.19",
|
|
29
|
+
"comments": {
|
|
30
|
+
"patch": [
|
|
31
|
+
{
|
|
32
|
+
"author": "ken@gizzar.com",
|
|
33
|
+
"package": "@lage-run/cache",
|
|
34
|
+
"commit": "bd449545266b4a823e6e79beb2b75103cc3b3739",
|
|
35
|
+
"comment": "adding a bit more logging to cache puts for \"silly\" log level"
|
|
36
|
+
}
|
|
37
|
+
]
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
"date": "Wed, 05 Oct 2022 23:59:29 GMT",
|
|
6
42
|
"tag": "@lage-run/cache_v0.1.18",
|
|
7
43
|
"version": "0.1.18",
|
|
8
44
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
# Change Log - @lage-run/cache
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 20 Oct 2022 00:22:08 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.1.20
|
|
8
|
+
|
|
9
|
+
Thu, 20 Oct 2022 00:22:08 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Allows for target specific environmentGlob override (kchau@microsoft.com)
|
|
14
|
+
- Bump @lage-run/target-graph to v0.4.3
|
|
15
|
+
|
|
16
|
+
## 0.1.19
|
|
17
|
+
|
|
18
|
+
Thu, 06 Oct 2022 16:07:29 GMT
|
|
19
|
+
|
|
20
|
+
### Patches
|
|
21
|
+
|
|
22
|
+
- adding a bit more logging to cache puts for "silly" log level (ken@gizzar.com)
|
|
23
|
+
|
|
7
24
|
## 0.1.18
|
|
8
25
|
|
|
9
|
-
Wed, 05 Oct 2022 23:59:
|
|
26
|
+
Wed, 05 Oct 2022 23:59:29 GMT
|
|
10
27
|
|
|
11
28
|
### Patches
|
|
12
29
|
|
package/lib/TargetHasher.js
CHANGED
|
@@ -15,7 +15,8 @@ class TargetHasher {
|
|
|
15
15
|
this.backfillLogger = (0, backfillWrapper_1.createBackfillLogger)();
|
|
16
16
|
}
|
|
17
17
|
async hash(target) {
|
|
18
|
-
|
|
18
|
+
var _a, _b;
|
|
19
|
+
const hashKey = await (0, salt_1.salt)((_b = (_a = target.environmentGlob) !== null && _a !== void 0 ? _a : this.options.environmentGlob) !== null && _b !== void 0 ? _b : ["lage.config.js"], `${target.id}|${JSON.stringify(this.options.cliArgs)}`, this.options.root, this.options.cacheKey || "");
|
|
19
20
|
const hasher = new backfill_hasher_1.Hasher({ packageRoot: target.cwd }, this.backfillLogger);
|
|
20
21
|
return hasher.createPackageHash(hashKey);
|
|
21
22
|
}
|
package/lib/TargetHasher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TargetHasher.js","sourceRoot":"","sources":["../src/TargetHasher.ts"],"names":[],"mappings":";;;AAAA,uDAAyD;AACzD,qDAA2D;AAC3D,iCAA8B;AAW9B;;;;GAIG;AACH,MAAa,YAAY;IAGvB,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAC9C,IAAI,CAAC,cAAc,GAAG,IAAA,sCAAoB,GAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc
|
|
1
|
+
{"version":3,"file":"TargetHasher.js","sourceRoot":"","sources":["../src/TargetHasher.ts"],"names":[],"mappings":";;;AAAA,uDAAyD;AACzD,qDAA2D;AAC3D,iCAA8B;AAW9B;;;;GAIG;AACH,MAAa,YAAY;IAGvB,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAC9C,IAAI,CAAC,cAAc,GAAG,IAAA,sCAAoB,GAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc;;QACvB,MAAM,OAAO,GAAG,MAAM,IAAA,WAAI,EACxB,MAAA,MAAA,MAAM,CAAC,eAAe,mCAAI,IAAI,CAAC,OAAO,CAAC,eAAe,mCAAI,CAAC,gBAAgB,CAAC,EAC5E,GAAG,MAAM,CAAC,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EACtD,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAC5B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,wBAAc,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACpF,OAAO,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;CACF;AAjBD,oCAiBC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { CacheProvider, CacheProviderOptions } from "../types/CacheProvider";
|
|
2
2
|
import type { Target } from "@lage-run/target-graph";
|
|
3
|
+
import type { Logger } from "@lage-run/logger";
|
|
3
4
|
export interface BackfillCacheProviderOptions {
|
|
4
5
|
root: string;
|
|
6
|
+
logger: Logger;
|
|
5
7
|
cacheOptions: Partial<CacheProviderOptions>;
|
|
6
8
|
}
|
|
7
9
|
export declare class BackfillCacheProvider implements CacheProvider {
|
|
@@ -46,6 +46,7 @@ class BackfillCacheProvider {
|
|
|
46
46
|
return (0, backfill_cache_1.getCacheStorageProvider)(cacheStorageConfig !== null && cacheStorageConfig !== void 0 ? cacheStorageConfig : { provider: "local" }, internalCacheFolder, this.backfillLogger, cwd, incrementalCaching);
|
|
47
47
|
}
|
|
48
48
|
async fetch(hash, target) {
|
|
49
|
+
const { logger } = this.options;
|
|
49
50
|
if (!hash) {
|
|
50
51
|
return false;
|
|
51
52
|
}
|
|
@@ -53,13 +54,21 @@ class BackfillCacheProvider {
|
|
|
53
54
|
try {
|
|
54
55
|
return await cacheStorage.fetch(hash);
|
|
55
56
|
}
|
|
56
|
-
catch (
|
|
57
|
+
catch (error) {
|
|
58
|
+
let message;
|
|
59
|
+
if (error instanceof Error) {
|
|
60
|
+
message = error.message;
|
|
61
|
+
}
|
|
62
|
+
else
|
|
63
|
+
message = String(error);
|
|
64
|
+
logger.silly(`Cache fetch failed: ${message}`, { target });
|
|
57
65
|
// backfill fetch can error, but we should simply ignore and continue
|
|
58
66
|
return false;
|
|
59
67
|
}
|
|
60
68
|
}
|
|
61
69
|
async put(hash, target) {
|
|
62
70
|
var _a, _b;
|
|
71
|
+
const { logger } = this.options;
|
|
63
72
|
if (!hash) {
|
|
64
73
|
return;
|
|
65
74
|
}
|
|
@@ -67,7 +76,14 @@ class BackfillCacheProvider {
|
|
|
67
76
|
try {
|
|
68
77
|
await cacheStorage.put(hash, (_b = (_a = target.outputs) !== null && _a !== void 0 ? _a : this.options.cacheOptions.outputGlob) !== null && _b !== void 0 ? _b : ["**/*"]);
|
|
69
78
|
}
|
|
70
|
-
catch (
|
|
79
|
+
catch (error) {
|
|
80
|
+
let message;
|
|
81
|
+
if (error instanceof Error) {
|
|
82
|
+
message = error.message;
|
|
83
|
+
}
|
|
84
|
+
else
|
|
85
|
+
message = String(error);
|
|
86
|
+
logger.silly(`Cache fetch failed: ${message}`, { target });
|
|
71
87
|
// backfill throws an error if outputGlob doesn't match any files, we will skip this error
|
|
72
88
|
}
|
|
73
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BackfillCacheProvider.js","sourceRoot":"","sources":["../../src/providers/BackfillCacheProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAqF;AACrF,mDAAyD;AACzD,qDAAkD;AAClD,+BAAiC;AACjC,uCAAyB;AACzB,2CAA6B;
|
|
1
|
+
{"version":3,"file":"BackfillCacheProvider.js","sourceRoot":"","sources":["../../src/providers/BackfillCacheProvider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lage-run/cache",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.20",
|
|
4
4
|
"description": "Cache for Lage",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "https://github.com/microsoft/lage"
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"lint": "monorepo-scripts lint"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@lage-run/target-graph": "^0.4.
|
|
18
|
+
"@lage-run/target-graph": "^0.4.3",
|
|
19
19
|
"@lage-run/logger": "^1.2.0",
|
|
20
20
|
"backfill-config": "^6.3.0",
|
|
21
21
|
"backfill-cache": "^5.6.1",
|