fix(ci): count both OCI recovery reads

This commit is contained in:
whyour
2026-08-22 17:02:20 +08:00
parent d55933d781
commit 9bf3472c14
4 changed files with 20 additions and 12 deletions
@@ -313,11 +313,11 @@ function validatePluginPackageRecoveryE2ELiveReport(report) {
]) ||
oci?.https !== true ||
oci?.authentication !== 'exact-registry-basic' ||
oci?.authenticatedRequestCount !== 12 ||
oci?.requestCount !== 12 ||
oci?.authenticatedRequestCount !== 24 ||
oci?.requestCount !== 24 ||
oci?.uniquePaths !== 12 ||
oci?.initialRequestCount !== 6 ||
oci?.upgradeRequestCount !== 6 ||
oci?.initialRequestCount !== 12 ||
oci?.upgradeRequestCount !== 12 ||
oci?.redirects !== 0
) {
findings.push(
@@ -1358,8 +1358,14 @@ function registryEvidence(fixture) {
.filter((value) => value.schema === REGISTRY_EVENT_SCHEMA);
const packageRequests = events.filter((event) => event.path !== '/v2/');
const expectedPaths = [
...fixture.initial.routes.map((routeValue) => routeValue.path),
...fixture.upgrade.routes.map((routeValue) => routeValue.path),
...fixture.initial.routes.flatMap((routeValue) => [
routeValue.path,
routeValue.path,
]),
...fixture.upgrade.routes.flatMap((routeValue) => [
routeValue.path,
routeValue.path,
]),
].sort();
assert.equal(packageRequests.length, expectedPaths.length);
assert.deepEqual(
@@ -1374,8 +1380,8 @@ function registryEvidence(fixture) {
authenticatedRequestCount: packageRequests.length,
requestCount: packageRequests.length,
uniquePaths: new Set(packageRequests.map((event) => event.path)).size,
initialRequestCount: fixture.initial.routes.length,
upgradeRequestCount: fixture.upgrade.routes.length,
initialRequestCount: fixture.initial.routes.length * 2,
upgradeRequestCount: fixture.upgrade.routes.length * 2,
redirects: 0,
});
}
@@ -82,11 +82,11 @@ function validReport() {
oci: {
https: true,
authentication: 'exact-registry-basic',
authenticatedRequestCount: 12,
requestCount: 12,
authenticatedRequestCount: 24,
requestCount: 24,
uniquePaths: 12,
initialRequestCount: 6,
upgradeRequestCount: 6,
initialRequestCount: 12,
upgradeRequestCount: 12,
redirects: 0,
},
kubernetes: {
@@ -243,6 +243,8 @@ test('private Registry evidence uses one exact Secret file and authenticated req
assert.match(live, /secretName: 'ql3-e2e-registry-auth'/);
assert.match(live, /defaultMode: 288/);
assert.match(live, /authentication: 'exact-registry-basic'/);
assert.match(live, /fixture\.initial\.routes\.length \* 2/);
assert.match(live, /fixture\.upgrade\.routes\.length \* 2/);
assert.match(
live,
/packageRequests\.every\(\(event\) => event\.authenticated === true\)/,