@lage-run/cache 0.1.17 → 0.1.19
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 +31 -1
- package/CHANGELOG.md +18 -2
- package/lib/backfillWrapper.d.ts +4 -4
- package/lib/backfillWrapper.js +1 -1
- package/lib/backfillWrapper.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 +1 -1
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,37 @@
|
|
|
2
2
|
"name": "@lage-run/cache",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Thu, 06 Oct 2022 16:07:15 GMT",
|
|
6
|
+
"tag": "@lage-run/cache_v0.1.19",
|
|
7
|
+
"version": "0.1.19",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "ken@gizzar.com",
|
|
12
|
+
"package": "@lage-run/cache",
|
|
13
|
+
"commit": "bd449545266b4a823e6e79beb2b75103cc3b3739",
|
|
14
|
+
"comment": "adding a bit more logging to cache puts for \"silly\" log level"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Wed, 05 Oct 2022 23:59:29 GMT",
|
|
21
|
+
"tag": "@lage-run/cache_v0.1.18",
|
|
22
|
+
"version": "0.1.18",
|
|
23
|
+
"comments": {
|
|
24
|
+
"patch": [
|
|
25
|
+
{
|
|
26
|
+
"author": "kchau@microsoft.com",
|
|
27
|
+
"package": "@lage-run/cache",
|
|
28
|
+
"commit": "8e77866719951e420ec42aa283cce0114cd52684",
|
|
29
|
+
"comment": "just a fix to which envrionment wins"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Wed, 05 Oct 2022 20:00:31 GMT",
|
|
6
36
|
"tag": "@lage-run/cache_v0.1.17",
|
|
7
37
|
"version": "0.1.17",
|
|
8
38
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,28 @@
|
|
|
1
1
|
# Change Log - @lage-run/cache
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 06 Oct 2022 16:07:15 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.1.19
|
|
8
|
+
|
|
9
|
+
Thu, 06 Oct 2022 16:07:15 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- adding a bit more logging to cache puts for "silly" log level (ken@gizzar.com)
|
|
14
|
+
|
|
15
|
+
## 0.1.18
|
|
16
|
+
|
|
17
|
+
Wed, 05 Oct 2022 23:59:29 GMT
|
|
18
|
+
|
|
19
|
+
### Patches
|
|
20
|
+
|
|
21
|
+
- just a fix to which envrionment wins (kchau@microsoft.com)
|
|
22
|
+
|
|
7
23
|
## 0.1.17
|
|
8
24
|
|
|
9
|
-
Wed, 05 Oct 2022 20:00:
|
|
25
|
+
Wed, 05 Oct 2022 20:00:31 GMT
|
|
10
26
|
|
|
11
27
|
### Patches
|
|
12
28
|
|
package/lib/backfillWrapper.d.ts
CHANGED
|
@@ -5,10 +5,6 @@ import type { Logger as BackfillLogger } from "backfill-logger";
|
|
|
5
5
|
import type { CacheOptions } from "./types/CacheOptions";
|
|
6
6
|
export declare function createBackfillLogger(): BackfillLogger;
|
|
7
7
|
export declare function createBackfillCacheConfig(cwd: string, cacheOptions: Partial<CacheOptions> | undefined, backfillLogger: BackfillLogger): {
|
|
8
|
-
writeRemoteCache?: boolean | undefined;
|
|
9
|
-
skipLocalCache?: boolean | undefined;
|
|
10
|
-
environmentGlob?: string[] | undefined;
|
|
11
|
-
cacheKey?: string | undefined;
|
|
12
8
|
cacheStorageConfig: import("backfill-config").CacheStorageConfig;
|
|
13
9
|
clearOutput: boolean;
|
|
14
10
|
internalCacheFolder: string;
|
|
@@ -22,4 +18,8 @@ export declare function createBackfillCacheConfig(cwd: string, cacheOptions: Par
|
|
|
22
18
|
producePerformanceLogs: boolean;
|
|
23
19
|
validateOutput: boolean;
|
|
24
20
|
incrementalCaching: boolean;
|
|
21
|
+
writeRemoteCache?: boolean | undefined;
|
|
22
|
+
skipLocalCache?: boolean | undefined;
|
|
23
|
+
environmentGlob?: string[] | undefined;
|
|
24
|
+
cacheKey?: string | undefined;
|
|
25
25
|
};
|
package/lib/backfillWrapper.js
CHANGED
|
@@ -50,7 +50,7 @@ function createBackfillLogger() {
|
|
|
50
50
|
exports.createBackfillLogger = createBackfillLogger;
|
|
51
51
|
function createBackfillCacheConfig(cwd, cacheOptions = {}, backfillLogger) {
|
|
52
52
|
const envConfig = (0, backfill_config_1.getEnvConfig)(backfillLogger);
|
|
53
|
-
return Object.assign(Object.assign(Object.assign({}, (0, backfill_config_1.createDefaultConfig)(cwd)),
|
|
53
|
+
return Object.assign(Object.assign(Object.assign({}, (0, backfill_config_1.createDefaultConfig)(cwd)), cacheOptions), envConfig);
|
|
54
54
|
}
|
|
55
55
|
exports.createBackfillCacheConfig = createBackfillCacheConfig;
|
|
56
56
|
//# sourceMappingURL=backfillWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfillWrapper.js","sourceRoot":"","sources":["../src/backfillWrapper.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,qDAAoE;AACpE,qDAA6C;AAI7C,SAAgB,oBAAoB;IAClC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,OAAO,IAAA,4BAAU,EAAC,OAAO,EAAE;QACzB,OAAO,EAAE;YACP,IAAI,CAAC,GAAG,IAAI;gBACV,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,GAAG,IAAI;gBACV,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;YACD,KAAK,CAAC,GAAG,IAAI;gBACX,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAhBD,oDAgBC;AAED,SAAgB,yBAAyB,CAAC,GAAW,EAAE,eAAsC,EAAE,EAAE,cAA8B;IAC7H,MAAM,SAAS,GAAG,IAAA,8BAAY,EAAC,cAAc,CAAC,CAAC;IAC/C,qDACK,IAAA,qCAAmB,EAAC,GAAG,CAAC,GACxB,
|
|
1
|
+
{"version":3,"file":"backfillWrapper.js","sourceRoot":"","sources":["../src/backfillWrapper.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,qDAAoE;AACpE,qDAA6C;AAI7C,SAAgB,oBAAoB;IAClC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,OAAO,IAAA,4BAAU,EAAC,OAAO,EAAE;QACzB,OAAO,EAAE;YACP,IAAI,CAAC,GAAG,IAAI;gBACV,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,GAAG,IAAI;gBACV,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;YACD,KAAK,CAAC,GAAG,IAAI;gBACX,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAhBD,oDAgBC;AAED,SAAgB,yBAAyB,CAAC,GAAW,EAAE,eAAsC,EAAE,EAAE,cAA8B;IAC7H,MAAM,SAAS,GAAG,IAAA,8BAAY,EAAC,cAAc,CAAC,CAAC;IAC/C,qDACK,IAAA,qCAAmB,EAAC,GAAG,CAAC,GACxB,YAAY,GACZ,SAAS,EACZ;AACJ,CAAC;AAPD,8DAOC"}
|
|
@@ -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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"}
|