@lage-run/cache 0.1.21 → 0.1.22
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 +16 -1
- package/CHANGELOG.md +10 -2
- package/lib/salt.js +26 -19
- package/lib/salt.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,22 @@
|
|
|
2
2
|
"name": "@lage-run/cache",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Mon, 24 Oct 2022 21:39:49 GMT",
|
|
6
|
+
"tag": "@lage-run/cache_v0.1.22",
|
|
7
|
+
"version": "0.1.22",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "kchau@microsoft.com",
|
|
12
|
+
"package": "@lage-run/cache",
|
|
13
|
+
"commit": "c91040aa0f9d6e804c300e18a1b41295c242fa4e",
|
|
14
|
+
"comment": "Fixed salt to not have race conditions with env hash calculations"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Sun, 23 Oct 2022 04:31:57 GMT",
|
|
6
21
|
"tag": "@lage-run/cache_v0.1.21",
|
|
7
22
|
"version": "0.1.21",
|
|
8
23
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
# Change Log - @lage-run/cache
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Mon, 24 Oct 2022 21:39:49 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.1.22
|
|
8
|
+
|
|
9
|
+
Mon, 24 Oct 2022 21:39:49 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Fixed salt to not have race conditions with env hash calculations (kchau@microsoft.com)
|
|
14
|
+
|
|
7
15
|
## 0.1.21
|
|
8
16
|
|
|
9
|
-
Sun, 23 Oct 2022 04:31:
|
|
17
|
+
Sun, 23 Oct 2022 04:31:57 GMT
|
|
10
18
|
|
|
11
19
|
### Patches
|
|
12
20
|
|
package/lib/salt.js
CHANGED
|
@@ -28,33 +28,40 @@ const path = __importStar(require("path"));
|
|
|
28
28
|
const crypto = __importStar(require("crypto"));
|
|
29
29
|
const fg = __importStar(require("fast-glob"));
|
|
30
30
|
const fs = __importStar(require("fs/promises"));
|
|
31
|
-
let
|
|
31
|
+
let envHashes = {};
|
|
32
32
|
function _testResetEnvHash() {
|
|
33
|
-
|
|
33
|
+
envHashes = {};
|
|
34
34
|
}
|
|
35
35
|
exports._testResetEnvHash = _testResetEnvHash;
|
|
36
36
|
async function salt(environmentGlobFiles, command, repoRoot, customKey = "") {
|
|
37
|
-
|
|
37
|
+
const envHash = await getEnvHash(environmentGlobFiles, repoRoot);
|
|
38
|
+
return hashStrings([...envHash, command, customKey]);
|
|
38
39
|
}
|
|
39
40
|
exports.salt = salt;
|
|
41
|
+
function envHashKey(environmentGlobFiles) {
|
|
42
|
+
return environmentGlobFiles.sort().join("|");
|
|
43
|
+
}
|
|
40
44
|
async function getEnvHash(environmentGlobFiles, repoRoot) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
45
|
+
const key = envHashKey(environmentGlobFiles);
|
|
46
|
+
if (envHashes[key]) {
|
|
47
|
+
return envHashes[key];
|
|
48
|
+
}
|
|
49
|
+
const envHash = [];
|
|
50
|
+
const newline = /\r\n|\r|\n/g;
|
|
51
|
+
const LF = "\n";
|
|
52
|
+
const files = fg.sync(environmentGlobFiles, {
|
|
53
|
+
cwd: repoRoot,
|
|
54
|
+
});
|
|
55
|
+
files.sort((a, b) => a.localeCompare(b));
|
|
56
|
+
for (const file of files) {
|
|
57
|
+
const hasher = crypto.createHash("sha1");
|
|
58
|
+
hasher.update(file);
|
|
59
|
+
const fileBuffer = await fs.readFile(path.join(repoRoot, file), "utf-8");
|
|
60
|
+
const data = fileBuffer.replace(newline, LF);
|
|
61
|
+
hasher.update(data);
|
|
62
|
+
envHash.push(hasher.digest("hex"));
|
|
57
63
|
}
|
|
64
|
+
envHashes[key] = envHash;
|
|
58
65
|
return envHash;
|
|
59
66
|
}
|
|
60
67
|
function hashStrings(strings) {
|
package/lib/salt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salt.js","sourceRoot":"","sources":["../src/salt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,+CAAiC;AACjC,8CAAgC;AAChC,gDAAkC;
|
|
1
|
+
{"version":3,"file":"salt.js","sourceRoot":"","sources":["../src/salt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,+CAAiC;AACjC,8CAAgC;AAChC,gDAAkC;AAMlC,IAAI,SAAS,GAAsB,EAAE,CAAC;AAEtC,SAAgB,iBAAiB;IAC/B,SAAS,GAAG,EAAE,CAAC;AACjB,CAAC;AAFD,8CAEC;AAEM,KAAK,UAAU,IAAI,CAAC,oBAA8B,EAAE,OAAe,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE;IAC1G,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IACjE,OAAO,WAAW,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;AACvD,CAAC;AAHD,oBAGC;AAED,SAAS,UAAU,CAAC,oBAA8B;IAChD,OAAO,oBAAoB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,oBAA8B,EAAE,QAAgB;IACxE,MAAM,GAAG,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAE7C,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;KACvB;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,aAAa,CAAC;IAC9B,MAAM,EAAE,GAAG,IAAI,CAAC;IAChB,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE;QAC1C,GAAG,EAAE,QAAQ;KACd,CAAC,CAAC;IAEH,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpB,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KACpC;IAED,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;IACzB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAAC,OAA0B;IAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAClE,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAEtD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC"}
|