Skip to content

Commit fa5d242

Browse files
author
Guy Bedford
authored
Merge branch 'main' into weval-stack-fix
2 parents 3189cb9 + 9161deb commit fa5d242

File tree

13 files changed

+67
-38
lines changed

13 files changed

+67
-38
lines changed

‎documentation/docs/acl/Acl/prototype/lookup.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ address prefix that was matched in the ACL.
3232
import { Acl } from 'fastly:acl';
3333
addEventListener('fetch', async (evt) => {
3434
const myAcl = Acl.open('myacl');
35-
const { action, prefix } = await myAcl.lookup(evt.client.address);
36-
evt.respondWith(new Response(action === 'BLOCK' ? 'blocked' : 'allowed'));
35+
const match = await myAcl.lookup(evt.client.address);
36+
evt.respondWith(new Response(match?.action === 'BLOCK' ? 'blocked' : 'allowed'));
3737
});
3838
```

‎integration-tests/js-compute/env.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function getEnv(serviceName) {
22
return {
3-
DICTIONARY_NAME: `aZ2 __ 2${serviceName ? '__' + serviceName.replace(/-/g, '_') : ''}`,
3+
DICTIONARY_NAME: `aZ2__2${serviceName ? '__' + serviceName.replace(/-/g, '_') : ''}`,
44
CONFIG_STORE_NAME: `testconfig${serviceName ? '__' + serviceName.replace(/-/g, '_') : ''}`,
55
KV_STORE_NAME: `example-test-kv-store${serviceName ? '--' + serviceName : ''}`,
66
SECRET_STORE_NAME: `example-test-secret-store${serviceName ? '--' + serviceName : ''}`,

‎integration-tests/js-compute/fixtures/app/tests.json

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
"GET /client/tlsClientCertificate": {},
410410
"GET /client/tlsCipherOpensslName": {},
411411
"GET /client/tlsProtocol": {},
412-
"GET /config-store": { "flake": true },
412+
"GET /config-store": { "flake": true, "skip": true },
413413
"GET /crypto": {
414414
"downstream_response": {
415415
"status": 200,
@@ -980,24 +980,49 @@
980980
"body": "ok"
981981
}
982982
},
983-
"GET /dictionary/exposed-as-global": { "flake": true },
984-
"GET /dictionary/interface": { "flake": true },
985-
"GET /dictionary/constructor/called-as-regular-function": { "flake": true },
983+
"GET /dictionary/exposed-as-global": { "flake": true, "skip": true },
984+
"GET /dictionary/interface": { "flake": true, "skip": true },
985+
"GET /dictionary/constructor/called-as-regular-function": {
986+
"flake": true,
987+
"skip": true
988+
},
986989
"GET /dictionary/constructor/parameter-calls-7.1.17-ToString": {
987-
"flake": true
990+
"flake": true,
991+
"skip": true
992+
},
993+
"GET /dictionary/constructor/empty-parameter": {
994+
"flake": true,
995+
"skip": true
996+
},
997+
"GET /dictionary/constructor/found": { "flake": true, "skip": true },
998+
"GET /dictionary/constructor/invalid-name": { "flake": true, "skip": true },
999+
"GET /dictionary/get/called-as-constructor": { "flake": true, "skip": true },
1000+
"GET /dictionary/get/called-unbound": { "flake": true, "skip": true },
1001+
"GET /dictionary/get/key-parameter-calls-7.1.17-ToString": {
1002+
"flake": true,
1003+
"skip": true
1004+
},
1005+
"GET /dictionary/get/key-parameter-not-supplied": {
1006+
"flake": true,
1007+
"skip": true
1008+
},
1009+
"GET /dictionary/get/key-parameter-empty-string": {
1010+
"flake": true,
1011+
"skip": true
1012+
},
1013+
"GET /dictionary/get/key-parameter-255-character-string": {
1014+
"flake": true,
1015+
"skip": true
1016+
},
1017+
"GET /dictionary/get/key-parameter-256-character-string": {
1018+
"flake": true,
1019+
"skip": true
1020+
},
1021+
"GET /dictionary/get/key-does-not-exist-returns-null": {
1022+
"flake": true,
1023+
"skip": true
9881024
},
989-
"GET /dictionary/constructor/empty-parameter": { "flake": true },
990-
"GET /dictionary/constructor/found": { "flake": true },
991-
"GET /dictionary/constructor/invalid-name": { "flake": true },
992-
"GET /dictionary/get/called-as-constructor": { "flake": true },
993-
"GET /dictionary/get/called-unbound": { "flake": true },
994-
"GET /dictionary/get/key-parameter-calls-7.1.17-ToString": { "flake": true },
995-
"GET /dictionary/get/key-parameter-not-supplied": { "flake": true },
996-
"GET /dictionary/get/key-parameter-empty-string": { "flake": true },
997-
"GET /dictionary/get/key-parameter-255-character-string": { "flake": true },
998-
"GET /dictionary/get/key-parameter-256-character-string": { "flake": true },
999-
"GET /dictionary/get/key-does-not-exist-returns-null": { "flake": true },
1000-
"GET /dictionary/get/key-exists": { "flake": true },
1025+
"GET /dictionary/get/key-exists": { "flake": true, "skip": true },
10011026
"GET /env": {
10021027
"environments": ["viceroy"]
10031028
},

‎integration-tests/js-compute/fixtures/module-mode/tests.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"GET /acl": { "environments": ["compute"] },
2+
"GET /acl": { "environments": ["compute"], "skip": true },
33
"GET /backend/timeout": {
44
"environments": ["compute"],
55
"downstream_response": {

‎integration-tests/js-compute/setup.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,12 @@ async function setupAcl() {
151151
}
152152

153153
zx.verbose = true;
154-
await setupConfigStores();
154+
// disabled pending 404 fix
155+
// await setupConfigStores();
155156
await setupKVStore();
156157
await setupSecretStore();
157-
await setupAcl();
158+
// disabled pending 503 fix
159+
// await setupAcl();
158160
zx.verbose = false;
159161

160162
await zx`fastly service-version activate --service-id ${serviceId} --version latest --token $FASTLY_API_TOKEN`;

‎integration-tests/js-compute/teardown.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,12 @@ async function removeAcl() {
135135
}
136136
}
137137

138-
await removeConfigStores();
138+
// Disabled pending 404 fix
139+
// await removeConfigStores();
139140
await removeKVStore();
140141
await removeSecretStore();
141-
await removeAcl();
142+
// Disabled pending 503 fix
143+
// await removeAcl();
142144

143145
console.log(
144146
`Tear down has finished! Took ${(Date.now() - startTime) / 1000} seconds to complete`,

‎runtime/StarlingMonkey

Submodule StarlingMonkey updated 42 files

‎runtime/fastly/build-debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -x
55

66
cd "$(dirname "$0")" || exit 1
77
RUNTIME_VERSION=$(npm pkg get version --json --prefix=../../ | jq -r)
8-
HOST_API=$(realpath host-api) cmake -B build-debug -DCMAKE_BUILD_TYPE=Debug -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DRUNTIME_VERSION="\"$RUNTIME_VERSION-debug\""
8+
HOST_API=$(realpath host-api) cmake -B build-debug -DCMAKE_BUILD_TYPE=Debug -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DRUNTIME_VERSION="\"$RUNTIME_VERSION-debug\"" -DENABLE_JS_DEBUGGER=OFF
99
cmake --build build-debug --parallel 10
1010
if [ "${1:-default}" != "--keep-debug-info" ]; then
1111
wasm-tools strip build-debug/starling-raw.wasm/starling-raw.wasm -d ".debug_(info|loc|ranges|abbrev|line|str)" -o ../../fastly.debug.wasm

‎runtime/fastly/build-release-weval.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
cd "$(dirname "$0")" || exit 1
33
RUNTIME_VERSION=$(npm pkg get version --json --prefix=../../ | jq -r)
4-
HOST_API=$(realpath host-api) cmake -B build-release-weval -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DRUNTIME_VERSION="\"$RUNTIME_VERSION\"" -DWEVAL=ON
4+
HOST_API=$(realpath host-api) cmake -B build-release-weval -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DRUNTIME_VERSION="\"$RUNTIME_VERSION\"" -DWEVAL=ON -DENABLE_JS_DEBUGGER=OFF
55
cmake --build build-release-weval --parallel 8
66
mv build-release-weval/starling-raw.wasm/starling-raw.wasm ../../fastly-weval.wasm
77
mv build-release-weval/starling-raw.wasm/starling-ics.wevalcache ../../fastly-ics.wevalcache

‎runtime/fastly/build-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
cd "$(dirname "$0")" || exit 1
33
RUNTIME_VERSION=$(npm pkg get version --json --prefix=../../ | jq -r)
4-
HOST_API=$(realpath host-api) cmake -B build-release -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DRUNTIME_VERSION="\"$RUNTIME_VERSION\""
4+
HOST_API=$(realpath host-api) cmake -B build-release -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DRUNTIME_VERSION="\"$RUNTIME_VERSION\"" -DENABLE_JS_DEBUGGER=OFF
55
cmake --build build-release
66
mv build-release/starling-raw.wasm/starling-raw.wasm ../../fastly.wasm

0 commit comments

Comments
 (0)