Compare commits

..
1 Commits
Author SHA1 Message Date
James MaesandCodex 04a929aae9 ci: retain Ruby coverage in shared CodeQL selection
Select Ruby for tracked .rb files alongside existing language detection. Covers qctl Java/Ruby/Actions, Ruby-only repositories and untracked-file exclusion.

Validation: red/green regression, seven selector tests, actionlint and two workflow contracts passed; actual qctl branch inventories select the expected languages. Consumer repins and scanner setup changes are outside this PR.

Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
2026-10-29 16:05:19 -05:00
23 changed files with 1622 additions and 1915 deletions

No files matched your search

-22
View File
@@ -1,22 +0,0 @@
schema: 1
scoped_delegation: true
components:
source:
toolchains:
node: 22.20.0
build:
tool: source
commands:
- - tracked-files
verification:
push:
branches:
- dev
- develop
- hotfix/**
- main
- master
- qualification/**
- rc
- release/**
tags: []
+2
View File
@@ -31,6 +31,8 @@ jobs:
languages.append('javascript-typescript')
if '.py' in extensions:
languages.append('python')
if '.rb' in extensions:
languages.append('ruby')
if any((name.startswith('.github/workflows/') and PurePosixPath(name).suffix in {'.yml', '.yaml'})
or PurePosixPath(name).name in {'action.yml', 'action.yaml'} for name in files if name):
languages.append('actions')
-146
View File
@@ -1,146 +0,0 @@
# DRAFT ONLY - NOT INSTALLED, NOT EXECUTED. Public, review-only.
# ONE-KEY NPM_TOKEN recovery variant of the reviewed qrun-secret-export workflow.
# Target path (after a new explicit owner decision): .github/workflows/qrun-secret-export.yml
# Delivery: normal Gitea PR onto develop, mirrored only by the existing dedicated shadow worker.
# Fails closed until the three PLACEHOLDER values below are replaced:
# NONCE, RECIPIENT_FPR, RECIPIENT_PUBLIC_PEM.
name: qrun-secret-export (one-shot, one-key NPM recovery only)
on:
workflow_dispatch:
inputs:
expected_head:
description: "Full 40-hex SHA of develop HEAD; must equal github.sha"
required: true
type: string
permissions: {} # artifact upload uses the runtime token, not GITHUB_TOKEN
env:
# Non-sensitive, reviewed constants (replaced at approval time).
NONCE: "6281c98f7a28fef56930c368dc19b97d"
RECIPIENT_FPR: "ed79db8053ad8b1c910994e71d07c4c914c76ebeda2eae9db6f38ecdae4fef6e"
concurrency:
group: qrun-secret-export
cancel-in-progress: false
jobs:
export:
if: >-
github.repository == 'QRun-IO/qqq-orb' &&
github.ref == format('refs/heads/{0}', github.event.repository.default_branch) &&
github.ref_name == 'develop' &&
github.sha == inputs.expected_head &&
github.run_attempt == 1
runs-on: ubuntu-24.04 # GitHub-hosted; never self-hosted
timeout-minutes: 10
permissions: {}
steps:
# No checkout. No repo code. No network install. Node built-in crypto only.
- name: Encrypt NPM_TOKEN to recipient
env:
# Exactly this one, on this step only.
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
# Non-secret context.
EXPECTED_HEAD: ${{ inputs.expected_head }}
RUN_ATTEMPT: ${{ github.run_attempt }}
RECIPIENT_PUBLIC_PEM: |
-----BEGIN PUBLIC KEY-----
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApnXE0AUAvxG+UO+lBbcl
eH+3MSgyGKo4xb78Z2ObhtwrgQXkzHhsvzH90APyx/Yh4IAlQ1e1G9P59b4Is6Mh
yaZ7zyu+KPP5vCeE3uO7CLd8M9EAp5i+1us9VyOoHhkM/klMXDITac/6Z6rMozAC
0wPhauwF4T/nsJqX1BFycL0p4FdFTHoSqfHNjiaKpN5ov43ho8E6MHVCsc2CEt1X
I99olcXFTybbCjHm8vjDrd/CepTHn26GQkwmxY2mKm43prcSC3uzHyL3nWg4uyKa
QzTjx9ff7fgcoOXO9/exZv3r5GDdFzGwBHE49PklCEAvbiu6y0smO4UhjEz4r/DN
6ratnC6UUqT3SQ3Zh+MkMIUAXi5AJfPELgUv5idSafPcOkjVd25VKP2LmqFvNecj
0LWX5HSVhDYb3LZiHqR1KY/+fBamyArfhEhHghLL5nhUN+EV/ba5wQgpUeG+STg8
NmBcvN1zhblS+KrhOJ7HZrthOfdck6GqgXQX0YSeFYSGdDG+pUI5XqJwJ6rOMLKD
iTpxB1JWgGpQxx4WX3/rFL9NJk5vfSUeAHFUzvyC3b8YGTIjfe6R08IDJK8nMLU3
gqSzFDkCldSq7nzr/psKmrw+6/+dYVEQ2ZD506+S3JGfcw3PzajYIWI65yAx7EIg
qNefU2CCRfPthnjw4WJhXbECAwEAAQ==
-----END PUBLIC KEY-----
run: |
node --input-type=commonjs - <<'NODE'
const c = require('crypto');
const fs = require('fs');
const E = process.env;
const NAMES = ['NPM_TOKEN'];
const bad = (m) => { const e = new Error(m); e.safe = true; throw e; };
let pt = null, aes = null;
try {
if (E.GITHUB_REPOSITORY !== 'QRun-IO/qqq-orb') bad('repository guard');
if (E.RUN_ATTEMPT !== '1') bad('attempt guard');
if (!/^[0-9a-f]{40}$/.test(E.EXPECTED_HEAD || '') || E.EXPECTED_HEAD !== E.GITHUB_SHA) bad('head guard');
if (!/^[0-9a-f]{32}$/.test(E.NONCE || '')) bad('nonce unset');
if (!/^[0-9a-f]{64}$/.test(E.RECIPIENT_FPR || '')) bad('recipient fingerprint unset');
let pub;
try { pub = c.createPublicKey(E.RECIPIENT_PUBLIC_PEM); } catch { bad('recipient key unset'); }
if (pub.asymmetricKeyType !== 'rsa' || pub.asymmetricKeyDetails.modulusLength !== 4096) bad('recipient key type');
const spki = pub.export({ type: 'spki', format: 'der' });
const spkiSha = c.createHash('sha256').update(spki).digest('hex');
if (spkiSha !== E.RECIPIENT_FPR) bad('recipient fingerprint mismatch');
const body = {};
for (const n of NAMES) {
if (!Object.prototype.hasOwnProperty.call(E, n) || typeof E[n] !== 'string') bad('missing secret field');
body[n] = E[n];
}
const prov = {
repository: E.GITHUB_REPOSITORY,
source_sha: E.GITHUB_SHA,
run_id: E.GITHUB_RUN_ID,
run_attempt: E.RUN_ATTEMPT,
operation_nonce: E.NONCE,
};
pt = Buffer.from(JSON.stringify({ ...prov, secrets: body }), 'utf8');
for (const n of NAMES) delete body[n];
aes = c.randomBytes(32);
const iv = c.randomBytes(12);
const aad = Buffer.from(`qrun-secret-export/v1|${spkiSha}|${E.NONCE}`, 'utf8');
const cipher = c.createCipheriv('aes-256-gcm', aes, iv);
cipher.setAAD(aad);
const ct = Buffer.concat([cipher.update(pt), cipher.final()]);
const tag = cipher.getAuthTag();
// oaepHash sets both the OAEP digest and the MGF1 digest (SHA-256 each).
const wrapped = c.publicEncrypt(
{ key: pub, padding: c.constants.RSA_PKCS1_OAEP_PADDING, oaepHash: 'sha256' }, aes);
const envelope = {
version: 1,
alg: 'RSA-OAEP-SHA256-MGF1SHA256+AES-256-GCM',
recipient_fingerprint: spkiSha,
provenance: prov,
wrapped_key: wrapped.toString('base64'),
iv: iv.toString('base64'),
tag: tag.toString('base64'),
ciphertext: ct.toString('base64'),
};
// Only file written: ciphertext, owner-only, create-exclusive.
fs.writeFileSync(`${E.RUNNER_TEMP}/${E.NONCE}.envelope.json`,
JSON.stringify(envelope), { mode: 0o600, flag: 'wx' });
console.log('envelope: written');
} catch (e) {
console.error('envelope: failed' + (e && e.safe ? ` (${e.message})` : ''));
process.exitCode = 1;
} finally {
if (pt) pt.fill(0);
if (aes) aes.fill(0);
for (const n of NAMES) delete process.env[n];
}
NODE
- name: Upload ciphertext artifact
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
with:
name: qrun-envelope-${{ env.NONCE }}
path: ${{ runner.temp }}/${{ env.NONCE }}.envelope.json # single explicit file
retention-days: 1
compression-level: 0
if-no-files-found: error
- name: Remove local ciphertext
if: always()
run: rm -f -- "${RUNNER_TEMP}/${NONCE}.envelope.json"
-6
View File
@@ -7,12 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- `cli` profile: publishes `@qrun-io/qqq-core` between the client and the conformance package on tag publishes, and refuses to publish when core's version differs from the CLI's or from the CLI's exact core dependency
- `cli` profile: one shared npm dist-tag for the four packages, `latest` when every version is final and `rc` when any has a prerelease part
- `cli` profile: optional `platforms: [macos-arm64, windows-x64]` manifest key that adds `cli_platform` lanes (new `cli_macos_arm64` and `cli_windows_x64` executors); a publishing tag's `cli_verify_publish` requires them. Off by default; other profiles reject the key
- `cli_verify.sh` runs `npm run lint` and diffs `packages/core/src/api/operations.ts` in the drift check; Node image `cimg/node:22.23`
### Fixed
- Maven compile, verify and frontend test steps pass `--update-snapshots`, so SNAPSHOT dependencies restored from the pom-checksum-keyed `~/.m2` cache are re-checked against the remote on every build instead of going stale
-9
View File
@@ -146,15 +146,6 @@ The orb auto-publishes via CircleCI:
Version bumps on main default to patch. Include `[minor]` or `[major]` in a commit message to bump accordingly.
## Voyage quality checks
The Voyage profile requires no Sonar service, account or token. Its existing
`mvn clean verify` runs the application's Checkstyle, PMD, SpotBugs and JaCoCo
checks alongside unit and integration tests. The profile retains those failures
as build failures and publishes their XML reports and `target/site` as artifacts.
The separate secret, SAST, dependency and image scans remain unchanged, as do
the dependencies that gate image publication and production GitOps updates.
## Project Status
**Maturity:** Stable, used across all QQQ repositories
+5 -15
View File
@@ -170,26 +170,16 @@ rather than silently ignored on these profiles. Existing direct jobs remain usab
## CLI profile
`cli` owns npm install, generated-client and operations drift, build, unit tests,
lint and the real Prism smoke contract through `cli_verify_publish`. Publication is **disabled by
`cli` owns npm install, generated-client drift, build, unit tests and the real
Prism smoke contract through `cli_verify_publish`. Publication is **disabled by
default**. To enable the existing v-tag publication, declare `publish.release:
true` plus `publish_context: VERIFIED_CONTEXT_NAME`, after verifying that an
existing trusted CircleCI context grants the required GitHub Packages permission.
No context name or credential availability is inferred from the former Actions
GITHUB_TOKEN. A tag must resolve to the current checkout; the job additionally
checks the client version, and that core shares the CLI version and matches the
CLI's exact core dependency, before publishing its four fixed workspaces (client,
core, conformance, CLI) under one dist-tag: `rc` if any of the four versions has
a prerelease part, otherwise `latest`. Main pushes never publish.
CLI docs-only is currently rejected because generated-client verification remains
mandatory.
Optional platform lanes are **off by default**. `platforms: [macos-arm64,
windows-x64]` (either or both) adds one `cli_platform` job per entry (`npm ci`,
build, tests and lint on Node 20 via the image's nvm), named `cli-macos-arm64` /
`cli-windows-x64`. On a publishing tag `cli_verify_publish` requires them. The
lanes use the `m4pro.medium` macOS and `windows.medium` resource classes, which
the CircleCI plan must include.
checks the client version before publishing its three fixed workspaces with the
existing rc dist-tag. Main pushes never publish. CLI docs-only is currently
rejected because generated-client verification remains mandatory.
## Conservative documentation routing
-6
View File
@@ -1,6 +0,0 @@
description: >
macOS arm64 executor for the opt-in CLI platform lane.
Requires the CircleCI plan to include the m4pro.medium resource class.
macos:
xcode: 16.4.0
resource_class: m4pro.medium
-7
View File
@@ -1,7 +0,0 @@
description: >
Windows x64 executor for the opt-in CLI platform lane. Steps run in Git Bash.
Requires the CircleCI plan to include the windows.medium resource class.
machine:
image: windows-server-2022-gui:current
resource_class: windows.medium
shell: bash.exe
-25
View File
@@ -1,25 +0,0 @@
description: >
Opt-in CLI platform lane: install, build, unit tests and lint on a non-Linux
executor. Rendered by the cli profile only for manifest platforms entries.
executor: << parameters.executor >>
parameters:
executor:
type: executor
description: "qqq-orb/cli_macos_arm64 or qqq-orb/cli_windows_x64"
node_version:
type: string
default: "20.20.2"
description: "Exact Node.js version installed with the image's nvm (the packages' engines floor)"
steps:
- checkout
- run:
name: Install Node.js << parameters.node_version >>
environment:
PARAM_NODE_VERSION: << parameters.node_version >>
command: <<include(scripts/cli_platform_node.sh)>>
- run:
name: Install locked CLI dependencies
command: npm ci
- run:
name: Build, tests and lint
command: npm run build && npm test && npm run lint
+3 -3
View File
@@ -1,13 +1,13 @@
description: >
Authoritative QQQ CLI validation, with optional tagged GitHub Packages publication.
Preserves generated-schema drift, build, tests, lint and Prism smoke before publishing.
Preserves generated-schema drift, build, tests and Prism smoke before publishing.
docker:
- image: cimg/node:22.23
- image: cimg/node:22.12
parameters:
publish:
type: boolean
default: false
description: "Publish four workspaces (dist-tag rc for prereleases, latest for final versions); requires matching version tag and GITHUB_TOKEN"
description: "Publish three workspaces with rc dist-tag; requires matching version tag and GITHUB_TOKEN"
steps:
- checkout
- restore_cache:
-15
View File
@@ -1,15 +0,0 @@
#!/bin/bash
# nvm is a shell function on macOS and not nounset-safe, so no -u here.
set -eo pipefail
# Install the exact Node.js version with the image's nvm (macOS login shell, nvm-windows in Git Bash).
nvm install "$PARAM_NODE_VERSION"
if [[ "$OSTYPE" == darwin* ]]; then
# Later steps start new login shells: make the version their default.
nvm alias default "$PARAM_NODE_VERSION"
else
# nvm-windows switches the global symlink, which later steps inherit.
nvm use "$PARAM_NODE_VERSION"
fi
node --version
npm --version
+4 -18
View File
@@ -2,12 +2,10 @@
set -euo pipefail
# Validate tag and fixed package destinations before asking for credentials.
# Prints the npm dist-tag shared by all four packages.
dist_tag=$(node --input-type=commonjs - <<'NODE'
node --input-type=commonjs - <<'NODE'
const fs = require('node:fs');
const packages = [
['packages/ui-api-client/package.json', '@qrun-io/qqq-ui-api-client'],
['packages/core/package.json', '@qrun-io/qqq-core'],
['packages/conformance/package.json', '@qrun-io/qqq-ui-api-conformance'],
['packages/cli/package.json', '@qrun-io/qqq-cli'],
];
@@ -21,18 +19,7 @@ const client = JSON.parse(fs.readFileSync(packages[0][0], 'utf8'));
if (!process.env.CIRCLE_TAG || process.env.CIRCLE_TAG !== 'v' + client.version) {
throw new Error('Version tag must match the client package version');
}
// The CLI pins core exactly and shares its version: publish only that pair.
const core = JSON.parse(fs.readFileSync(packages[1][0], 'utf8'));
const cli = JSON.parse(fs.readFileSync(packages[3][0], 'utf8'));
if (core.version !== cli.version || cli.dependencies?.['@qrun-io/qqq-core'] !== core.version) {
throw new Error('Core package version must match the CLI version and its exact core dependency');
}
// Final releases become latest; any prerelease part (e.g. -rc.1, -beta.2) in
// any of the four keeps every package on rc, so latest never points at an rc.
const versions = packages.map(([path]) => JSON.parse(fs.readFileSync(path, 'utf8')).version);
console.log(versions.some((version) => version.includes('-')) ? 'rc' : 'latest');
NODE
)
: "${GITHUB_TOKEN:?GitHub Packages write credential GITHUB_TOKEN is required}"
export NODE_AUTH_TOKEN="$GITHUB_TOKEN"
# Store only an environment substitution, never the token itself.
@@ -48,7 +35,6 @@ export NPM_CONFIG_USERCONFIG="$npm_config"
# Authentication alone is not proof of package write permission; hosted publish
# migration remains gated on verifying the actual context's package access.
npm whoami --registry https://npm.pkg.github.com >/dev/null
npm publish -w @qrun-io/qqq-ui-api-client --registry https://npm.pkg.github.com --tag "$dist_tag"
npm publish -w @qrun-io/qqq-core --registry https://npm.pkg.github.com --tag "$dist_tag"
npm publish -w @qrun-io/qqq-ui-api-conformance --registry https://npm.pkg.github.com --tag "$dist_tag"
npm publish -w @qrun-io/qqq-cli --registry https://npm.pkg.github.com --tag "$dist_tag"
npm publish -w @qrun-io/qqq-ui-api-client --registry https://npm.pkg.github.com --tag rc
npm publish -w @qrun-io/qqq-ui-api-conformance --registry https://npm.pkg.github.com --tag rc
npm publish -w @qrun-io/qqq-cli --registry https://npm.pkg.github.com --tag rc
+1 -2
View File
@@ -2,10 +2,9 @@
set -euo pipefail
npm run generate
git diff --exit-code -- packages/ui-api-client/src/schema.ts packages/core/src/api/operations.ts
git diff --exit-code -- packages/ui-api-client/src/schema.ts
npm run build
npm test
npm run lint
# Use the locked local executable; never download an unpinned npx fallback.
./node_modules/.bin/prism mock --port 4010 packages/ui-api-client/openapi/qqq-v1.json > prism.log 2>&1 &
+3 -17
View File
@@ -64,10 +64,6 @@ def boolean(data, key, default):
return value
# Opt-in CLI platform lanes: manifest entry -> orb executor.
CLI_PLATFORMS = {"macos-arm64": "qqq-orb/cli_macos_arm64", "windows-x64": "qqq-orb/cli_windows_x64"}
def load_manifest(path, setup_version):
raw = Path(path).read_text(encoding="utf-8")
if len(raw) > 65536:
@@ -88,7 +84,7 @@ def load_manifest(path, setup_version):
if profile == "qbit":
allowed += ("release_completion", "release_on_main", "release_tag_policy", "test_branch_policy")
elif profile == "cli":
allowed += ("publish_context", "platforms")
allowed += ("publish_context",)
elif profile in ("voyage", "frontend-next", "app-starter", "android", "mcp-policy", "repository-policy", "marketing", "application-template"):
allowed = ("profile", "orb_version", "default_branch")
elif profile == "all":
@@ -163,9 +159,6 @@ def load_manifest(path, setup_version):
raise ManifestError("CLI publication requires an explicitly verified context")
if profile == "cli" and boolean(data, "docs_only", False):
raise ManifestError("CLI currently requires full generated-client verification")
platforms = data.get("platforms", [])
if not isinstance(platforms, list) or any(not isinstance(x, str) or x not in CLI_PLATFORMS for x in platforms) or len(platforms) != len(set(platforms)):
raise ManifestError("platforms must be distinct entries of " + ", ".join(CLI_PLATFORMS))
tag_policy = data.get("release_tag_policy", "stable")
if tag_policy not in ("stable", "v-prefix", "none"):
raise ManifestError("Unsupported QBit release tag policy")
@@ -181,7 +174,7 @@ def load_manifest(path, setup_version):
"release_on_main": boolean(data, "release_on_main", False),
"release_tag_policy": tag_policy, "test_branch_policy": test_policy,
"docs_only": boolean(data, "docs_only", False),
"publish_context": publish_context, "platforms": platforms,
"publish_context": publish_context,
"publish": {key: boolean(publishing, key, key != "asciidoc" and profile not in ("cli", "all", "repository-policy", "application-template")
and not (profile == "qbit" and key in ("hotfix", "feature")))
for key in publish_keys}}
@@ -443,16 +436,9 @@ def cli_template(config, branch, tag):
options = {"publish": publish, "filters": filters}
if publish:
options["context"] = [config["publish_context"]]
platforms = config.get("platforms", [])
jobs = [{"qqq-orb/cli_platform": {"name": "cli-" + p, "executor": CLI_PLATFORMS[p], "filters": copy.deepcopy(filters)}}
for p in platforms]
if publish and platforms:
# Every opted-in platform must pass before packages are published.
options["requires"] = ["cli-" + p for p in platforms]
jobs.append({"qqq-orb/cli_verify_publish": options})
# CLI docs are still verified until its generated-client inputs get a dedicated policy.
return {"version": 2.1, "orbs": {"qqq-orb": "kingsrook/qqq-orb@" + config["orb_version"]},
"workflows": {"publish_release" if publish else "test_only": {"jobs": jobs}}}
"workflows": {"publish_release" if publish else "test_only": {"jobs": [{"qqq-orb/cli_verify_publish": options}]}}}
def marketing_template(config, branch, tag):
+5 -19
View File
@@ -16,9 +16,9 @@ import yaml
# Generated by scripts/pack_pipeline.py; edit source/resources, then regenerate.
import base64
import zlib
CORE_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("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 truncated
CORE_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("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 truncated
MATERIAL_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNq1lMtugzAQRfd8heV1TNRKlar8QXdVt02EXDMhDthGfqRBiH/vQAmPvKRU6g7PjH3PXI+pI0IoHEEEb6yjK1JjAENlwatvK7OdH2IYTY3IwWLks4+QIdflpeIZYJoqYWMlhTXObH0sjFqOB64OT/HLa/zM9lypig77m/5rE51WzaKl25uvq2CJB+fdFO/UR0swaWBxyjsPpZvRU7EDkZswFp11ZFHDWEgEx8qJVp/OoZof2Md1qViKYqyuSSfhgiJrWnKRo0OsQB/jvTN6TUnTTLTPt9NZZjNZNaNvt9CDvgTWXHUX9Kad50VBUAV0ClpIcGccFK9NcZ225QhEhCSMFZBxUbESwHaE9CEkxw/3rOyV/uwcVvnd9fswKSTKpKEA92+efgRN3oexIwfpAi+IhQyHyEmjye/A3nP5SMa57cof9LebVW693HIxexsTg+avg1kojfXLc6wUxaXmHrmvbvgLWNtQgmaE4h5bW8X6quUNmctfRdREPykCLqM=")))
VOYAGE_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("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")))
VOYAGE_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("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")))
NEXT_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrNVE1v2zAMvedXCFqAtlscb70tQLGtXTEUGFYgHXqJM0OxmUSJLCmS7DYr8t9HubaXOOnHYYfdLPLp6fGR9EOHEFqAsVxJOiCn/Q89H1FmYvH4gN94Wq1WAUYwQJdczqxRahlWwc9xfD08j28vhzdX1z/imOKVTcmxUNscOp8Ibudxyux8ophJ4wUzTRoBcA9J7pSP1Q+GC1Yw2qsR1oH2jKMqgKFkDslS5a4BkYZwW3nIpXVMiLgkHOxgEFVnpUoBs87k0NtF+Ez81yZ6ekq3AJvme/OEDpPL/Wcly/xz9BYMn66JmwPhWZY7NhFADAhgFkj9aEtQorKMydRfr5C1vLOIdh8uroYX3y/jn1++vSk2EY3k1CjpQKYNqnvsayKBJhEyrHJu4PioH2qWLNkM+gur5NFJv0JH9CSSGStAbt3PCkmCcxKsyByEHkDBRM4cUn6Fe23AljBt1AISVxNhcqpMAjcuxa4hqQPrUEG3rS+i5MzHW8X5UuorO3qewf/DTp3nXKRlo3BgHE8IVqqMe6Y5iTLgPSUgfVsjqaXOSDVwJAiw7t8gA6GS5ZQ3ebfWUI52dRZcujqF1VefE69m8CjhFWU2y4CN88sXp6CFWtf3xp365uP63imznAp1d2CHK5O3t7da9tHza1iuEdM6LqXv+4wWOGzcXgJTE8MkWnIo5zd4JtFob3jYfxvSFmDTa7M5NnuCSUmx3ilkKxcWB8hr5w653z69PH4v/SabCcM1uHcHhJZel6sRGJhx68w6SAykIB1nwu6qH/f+V/9p+KsYvQ8+jt9FUb/1cRwML5rDyafu/nuvacD+2Hc2nT/snNGl")))
ALL_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNq1T7EOgjAU3PmKpjNIdHQyJg4ukmDiYkwDUkxt4UkLEkP4dwsSUojootu7u/fu7lUWQvhOpWKQ4iVazOZ2w4AMlYaVnjXKsszRjCYwZ+lFSQDuduSKEM9fk8PG32+9HSFYn9StRwmSxwJKw0gHsfjhBGnkqAQ47RWtXaGNPHYY9YpZwQ2EIC8X47bbSYOkccRhwUTUhuRU5dhYqvu5rfglZ1xxFHMGSbE91G4SYiYmZUmzgkk6/LPTplsjdPrXD3EhxIcf3sk//sEy1QbVVm09Ad15mhY=")))
STARTER_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNp1UMGKwkAMvc9XlDmKtejR0yJ42MsKCl5EQnUzZbbTiZ0ZqiL9d1OpWqt7y3t5eS/JRUSRrNB5TVZOo8loPGwYcjvP8MI1o7IsY2aYkLm2mXdEedKSXwCL5QzW8+Xqe/EDIHmkvnkcyeXK0LFjFNAHIGvOD4rJP7plbVocPTrd7KSoLHwab2V7Kg7aIOxQkUPgi7RqZCo1Hod9rQ14Ci+ZnbQirdDGDjPtgzvHe4e/aINmI/ki3/ZslTaBH/m2W3N3mn3iuaMzy/s2n01Gg0T2BLX4Dz3re7UVd1SLWlwByepyJQ==")))
@@ -64,10 +64,6 @@ def boolean(data, key, default):
return value
# Opt-in CLI platform lanes: manifest entry -> orb executor.
CLI_PLATFORMS = {"macos-arm64": "qqq-orb/cli_macos_arm64", "windows-x64": "qqq-orb/cli_windows_x64"}
def load_manifest(path, setup_version):
raw = Path(path).read_text(encoding="utf-8")
if len(raw) > 65536:
@@ -88,7 +84,7 @@ def load_manifest(path, setup_version):
if profile == "qbit":
allowed += ("release_completion", "release_on_main", "release_tag_policy", "test_branch_policy")
elif profile == "cli":
allowed += ("publish_context", "platforms")
allowed += ("publish_context",)
elif profile in ("voyage", "frontend-next", "app-starter", "android", "mcp-policy", "repository-policy", "marketing", "application-template"):
allowed = ("profile", "orb_version", "default_branch")
elif profile == "all":
@@ -163,9 +159,6 @@ def load_manifest(path, setup_version):
raise ManifestError("CLI publication requires an explicitly verified context")
if profile == "cli" and boolean(data, "docs_only", False):
raise ManifestError("CLI currently requires full generated-client verification")
platforms = data.get("platforms", [])
if not isinstance(platforms, list) or any(not isinstance(x, str) or x not in CLI_PLATFORMS for x in platforms) or len(platforms) != len(set(platforms)):
raise ManifestError("platforms must be distinct entries of " + ", ".join(CLI_PLATFORMS))
tag_policy = data.get("release_tag_policy", "stable")
if tag_policy not in ("stable", "v-prefix", "none"):
raise ManifestError("Unsupported QBit release tag policy")
@@ -181,7 +174,7 @@ def load_manifest(path, setup_version):
"release_on_main": boolean(data, "release_on_main", False),
"release_tag_policy": tag_policy, "test_branch_policy": test_policy,
"docs_only": boolean(data, "docs_only", False),
"publish_context": publish_context, "platforms": platforms,
"publish_context": publish_context,
"publish": {key: boolean(publishing, key, key != "asciidoc" and profile not in ("cli", "all", "repository-policy", "application-template")
and not (profile == "qbit" and key in ("hotfix", "feature")))
for key in publish_keys}}
@@ -443,16 +436,9 @@ def cli_template(config, branch, tag):
options = {"publish": publish, "filters": filters}
if publish:
options["context"] = [config["publish_context"]]
platforms = config.get("platforms", [])
jobs = [{"qqq-orb/cli_platform": {"name": "cli-" + p, "executor": CLI_PLATFORMS[p], "filters": copy.deepcopy(filters)}}
for p in platforms]
if publish and platforms:
# Every opted-in platform must pass before packages are published.
options["requires"] = ["cli-" + p for p in platforms]
jobs.append({"qqq-orb/cli_verify_publish": options})
# CLI docs are still verified until its generated-client inputs get a dedicated policy.
return {"version": 2.1, "orbs": {"qqq-orb": "kingsrook/qqq-orb@" + config["orb_version"]},
"workflows": {"publish_release" if publish else "test_only": {"jobs": jobs}}}
"workflows": {"publish_release" if publish else "test_only": {"jobs": [{"qqq-orb/cli_verify_publish": options}]}}}
def marketing_template(config, branch, tag):
+2 -2
View File
@@ -341,9 +341,9 @@
},
{
"run": {
"name": "Require source-generated starter and application acceptance with live PostgreSQL",
"name": "Require source-generated starter and application acceptance with live MySQL",
"no_output_timeout": "30m",
"command": "set -euo pipefail\nconsumer_root=$(mktemp -d /tmp/qqq-starter-acceptance-XXXXXX)\ntrap 'rm -rf \"$consumer_root\"' EXIT\ngit clone https://github.com/QRun-IO/qqq-app-starter.git \"$consumer_root/starter\"\ngit -C \"$consumer_root/starter\" checkout --detach 2fb62378fa76da1950dc9e67984c18fd0491ae3f\ntest \"$(git -C \"$consumer_root/starter\" rev-parse HEAD)\" = 2fb62378fa76da1950dc9e67984c18fd0491ae3f\ngit clone https://github.com/QRun-IO/qbit-template-application.git \"$consumer_root/template\"\ngit -C \"$consumer_root/template\" fetch origin refs/pull/5/head\ngit -C \"$consumer_root/template\" checkout --detach FETCH_HEAD\ntest \"$(git -C \"$consumer_root/template\" rev-parse HEAD)\" = 70a72a54f4a3024e39d07a7d86c5acf738283286\ndocker pull postgres:17-alpine\nQQQ_STARTER_SOURCE=\"$consumer_root/starter\" QQQ_TEMPLATE_SOURCE=\"$consumer_root/template\" \\\n python3 -m unittest discover -s qqq-sample-project/acceptance -p test_starter_application.py -v\npython3 qqq-sample-project/acceptance/run_starter_application.py \\\n --qqq-source . --starter-source \"$consumer_root/starter\" \\\n --template-source \"$consumer_root/template\" \\\n --candidate-version 0.0.0-sample-acceptance \\\n --maven-repo \"$consumer_root/m2\" --online \\\n --maven-settings /tmp/circleci/mvn-settings.xml --live-postgres \\\n --junit-dir qqq-sample-project/target/starter-application-junit\npython3 qqq-sample-project/verify-feature-coverage.py --stage source \\\n --require-feature train.starter --require-feature train.application\n"
"command": "set -euo pipefail\nconsumer_root=$(mktemp -d /tmp/qqq-starter-acceptance-XXXXXX)\ntrap 'rm -rf \"$consumer_root\"' EXIT\ngit clone https://github.com/QRun-IO/qqq-app-starter.git \"$consumer_root/starter\"\ngit -C \"$consumer_root/starter\" checkout --detach 2fb62378fa76da1950dc9e67984c18fd0491ae3f\ntest \"$(git -C \"$consumer_root/starter\" rev-parse HEAD)\" = 2fb62378fa76da1950dc9e67984c18fd0491ae3f\ngit clone https://github.com/QRun-IO/qbit-template-application.git \"$consumer_root/template\"\ngit -C \"$consumer_root/template\" fetch origin refs/pull/5/head\ngit -C \"$consumer_root/template\" checkout --detach FETCH_HEAD\ntest \"$(git -C \"$consumer_root/template\" rev-parse HEAD)\" = 70a72a54f4a3024e39d07a7d86c5acf738283286\ndocker pull mysql:8.4\nQQQ_STARTER_SOURCE=\"$consumer_root/starter\" QQQ_TEMPLATE_SOURCE=\"$consumer_root/template\" \\\n python3 -m unittest discover -s qqq-sample-project/acceptance -p test_starter_application.py -v\npython3 qqq-sample-project/acceptance/run_starter_application.py \\\n --qqq-source . --starter-source \"$consumer_root/starter\" \\\n --template-source \"$consumer_root/template\" \\\n --candidate-version 0.0.0-sample-acceptance \\\n --maven-repo \"$consumer_root/m2\" --online \\\n --maven-settings /tmp/circleci/mvn-settings.xml --live-mysql \\\n --junit-dir qqq-sample-project/target/starter-application-junit\npython3 qqq-sample-project/verify-feature-coverage.py --stage source \\\n --require-feature train.starter --require-feature train.application\n"
}
},
{
File diff suppressed because it is too large. Load diff
+3 -3
View File
@@ -313,7 +313,7 @@ jobs:
name: Build framework dependencies for the consumers
command: mvn -B -s /tmp/circleci/mvn-settings.xml -Drevision=0.0.0-sample-acceptance -DskipTests clean install
- run:
name: Require source-generated starter and application acceptance with live PostgreSQL
name: Require source-generated starter and application acceptance with live MySQL
no_output_timeout: 30m
command: |
set -euo pipefail
@@ -326,7 +326,7 @@ jobs:
git -C "$consumer_root/template" fetch origin refs/pull/5/head
git -C "$consumer_root/template" checkout --detach FETCH_HEAD
test "$(git -C "$consumer_root/template" rev-parse HEAD)" = 70a72a54f4a3024e39d07a7d86c5acf738283286
docker pull postgres:17-alpine
docker pull mysql:8.4
QQQ_STARTER_SOURCE="$consumer_root/starter" QQQ_TEMPLATE_SOURCE="$consumer_root/template" \
python3 -m unittest discover -s qqq-sample-project/acceptance -p test_starter_application.py -v
python3 qqq-sample-project/acceptance/run_starter_application.py \
@@ -334,7 +334,7 @@ jobs:
--template-source "$consumer_root/template" \
--candidate-version 0.0.0-sample-acceptance \
--maven-repo "$consumer_root/m2" --online \
--maven-settings /tmp/circleci/mvn-settings.xml --live-postgres \
--maven-settings /tmp/circleci/mvn-settings.xml --live-mysql \
--junit-dir qqq-sample-project/target/starter-application-junit
python3 qqq-sample-project/verify-feature-coverage.py --stage source \
--require-feature train.starter --require-feature train.application
+10 -27
View File
@@ -5,7 +5,7 @@ scripts=$(cd "$(dirname "${BASH_SOURCE[0]}")/../src/scripts" && pwd)
scratch=$(mktemp -d)
trap 'rm -rf "$scratch"' EXIT
cd "$scratch"
mkdir -p bin node_modules/.bin packages/{ui-api-client,core,conformance,cli}/src
mkdir -p bin node_modules/.bin packages/{ui-api-client,conformance,cli}/src
export CLI_LOG="$scratch/commands" PRISM_PID_FILE="$scratch/prism-pid" CONFIG_PATH_FILE="$scratch/npm-config-path"
cat > bin/npm <<'STUB'
#!/bin/bash
@@ -35,7 +35,7 @@ chmod +x bin/* node_modules/.bin/prism
export PATH="$scratch/bin:$PATH"
: > "$CLI_LOG"
bash "$scripts/cli_verify.sh"
[[ "$(cat "$CLI_LOG")" == $'run generate\nrun build\ntest\nrun lint' ]]
[[ "$(cat "$CLI_LOG")" == $'run generate\nrun build\ntest' ]]
if [[ -e "$PRISM_PID_FILE" ]] && kill -0 "$(cat "$PRISM_PID_FILE")" 2>/dev/null; then
echo 'Prism process survived cleanup' >&2
exit 1
@@ -51,37 +51,20 @@ if [[ -e "$PRISM_PID_FILE" ]] && kill -0 "$(cat "$PRISM_PID_FILE")" 2>/dev/null;
echo 'Prism process survived cleanup' >&2
exit 1
fi
write_packages() {
local core_version=$1 core_dependency=$2 client_version=${3:-1.6.0-rc.1} cli_version=${4:-0.1.0-rc.1} item dir name version
for item in "ui-api-client qqq-ui-api-client $client_version" "core qqq-core $core_version" "conformance qqq-ui-api-conformance $client_version" "cli qqq-cli $cli_version"; do
read -r dir name version <<< "$item"
printf '{"name":"@qrun-io/%s","version":"%s","publishConfig":{"registry":"https://npm.pkg.github.com"},"dependencies":{"@qrun-io/qqq-core":"%s"}}\n' "$name" "$version" "$core_dependency" > "packages/$dir/package.json"
done
}
write_packages 0.1.0-rc.1 0.1.0-rc.1
for item in 'ui-api-client qqq-ui-api-client 1.6.0-rc.1' 'conformance qqq-ui-api-conformance 1.6.0-rc.1' 'cli qqq-cli 0.1.0-rc.1'; do
read -r dir name version <<< "$item"
printf '{"name":"@qrun-io/%s","version":"%s","publishConfig":{"registry":"https://npm.pkg.github.com"}}\n' "$name" "$version" > "packages/$dir/package.json"
done
export CIRCLE_TAG=v1.6.0-rc.1 GITHUB_TOKEN=test-not-a-credential
: > "$CLI_LOG"
bash "$scripts/cli_publish.sh"
[[ "$(grep '^publish ' "$CLI_LOG" | cut -d' ' -f3)" == $'@qrun-io/qqq-ui-api-client\n@qrun-io/qqq-core\n@qrun-io/qqq-ui-api-conformance\n@qrun-io/qqq-cli' ]]
[[ $(grep -c -- '--tag rc$' "$CLI_LOG") -eq 4 ]]
# Final versions publish as latest; any prerelease among the four keeps rc.
write_packages 1.0.0 1.0.0 1.6.0 1.0.0
: > "$CLI_LOG"
CIRCLE_TAG=v1.6.0 bash "$scripts/cli_publish.sh"
[[ $(grep -c -- '--tag latest$' "$CLI_LOG") -eq 4 ]]
[[ $(grep -c '^publish ' "$CLI_LOG") -eq 4 ]]
write_packages 1.0.0 1.0.0 1.6.0-rc.3 1.0.0
: > "$CLI_LOG"
CIRCLE_TAG=v1.6.0-rc.3 bash "$scripts/cli_publish.sh"
[[ $(grep -c -- '--tag rc$' "$CLI_LOG") -eq 4 ]]
[[ $(grep -c '^publish ' "$CLI_LOG") -eq 3 ]]
[[ $(grep -c -- '--tag rc$' "$CLI_LOG") -eq 3 ]]
[[ $(grep -c '^test$' "$CLI_LOG" || true) -eq 0 ]]
[[ ! -e "$(cat "$CONFIG_PATH_FILE")" ]]
for condition in wrong-tag missing-token denied-auth core-version core-dependency; do
for condition in wrong-tag missing-token denied-auth; do
: > "$CLI_LOG"
write_packages 0.1.0-rc.1 0.1.0-rc.1
case "$condition" in
core-version) write_packages 0.1.0-rc.2 0.1.0-rc.2; if bash "$scripts/cli_publish.sh" >/dev/null 2>&1; then exit 1; fi ;;
core-dependency) write_packages 0.1.0-rc.1 0.1.0-rc.0; if bash "$scripts/cli_publish.sh" >/dev/null 2>&1; then exit 1; fi ;;
wrong-tag) if CIRCLE_TAG=v0.1.0 bash "$scripts/cli_publish.sh" >/dev/null 2>&1; then exit 1; fi ;;
missing-token) if GITHUB_TOKEN='' bash "$scripts/cli_publish.sh" >/dev/null 2>&1; then exit 1; fi ;;
denied-auth) if FAIL_AUTH=true bash "$scripts/cli_publish.sh" >/dev/null 2>&1; then exit 1; fi ;;
@@ -91,4 +74,4 @@ for condition in wrong-tag missing-token denied-auth core-version core-dependenc
exit 1
fi
done
printf 'PASS: CLI validation once, drift/test/smoke failures, cleanup, tag/core-version/auth checks and four rc/latest publishes (stubbed)\n'
printf 'PASS: CLI validation once, drift/test/smoke failures, cleanup, tag/auth checks and three rc publishes (stubbed)\n'
+1 -13
View File
@@ -10,7 +10,7 @@ class CliContract(unittest.TestCase):
def test_single_full_validation_and_opt_in_publication(self):
config = yaml.safe_load((ROOT / "src/jobs/cli_verify_publish.yml").read_text())
self.assertIs(config["parameters"]["publish"]["default"], False)
self.assertEqual(config["docker"], [{"image": "cimg/node:22.23"}])
self.assertEqual(config["docker"], [{"image": "cimg/node:22.12"}])
steps = config["steps"]
ci = [i for i, s in enumerate(steps) if isinstance(s, dict) and s.get("run", {}).get("command") == "npm ci"]
verify = [i for i, s in enumerate(steps) if "scripts/cli_verify.sh" in str(s)]
@@ -24,18 +24,6 @@ class CliContract(unittest.TestCase):
cache = next(s["save_cache"] for s in steps if isinstance(s, dict) and "save_cache" in s)
self.assertEqual(cache["paths"], ["~/.npm"])
def test_platform_lane_runs_install_build_test_and_lint(self):
config = yaml.safe_load((ROOT / "src/jobs/cli_platform.yml").read_text())
self.assertEqual(config["executor"], "<< parameters.executor >>")
self.assertEqual(config["parameters"]["executor"]["type"], "executor")
commands = [s["run"]["command"] if isinstance(s["run"], dict) else s["run"]
for s in config["steps"] if isinstance(s, dict) and "run" in s]
self.assertIn("npm ci", commands)
self.assertEqual(commands[-1], "npm run build && npm test && npm run lint")
self.assertNotIn("publish", str(config))
for name in ("cli_macos_arm64", "cli_windows_x64"):
self.assertTrue((ROOT / "src/executors" / (name + ".yml")).exists())
if __name__ == "__main__":
unittest.main()
File diff suppressed because it is too large. Load diff
+13 -1
View File
@@ -44,8 +44,20 @@ class BranchLanguages(unittest.TestCase):
self.assertEqual(0, result.returncode, result.stderr)
self.assertIn('build-mode=autobuild\n', output)
def test_java_cli_preserves_homebrew_ruby_coverage(self):
result, output = self.select(['src/Main.java', 'packaging/homebrew/qctl.rb', '.github/workflows/build.yml'])
self.assertEqual(0, result.returncode, result.stderr)
self.assertIn('languages=java-kotlin,ruby,actions\n', output)
self.assertIn('build-mode=none\n', output)
def test_ruby_only_source_is_supported(self):
result, output = self.select(['Formula/qctl.rb'])
self.assertEqual(0, result.returncode, result.stderr)
self.assertIn('languages=ruby\n', output)
self.assertIn('build-mode=none\n', output)
def test_untracked_files_do_not_select_languages(self):
result, output = self.select(['src/Example.java'], ['web/generated.js', '.github/workflows/untracked.yml'])
result, output = self.select(['src/Example.java'], ['web/generated.js', 'generated/formula.rb', '.github/workflows/untracked.yml'])
self.assertEqual(0, result.returncode, result.stderr)
self.assertIn('languages=java-kotlin\n', output)
+131 -137
View File
@@ -1,137 +1,131 @@
"""Voyage's authoritative CI contracts, extracted from source 9f598cc105ef."""
import json
import os
import subprocess
import tempfile
from pathlib import Path
import re
import unittest
TEMPLATE = json.loads((Path(__file__).resolve().parents[1] / "src/scripts/templates/voyage.json").read_text())
def matches(pattern, branch):
if isinstance(pattern, list):
return any(matches(p, branch) for p in pattern)
if pattern.startswith("/") and pattern.endswith("/"):
return re.fullmatch(pattern[1:-1], branch) is not None
return pattern == branch
def selected(branch):
found = []
for workflow, body in TEMPLATE["workflows"].items():
for invocation in body["jobs"]:
name, options = next(iter(invocation.items()))
filters = options.get("filters", {}).get("branches", {})
if "only" in filters and not matches(filters["only"], branch):
continue
if "ignore" in filters and matches(filters["ignore"], branch):
continue
found.append((workflow, options.get("name", name), options))
return found
class VoyageContract(unittest.TestCase):
def test_each_supported_branch_has_one_validation_owner(self):
for branch, workflow in (("feature/example", "pull-request"), ("hotfix/example", "pull-request"), ("develop", "develop"), ("main", "release"), ("release/1.0", "release")):
with self.subTest(branch=branch):
jobs = selected(branch)
self.assertEqual({w for w, _, _ in jobs}, {workflow})
self.assertEqual([n for _, n, _ in jobs].count("build-and-test"), 1)
self.assertEqual({n for _, n, _ in selected("release-please--branches--main")},
{"build-and-test", "secrets-scan", "sast-scan", "security-scan"})
def test_verify_owns_tests_quality_and_coverage_without_skips(self):
jobs = TEMPLATE["jobs"]
self.assertNotIn("coverage", jobs)
self.assertNotIn("code-quality", jobs)
steps = jobs["build-and-test"]["steps"]
commands = [s["run"]["command"] for s in steps if isinstance(s, dict) and "run" in s]
self.assertEqual(commands, ["mvn clean verify -B -T4 --update-snapshots --no-transfer-progress"])
full = json.dumps(jobs)
self.assertNotIn("mvn test", full)
self.assertNotIn("jacoco.skip", full)
self.assertNotIn("skipTests", full)
self.assertLess(steps.index("qqq-orb/mvn_cache_restore"), steps.index("qqq-orb/mvn_cache_save"))
def test_unit_integration_and_coverage_evidence_retained(self):
steps = TEMPLATE["jobs"]["build-and-test"]["steps"]
results = [s["store_test_results"]["path"] for s in steps if isinstance(s, dict) and "store_test_results" in s]
self.assertEqual(results, ["target/surefire-reports", "target/failsafe-reports"])
paths = next(s["persist_to_workspace"]["paths"] for s in steps if isinstance(s, dict) and "persist_to_workspace" in s)
for path in ("target/site", "target/jacoco.exec", "target/voyage.jar", "target/classes", "target/test-classes"):
self.assertIn(path, paths)
artifacts = [s["store_artifacts"]["path"] for s in steps if isinstance(s, dict) and "store_artifacts" in s]
for path in ("target/site", "target/checkstyle-result.xml", "target/spotbugsXml.xml", "target/pmd.xml"):
self.assertIn(path, artifacts)
def test_quality_requires_no_sonar_service_or_credentials(self):
self.assertNotIn("sonar", json.dumps(TEMPLATE).lower())
for branch in ("main", "develop", "release/1.0", "feature/example"):
names = {name for _, name, _ in selected(branch)}
self.assertTrue({"build-and-test", "secrets-scan", "sast-scan", "security-scan"}.issubset(names))
def test_all_workflow_dependencies_exist_and_preserve_release_boundaries(self):
for workflow, body in TEMPLATE["workflows"].items():
names = {next(iter(entry.values())).get("name", next(iter(entry))) for entry in body["jobs"]}
for entry in body["jobs"]:
name, options = next(iter(entry.items()))
self.assertTrue(name in TEMPLATE["jobs"] or name == "munitor/update_cd_repo")
self.assertTrue(set(options.get("requires", [])).issubset(names))
for branch in ("feature/example", "release/1.0", "develop"):
self.assertNotIn("update-cd-repo", [n for _, n, _ in selected(branch)])
self.assertNotIn("release-please", [n for _, n, _ in selected(branch)])
main = {n: o for _, n, o in selected("main")}
self.assertEqual(main["update-cd-repo"]["requires"], ["docker-build"])
self.assertEqual(main["release-please"]["requires"], ["docker-build"])
self.assertEqual(main["docker-build"]["requires"], ["build-and-test", "secrets-scan", "sast-scan", "security-scan"])
def test_dependency_scan_propagates_findings_and_operational_errors(self):
command = next(s["run"]["command"] for s in TEMPLATE["jobs"]["security-scan"]["steps"]
if isinstance(s, dict) and "run" in s)
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
(root / "bin").mkdir()
docker = root / "bin/docker"
docker.write_text('#!/bin/sh\nexit "$SCANNER_RESULT"\n')
docker.chmod(0o755)
(root / "target").mkdir()
(root / "target/voyage.jar").write_bytes(b"artifact")
env = {**os.environ, "HOME": directory, "PATH": str(root / "bin") + os.pathsep + os.environ["PATH"],
"CIRCLE_BRANCH": "develop"}
for code in (0, 1, 2):
result = subprocess.run(["bash", "-c", command], cwd=root,
env={**env, "SCANNER_RESULT": str(code)}, capture_output=True)
self.assertEqual(result.returncode, code)
(root / "target/voyage.jar").unlink()
result = subprocess.run(["bash", "-c", command], cwd=root,
env={**env, "SCANNER_RESULT": "0"}, capture_output=True)
self.assertNotEqual(result.returncode, 0)
def test_security_policies_and_destinations_preserved(self):
jobs = TEMPLATE["jobs"]
self.assertIn('--exit-code 1', json.dumps(jobs["docker-build"]))
self.assertIn('--severity CRITICAL,HIGH', json.dumps(jobs["docker-build"]))
self.assertIn('ghcr.io/qrun-io/voyage', json.dumps(jobs["docker-build"]))
self.assertNotIn('update-cd-repo', jobs)
owasp = '\n'.join(s["run"]["command"] for s in jobs["security-scan"]["steps"] if isinstance(s, dict) and "run" in s)
self.assertIn('--severity HIGH,CRITICAL --exit-code 1', owasp)
self.assertIn('target/voyage.jar:/scan/voyage.jar:ro', owasp)
self.assertIn('aquasec/trivy:0.76.0@sha256:', owasp)
self.assertNotIn('--ignore-unfixed', owasp)
self.assertNotIn('NVD_API_KEY', owasp)
self.assertNotIn('mvn ', owasp)
self.assertIn('set -euo pipefail', owasp)
self.assertEqual(jobs["security-scan"]["resource_class"], "medium")
for workflow in TEMPLATE["workflows"].values():
for invocation in workflow["jobs"]:
if "security-scan" in invocation:
self.assertNotIn("context", invocation["security-scan"])
self.assertIn('./gitleaks detect', json.dumps(jobs["secrets-scan"]))
self.assertIn('|| true', json.dumps(jobs["sast-scan"]))
self.assertIn('makeAggregateBom', json.dumps(jobs["sbom"]))
if __name__ == "__main__":
unittest.main()
"""Voyage's authoritative CI contracts, extracted from source 9f598cc105ef."""
import json
import os
import subprocess
import tempfile
from pathlib import Path
import re
import unittest
TEMPLATE = json.loads((Path(__file__).resolve().parents[1] / "src/scripts/templates/voyage.json").read_text())
def matches(pattern, branch):
if isinstance(pattern, list):
return any(matches(p, branch) for p in pattern)
if pattern.startswith("/") and pattern.endswith("/"):
return re.fullmatch(pattern[1:-1], branch) is not None
return pattern == branch
def selected(branch):
found = []
for workflow, body in TEMPLATE["workflows"].items():
for invocation in body["jobs"]:
name, options = next(iter(invocation.items()))
filters = options.get("filters", {}).get("branches", {})
if "only" in filters and not matches(filters["only"], branch):
continue
if "ignore" in filters and matches(filters["ignore"], branch):
continue
found.append((workflow, options.get("name", name), options))
return found
class VoyageContract(unittest.TestCase):
def test_each_supported_branch_has_one_validation_owner(self):
for branch, workflow in (("feature/example", "pull-request"), ("hotfix/example", "pull-request"), ("develop", "develop"), ("main", "release"), ("release/1.0", "release")):
with self.subTest(branch=branch):
jobs = selected(branch)
self.assertEqual({w for w, _, _ in jobs}, {workflow})
self.assertEqual([n for _, n, _ in jobs].count("build-and-test"), 1)
self.assertEqual({n for _, n, _ in selected("release-please--branches--main")},
{"build-and-test", "secrets-scan", "sast-scan", "security-scan"})
def test_verify_owns_tests_quality_and_coverage_without_skips(self):
jobs = TEMPLATE["jobs"]
self.assertNotIn("coverage", jobs)
self.assertNotIn("code-quality", jobs)
steps = jobs["build-and-test"]["steps"]
commands = [s["run"]["command"] for s in steps if isinstance(s, dict) and "run" in s]
self.assertEqual(commands, ["mvn clean verify -B -T4 --update-snapshots --no-transfer-progress"])
full = json.dumps(jobs)
self.assertNotIn("mvn test", full)
self.assertNotIn("jacoco.skip", full)
self.assertNotIn("skipTests", full)
self.assertLess(steps.index("qqq-orb/mvn_cache_restore"), steps.index("qqq-orb/mvn_cache_save"))
def test_unit_integration_and_coverage_evidence_retained(self):
steps = TEMPLATE["jobs"]["build-and-test"]["steps"]
results = [s["store_test_results"]["path"] for s in steps if isinstance(s, dict) and "store_test_results" in s]
self.assertEqual(results, ["target/surefire-reports", "target/failsafe-reports"])
paths = next(s["persist_to_workspace"]["paths"] for s in steps if isinstance(s, dict) and "persist_to_workspace" in s)
for path in ("target/site", "target/jacoco.exec", "target/voyage.jar", "target/classes", "target/test-classes"):
self.assertIn(path, paths)
sonar = json.dumps(TEMPLATE["jobs"]["sonar-scan"])
self.assertIn("target/site/jacoco/jacoco.xml", sonar)
self.assertIn("attach_workspace", sonar)
def test_all_workflow_dependencies_exist_and_preserve_release_boundaries(self):
for workflow, body in TEMPLATE["workflows"].items():
names = {next(iter(entry.values())).get("name", next(iter(entry))) for entry in body["jobs"]}
for entry in body["jobs"]:
name, options = next(iter(entry.items()))
self.assertTrue(name in TEMPLATE["jobs"] or name == "munitor/update_cd_repo")
self.assertTrue(set(options.get("requires", [])).issubset(names))
for branch in ("feature/example", "release/1.0", "develop"):
self.assertNotIn("update-cd-repo", [n for _, n, _ in selected(branch)])
self.assertNotIn("release-please", [n for _, n, _ in selected(branch)])
main = {n: o for _, n, o in selected("main")}
self.assertEqual(main["update-cd-repo"]["requires"], ["docker-build"])
self.assertEqual(main["release-please"]["requires"], ["docker-build"])
self.assertEqual(main["docker-build"]["requires"], ["build-and-test", "secrets-scan", "sast-scan", "security-scan"])
def test_dependency_scan_propagates_findings_and_operational_errors(self):
command = next(s["run"]["command"] for s in TEMPLATE["jobs"]["security-scan"]["steps"]
if isinstance(s, dict) and "run" in s)
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
(root / "bin").mkdir()
docker = root / "bin/docker"
docker.write_text('#!/bin/sh\nexit "$SCANNER_RESULT"\n')
docker.chmod(0o755)
(root / "target").mkdir()
(root / "target/voyage.jar").write_bytes(b"artifact")
env = {**os.environ, "HOME": directory, "PATH": str(root / "bin") + os.pathsep + os.environ["PATH"],
"CIRCLE_BRANCH": "develop"}
for code in (0, 1, 2):
result = subprocess.run(["bash", "-c", command], cwd=root,
env={**env, "SCANNER_RESULT": str(code)}, capture_output=True)
self.assertEqual(result.returncode, code)
(root / "target/voyage.jar").unlink()
result = subprocess.run(["bash", "-c", command], cwd=root,
env={**env, "SCANNER_RESULT": "0"}, capture_output=True)
self.assertNotEqual(result.returncode, 0)
def test_security_policies_and_destinations_preserved(self):
jobs = TEMPLATE["jobs"]
self.assertIn('--exit-code 1', json.dumps(jobs["docker-build"]))
self.assertIn('--severity CRITICAL,HIGH', json.dumps(jobs["docker-build"]))
self.assertIn('ghcr.io/qrun-io/voyage', json.dumps(jobs["docker-build"]))
self.assertNotIn('update-cd-repo', jobs)
owasp = '\n'.join(s["run"]["command"] for s in jobs["security-scan"]["steps"] if isinstance(s, dict) and "run" in s)
self.assertIn('--severity HIGH,CRITICAL --exit-code 1', owasp)
self.assertIn('target/voyage.jar:/scan/voyage.jar:ro', owasp)
self.assertIn('aquasec/trivy:0.76.0@sha256:', owasp)
self.assertNotIn('--ignore-unfixed', owasp)
self.assertNotIn('NVD_API_KEY', owasp)
self.assertNotIn('mvn ', owasp)
self.assertIn('set -euo pipefail', owasp)
self.assertEqual(jobs["security-scan"]["resource_class"], "medium")
for workflow in TEMPLATE["workflows"].values():
for invocation in workflow["jobs"]:
if "security-scan" in invocation:
self.assertNotIn("context", invocation["security-scan"])
self.assertIn('./gitleaks detect', json.dumps(jobs["secrets-scan"]))
self.assertIn('|| true', json.dumps(jobs["sast-scan"]))
self.assertIn('makeAggregateBom', json.dumps(jobs["sbom"]))
if __name__ == "__main__":
unittest.main()