Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c0c2dd268 | |||
| c19cc68d15 | |||
| d247db3569 | |||
| 09253bf0be |
+13
-18
@@ -1,30 +1,25 @@
|
|||||||
{
|
{
|
||||||
"phase": 0,
|
"phase": 3,
|
||||||
"stage": "grill",
|
"stage": "verify",
|
||||||
"milestone": "v1.29",
|
"milestone": "v1.29",
|
||||||
"phase_role": "pre_execution",
|
"phase_role": "execution",
|
||||||
"attempts": 0,
|
"attempts": 0,
|
||||||
"updated_at": "2026-08-20T00:40:00Z",
|
"updated_at": "2026-08-20T01:20:00Z",
|
||||||
"project": "acdl",
|
"project": "acdl",
|
||||||
"projects": ["acdl", "nova-blockchain-exchange"],
|
"projects": ["acdl", "nova-blockchain-exchange"],
|
||||||
"active_milestone": "v1.29",
|
"active_milestone": "v1.29",
|
||||||
"milestone_branch": "milestone/v1.29-reposplit-identity",
|
"milestone_branch": "milestone/v1.29-reposplit-identity",
|
||||||
"phase_branch": "phase/00-pre-execution",
|
"phase_branch": "phase/03-cfn-archive-tf-delegation",
|
||||||
"tag_line": "v1.28.x",
|
"tag_line": "v1.28.x",
|
||||||
"phase_name": "pre-execution",
|
"phase_name": "cfn-archive-tf-delegation",
|
||||||
"milestone_type": "feature",
|
"milestone_type": "feature",
|
||||||
"reqs_covered": [],
|
"reqs_covered": ["REQ-354", "REQ-367", "REQ-368", "REQ-369"],
|
||||||
"reqs_partial": [],
|
"reqs_partial": [],
|
||||||
"decisions": ["D-232", "D-233", "D-234", "D-235", "D-236", "D-237", "D-238", "D-239", "D-240"],
|
"verification": {
|
||||||
"carry_forward": ["Q7 (kj image verification dependency — M1.5 gate, verified in nova-platform-ops CI)"],
|
"structural": "PASS (py_compile exit 0, setup.py 44 lines <=50 CAP-034)",
|
||||||
"personas": ["lead-developer", "backend-engineer", "security-engineer", "cli-engineer", "data-engineer"],
|
"behavioral": "PASS (11 assertions pass via stdlib harness: terraform delegation, CFN fallback deprecation, verify delegation)",
|
||||||
"grill": {
|
"security": "PASS (CFN archived read-only, deprecation warning guides to terraform path)",
|
||||||
"verdict": "PROCEED-WITH-CONDITIONS",
|
"quality": "PASS (550-line archive with full CFN template, 216-line test file covering all paths)"
|
||||||
"confidence": 0.72,
|
|
||||||
"critical_fixes": 4,
|
|
||||||
"tracked_conditions": 6,
|
|
||||||
"binding_decisions": ["G-1", "G-2.1", "G-2.2", "G-3", "G-4", "G-5"],
|
|
||||||
"critical_fix_ids": ["CF-1", "CF-2", "CF-3", "CF-4"]
|
|
||||||
},
|
},
|
||||||
"notes": "v1.29 GRILL complete. PROCEED-WITH-CONDITIONS 0.72. 4 critical fixes applied to PLAN.md: CF-1 (M1.5 hard P6 ship gate, spike 8->12 items), CF-2 (covered-reference REQs gated by operator-attested Result column), CF-3 (P1 pushes v1.29.0 intermediate tag, P5 smoke no hedge), CF-4 (kj source-fetch confirmed before P1 Wave 1, recorded in kj-version.txt). 6 tracked conditions (TC-1..TC-6). Covered-reference pattern accepted as verification surface ONLY with CF-1+CF-2 (G-1)."
|
"notes": "v1.29 P3 EXECUTE+VERIFY complete. CFN template archived to docs/archive/nova-idp-cfn-v1.28.md (550 lines, full template). nova/idp/setup.py --apply delegates to terraform apply (shutil.which detection), --verify delegates to terraform plan. CFN fallback emits DeprecationWarning. test_idp_setup_tf_delegation.py authored (11 assertions)."
|
||||||
}
|
}
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
# Gitea Workflows — Limitation Documentation (v1.14, REQ-150)
|
|
||||||
|
|
||||||
## Shared workflows (byte-identical Gitea + GitHub)
|
|
||||||
|
|
||||||
These 3 workflows exist in both `.gitea/workflows/` and `.github/workflows/`
|
|
||||||
and are byte-identical (asserted by `tests/test_pipeline_contract.py`):
|
|
||||||
|
|
||||||
- `ci.yml` — lint + test + check-only (runs on every PR)
|
|
||||||
- `deploy.yml` — reusable deploy workflow (invoked by consumer repos)
|
|
||||||
- `modules-lifecycle.yml` — L1 + L2 module lifecycle pipeline (plan-only
|
|
||||||
default, full on workflow_dispatch override)
|
|
||||||
|
|
||||||
## GitHub-only workflows (no Gitea mirror)
|
|
||||||
|
|
||||||
These 4 workflows exist only in `.github/workflows/`:
|
|
||||||
|
|
||||||
- `platform-test.yml` — PR pipeline: lint + unit + integration + schema
|
|
||||||
validation. Uses GitHub Actions features (reusable workflow composition,
|
|
||||||
environment protection) not available in Gitea Actions.
|
|
||||||
- `primitives-plan.yml` — PR plan-only matrix over all L1 primitives. Uses
|
|
||||||
GitHub matrix strategy + `terraform plan` against live AWS.
|
|
||||||
- `patterns-plan.yml` — PR plan-only matrix over all L2 modules. Same
|
|
||||||
pattern as primitives-plan.
|
|
||||||
- `release.yml` — release job on merge to main: computes next semver,
|
|
||||||
creates + updates MAJOR.MINOR.PATCH / MAJOR.MINOR / MAJOR floating tags,
|
|
||||||
creates a GitHub release. GitHub-only by design (Gitea releases are
|
|
||||||
created via the ship workflow's API call, not a workflow).
|
|
||||||
|
|
||||||
## Why no Gitea mirror
|
|
||||||
|
|
||||||
Gitea Actions (act_runner) has limited support for reusable workflow
|
|
||||||
composition, environment protection, and the `gh` CLI used by the release
|
|
||||||
job. The 3 shared workflows are the ones that need to run on both forges
|
|
||||||
(CI + deploy + lifecycle). The 4 GitHub-only workflows are the
|
|
||||||
production-grade platform pipelines that run on GitHub Actions; Gitea is
|
|
||||||
the dev/integration forge. Mirroring them would require feature parity
|
|
||||||
that Gitea Actions does not currently provide.
|
|
||||||
|
|
||||||
This is a documented limitation, not a defect. A future milestone may
|
|
||||||
add Gitea mirrors if act_runner gains the required features.
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
# Nova CI Pipeline (dev environment)
|
|
||||||
#
|
|
||||||
# This workflow implements the central pipeline contract:
|
|
||||||
# pipelines/ci.yml (validated against schemas/pipeline.schema.json)
|
|
||||||
#
|
|
||||||
# The same contract is implemented by .github/workflows/ci.yml (GitHub
|
|
||||||
# Actions, production). Both files must be byte-identical — the only
|
|
||||||
# declared difference is the forge/runtime, not the stages or commands.
|
|
||||||
#
|
|
||||||
# Shell reproducibility: scripts/run_ci.sh runs the same 3 stages locally.
|
|
||||||
#
|
|
||||||
# Stages (from the contract):
|
|
||||||
# 1. lint — py_compile all Python files
|
|
||||||
# 2. test — pytest test suite (offline, no AWS)
|
|
||||||
# 3. check-only — run_platform.sh --check-only (offline, no AWS)
|
|
||||||
name: acdl-ci
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
pull_request:
|
|
||||||
branches: [main]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lint:
|
|
||||||
name: Lint
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
|
|
||||||
- name: Compile all Python files
|
|
||||||
run: |
|
|
||||||
python3 -m py_compile \
|
|
||||||
core/confidence_signal.py \
|
|
||||||
core/outbox_writer.py \
|
|
||||||
core/output_publisher.py \
|
|
||||||
core/contract_resolver.py \
|
|
||||||
core/lambda/contract_ingestor.py \
|
|
||||||
adapters/terraform/adapter.py \
|
|
||||||
adapters/terraform/policy/checkov_adapter.py \
|
|
||||||
scripts/push_consumer_image.py
|
|
||||||
|
|
||||||
test:
|
|
||||||
name: Test
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
|
|
||||||
- name: Install test dependencies
|
|
||||||
run: pip install -r requirements-test.txt
|
|
||||||
|
|
||||||
- name: Run pytest
|
|
||||||
run: python3 -m pytest tests/ -v --tb=short
|
|
||||||
|
|
||||||
check-only:
|
|
||||||
name: Platform check-only (offline)
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
|
|
||||||
- name: Install runtime dependencies
|
|
||||||
run: pip install jsonschema pyyaml boto3
|
|
||||||
|
|
||||||
- name: Run platform check-only
|
|
||||||
run: bash scripts/run_platform.sh --check-only
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
# Nova Reusable Deploy Workflow (dev environment)
|
|
||||||
#
|
|
||||||
# This reusable workflow implements the central deployment pipeline contract:
|
|
||||||
# pipelines/contract.yml (validated against schemas/deploy-pipeline.schema.json)
|
|
||||||
#
|
|
||||||
# The same contract is implemented by .github/workflows/deploy.yml (GitHub
|
|
||||||
# Actions, production). Both files must be byte-identical — the only
|
|
||||||
# declared difference is the forge/runtime, not the stages or commands.
|
|
||||||
#
|
|
||||||
# Consumer repos invoke this workflow via a versioned tag (floating MAJOR + MINOR):
|
|
||||||
# uses: nova/.github/workflows/deploy.yml@v1.19
|
|
||||||
# uses: acdl/.github/workflows/deploy.yml@v1.9 (GitHub)
|
|
||||||
#
|
|
||||||
# Unversioned references (@main, bare) are discouraged — the consumer's setup
|
|
||||||
# must be immutable + resilient. The versioned tag is the only immutability
|
|
||||||
# lever (version constraints cannot be expressed inside the contract).
|
|
||||||
#
|
|
||||||
# What this workflow does:
|
|
||||||
# 1. Checks out the consumer repo (the repo that invoked the workflow).
|
|
||||||
# 2. Checks out the ACDL platform repo into the workspace (platform/).
|
|
||||||
# This is the run-time fetch — consumers never clone the platform repo.
|
|
||||||
# 3. Installs runtime deps: Python 3.12, Terraform 1.9.*, Checkov.
|
|
||||||
# 4. Configures AWS auth (OIDC default; static-key override via secrets).
|
|
||||||
# 5. Runs scripts/run_platform.sh against the consumer's contract path.
|
|
||||||
# 6. Uploads artifacts (emitted Terraform, Checkov JSON, confidence JSON,
|
|
||||||
# platform log) for auditability.
|
|
||||||
#
|
|
||||||
# Inputs:
|
|
||||||
# contract — path to the consumer's contract YAML (default .nova/contract.yml)
|
|
||||||
# mode — full | plan-only | check-only (default full; dev = full apply,
|
|
||||||
# higher environments hold for HITL — the calling repo or the
|
|
||||||
# forge environment gate enforces that)
|
|
||||||
#
|
|
||||||
# Auth (zero-trust default — see README.md#credentials--zero-trust):
|
|
||||||
# OIDC federation is the default. permissions: id-token: write lets the
|
|
||||||
# forge mint a short-lived STS token. The role-to-assume is scoped by the
|
|
||||||
# consumer's repository identity (ABAC) — the workflow assumes the role
|
|
||||||
# that matches repo:org/consumer-repo:ref:refs/heads/main, and the session
|
|
||||||
# policy restricts view/update to resources tagged acdl:owner=<consumer-repo>.
|
|
||||||
#
|
|
||||||
# Override (where OIDC is unavailable, e.g. pending
|
|
||||||
# upstream forge OIDC support): set NOVA_AWS_ACCESS_KEY_ID + NOVA_AWS_SECRET_ACCESS_KEY
|
|
||||||
# as repository secrets. The platform-managed scheduled pipeline rotates
|
|
||||||
# the key on a daily cadence. When .env.secrets is used locally instead,
|
|
||||||
# rotating the key out of band is the consumer's responsibility.
|
|
||||||
name: nova-deploy
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_call:
|
|
||||||
inputs:
|
|
||||||
contract:
|
|
||||||
description: Path to the consumer contract YAML (in the consumer repo)
|
|
||||||
type: string
|
|
||||||
default: .nova/contract.yml
|
|
||||||
mode:
|
|
||||||
description: Pipeline mode — full (apply), plan-only, check-only, or decommission
|
|
||||||
type: string
|
|
||||||
default: full
|
|
||||||
changeRequestId:
|
|
||||||
description: Change request ID (required for decommission mode — validated against CMDB)
|
|
||||||
type: string
|
|
||||||
default: ""
|
|
||||||
environment:
|
|
||||||
description: Target environment override (dev/qa/prod/dr); when empty, the contract's environment field is used
|
|
||||||
type: string
|
|
||||||
default: ""
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
id-token: write
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
name: Deploy
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Check out consumer repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Check out ACDL platform repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: acdl/acdl
|
|
||||||
path: platform
|
|
||||||
ref: v1.25
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
|
|
||||||
- name: Install runtime dependencies
|
|
||||||
run: |
|
|
||||||
pip install --break-system-packages jsonschema pyyaml boto3
|
|
||||||
pip install --break-system-packages "checkov>=3.2,<4"
|
|
||||||
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
|
|
||||||
- name: Configure AWS credentials (OIDC default + static-key override)
|
|
||||||
uses: aws-actions/configure-aws-credentials@v4
|
|
||||||
with:
|
|
||||||
# P4 (REQ-163): IAM role renamed acdl-deploy- → nova-deploy-.
|
|
||||||
role-to-assume: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID == '' && format('arn:aws:iam::{0}:role/nova-deploy-{1}', secrets.NOVA_AWS_ACCOUNT_ID, github.repository_id) || '' }}
|
|
||||||
aws-region: ${{ secrets.AWS_DEFAULT_REGION || 'us-east-1' }}
|
|
||||||
access-key-id: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
secret-access-key: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
|
|
||||||
- name: Run the platform pipeline
|
|
||||||
working-directory: ${{ github.workspace }}
|
|
||||||
env:
|
|
||||||
NOVA_CONSUMER_REPO: ${{ github.repository }}
|
|
||||||
run: |
|
|
||||||
MODE_FLAG=""
|
|
||||||
case "${{ inputs.mode }}" in
|
|
||||||
full) MODE_FLAG="" ;;
|
|
||||||
plan-only) MODE_FLAG="--plan-only" ;;
|
|
||||||
check-only) MODE_FLAG="--check-only" ;;
|
|
||||||
decommission)
|
|
||||||
if [ -z "${{ inputs.changeRequestId }}" ]; then
|
|
||||||
echo "FAIL: changeRequestId is required for decommission mode"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
MODE_FLAG="--decommission ${{ inputs.changeRequestId }}"
|
|
||||||
;;
|
|
||||||
*) echo "Unknown mode: ${{ inputs.mode }}"; exit 1 ;;
|
|
||||||
esac
|
|
||||||
ENV_FLAG=""
|
|
||||||
if [ -n "${{ inputs.environment }}" ]; then
|
|
||||||
ENV_FLAG="--environment ${{ inputs.environment }}"
|
|
||||||
fi
|
|
||||||
bash platform/scripts/run_platform.sh $MODE_FLAG $ENV_FLAG "${{ inputs.contract }}"
|
|
||||||
|
|
||||||
- name: Post stage summary comment to PR
|
|
||||||
if: success() && github.event_name == 'pull_request'
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
GITHUB_REPOSITORY: ${{ github.repository }}
|
|
||||||
GITHUB_REF: ${{ github.ref }}
|
|
||||||
run: |
|
|
||||||
bash platform/scripts/post_stage_comment.sh deploy pass '{"mode":"${{ inputs.mode }}","runId":"${{ github.run_id }}"}'
|
|
||||||
|
|
||||||
- name: Report error to platform team (on failure)
|
|
||||||
if: failure()
|
|
||||||
env:
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: |
|
|
||||||
aws lambda invoke-function-url \
|
|
||||||
--function-url "${{ secrets.NOVA_LAMBDA_URL }}" \
|
|
||||||
--cli-binary-format raw-in-base64-out \
|
|
||||||
--payload "$(python3 -c "import json,os; print(json.dumps({'action':'report_error','consumerRepo':os.environ.get('GITHUB_REPOSITORY',''),'contractId':'${{ github.run_id }}','error':'Deploy pipeline failed. See run logs.','runUrl':'${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}','environment':'dev'}))")" \
|
|
||||||
/dev/null || true
|
|
||||||
|
|
||||||
- name: Upload emitted Terraform
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: nova-terraform
|
|
||||||
path: /tmp/nova_platform_run/tf/*.tf
|
|
||||||
if-no-files-found: warn
|
|
||||||
|
|
||||||
- name: Upload platform log
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: nova-platform-log
|
|
||||||
path: platform/logs/
|
|
||||||
if-no-files-found: warn
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
# Nova Modules Lifecycle Pipeline (dev environment)
|
|
||||||
#
|
|
||||||
# Matrix-runs each L1 module's examples/{simple,complex}.yml contracts through
|
|
||||||
# apply→modify→destroy against live AWS. No per-module Python. The "test" =
|
|
||||||
# the pipeline cell going green.
|
|
||||||
#
|
|
||||||
# Also matrix-runs L2 composition modules (static-assets, microservice) through
|
|
||||||
# the same apply→modify→destroy lifecycle. L2 = composition only (no L2
|
|
||||||
# terraform files); the composition must be deterministic.
|
|
||||||
#
|
|
||||||
# This workflow implements pipelines/modules-lifecycle.yml (byte-identical
|
|
||||||
# in .github/workflows/).
|
|
||||||
#
|
|
||||||
# Lifecycle mode (REQ-134, v1.12): the `lifecycle_mode` input defaults to
|
|
||||||
# "plan" — the lifecycle scripts run `run_platform.sh --plan-only` (fast,
|
|
||||||
# no AWS mutation, validates the contract->resolver->adapter->plan chain
|
|
||||||
# for every module on every PR, with no AWS credentials or cost). Set to
|
|
||||||
# "full" via workflow_dispatch (or the NOVA_LIFECYCLE_MODE repo variable)
|
|
||||||
# to run the real apply→modify→destroy against live AWS. In plan mode the
|
|
||||||
# short-lived CI VPC apply/destroy jobs are skipped (nothing is applied).
|
|
||||||
#
|
|
||||||
# A short-lived CI VPC (terraform/ci-vpc/) is created before testing VPC-dependent
|
|
||||||
# modules (alb, ecs-service, rds, uptime, and L2 microservice) and destroyed
|
|
||||||
# after all tests complete. The CI VPC is separate from the long-lived platform
|
|
||||||
# VPC. Outputs are read from the S3 state by each lifecycle job (no artifact
|
|
||||||
# passing needed).
|
|
||||||
name: acdl-modules-lifecycle
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
lifecycle_mode:
|
|
||||||
description: "Lifecycle mode: 'plan' (default, fast, no AWS mutation) or 'full' (real apply→modify→destroy against live AWS)"
|
|
||||||
required: false
|
|
||||||
default: "plan"
|
|
||||||
type: choice
|
|
||||||
options:
|
|
||||||
- plan
|
|
||||||
- full
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
# Prerequisite: apply the short-lived CI VPC (needed by VPC-dependent L1s + L2 microservice)
|
|
||||||
# Skipped in plan mode (no resources are applied, so no VPC is needed).
|
|
||||||
ci-vpc-apply:
|
|
||||||
name: CI VPC apply
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: ${{ github.event.inputs.lifecycle_mode != 'plan' && vars.NOVA_LIFECYCLE_MODE != 'plan' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
- name: Apply CI VPC
|
|
||||||
working-directory: terraform/ci-vpc
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: |
|
|
||||||
terraform init -input=false -lock=false
|
|
||||||
terraform apply -auto-approve -lock=false
|
|
||||||
|
|
||||||
# L1 lifecycle matrix: apply simple → apply complex (modify) → destroy
|
|
||||||
lifecycle:
|
|
||||||
name: L1 lifecycle (${{ matrix.module }})
|
|
||||||
needs: ci-vpc-apply
|
|
||||||
if: always()
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
module: [s3, kms-key, ecr, ecs-cluster, iam-role, cloudfront, waf, vpc, alb, ecs-service, rds, uptime]
|
|
||||||
env:
|
|
||||||
NOVA_LIFECYCLE_MODE: ${{ github.event.inputs.lifecycle_mode || vars.NOVA_LIFECYCLE_MODE || 'plan' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Free disk space
|
|
||||||
run: |
|
|
||||||
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /usr/local/share/boost
|
|
||||||
sudo apt-get clean
|
|
||||||
df -h /
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pip install jsonschema pyyaml boto3
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
- name: Read CI VPC outputs
|
|
||||||
if: ${{ env.NOVA_LIFECYCLE_MODE == 'full' }}
|
|
||||||
working-directory: terraform/ci-vpc
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: |
|
|
||||||
terraform init -input=false -lock=false
|
|
||||||
terraform output -json > /tmp/ci-vpc-outputs.json
|
|
||||||
- name: Apply (simple)
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: bash scripts/run_lifecycle_test.sh ${{ matrix.module }} simple /tmp/ci-vpc-outputs.json
|
|
||||||
- name: Modify (complex)
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: bash scripts/run_lifecycle_test.sh ${{ matrix.module }} complex /tmp/ci-vpc-outputs.json
|
|
||||||
- name: Destroy
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: bash scripts/run_lifecycle_destroy.sh ${{ matrix.module }} /tmp/ci-vpc-outputs.json
|
|
||||||
|
|
||||||
# L2 lifecycle matrix: apply simple → apply complex (modify) → destroy
|
|
||||||
l2-lifecycle:
|
|
||||||
name: L2 lifecycle (${{ matrix.module }})
|
|
||||||
needs: ci-vpc-apply
|
|
||||||
if: always()
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
module: [static-assets, microservice]
|
|
||||||
env:
|
|
||||||
NOVA_LIFECYCLE_MODE: ${{ github.event.inputs.lifecycle_mode || vars.NOVA_LIFECYCLE_MODE || 'plan' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Free disk space
|
|
||||||
run: |
|
|
||||||
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /usr/local/share/boost
|
|
||||||
sudo apt-get clean
|
|
||||||
df -h /
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pip install jsonschema pyyaml boto3
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
- name: Read CI VPC outputs
|
|
||||||
if: ${{ env.NOVA_LIFECYCLE_MODE == 'full' }}
|
|
||||||
working-directory: terraform/ci-vpc
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: |
|
|
||||||
terraform init -input=false -lock=false
|
|
||||||
terraform output -json > /tmp/ci-vpc-outputs.json
|
|
||||||
- name: Apply (simple)
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: bash scripts/run_l2_lifecycle_test.sh ${{ matrix.module }} simple /tmp/ci-vpc-outputs.json
|
|
||||||
- name: Modify (complex)
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: bash scripts/run_l2_lifecycle_test.sh ${{ matrix.module }} complex /tmp/ci-vpc-outputs.json
|
|
||||||
- name: Destroy
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: bash scripts/run_l2_lifecycle_destroy.sh ${{ matrix.module }} /tmp/ci-vpc-outputs.json
|
|
||||||
|
|
||||||
# Cleanup: destroy the CI VPC (always runs in full mode, even if lifecycle fails)
|
|
||||||
ci-vpc-destroy:
|
|
||||||
name: CI VPC destroy
|
|
||||||
needs: [lifecycle, l2-lifecycle]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: ${{ always() && github.event.inputs.lifecycle_mode != 'plan' && vars.NOVA_LIFECYCLE_MODE != 'plan' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Install Terraform 1.9.*
|
|
||||||
run: |
|
|
||||||
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
|
|
||||||
sudo apt-get update && sudo apt-get install -y terraform=1.9.*
|
|
||||||
- name: Destroy CI VPC
|
|
||||||
working-directory: terraform/ci-vpc
|
|
||||||
env:
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: us-east-1
|
|
||||||
run: |
|
|
||||||
terraform init -input=false -lock=false
|
|
||||||
terraform destroy -auto-approve -lock=false
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
# Nova Publish Pipeline — wheel + Lambda layer (REQ-323, CAP-035, NFR-6)
|
|
||||||
#
|
|
||||||
# This workflow is byte-identical across the production forge (GitHub
|
|
||||||
# Actions) and the dev forge (act_runner) — the same file is installed
|
|
||||||
# at .github/workflows/publish.yml and the mirror at
|
|
||||||
# <dev-forge>/workflows/publish.yml. Both copies must match exactly
|
|
||||||
# (asserted by tests/test_forge_action_byte_identical.py for the action
|
|
||||||
# and by the repo's byte-identical convention for workflows).
|
|
||||||
#
|
|
||||||
# NFR-6 (wheel/layer co-versioning): every merge to main affecting
|
|
||||||
# core/**, adapters/**, nova/**, or pyproject.toml publishes BOTH a
|
|
||||||
# wheel AND a Lambda layer with identical version strings. If either
|
|
||||||
# publish fails, the job fails and the merge is blocked.
|
|
||||||
#
|
|
||||||
# REQ-323: CodeArtifact wheel + Lambda layer pipeline.
|
|
||||||
# CAP-035: Lambda layer ARN version matches the nova-cli wheel version;
|
|
||||||
# the mapping is recorded in SSM /nova/layer/nova-cli/version.
|
|
||||||
#
|
|
||||||
# Triggers:
|
|
||||||
# - push to main when core/**, adapters/**, nova/**, or pyproject.toml
|
|
||||||
# changed (the surfaces that ship in the wheel + layer)
|
|
||||||
# - workflow_dispatch (manual republish, e.g. after a CodeArtifact
|
|
||||||
# provisioning fix)
|
|
||||||
#
|
|
||||||
# Wheel index selection (CodeArtifact default + fallback):
|
|
||||||
# - CodeArtifact mode: set the NOVA_CODEARTIFACT_DOMAIN repository
|
|
||||||
# secret (e.g. "nova"). The workflow runs
|
|
||||||
# `aws codeartifact login --tool twine --domain $NOVA_CODEARTIFACT_DOMAIN
|
|
||||||
# --repository nova-pypi` and twine uploads to the CodeArtifact pypi
|
|
||||||
# endpoint.
|
|
||||||
# - Fallback mode: leave NOVA_CODEARTIFACT_DOMAIN unset and provide
|
|
||||||
# TWINE_REPOSITORY_URL + TWINE_USERNAME + TWINE_PASSWORD repository
|
|
||||||
# secrets pointing at any PEP 503 simple index (a private package
|
|
||||||
# registry). twine uploads to TWINE_REPOSITORY_URL.
|
|
||||||
# See docs/codeartifact-provisioning.md for the required IAM grants
|
|
||||||
# + the fallback index shape.
|
|
||||||
#
|
|
||||||
# Secrets / env:
|
|
||||||
# AWS_ROLE_ARN — OIDC role to assume (id-token: write)
|
|
||||||
# NOVA_CODEARTIFACT_DOMAIN — optional; when set, CodeArtifact mode
|
|
||||||
# TWINE_USERNAME — fallback-index upload user
|
|
||||||
# TWINE_PASSWORD — fallback-index upload password
|
|
||||||
# TWINE_REPOSITORY_URL — fallback-index upload URL
|
|
||||||
# AWS_DEFAULT_REGION (optional) — defaults to us-east-1
|
|
||||||
name: nova-publish
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
paths:
|
|
||||||
- "core/**"
|
|
||||||
- "adapters/**"
|
|
||||||
- "nova/**"
|
|
||||||
- "pyproject.toml"
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
id-token: write # OIDC federation to AWS
|
|
||||||
contents: write # tag the release
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
publish:
|
|
||||||
name: Publish wheel + Lambda layer
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
|
|
||||||
- name: Configure AWS credentials (OIDC)
|
|
||||||
uses: aws-actions/configure-aws-credentials@v4
|
|
||||||
with:
|
|
||||||
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
|
|
||||||
aws-region: ${{ secrets.AWS_DEFAULT_REGION || 'us-east-1' }}
|
|
||||||
|
|
||||||
- name: Install build + publish tools
|
|
||||||
run: pip install build twine
|
|
||||||
|
|
||||||
- name: Compute version from pyproject.toml
|
|
||||||
id: ver
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
VERSION=$(python -c 'import tomllib;print(tomllib.load(open("pyproject.toml","rb"))["project"]["version"])')
|
|
||||||
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "Nova version: $VERSION"
|
|
||||||
|
|
||||||
- name: Build wheel
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
python -m build --wheel
|
|
||||||
ls -1 dist/
|
|
||||||
|
|
||||||
- name: Upload wheel to index (CodeArtifact default + fallback)
|
|
||||||
id: wheel
|
|
||||||
env:
|
|
||||||
NOVA_CODEARTIFACT_DOMAIN: ${{ secrets.NOVA_CODEARTIFACT_DOMAIN }}
|
|
||||||
TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
|
|
||||||
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
|
|
||||||
TWINE_REPOSITORY_URL: ${{ secrets.TWINE_REPOSITORY_URL }}
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
# CodeArtifact mode: log in to the domain's pypi repository.
|
|
||||||
if [ -n "$NOVA_CODEARTIFACT_DOMAIN" ]; then
|
|
||||||
echo "CodeArtifact mode: domain=$NOVA_CODEARTIFACT_DOMAIN repository=nova-pypi"
|
|
||||||
aws codeartifact login --tool twine \
|
|
||||||
--domain "$NOVA_CODEARTIFACT_DOMAIN" --repository nova-pypi
|
|
||||||
else
|
|
||||||
echo "Fallback-index mode: uploading to TWINE_REPOSITORY_URL"
|
|
||||||
if [ -z "$TWINE_REPOSITORY_URL" ] || [ -z "$TWINE_USERNAME" ] || [ -z "$TWINE_PASSWORD" ]; then
|
|
||||||
echo "FAIL: NOVA_CODEARTIFACT_DOMAIN is unset and one of TWINE_REPOSITORY_URL/TWINE_USERNAME/TWINE_PASSWORD is missing."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# Idempotent upload: a re-run for the same version may hit
|
|
||||||
# "file already exists" on the index. Treat that as success.
|
|
||||||
twine upload "dist/nova-${{ steps.ver.outputs.version }}-*.whl" \
|
|
||||||
|| twine upload "dist/nova-${{ steps.ver.outputs.version }}-*.whl" 2>&1 | tee /tmp/twine.log
|
|
||||||
if grep -qi "already exist" /tmp/twine.log 2>/dev/null; then
|
|
||||||
echo "Wheel already present on the index — treating as success (idempotent)."
|
|
||||||
fi
|
|
||||||
echo "uploaded=true" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Build Lambda layer
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
rm -rf layer
|
|
||||||
mkdir -p layer/python
|
|
||||||
# Install the wheel we just built + the identity extras' deps
|
|
||||||
# so the layer carries argon2-cffi, cryptography, pyjwt.
|
|
||||||
pip install --target layer/python/ \
|
|
||||||
"dist/nova-${{ steps.ver.outputs.version }}-*.whl" \
|
|
||||||
argon2-cffi cryptography pyjwt
|
|
||||||
( cd layer && zip -r ../nova-layer.zip python/ )
|
|
||||||
ls -lh nova-layer.zip
|
|
||||||
|
|
||||||
- name: Publish Lambda layer
|
|
||||||
id: layer
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
ARN=$(aws lambda publish-layer-version \
|
|
||||||
--layer-name nova-cli \
|
|
||||||
--zip-file fileb://nova-layer.zip \
|
|
||||||
--compatible-runtimes python3.12 \
|
|
||||||
--compatible-architectures x86_64 \
|
|
||||||
--description "nova-cli v${{ steps.ver.outputs.version }}" \
|
|
||||||
--query LayerVersionArn --output text)
|
|
||||||
echo "arn=$ARN" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "Published Lambda layer: $ARN"
|
|
||||||
|
|
||||||
- name: Record SSM version↔ARN mapping (CAP-035)
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
aws ssm put-parameter \
|
|
||||||
--name /nova/layer/nova-cli/version \
|
|
||||||
--value "${{ steps.ver.outputs.version }}:${{ steps.layer.outputs.arn }}" \
|
|
||||||
--type String --overwrite
|
|
||||||
echo "SSM /nova/layer/nova-cli/version = ${{ steps.ver.outputs.version }}:${{ steps.layer.outputs.arn }}"
|
|
||||||
|
|
||||||
- name: Fail job if either publish failed (REQ-323 AC)
|
|
||||||
if: ${{ steps.wheel.outputs.uploaded != 'true' || steps.layer.outputs.arn == '' }}
|
|
||||||
run: |
|
|
||||||
echo "FAIL: wheel uploaded=${{ steps.wheel.outputs.uploaded }} layer_arn=${{ steps.layer.outputs.arn }}"
|
|
||||||
exit 1
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
# Nova AWS key rotation — platform-managed scheduled pipeline (SPEC §5.9)
|
|
||||||
#
|
|
||||||
# Rotates the NOVA_AWS_* static key daily (no long-lived keys in the steady
|
|
||||||
# state). v0.2 scope: the mechanism must exist (SPEC §5.9); the v0.2 deploy
|
|
||||||
# uses the currently-active key. The rotation is best-effort + idempotent
|
|
||||||
# (scripts/rotate_spike_key.sh deactivates the old key only after the new
|
|
||||||
# key propagates to the consumer's Actions secret store).
|
|
||||||
#
|
|
||||||
# Auth: the rotation uses the CURRENT NOVA_AWS_* key to authenticate to IAM
|
|
||||||
# (the root account 581513795199 can rotate its own keys — confirmed by the
|
|
||||||
# bootstrap). The aws-actions/configure-aws-credentials@v4 step uses the
|
|
||||||
# static-key path (no OIDC role-to-assume); the long-lived key rotates
|
|
||||||
# itself, which is the bootstrap-exception documented in §5.9.
|
|
||||||
#
|
|
||||||
# Forge coords (base URL / owner / consumer repo) are sourced from
|
|
||||||
# repository secrets — NOVA_FORGE_BASE_URL, NOVA_FORGE_OWNER,
|
|
||||||
# NOVA_CONSUMER_REPO — so the synced workflow file stays forge-agnostic
|
|
||||||
# (REQ-230). The rotation script uploads the new key to the consumer's
|
|
||||||
# Actions secret store (the consumer whose deploy.yml consumes NOVA_AWS_*
|
|
||||||
# via secrets: inherit).
|
|
||||||
name: nova-rotate-aws-key
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "0 0 * * *" # daily at 00:00 UTC
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
id-token: write
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
rotate:
|
|
||||||
name: Rotate NOVA_AWS_* static key
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Check out Nova platform repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Configure AWS credentials (bootstrap root creds for IAM key rotation)
|
|
||||||
uses: aws-actions/configure-aws-credentials@v4
|
|
||||||
with:
|
|
||||||
aws-region: ${{ secrets.AWS_DEFAULT_REGION || 'us-east-1' }}
|
|
||||||
access-key-id: ${{ secrets.NOVA_AWS_ACCESS_KEY_ID }}
|
|
||||||
secret-access-key: ${{ secrets.NOVA_AWS_SECRET_ACCESS_KEY }}
|
|
||||||
|
|
||||||
- name: Install Python deps (boto3 for the rotation script)
|
|
||||||
run: |
|
|
||||||
python3 -m pip install --break-system-packages --quiet boto3
|
|
||||||
|
|
||||||
- name: Run the key rotation script
|
|
||||||
env:
|
|
||||||
# aws-actions/configure-aws-credentials exports AWS_ACCESS_KEY_ID /
|
|
||||||
# AWS_SECRET_ACCESS_KEY; the rotation script reads the bootstrap
|
|
||||||
# creds via NOVA_BOOTSTRAP_AWS_* (its dual-read contract, D-034).
|
|
||||||
# Map the standard AWS_* exports onto the script's expected vars.
|
|
||||||
NOVA_BOOTSTRAP_AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
|
|
||||||
NOVA_BOOTSTRAP_AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
|
|
||||||
# Forge + consumer coords come from repository secrets (REQ-230 —
|
|
||||||
# no forge hostnames/orgs hardcoded in the synced workflow file).
|
|
||||||
# NOVA_FORGE_TOKEN holds the forge API token (set equal to the
|
|
||||||
# existing forge token as a one-time secret setup).
|
|
||||||
NOVA_FORGE_TOKEN: ${{ secrets.NOVA_FORGE_TOKEN }}
|
|
||||||
NOVA_FORGE_BASE_URL: ${{ secrets.NOVA_FORGE_BASE_URL }}
|
|
||||||
NOVA_FORGE_OWNER: ${{ secrets.NOVA_FORGE_OWNER }}
|
|
||||||
NOVA_CONSUMER_REPO: ${{ secrets.NOVA_CONSUMER_REPO }}
|
|
||||||
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION || 'us-east-1' }}
|
|
||||||
run: |
|
|
||||||
bash scripts/rotate_spike_key.sh
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
# Nova Slides Render — re-renders presentation deck when source files change.
|
|
||||||
# REQ-273: install python-pptx, pin CLI versions, stage HTML + both PPTX +
|
|
||||||
# base64-inlined images.
|
|
||||||
name: Nova Slides Render
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
paths:
|
|
||||||
- 'docs/presentations/**'
|
|
||||||
- 'scripts/render_slides.sh'
|
|
||||||
- 'scripts/inline_images.py'
|
|
||||||
- 'scripts/render_pptx.py'
|
|
||||||
- 'pyproject.toml'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
render:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with: { fetch-depth: 0 }
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with: { node-version: '20' }
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: '3.10'
|
|
||||||
- name: Install python-pptx (slides extra)
|
|
||||||
run: pip install -e ".[slides]"
|
|
||||||
- name: Install + pin render CLIs
|
|
||||||
run: |
|
|
||||||
npx --yes @marp-team/marp-cli@4.5.0 --version
|
|
||||||
npx --yes @mermaid-js/mermaid-cli@11.16.0 --version
|
|
||||||
- name: Render slides
|
|
||||||
run: bash scripts/render_slides.sh
|
|
||||||
- name: Commit rendered artifacts
|
|
||||||
run: |
|
|
||||||
git config user.name "nova-slides-bot"
|
|
||||||
git config user.email "bot@nova.local"
|
|
||||||
git add docs/presentations/*.html \
|
|
||||||
docs/presentations/*.pptx \
|
|
||||||
docs/presentations/*-python.pptx \
|
|
||||||
docs/presentations/assets/png/*.png
|
|
||||||
git diff --cached --quiet || git commit -m "chore(slides): re-render deck [skip ci]"
|
|
||||||
git push
|
|
||||||
@@ -5,8 +5,10 @@ platform. 3 are generated from `workflows-src/<name>`; 4 are GitHub-only.
|
|||||||
|
|
||||||
## Shared workflows (generated from source)
|
## Shared workflows (generated from source)
|
||||||
|
|
||||||
These 3 are generated from `workflows-src/<name>`. Run `python3 scripts/sync_workflows.py --check` to verify
|
These 3 are generated from `workflows-src/<name>`. D-232 (v1.29): the
|
||||||
no drift.
|
byte-identical forge-parity generator (`scripts/sync_workflows.py`) was
|
||||||
|
removed with the dev-forge parity retirement — the `workflows-src/`
|
||||||
|
copies remain as the source of truth but are no longer auto-synced.
|
||||||
|
|
||||||
| Workflow | Trigger | Inputs | Required Secrets | Purpose |
|
| Workflow | Trigger | Inputs | Required Secrets | Purpose |
|
||||||
|----------|---------|--------|------------------|---------|
|
|----------|---------|--------|------------------|---------|
|
||||||
|
|||||||
@@ -22,6 +22,27 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
forge-parity-disabled:
|
||||||
|
name: forge_parity_disabled
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Assert forge_parity_disabled
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
# Build the dev-forge needle from char codes so this workflow
|
||||||
|
# file does not itself contain the forbidden literal (REQ-230).
|
||||||
|
needle="$(printf '\x67\x69\x74\x65\x61')"
|
||||||
|
if [ -d ".${needle}" ]; then
|
||||||
|
echo "forge_parity_disabled: dev-forge directory still present (D-232)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if grep -rqi "$needle" .github/workflows/; then
|
||||||
|
echo "forge_parity_disabled: dev-forge references found in .github/workflows/ (D-232)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "forge_parity_disabled: OK"
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
name: Lint
|
name: Lint
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
+249
-18
@@ -1,4 +1,6 @@
|
|||||||
# Nova Publish Pipeline — wheel + Lambda layer (REQ-323, CAP-035, NFR-6)
|
# Nova Publish Pipeline — wheel + Lambda layer + Lambda zip + ECR kj
|
||||||
|
# image, all attached to a GitHub Release per tag (REQ-323, CAP-035,
|
||||||
|
# REQ-354, NFR-6, KJ-STATIC, D-239).
|
||||||
#
|
#
|
||||||
# This workflow is byte-identical across the production forge (GitHub
|
# This workflow is byte-identical across the production forge (GitHub
|
||||||
# Actions) and the dev forge (act_runner) — the same file is installed
|
# Actions) and the dev forge (act_runner) — the same file is installed
|
||||||
@@ -7,18 +9,28 @@
|
|||||||
# (asserted by tests/test_forge_action_byte_identical.py for the action
|
# (asserted by tests/test_forge_action_byte_identical.py for the action
|
||||||
# and by the repo's byte-identical convention for workflows).
|
# and by the repo's byte-identical convention for workflows).
|
||||||
#
|
#
|
||||||
# NFR-6 (wheel/layer co-versioning): every merge to main affecting
|
# NFR-6 (wheel/layer co-versioning): every tag publish affecting
|
||||||
# core/**, adapters/**, nova/**, or pyproject.toml publishes BOTH a
|
# core/**, adapters/**, nova/**, or pyproject.toml publishes BOTH a
|
||||||
# wheel AND a Lambda layer with identical version strings. If either
|
# wheel AND a Lambda layer with identical version strings. If either
|
||||||
# publish fails, the job fails and the merge is blocked.
|
# publish fails, the job fails and the release is blocked.
|
||||||
#
|
#
|
||||||
# REQ-323: CodeArtifact wheel + Lambda layer pipeline.
|
# REQ-323: CodeArtifact wheel + Lambda layer pipeline.
|
||||||
|
# REQ-354: per-tag GitHub Release attaching the Lambda token-vend zip,
|
||||||
|
# the Lambda layer zip, the Python wheel, and the ECR kj
|
||||||
|
# container image URI + digest, each with SHA-256 in the body.
|
||||||
# CAP-035: Lambda layer ARN version matches the nova-cli wheel version;
|
# CAP-035: Lambda layer ARN version matches the nova-cli wheel version;
|
||||||
# the mapping is recorded in SSM /nova/layer/nova-cli/version.
|
# the mapping is recorded in SSM /nova/layer/nova-cli/version.
|
||||||
|
# KJ-STATIC: the `kj` Go binary is built CGO_ENABLED=0 and asserted
|
||||||
|
# statically linked by `file(1)` before it is embedded in the
|
||||||
|
# ECR image. The build fails closed if `file kj` does not
|
||||||
|
# contain `statically linked` or does contain `shared library`.
|
||||||
|
# D-239: ECR tags reject `+`; the image tag uses `-` as the separator:
|
||||||
|
# `v1.29.x-kj-<kj-source-sha>`.
|
||||||
#
|
#
|
||||||
# Triggers:
|
# Triggers:
|
||||||
# - push to main when core/**, adapters/**, nova/**, or pyproject.toml
|
# - push of a tag matching `v1.29.*` (the tag carries the version;
|
||||||
# changed (the surfaces that ship in the wheel + layer)
|
# REQ-354 criterion 1). Each tag produces an independent release
|
||||||
|
# (criterion 2 — previous tags' artifacts remain downloadable).
|
||||||
# - workflow_dispatch (manual republish, e.g. after a CodeArtifact
|
# - workflow_dispatch (manual republish, e.g. after a CodeArtifact
|
||||||
# provisioning fix)
|
# provisioning fix)
|
||||||
#
|
#
|
||||||
@@ -33,7 +45,18 @@
|
|||||||
# secrets pointing at any PEP 503 simple index (a private package
|
# secrets pointing at any PEP 503 simple index (a private package
|
||||||
# registry). twine uploads to TWINE_REPOSITORY_URL.
|
# registry). twine uploads to TWINE_REPOSITORY_URL.
|
||||||
# See docs/codeartifact-provisioning.md for the required IAM grants
|
# See docs/codeartifact-provisioning.md for the required IAM grants
|
||||||
# + the fallback index shape.
|
# + the fallback index shape.
|
||||||
|
#
|
||||||
|
# ECR image (kj substrate, REQ-354 criterion 3):
|
||||||
|
# - The `build-kj-image` job reads platform/abac/kj-version.txt
|
||||||
|
# (line 1 = version tag, line 2 = tree SHA, line 3 = source repo URL).
|
||||||
|
# - It fetches the kj Go source by tag (reliable; the pinned tree SHA
|
||||||
|
# is kept for traceability with v1.28 — see kj-version.txt comments).
|
||||||
|
# - It builds CGO_ENABLED=0, asserts KJ-STATIC via `file(1)`, packages
|
||||||
|
# the binary into public.ecr.aws/lambda/python:3.12-al2023 at
|
||||||
|
# /opt/kj/kj (chmod 0555, sbx_user:1051), and pushes to ECR with tag
|
||||||
|
# v1.29.x-kj-<kj-source-sha>. The tag is validated against
|
||||||
|
# ^[a-zA-Z0-9._-]+$ before push (D-239).
|
||||||
#
|
#
|
||||||
# Secrets / env:
|
# Secrets / env:
|
||||||
# AWS_ROLE_ARN — OIDC role to assume (id-token: write)
|
# AWS_ROLE_ARN — OIDC role to assume (id-token: write)
|
||||||
@@ -42,26 +65,160 @@
|
|||||||
# TWINE_PASSWORD — fallback-index upload password
|
# TWINE_PASSWORD — fallback-index upload password
|
||||||
# TWINE_REPOSITORY_URL — fallback-index upload URL
|
# TWINE_REPOSITORY_URL — fallback-index upload URL
|
||||||
# AWS_DEFAULT_REGION (optional) — defaults to us-east-1
|
# AWS_DEFAULT_REGION (optional) — defaults to us-east-1
|
||||||
|
# NOVA_ECR_REPO — ECR repository URI for the kj image
|
||||||
|
# (e.g. 581513795199.dkr.ecr.us-east-1.
|
||||||
|
# amazonaws.com/nova-kj)
|
||||||
name: nova-publish
|
name: nova-publish
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
tags:
|
||||||
paths:
|
- "v1.29.*"
|
||||||
- "core/**"
|
|
||||||
- "adapters/**"
|
|
||||||
- "nova/**"
|
|
||||||
- "pyproject.toml"
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
id-token: write # OIDC federation to AWS
|
id-token: write # OIDC federation to AWS
|
||||||
contents: write # tag the release
|
contents: write # create the GitHub Release + upload artifacts
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish:
|
build-kj-image:
|
||||||
name: Publish wheel + Lambda layer
|
# KJ substrate — compile the kj Go binary static, package it into a
|
||||||
|
# public.ecr.aws/lambda/python:3.12-al2023 image at /opt/kj/kj, and
|
||||||
|
# push to ECR with tag v1.29.x-kj-<kj-source-sha> (D-239). Records
|
||||||
|
# image_uri + digest for the release body (REQ-354 criterion 4).
|
||||||
|
name: Build + push kj ECR image (KJ-STATIC, D-239)
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
image_uri: ${{ steps.ecr-push.outputs.image_uri }}
|
||||||
|
image_digest: ${{ steps.ecr-push.outputs.image_digest }}
|
||||||
|
image_tag: ${{ steps.ecr-push.outputs.image_tag }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version: "1.22"
|
||||||
|
|
||||||
|
- name: Read kj version pin (platform/abac/kj-version.txt)
|
||||||
|
id: kj-ver
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
KJ_VERSION=$(sed -n '1p' platform/abac/kj-version.txt)
|
||||||
|
KJ_TREE_SHA=$(sed -n '2p' platform/abac/kj-version.txt)
|
||||||
|
KJ_REPO_URL=$(sed -n '3p' platform/abac/kj-version.txt)
|
||||||
|
echo "kj_version=${KJ_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "kj_tree_sha=${KJ_TREE_SHA}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "kj_repo_url=${KJ_REPO_URL}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "Pinned kj: version=${KJ_VERSION} tree_sha=${KJ_TREE_SHA} repo=${KJ_REPO_URL}"
|
||||||
|
|
||||||
|
- name: Fetch kj Go source at tag v0.0.3
|
||||||
|
env:
|
||||||
|
KJ_REPO_URL: ${{ steps.kj-ver.outputs.kj_repo_url }}
|
||||||
|
KJ_VERSION: ${{ steps.kj-ver.outputs.kj_version }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
# The pinned tree SHA (line 2) 404s as a commit; the build
|
||||||
|
# fetches by tag, which dereferences to a real commit
|
||||||
|
# (verified: 924a6af2474523c4e27e3a826248c91c8fe1d1cf).
|
||||||
|
rm -rf kj-src
|
||||||
|
git clone --depth 1 --branch "${KJ_VERSION}" \
|
||||||
|
"${KJ_REPO_URL}" kj-src
|
||||||
|
|
||||||
|
- name: Build kj (CGO_ENABLED=0 — KJ-STATIC)
|
||||||
|
working-directory: kj-src
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
# Resolve the tagged commit SHA — this is the source SHA
|
||||||
|
# embedded in the ECR image tag (REQ-354 criterion 3).
|
||||||
|
KJ_SOURCE_SHA=$(git rev-parse HEAD)
|
||||||
|
echo "kj_source_sha=${KJ_SOURCE_SHA}" >> "$GITHUB_ENV"
|
||||||
|
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
|
||||||
|
go build -ldflags="-s -w" -o kj ./...
|
||||||
|
file kj
|
||||||
|
|
||||||
|
- name: Assert kj is statically linked (KJ-STATIC CI gate)
|
||||||
|
working-directory: kj-src
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
# KJ-STATIC: file(1) MUST report `statically linked` and MUST
|
||||||
|
# NOT report `shared library`. Fail closed otherwise — this
|
||||||
|
# is the mechanical enforcement of KJ-STATIC (not human review).
|
||||||
|
FILE_OUT=$(file kj)
|
||||||
|
echo "$FILE_OUT"
|
||||||
|
case "$FILE_OUT" in
|
||||||
|
*statically\ linked*) ;;
|
||||||
|
*) echo "FAIL (KJ-STATIC): kj is not statically linked"; exit 1 ;;
|
||||||
|
esac
|
||||||
|
case "$FILE_OUT" in
|
||||||
|
*shared\ library*)
|
||||||
|
echo "FAIL (KJ-STATIC): kj links a shared library"; exit 1 ;;
|
||||||
|
*) ;;
|
||||||
|
esac
|
||||||
|
# readelf defense-in-depth: assert no NEEDED entries.
|
||||||
|
if readelf -d kj 2>/dev/null | grep -q NEEDED; then
|
||||||
|
echo "FAIL (KJ-STATIC): readelf -d reports NEEDED entries"; exit 1
|
||||||
|
fi
|
||||||
|
echo "KJ-STATIC assertion passed."
|
||||||
|
|
||||||
|
- name: Configure AWS credentials (OIDC)
|
||||||
|
uses: aws-actions/configure-aws-credentials@v4
|
||||||
|
with:
|
||||||
|
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
|
||||||
|
aws-region: ${{ secrets.AWS_DEFAULT_REGION || 'us-east-1' }}
|
||||||
|
|
||||||
|
- name: Log in to ECR
|
||||||
|
env:
|
||||||
|
NOVA_ECR_REPO: ${{ secrets.NOVA_ECR_REPO }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
# NOVA_ECR_REPO is the full repo URI, e.g.
|
||||||
|
# 581513795199.dkr.ecr.us-east-1.amazonaws.com/nova-kj
|
||||||
|
REGISTRY=$(echo "$NOVA_ECR_REPO" | cut -d/ -f1)
|
||||||
|
aws ecr get-login-password --region "${AWS_REGION}" \
|
||||||
|
| docker login --username AWS --password-stdin "$REGISTRY"
|
||||||
|
|
||||||
|
- name: Build + push kj image to ECR (D-239)
|
||||||
|
id: ecr-push
|
||||||
|
env:
|
||||||
|
NOVA_ECR_REPO: ${{ secrets.NOVA_ECR_REPO }}
|
||||||
|
KJ_SOURCE_SHA: ${{ env.kj_source_sha }}
|
||||||
|
working-directory: kj-src
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
# D-239: ECR tags reject `+`; use `-` separator. The tag is
|
||||||
|
# v1.29.x-kj-<kj-source-sha> and is validated against
|
||||||
|
# ^[a-zA-Z0-9._-]+$ before push.
|
||||||
|
IMAGE_TAG="v1.29.x-kj-${KJ_SOURCE_SHA}"
|
||||||
|
if ! echo "$IMAGE_TAG" | grep -Eq '^[a-zA-Z0-9._-]+$'; then
|
||||||
|
echo "FAIL (D-239): invalid ECR tag: ${IMAGE_TAG}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
IMAGE_URI="${NOVA_ECR_REPO}:${IMAGE_TAG}"
|
||||||
|
echo "Pushing image: ${IMAGE_URI}"
|
||||||
|
# Stage the binary into a build context root.
|
||||||
|
rm -rf imgctx && mkdir -p imgctx/opt/kj
|
||||||
|
cp kj imgctx/opt/kj/kj
|
||||||
|
chmod 0555 imgctx/opt/kj/kj
|
||||||
|
printf '%s\n' \
|
||||||
|
'FROM public.ecr.aws/lambda/python:3.12-al2023' \
|
||||||
|
'COPY --chown=sbx_user:1051 --chmod=0555 opt/kj/kj /opt/kj/kj' \
|
||||||
|
> imgctx/Dockerfile
|
||||||
|
docker build -t "$IMAGE_URI" imgctx
|
||||||
|
docker push "$IMAGE_URI" >/tmp/docker-push.log 2>&1
|
||||||
|
cat /tmp/docker-push.log
|
||||||
|
# Extract the registry digest via `docker inspect` (the
|
||||||
|
# canonical source — push output wording varies by client).
|
||||||
|
IMAGE_DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' \
|
||||||
|
"$IMAGE_URI" | sed 's/.*@//')
|
||||||
|
echo "image_uri=${IMAGE_URI}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "image_digest=${IMAGE_DIGEST}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "image_tag=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "Pushed ${IMAGE_URI} @ ${IMAGE_DIGEST}"
|
||||||
|
|
||||||
|
publish:
|
||||||
|
name: Publish wheel + Lambda layer + Lambda zip + Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build-kj-image
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
@@ -132,8 +289,8 @@ jobs:
|
|||||||
pip install --target layer/python/ \
|
pip install --target layer/python/ \
|
||||||
"dist/nova-${{ steps.ver.outputs.version }}-*.whl" \
|
"dist/nova-${{ steps.ver.outputs.version }}-*.whl" \
|
||||||
argon2-cffi cryptography pyjwt
|
argon2-cffi cryptography pyjwt
|
||||||
( cd layer && zip -r ../nova-layer.zip python/ )
|
( cd layer && zip -r ../nova-cli-layer-v1.29.x.zip python/ )
|
||||||
ls -lh nova-layer.zip
|
ls -lh nova-cli-layer-v1.29.x.zip
|
||||||
|
|
||||||
- name: Publish Lambda layer
|
- name: Publish Lambda layer
|
||||||
id: layer
|
id: layer
|
||||||
@@ -141,7 +298,7 @@ jobs:
|
|||||||
set -e
|
set -e
|
||||||
ARN=$(aws lambda publish-layer-version \
|
ARN=$(aws lambda publish-layer-version \
|
||||||
--layer-name nova-cli \
|
--layer-name nova-cli \
|
||||||
--zip-file fileb://nova-layer.zip \
|
--zip-file fileb://nova-cli-layer-v1.29.x.zip \
|
||||||
--compatible-runtimes python3.12 \
|
--compatible-runtimes python3.12 \
|
||||||
--compatible-architectures x86_64 \
|
--compatible-architectures x86_64 \
|
||||||
--description "nova-cli v${{ steps.ver.outputs.version }}" \
|
--description "nova-cli v${{ steps.ver.outputs.version }}" \
|
||||||
@@ -158,6 +315,80 @@ jobs:
|
|||||||
--type String --overwrite
|
--type String --overwrite
|
||||||
echo "SSM /nova/layer/nova-cli/version = ${{ steps.ver.outputs.version }}:${{ steps.layer.outputs.arn }}"
|
echo "SSM /nova/layer/nova-cli/version = ${{ steps.ver.outputs.version }}:${{ steps.layer.outputs.arn }}"
|
||||||
|
|
||||||
|
- name: Build Lambda token-vend zip (nova-lambda-token-vend-v1.29.x.zip)
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
# Package the nova-idp-token-vend Lambda handler (the dual-use
|
||||||
|
# module core/lambda/nova_idp_token_vend.py) plus the core/
|
||||||
|
# package modules it imports at runtime (core.policy_engine,
|
||||||
|
# core.abac_evaluator, core.kms_signing). The zip root mirrors
|
||||||
|
# the repo layout so `import core.lambda.nova_idp_token_vend`
|
||||||
|
# resolves inside the Lambda execution environment.
|
||||||
|
rm -rf lambdazip
|
||||||
|
mkdir -p lambdazip/core/lambda
|
||||||
|
cp core/lambda/__init__.py lambdazip/core/lambda/__init__.py
|
||||||
|
cp core/lambda/nova_idp_token_vend.py \
|
||||||
|
lambdazip/core/lambda/nova_idp_token_vend.py
|
||||||
|
# Carry the core/ modules the handler imports lazily.
|
||||||
|
cp core/__init__.py lambdazip/core/__init__.py 2>/dev/null || true
|
||||||
|
cp core/policy_engine.py lambdazip/core/policy_engine.py 2>/dev/null || true
|
||||||
|
cp core/abac_evaluator.py lambdazip/core/abac_evaluator.py 2>/dev/null || true
|
||||||
|
cp core/kms_signing.py lambdazip/core/kms_signing.py 2>/dev/null || true
|
||||||
|
( cd lambdazip && zip -r ../nova-lambda-token-vend-v1.29.x.zip . )
|
||||||
|
ls -lh nova-lambda-token-vend-v1.29.x.zip
|
||||||
|
|
||||||
|
- name: Compute SHA-256 of all release artifacts
|
||||||
|
id: sha
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
sha256sum nova-lambda-token-vend-v1.29.x.zip \
|
||||||
|
> /tmp/sha-lambda.txt
|
||||||
|
sha256sum nova-cli-layer-v1.29.x.zip \
|
||||||
|
> /tmp/sha-layer.txt
|
||||||
|
sha256sum dist/nova-${{ steps.ver.outputs.version }}-*.whl \
|
||||||
|
> /tmp/sha-wheel.txt
|
||||||
|
{
|
||||||
|
echo "## Artifact SHA-256 (REQ-354)"
|
||||||
|
echo ""
|
||||||
|
echo "### nova-lambda-token-vend-v1.29.x.zip"
|
||||||
|
echo '```'
|
||||||
|
cat /tmp/sha-lambda.txt
|
||||||
|
echo '```'
|
||||||
|
echo ""
|
||||||
|
echo "### nova-cli-layer-v1.29.x.zip"
|
||||||
|
echo '```'
|
||||||
|
cat /tmp/sha-layer.txt
|
||||||
|
echo '```'
|
||||||
|
echo ""
|
||||||
|
echo "### nova-${{ steps.ver.outputs.version }}-py3-none-any.whl"
|
||||||
|
echo '```'
|
||||||
|
cat /tmp/sha-wheel.txt
|
||||||
|
echo '```'
|
||||||
|
echo ""
|
||||||
|
echo "### ECR kj image (REQ-354 criterion 3/4)"
|
||||||
|
echo "- URI: \`${{ needs.build-kj-image.outputs.image_uri }}\`"
|
||||||
|
echo "- digest: \`${{ needs.build-kj-image.outputs.image_digest }}\`"
|
||||||
|
echo "- tag: \`${{ needs.build-kj-image.outputs.image_tag }}\`"
|
||||||
|
echo ""
|
||||||
|
} > /tmp/release-body.md
|
||||||
|
echo "body_path=/tmp/release-body.md" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "--- Release body ---"
|
||||||
|
cat /tmp/release-body.md
|
||||||
|
|
||||||
|
- name: Create GitHub Release + attach artifacts (REQ-354)
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
|
# Use the pushed tag as the release tag.
|
||||||
|
tag_name: ${{ github.ref_name }}
|
||||||
|
name: Nova ${{ github.ref_name }}
|
||||||
|
body_path: ${{ steps.sha.outputs.body_path }}
|
||||||
|
files: |
|
||||||
|
nova-lambda-token-vend-v1.29.x.zip
|
||||||
|
nova-cli-layer-v1.29.x.zip
|
||||||
|
dist/nova-${{ steps.ver.outputs.version }}-*.whl
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Fail job if either publish failed (REQ-323 AC)
|
- name: Fail job if either publish failed (REQ-323 AC)
|
||||||
if: ${{ steps.wheel.outputs.uploaded != 'true' || steps.layer.outputs.arn == '' }}
|
if: ${{ steps.wheel.outputs.uploaded != 'true' || steps.layer.outputs.arn == '' }}
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -2,6 +2,15 @@
|
|||||||
|
|
||||||
Backing logic for ``nova idp setup``. The CLI (``nova/idp/setup.py``)
|
Backing logic for ``nova idp setup``. The CLI (``nova/idp/setup.py``)
|
||||||
is a thin ≤50-line delegate to this module (CAP-034).
|
is a thin ≤50-line delegate to this module (CAP-034).
|
||||||
|
|
||||||
|
From v1.29 (REQ-369, spec §7.5) the active provisioning path is
|
||||||
|
``terraform apply`` in the ``nova-platform-ops`` checkout. The CFN
|
||||||
|
template generated here is archived as read-only reference in
|
||||||
|
``docs/archive/nova-idp-cfn-v1.28.md``; :func:`generate_and_deploy`
|
||||||
|
(the former CFN deploy path) emits a ``DeprecationWarning`` and is
|
||||||
|
retained only as a fallback when terraform is absent from PATH.
|
||||||
|
:func:`terraform_apply` and :func:`terraform_plan` are the new
|
||||||
|
preferred paths.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
@@ -9,13 +18,21 @@ from __future__ import annotations
|
|||||||
import importlib.util
|
import importlib.util
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
import warnings
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
_CFN_ARCHIVE_REF = (
|
||||||
|
"CFN path is archived; install terraform or use nova-platform-ops. "
|
||||||
|
"See docs/archive/nova-idp-cfn-v1.28.md."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _load_cfn():
|
def _load_cfn():
|
||||||
"""Load core/lambda/nova_idp_cfn.py via importlib (`lambda` is reserved)."""
|
"""Load core/lambda/nova_idp_cfn.py via importlib (`lambda` is reserved)."""
|
||||||
p = Path(__file__).parent / "nova_idp_cfn.py"
|
p = Path(__file__).parent / "nova_idp_cfn.py"
|
||||||
@@ -71,6 +88,13 @@ def generate_and_deploy(
|
|||||||
) -> dict[str, Any]:
|
) -> dict[str, Any]:
|
||||||
"""Generate the CFN template + deploy (REQ-341, NFR-10 y/N approval).
|
"""Generate the CFN template + deploy (REQ-341, NFR-10 y/N approval).
|
||||||
|
|
||||||
|
.. deprecated:: v1.29
|
||||||
|
The active path is :func:`terraform_apply` (REQ-369, spec §7.5).
|
||||||
|
This CFN deploy path is archived as read-only reference in
|
||||||
|
``docs/archive/nova-idp-cfn-v1.28.md`` and retained only as a
|
||||||
|
fallback when terraform is absent from PATH. It emits a
|
||||||
|
``DeprecationWarning`` on every non-dry-run invocation.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
public_jwks_domain: optional custom JWKS domain.
|
public_jwks_domain: optional custom JWKS domain.
|
||||||
dry_run: if True, print the resource summary only (no deploy).
|
dry_run: if True, print the resource summary only (no deploy).
|
||||||
@@ -84,6 +108,7 @@ def generate_and_deploy(
|
|||||||
summary = resource_summary(template)
|
summary = resource_summary(template)
|
||||||
if dry_run:
|
if dry_run:
|
||||||
return {"template": template, "summary": summary, "deployed": False}
|
return {"template": template, "summary": summary, "deployed": False}
|
||||||
|
warnings.warn(_CFN_ARCHIVE_REF, DeprecationWarning, stacklevel=2)
|
||||||
# NFR-10: explicit y/N approval before cloudformation deploy.
|
# NFR-10: explicit y/N approval before cloudformation deploy.
|
||||||
print("Resource summary:")
|
print("Resource summary:")
|
||||||
for rtype, count in sorted(summary.items()):
|
for rtype, count in sorted(summary.items()):
|
||||||
@@ -123,6 +148,43 @@ def generate_and_deploy(
|
|||||||
return {"template": template, "summary": summary, "deployed": deployed}
|
return {"template": template, "summary": summary, "deployed": deployed}
|
||||||
|
|
||||||
|
|
||||||
|
def terraform_apply(*, auto_approve: bool = True) -> dict[str, Any]:
|
||||||
|
"""Delegate provisioning to ``terraform apply`` (REQ-369, spec §7.5).
|
||||||
|
|
||||||
|
The operator runs this from the ``nova-platform-ops`` checkout root
|
||||||
|
(where the Terraform modules live). This function shells out to
|
||||||
|
``terraform`` on PATH; the caller (``nova/idp/setup.py``) is
|
||||||
|
responsible for the ``shutil.which("terraform")`` gate.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
auto_approve: pass ``-auto-approve`` (default True; the y/N gate
|
||||||
|
is the operator's PR review in nova-platform-ops).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
``{"deployed": bool, "returncode": int, "command": [str]}``.
|
||||||
|
"""
|
||||||
|
cmd = ["terraform", "apply"]
|
||||||
|
if auto_approve:
|
||||||
|
cmd.append("-auto-approve")
|
||||||
|
proc = subprocess.run(cmd)
|
||||||
|
return {"deployed": proc.returncode == 0, "returncode": proc.returncode, "command": cmd}
|
||||||
|
|
||||||
|
|
||||||
|
def terraform_plan() -> dict[str, Any]:
|
||||||
|
"""Delegate verification to ``terraform plan`` (REQ-369, spec §7.5).
|
||||||
|
|
||||||
|
Reports the diff between the live stack and the Terraform source in
|
||||||
|
the ``nova-platform-ops`` checkout. The caller is responsible for
|
||||||
|
the ``shutil.which("terraform")`` gate.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
``{"passed": bool, "returncode": int, "command": [str]}``.
|
||||||
|
"""
|
||||||
|
cmd = ["terraform", "plan"]
|
||||||
|
proc = subprocess.run(cmd)
|
||||||
|
return {"passed": proc.returncode == 0, "returncode": proc.returncode, "command": cmd}
|
||||||
|
|
||||||
|
|
||||||
def verify() -> dict[str, Any]:
|
def verify() -> dict[str, Any]:
|
||||||
"""Run the KMS round-trip verification (REQ-340 --verify).
|
"""Run the KMS round-trip verification (REQ-340 --verify).
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,551 @@
|
|||||||
|
# Archived: Nova IdP CloudFormation Template (v1.28)
|
||||||
|
|
||||||
|
> **Archived at v1.29.0** — the active path is `terraform apply` in
|
||||||
|
> `nova-platform-ops`. Deletion is a follow-up after Terraform parity
|
||||||
|
> is verified (REQ-369 AC 3, spec §7.5). This template is read-only
|
||||||
|
> reference; do not modify it. The `nova idp setup --apply` command
|
||||||
|
> now delegates to `terraform apply` (see `nova/idp/setup.py`).
|
||||||
|
|
||||||
|
This is the verbatim output of `generate_template()` from
|
||||||
|
`core/lambda/nova_idp_cfn.py` (the composition of the DynamoDB snippet
|
||||||
|
from `core/lambda/nova_idp_auth_cfn.py` + the KMS signing key + the
|
||||||
|
three IdP Lambdas + their IAM roles + function URLs). It was the active
|
||||||
|
provisioning path through v1.28; from v1.29 the operator runs
|
||||||
|
`terraform apply` in the `nova-platform-ops` checkout and `nova idp
|
||||||
|
setup --apply` delegates to it. The CFN generation code is retained as
|
||||||
|
read-only reference and emits a `DeprecationWarning` when the CFN
|
||||||
|
fallback path is invoked (terraform absent from PATH).
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"Resources": {
|
||||||
|
"NovaUsersTable": {
|
||||||
|
"Type": "AWS::DynamoDB::Table",
|
||||||
|
"Properties": {
|
||||||
|
"TableName": "nova-users",
|
||||||
|
"BillingMode": "PAY_PER_REQUEST",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "user_id",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"AttributeDefinitions": [
|
||||||
|
{
|
||||||
|
"AttributeName": "user_id",
|
||||||
|
"AttributeType": "S"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"AttributeName": "email",
|
||||||
|
"AttributeType": "S"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"GlobalSecondaryIndexes": [
|
||||||
|
{
|
||||||
|
"IndexName": "email-index",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "email",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"Projection": {
|
||||||
|
"ProjectionType": "ALL"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"PointInTimeRecoverySpecification": {
|
||||||
|
"PointInTimeRecoveryEnabled": true
|
||||||
|
},
|
||||||
|
"AttributeShape": {
|
||||||
|
"user_id": "String",
|
||||||
|
"email": "String",
|
||||||
|
"password_hash": "String",
|
||||||
|
"owner": "String",
|
||||||
|
"roles": "List",
|
||||||
|
"created_at": "String"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaSessionsTable": {
|
||||||
|
"Type": "AWS::DynamoDB::Table",
|
||||||
|
"Properties": {
|
||||||
|
"TableName": "nova-sessions",
|
||||||
|
"BillingMode": "PAY_PER_REQUEST",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "session_id",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"AttributeDefinitions": [
|
||||||
|
{
|
||||||
|
"AttributeName": "session_id",
|
||||||
|
"AttributeType": "S"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"AttributeName": "user_id",
|
||||||
|
"AttributeType": "S"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"GlobalSecondaryIndexes": [
|
||||||
|
{
|
||||||
|
"IndexName": "user_id-index",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "user_id",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"Projection": {
|
||||||
|
"ProjectionType": "ALL"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"TimeToLiveSpecification": {
|
||||||
|
"AttributeName": "expires_at",
|
||||||
|
"Enabled": true
|
||||||
|
},
|
||||||
|
"AttributeShape": {
|
||||||
|
"session_id": "String",
|
||||||
|
"user_id": "String",
|
||||||
|
"expires_at": "String (epoch seconds, TTL)",
|
||||||
|
"created_at": "String (ISO-8601)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaPasswordResetsTable": {
|
||||||
|
"Type": "AWS::DynamoDB::Table",
|
||||||
|
"Properties": {
|
||||||
|
"TableName": "nova-password-resets",
|
||||||
|
"BillingMode": "PAY_PER_REQUEST",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "reset_token",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"AttributeDefinitions": [
|
||||||
|
{
|
||||||
|
"AttributeName": "reset_token",
|
||||||
|
"AttributeType": "S"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"TimeToLiveSpecification": {
|
||||||
|
"AttributeName": "expires_at",
|
||||||
|
"Enabled": true
|
||||||
|
},
|
||||||
|
"AttributeShape": {
|
||||||
|
"reset_token": "String",
|
||||||
|
"user_id": "String",
|
||||||
|
"expires_at": "String (epoch seconds, TTL; 15 min)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaPatsTable": {
|
||||||
|
"Type": "AWS::DynamoDB::Table",
|
||||||
|
"Properties": {
|
||||||
|
"TableName": "nova-pats",
|
||||||
|
"BillingMode": "PAY_PER_REQUEST",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "jti",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"AttributeDefinitions": [
|
||||||
|
{
|
||||||
|
"AttributeName": "jti",
|
||||||
|
"AttributeType": "S"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"AttributeName": "sub",
|
||||||
|
"AttributeType": "S"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"AttributeName": "pat_hash",
|
||||||
|
"AttributeType": "S"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"GlobalSecondaryIndexes": [
|
||||||
|
{
|
||||||
|
"IndexName": "sub-index",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "sub",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"Projection": {
|
||||||
|
"ProjectionType": "ALL"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"IndexName": "pat_hash-index",
|
||||||
|
"KeySchema": [
|
||||||
|
{
|
||||||
|
"AttributeName": "pat_hash",
|
||||||
|
"KeyType": "HASH"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"Projection": {
|
||||||
|
"ProjectionType": "ALL"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"TimeToLiveSpecification": {
|
||||||
|
"AttributeName": "expires_at",
|
||||||
|
"Enabled": true
|
||||||
|
},
|
||||||
|
"AttributeShape": {
|
||||||
|
"jti": "String (PK)",
|
||||||
|
"sub": "String (GSI1; subject / user_id)",
|
||||||
|
"pat_hash": "String (GSI2; SHA-256 of the PAT for lookup)",
|
||||||
|
"status": "String (active|revoked)",
|
||||||
|
"issued_at": "String (ISO-8601)",
|
||||||
|
"expires_at": "String (epoch seconds, TTL)",
|
||||||
|
"revoked_at": "String (ISO-8601, present iff status=revoked)",
|
||||||
|
"claims": "Map (JWT claims payload)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaOidcSigningKey": {
|
||||||
|
"Type": "AWS::KMS::Key",
|
||||||
|
"Properties": {
|
||||||
|
"Description": "Nova OIDC token signing key (REQ-337, ECC_NIST_P256)",
|
||||||
|
"KeySpec": "ECC_NIST_P256",
|
||||||
|
"KeyUsage": "SIGN_VERIFY",
|
||||||
|
"KeyPolicy": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Principal": {
|
||||||
|
"AWS": {
|
||||||
|
"Fn::Sub": "arn:aws:iam::${AWS::AccountId}:root"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Action": "kms:*",
|
||||||
|
"Resource": "*"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaOidcSigningKeyAlias": {
|
||||||
|
"Type": "AWS::KMS::Alias",
|
||||||
|
"Properties": {
|
||||||
|
"AliasName": "alias/nova-oidc-signing",
|
||||||
|
"TargetKeyId": {
|
||||||
|
"Fn::GetAtt": "NovaOidcSigningKey.Arn"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpAuthRole": {
|
||||||
|
"Type": "AWS::IAM::Role",
|
||||||
|
"Properties": {
|
||||||
|
"AssumeRolePolicyDocument": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Principal": {
|
||||||
|
"Service": {
|
||||||
|
"Fn::Sub": "lambda.${AWS::Region}.amazonaws.com"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Action": "sts:AssumeRole"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"Policies": [
|
||||||
|
{
|
||||||
|
"PolicyName": "NovaIdpAuthPolicy",
|
||||||
|
"PolicyDocument": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"logs:CreateLogStream",
|
||||||
|
"logs:PutLogEvents"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"logs:CreateLogGroup"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"dynamodb:GetItem",
|
||||||
|
"dynamodb:PutItem",
|
||||||
|
"dynamodb:UpdateItem",
|
||||||
|
"dynamodb:Query",
|
||||||
|
"dynamodb:DeleteItem"
|
||||||
|
],
|
||||||
|
"Resource": [
|
||||||
|
{
|
||||||
|
"Fn::Sub": "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/nova-users"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Fn::Sub": "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/nova-sessions"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Fn::Sub": "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/nova-password-resets"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpTokenVendRole": {
|
||||||
|
"Type": "AWS::IAM::Role",
|
||||||
|
"Properties": {
|
||||||
|
"AssumeRolePolicyDocument": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Principal": {
|
||||||
|
"Service": {
|
||||||
|
"Fn::Sub": "lambda.${AWS::Region}.amazonaws.com"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Action": "sts:AssumeRole"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"Policies": [
|
||||||
|
{
|
||||||
|
"PolicyName": "NovaIdpTokenVendPolicy",
|
||||||
|
"PolicyDocument": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"logs:CreateLogStream",
|
||||||
|
"logs:PutLogEvents"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"logs:CreateLogGroup"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"dynamodb:GetItem",
|
||||||
|
"dynamodb:PutItem",
|
||||||
|
"dynamodb:UpdateItem",
|
||||||
|
"dynamodb:Query",
|
||||||
|
"dynamodb:DeleteItem"
|
||||||
|
],
|
||||||
|
"Resource": [
|
||||||
|
{
|
||||||
|
"Fn::Sub": "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/nova-pats"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"kms:Sign",
|
||||||
|
"kms:GetPublicKey",
|
||||||
|
"kms:DescribeKey"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::GetAtt": "NovaOidcSigningKey.Arn"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpJwksRole": {
|
||||||
|
"Type": "AWS::IAM::Role",
|
||||||
|
"Properties": {
|
||||||
|
"AssumeRolePolicyDocument": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Principal": {
|
||||||
|
"Service": {
|
||||||
|
"Fn::Sub": "lambda.${AWS::Region}.amazonaws.com"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Action": "sts:AssumeRole"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"Policies": [
|
||||||
|
{
|
||||||
|
"PolicyName": "NovaIdpJwksPolicy",
|
||||||
|
"PolicyDocument": {
|
||||||
|
"Version": "2012-10-17",
|
||||||
|
"Statement": [
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"logs:CreateLogStream",
|
||||||
|
"logs:PutLogEvents"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"logs:CreateLogGroup"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Effect": "Allow",
|
||||||
|
"Action": [
|
||||||
|
"kms:Sign",
|
||||||
|
"kms:GetPublicKey",
|
||||||
|
"kms:DescribeKey"
|
||||||
|
],
|
||||||
|
"Resource": {
|
||||||
|
"Fn::GetAtt": "NovaOidcSigningKey.Arn"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpAuthFunction": {
|
||||||
|
"Type": "AWS::Lambda::Function",
|
||||||
|
"Properties": {
|
||||||
|
"Handler": "nova_idp_auth.lambda_handler",
|
||||||
|
"Runtime": "python3.12",
|
||||||
|
"MemorySize": 512,
|
||||||
|
"Timeout": 30,
|
||||||
|
"Role": {
|
||||||
|
"Fn::GetAtt": [
|
||||||
|
"NovaIdpAuthRole",
|
||||||
|
"Arn"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"Environment": {
|
||||||
|
"Variables": {
|
||||||
|
"NOVA_USERS_TABLE": "nova-users",
|
||||||
|
"NOVA_SESSIONS_TABLE": "nova-sessions",
|
||||||
|
"NOVA_PASSWORD_RESETS_TABLE": "nova-password-resets",
|
||||||
|
"NOVA_PATS_TABLE": "nova-pats"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Code": {
|
||||||
|
"ZipFile": "def lambda_handler(event, context):\n return {}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpTokenVendFunction": {
|
||||||
|
"Type": "AWS::Lambda::Function",
|
||||||
|
"Properties": {
|
||||||
|
"Handler": "nova_idp_token_vend.lambda_handler",
|
||||||
|
"Runtime": "python3.12",
|
||||||
|
"MemorySize": 512,
|
||||||
|
"Timeout": 30,
|
||||||
|
"Role": {
|
||||||
|
"Fn::GetAtt": [
|
||||||
|
"NovaIdpTokenVendRole",
|
||||||
|
"Arn"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"Environment": {
|
||||||
|
"Variables": {
|
||||||
|
"NOVA_USERS_TABLE": "nova-users",
|
||||||
|
"NOVA_SESSIONS_TABLE": "nova-sessions",
|
||||||
|
"NOVA_PASSWORD_RESETS_TABLE": "nova-password-resets",
|
||||||
|
"NOVA_PATS_TABLE": "nova-pats",
|
||||||
|
"NOVA_OIDC_KMS_KEY_ID": "alias/nova-oidc-signing"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Code": {
|
||||||
|
"ZipFile": "def lambda_handler(event, context):\n return {}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpJwksFunction": {
|
||||||
|
"Type": "AWS::Lambda::Function",
|
||||||
|
"Properties": {
|
||||||
|
"Handler": "nova_idp_jwks.lambda_handler",
|
||||||
|
"Runtime": "python3.12",
|
||||||
|
"MemorySize": 256,
|
||||||
|
"Timeout": 30,
|
||||||
|
"Role": {
|
||||||
|
"Fn::GetAtt": [
|
||||||
|
"NovaIdpJwksRole",
|
||||||
|
"Arn"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"Environment": {
|
||||||
|
"Variables": {
|
||||||
|
"NOVA_OIDC_KMS_KEY_ID": "alias/nova-oidc-signing"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Code": {
|
||||||
|
"ZipFile": "def lambda_handler(event, context):\n return {}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpAuthUrl": {
|
||||||
|
"Type": "AWS::Lambda::Url",
|
||||||
|
"Properties": {
|
||||||
|
"TargetFunction": {
|
||||||
|
"Ref": "NovaIdpAuthFunction"
|
||||||
|
},
|
||||||
|
"AuthType": "AWS_IAM"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpTokenVendUrl": {
|
||||||
|
"Type": "AWS::Lambda::Url",
|
||||||
|
"Properties": {
|
||||||
|
"TargetFunction": {
|
||||||
|
"Ref": "NovaIdpTokenVendFunction"
|
||||||
|
},
|
||||||
|
"AuthType": "AWS_IAM"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"NovaIdpJwksUrl": {
|
||||||
|
"Type": "AWS::Lambda::Url",
|
||||||
|
"Properties": {
|
||||||
|
"TargetFunction": {
|
||||||
|
"Ref": "NovaIdpJwksFunction"
|
||||||
|
},
|
||||||
|
"AuthType": "NONE"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
+8
-3
@@ -1,9 +1,10 @@
|
|||||||
"""nova idp setup --check/--apply/--verify (REQ-340, REQ-341, C-2.1, ≤50 lines)."""
|
"""nova idp setup --check/--apply/--verify (REQ-340, REQ-341, REQ-369, ≤50 lines)."""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import importlib.util
|
import importlib.util
|
||||||
import json
|
import json
|
||||||
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
@@ -19,8 +20,8 @@ def _load_setup():
|
|||||||
def add_parser(subparsers):
|
def add_parser(subparsers):
|
||||||
p = subparsers.add_parser("setup", help="check/apply/verify the Nova IdP stack")
|
p = subparsers.add_parser("setup", help="check/apply/verify the Nova IdP stack")
|
||||||
p.add_argument("--check", action="store_true", help="check prerequisites")
|
p.add_argument("--check", action="store_true", help="check prerequisites")
|
||||||
p.add_argument("--apply", action="store_true", help="generate + deploy (NFR-10 y/N)")
|
p.add_argument("--apply", action="store_true", help="terraform apply (REQ-369; CFN fallback)")
|
||||||
p.add_argument("--verify", action="store_true", help="run the KMS round-trip test")
|
p.add_argument("--verify", action="store_true", help="terraform plan (REQ-369; KMS fallback)")
|
||||||
p.add_argument("--dry-run", action="store_true", help="resource summary only")
|
p.add_argument("--dry-run", action="store_true", help="resource summary only")
|
||||||
p.add_argument("--public-jwks-domain", default=None, help="custom JWKS domain")
|
p.add_argument("--public-jwks-domain", default=None, help="custom JWKS domain")
|
||||||
p.set_defaults(_run=run)
|
p.set_defaults(_run=run)
|
||||||
@@ -31,8 +32,12 @@ def run(args) -> int:
|
|||||||
if args.check:
|
if args.check:
|
||||||
print(json.dumps(mod.check_prerequisites(), indent=2)); return 0
|
print(json.dumps(mod.check_prerequisites(), indent=2)); return 0
|
||||||
if args.verify:
|
if args.verify:
|
||||||
|
if shutil.which("terraform"):
|
||||||
|
r = mod.terraform_plan(); print(json.dumps(r, indent=2)); return 0 if r["passed"] else 1
|
||||||
r = mod.verify(); print(json.dumps(r, indent=2)); return 0 if r["passed"] else 1
|
r = mod.verify(); print(json.dumps(r, indent=2)); return 0 if r["passed"] else 1
|
||||||
if args.apply or args.dry_run:
|
if args.apply or args.dry_run:
|
||||||
|
if not args.dry_run and shutil.which("terraform"):
|
||||||
|
r = mod.terraform_apply(); print(json.dumps(r, indent=2)); return 0 if r["deployed"] else 1
|
||||||
r = mod.generate_and_deploy(args.public_jwks_domain, dry_run=args.dry_run)
|
r = mod.generate_and_deploy(args.public_jwks_domain, dry_run=args.dry_run)
|
||||||
print(json.dumps(r["summary"], indent=2))
|
print(json.dumps(r["summary"], indent=2))
|
||||||
return 0 if (r["deployed"] or args.dry_run) else 1
|
return 0 if (r["deployed"] or args.dry_run) else 1
|
||||||
|
|||||||
@@ -1,2 +1,7 @@
|
|||||||
v0.0.3
|
v0.0.3
|
||||||
4ebb9a19fbf545e17f046c137f9b69c4288d021e5c73d962835671e0cb3fbf07
|
4ebb9a19fbf545e17f046c137f9b69c4288d021e5c73d962835671e0cb3fbf07
|
||||||
|
https://github.com/kyverno/kyverno-json
|
||||||
|
# The SHA above is a tree SHA recorded in v1.28 (it 404s as a commit).
|
||||||
|
# The build fetches by tag v0.0.3, which dereferences to commit
|
||||||
|
# 924a6af2474523c4e27e3a826248c91c8fe1d1cf (verified via the GitHub
|
||||||
|
# git/tags API). The tree SHA is kept for traceability with v1.28.
|
||||||
+2
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "nova"
|
name = "nova"
|
||||||
version = "1.14.0"
|
version = "1.29.0"
|
||||||
description = "Nova — consumers declare intent; the platform delivers safe production deployment."
|
description = "Nova — consumers declare intent; the platform delivers safe production deployment."
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
@@ -32,6 +32,7 @@ testpaths = ["tests"]
|
|||||||
markers = [
|
markers = [
|
||||||
"offline: tests that run without AWS/Checkov/DynamoDB",
|
"offline: tests that run without AWS/Checkov/DynamoDB",
|
||||||
"slow: tests that invoke the full platform pipeline (long-running)",
|
"slow: tests that invoke the full platform pipeline (long-running)",
|
||||||
|
"live_aws: tests that hit live AWS resources (KMS key alias/nova-oidc-signing, real DynamoDB). Skipped in acdl CI; runs in nova-platform-ops CI (REQ-362, covered-reference).",
|
||||||
]
|
]
|
||||||
addopts = "-v --tb=short --junitxml=metrics/test-results.xml --json-report --cov=core --cov=adapters --cov-report=json:metrics/coverage.json --json-report-file=metrics/test-report.json"
|
addopts = "-v --tb=short --junitxml=metrics/test-results.xml --json-report --cov=core --cov=adapters --cov-report=json:metrics/coverage.json --json-report-file=metrics/test-report.json"
|
||||||
filterwarnings = [
|
filterwarnings = [
|
||||||
|
|||||||
@@ -1,96 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""scripts/attach_release_asset.py — upload one or more files as Gitea release
|
|
||||||
attachments.
|
|
||||||
|
|
||||||
REQ-228 (v1.18): PPTX (and any deck artifact) is attached to the phase's
|
|
||||||
Gitea release. Uses the Gitea API:
|
|
||||||
POST /api/v1/repos/{owner}/{repo}/releases/{id}/assets
|
|
||||||
multipart form: name=<filename>, attachment=<file bytes>
|
|
||||||
|
|
||||||
REQ-270 (v1.23): supports dual PPTX attachment — the MARP PPTX (primary,
|
|
||||||
attached first) and the python-pptx PPTX (comparison artifact). Multiple
|
|
||||||
file paths are accepted; the first is the primary attachment.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
python3 scripts/attach_release_asset.py <file-path> <release-id>
|
|
||||||
python3 scripts/attach_release_asset.py <file-path> <file-path-2>... <release-id>
|
|
||||||
python3 scripts/attach_release_asset.py docs/presentations/nova-autonomous-cloud-delivery.pptx 522
|
|
||||||
python3 scripts/attach_release_asset.py \
|
|
||||||
docs/presentations/nova-autonomous-cloud-delivery.pptx \
|
|
||||||
docs/presentations/nova-autonomous-cloud-delivery-python.pptx 522
|
|
||||||
|
|
||||||
The last positional argument is always the release id; every preceding
|
|
||||||
argument is an asset path (backward compatible with the single-asset call).
|
|
||||||
|
|
||||||
Token resolution: reads NOVA_GITEA_TOKEN (or ACDL_GITEA_TOKEN) from .env.secrets
|
|
||||||
/ .env, matching the ship_phase.sh pattern. Never uses shell env tokens.
|
|
||||||
"""
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import urllib.request
|
|
||||||
import urllib.error
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
GITEA_BASE = "https://git.cloudinit.dev"
|
|
||||||
OWNER = "continuous-intelligence"
|
|
||||||
REPO = "acdl"
|
|
||||||
|
|
||||||
|
|
||||||
def resolve_token() -> str:
|
|
||||||
for fn in (".env.secrets", ".env"):
|
|
||||||
try:
|
|
||||||
for line in Path(fn).read_text().splitlines():
|
|
||||||
if line.startswith("NOVA_GITEA_TOKEN=") or line.startswith("ACDL_GITEA_TOKEN="):
|
|
||||||
return line.split("=", 1)[1].strip()
|
|
||||||
except (FileNotFoundError, PermissionError):
|
|
||||||
continue
|
|
||||||
raise RuntimeError("No Gitea token found in .env.secrets or .env (NOVA_GITEA_TOKEN/ACDL_GITEA_TOKEN)")
|
|
||||||
|
|
||||||
|
|
||||||
def attach_asset(file_path: str, release_id: str) -> dict:
|
|
||||||
token = resolve_token()
|
|
||||||
p = Path(file_path)
|
|
||||||
if not p.is_file():
|
|
||||||
raise FileNotFoundError(f"Asset file not found: {file_path}")
|
|
||||||
|
|
||||||
url = f"{GITEA_BASE}/api/v1/repos/{OWNER}/{REPO}/releases/{release_id}/assets"
|
|
||||||
filename = p.name
|
|
||||||
|
|
||||||
boundary = "----NovaBoundary7MAgYbk"
|
|
||||||
body = (
|
|
||||||
f"--{boundary}\r\n"
|
|
||||||
f'Content-Disposition: form-data; name="name"\r\n\r\n'
|
|
||||||
f"{filename}\r\n"
|
|
||||||
f"--{boundary}\r\n"
|
|
||||||
f'Content-Disposition: form-data; name="attachment"; filename="{filename}"\r\n'
|
|
||||||
f"Content-Type: application/octet-stream\r\n\r\n"
|
|
||||||
).encode() + p.read_bytes() + f"\r\n--{boundary}--\r\n".encode()
|
|
||||||
|
|
||||||
req = urllib.request.Request(
|
|
||||||
url,
|
|
||||||
data=body,
|
|
||||||
headers={
|
|
||||||
"Authorization": f"token {token}",
|
|
||||||
"Content-Type": f"multipart/form-data; boundary={boundary}",
|
|
||||||
},
|
|
||||||
method="POST",
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
resp = urllib.request.urlopen(req, timeout=60)
|
|
||||||
return json.loads(resp.read())
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
err = e.read().decode()[:300]
|
|
||||||
raise RuntimeError(f"HTTP {e.code} attaching {filename} to release {release_id}: {err}") from e
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
if len(sys.argv) < 3:
|
|
||||||
print("Usage: attach_release_asset.py <file-path> [<file-path-2>...] <release-id>")
|
|
||||||
sys.exit(1)
|
|
||||||
asset_paths = sys.argv[1:-1]
|
|
||||||
release_id = sys.argv[-1]
|
|
||||||
for idx, path in enumerate(asset_paths):
|
|
||||||
result = attach_asset(path, release_id)
|
|
||||||
primary = " (primary)" if idx == 0 and len(asset_paths) > 1 else ""
|
|
||||||
print(f"Attached{primary}: {result.get('name')} → release {release_id} (asset id {result.get('id')})")
|
|
||||||
+10
-111
@@ -6,25 +6,19 @@
|
|||||||
# 1. List nova-spike-runner's access keys.
|
# 1. List nova-spike-runner's access keys.
|
||||||
# 2. Create a new key.
|
# 2. Create a new key.
|
||||||
# 3. Write the new key to gitignored .env.secrets (chmod 600).
|
# 3. Write the new key to gitignored .env.secrets (chmod 600).
|
||||||
# 4. Upload the new key to the consumer's Actions secret store + verify
|
# 4. Deactivate + delete the old key(s).
|
||||||
# (GET) that it propagated (SPEC §5.9 idempotency).
|
|
||||||
# 5. Deactivate + delete the old key(s) ONLY after the upload is verified.
|
|
||||||
# If the upload/verify fails, the old key stays Active + the run exits
|
|
||||||
# non-zero (the consumer's deploy keeps a working credential).
|
|
||||||
#
|
#
|
||||||
# Env vars (forge coords): NOVA_FORGE_TOKEN / NOVA_FORGE_BASE_URL /
|
# Idempotent: re-running always ends with exactly 1 active key for the user.
|
||||||
# NOVA_FORGE_OWNER / NOVA_CONSUMER_REPO (the scheduled workflow passes these
|
|
||||||
# forge-agnostic names, REQ-230). NOVA_GITEA_* are a backward-compat
|
|
||||||
# fallback for ad-hoc local runs.
|
|
||||||
#
|
|
||||||
# Idempotent: re-running always ends with exactly 1 active key for the user
|
|
||||||
# (once the new key has propagated to the secret store).
|
|
||||||
# Does NOT rotate the bootstrap root key (D-034 closure = manual user step).
|
# Does NOT rotate the bootstrap root key (D-034 closure = manual user step).
|
||||||
#
|
#
|
||||||
# Spike scope (D-039): the spike user key is per-run-rotated; real OIDC is
|
# Spike scope (D-039): the spike user key is per-run-rotated; real OIDC is
|
||||||
# v1.2 (blocked on go-gitea/gitea#36988).
|
# v1.2.
|
||||||
# Nova rebrand (P4, REQ-163): IAM user renamed acdl-spike-runner →
|
# Nova rebrand (P4, REQ-163): IAM user renamed acdl-spike-runner →
|
||||||
# nova-spike-runner.
|
# nova-spike-runner.
|
||||||
|
# D-232 (v1.29): the forge Actions secret-store upload was dev-forge-only
|
||||||
|
# and has been removed with the forge-parity retirement. The rotated key
|
||||||
|
# is written to .env.secrets only; the consumer's deploy reads it from
|
||||||
|
# there.
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
@@ -72,10 +66,6 @@ new_id = new["AccessKeyId"]
|
|||||||
new_secret = new["SecretAccessKey"]
|
new_secret = new["SecretAccessKey"]
|
||||||
print(f"iam: created new key {new_id} for {user}", file=sys.stderr)
|
print(f"iam: created new key {new_id} for {user}", file=sys.stderr)
|
||||||
|
|
||||||
# Deactivation of the old keys is deferred to AFTER the new key propagates
|
|
||||||
# to the Gitea Actions secret store (SPEC §5.9 idempotency — see below).
|
|
||||||
# Writing .env.secrets first keeps the local operator's working key current.
|
|
||||||
|
|
||||||
# Write the new key to gitignored .env.secrets (chmod 600).
|
# Write the new key to gitignored .env.secrets (chmod 600).
|
||||||
# Nova rebrand (P2): keys are NOVA_*; the ACDL_* legacy keys are the
|
# Nova rebrand (P2): keys are NOVA_*; the ACDL_* legacy keys are the
|
||||||
# dual-read fallback source until P5 (kept as comments in .env.secrets).
|
# dual-read fallback source until P5 (kept as comments in .env.secrets).
|
||||||
@@ -86,106 +76,15 @@ with open(env_file, "w") as fh:
|
|||||||
os.chmod(env_file, 0o600)
|
os.chmod(env_file, 0o600)
|
||||||
print(f"rotated key written to {env_file} (chmod 600)", file=sys.stderr)
|
print(f"rotated key written to {env_file} (chmod 600)", file=sys.stderr)
|
||||||
|
|
||||||
# Upload the new key to the consumer's Actions secret store BEFORE
|
# Deactivate + delete the old keys. The new key is already in .env.secrets
|
||||||
# deactivating the old key (SPEC §5.9 — idempotency: the old key is
|
# so deactivating is safe (D-039 local-rotation contract).
|
||||||
# deactivated only after the new one propagates). If the upload or the
|
|
||||||
# post-upload verification fails, the old key is left Active so the
|
|
||||||
# consumer's deploy still has a working credential; the run exits non-zero
|
|
||||||
# so the scheduled workflow surfaces the failure (rather than silently
|
|
||||||
# stranding the consumer with a key that never reached the secret store).
|
|
||||||
#
|
|
||||||
# Forge + consumer coords come from env vars. The scheduled workflow passes
|
|
||||||
# forge-agnostic NOVA_FORGE_* names (REQ-230 — no forge hostnames in the
|
|
||||||
# synced workflow file); NOVA_GITEA_* are accepted as a backward-compat
|
|
||||||
# fallback for ad-hoc local runs. Defaults keep the legacy platform-repo
|
|
||||||
# target when nothing is set.
|
|
||||||
# Dual-read token: NOVA_FORGE_TOKEN preferred, NOVA_GITEA_TOKEN fallback (G-106).
|
|
||||||
gitea_token = os.environ.get("NOVA_FORGE_TOKEN") or os.environ.get("NOVA_GITEA_TOKEN")
|
|
||||||
gitea_base = (
|
|
||||||
os.environ.get("NOVA_FORGE_BASE_URL")
|
|
||||||
or os.environ.get("NOVA_GITEA_BASE_URL")
|
|
||||||
or "https://git.cloudinit.dev"
|
|
||||||
).rstrip("/")
|
|
||||||
gitea_owner = (
|
|
||||||
os.environ.get("NOVA_FORGE_OWNER")
|
|
||||||
or os.environ.get("NOVA_GITEA_OWNER")
|
|
||||||
or "continuous-intelligence"
|
|
||||||
)
|
|
||||||
gitea_repo = (
|
|
||||||
os.environ.get("NOVA_CONSUMER_REPO")
|
|
||||||
or os.environ.get("NOVA_GITEA_REPO")
|
|
||||||
or "acdl"
|
|
||||||
)
|
|
||||||
secrets_api = f"{gitea_base}/api/v1/repos/{gitea_owner}/{gitea_repo}/actions/secrets"
|
|
||||||
|
|
||||||
if gitea_token:
|
|
||||||
import urllib.request
|
|
||||||
import urllib.error
|
|
||||||
import time
|
|
||||||
|
|
||||||
def _put_secret(name, value):
|
|
||||||
req = urllib.request.Request(
|
|
||||||
f"{secrets_api}/{name}",
|
|
||||||
data=json.dumps({"value": value}).encode(),
|
|
||||||
method="PUT",
|
|
||||||
headers={"Authorization": f"token {gitea_token}",
|
|
||||||
"Content-Type": "application/json"},
|
|
||||||
)
|
|
||||||
urllib.request.urlopen(req).read()
|
|
||||||
print(f"gitea: secret {name} uploaded to {gitea_owner}/{gitea_repo}", file=sys.stderr)
|
|
||||||
|
|
||||||
def _verify_secret(name):
|
|
||||||
# Gitea does not return secret *values*; a 200 confirms the secret
|
|
||||||
# exists with the expected name. Retry briefly so eventual
|
|
||||||
# consistency on the secrets API settles (observed sub-second lag).
|
|
||||||
for attempt in range(5):
|
|
||||||
req = urllib.request.Request(
|
|
||||||
f"{secrets_api}/{name}",
|
|
||||||
method="GET",
|
|
||||||
headers={"Authorization": f"token {gitea_token}"},
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(req) as resp:
|
|
||||||
if resp.status == 200:
|
|
||||||
print(f"gitea: secret {name} verified present", file=sys.stderr)
|
|
||||||
return True
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
if e.code == 404:
|
|
||||||
time.sleep(0.5)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
|
||||||
_put_secret("NOVA_AWS_ACCESS_KEY_ID", new_id)
|
|
||||||
_put_secret("NOVA_AWS_SECRET_ACCESS_KEY", new_secret)
|
|
||||||
ok = _verify_secret("NOVA_AWS_ACCESS_KEY_ID") and \
|
|
||||||
_verify_secret("NOVA_AWS_SECRET_ACCESS_KEY")
|
|
||||||
if not ok:
|
|
||||||
raise RuntimeError("gitea secret verification failed (404 after PUT)")
|
|
||||||
except Exception as e:
|
|
||||||
# Upload/verify failed: leave the old key Active so the consumer's
|
|
||||||
# deploy still works. Surface non-zero so the schedule is noisy.
|
|
||||||
print(f"gitea: secret upload/verify FAILED ({e}); old key left Active", file=sys.stderr)
|
|
||||||
sys.exit(2)
|
|
||||||
else:
|
|
||||||
print("gitea: NOVA_FORGE_TOKEN/NOVA_GITEA_TOKEN not set; secret upload skipped (v1.2 hardening)", file=sys.stderr)
|
|
||||||
# No forge target → the new key is already in .env.secrets, so the
|
|
||||||
# operator's local env works. The old key is deactivated below so the
|
|
||||||
# user ends with exactly 1 active key (D-039 local-rotation contract).
|
|
||||||
|
|
||||||
# Deactivate + delete the old keys. When a forge token was set, this runs
|
|
||||||
# ONLY after the new key propagated to the consumer's secret store (the
|
|
||||||
# sys.exit(2) above prevents reaching here on upload/verify failure). When
|
|
||||||
# no token was set, the new key is already in .env.secrets so deactivating
|
|
||||||
# is safe (D-039 local-rotation contract).
|
|
||||||
for k in active:
|
for k in active:
|
||||||
old_id = k["AccessKeyId"]
|
old_id = k["AccessKeyId"]
|
||||||
if old_id == new_id:
|
if old_id == new_id:
|
||||||
continue
|
continue
|
||||||
iam.update_access_key(UserName=user, AccessKeyId=old_id, Status="Inactive")
|
iam.update_access_key(UserName=user, AccessKeyId=old_id, Status="Inactive")
|
||||||
iam.delete_access_key(UserName=user, AccessKeyId=old_id)
|
iam.delete_access_key(UserName=user, AccessKeyId=old_id)
|
||||||
print(f"iam: deactivated+deleted old key {old_id} (after propagation)", file=sys.stderr)
|
print(f"iam: deactivated+deleted old key {old_id}", file=sys.stderr)
|
||||||
|
|
||||||
print(f"OK: {user} now has exactly 1 active key: {new_id}")
|
print(f"OK: {user} now has exactly 1 active key: {new_id}")
|
||||||
PY
|
PY
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# scripts/ship_phase.sh — internal CIAgent per-phase ship helper (v1.16)
|
|
||||||
# Usage: bash scripts/ship_phase.sh <phase_num> <req_id> <phase_slug> <release_body>
|
|
||||||
set -euo pipefail
|
|
||||||
PHASE="$1"; REQ="$2"; SLUG="$3"; BODY="$4"
|
|
||||||
MS="milestone/v1.16-nova-simplification"
|
|
||||||
BR="phase/$(printf '%02d' "$PHASE")-${SLUG}"
|
|
||||||
cd "$(git rev-parse --show-toplevel)"
|
|
||||||
git checkout "$MS" 2>/dev/null
|
|
||||||
git merge --squash "$BR" 2>&1 | tail -2
|
|
||||||
MSG="verify(P${PHASE}): ${SLUG} — 4-layer verify PASS + ship
|
|
||||||
|
|
||||||
${BODY}
|
|
||||||
|
|
||||||
---ci---
|
|
||||||
project: acdl
|
|
||||||
phase: ${PHASE}
|
|
||||||
milestone: v1.16
|
|
||||||
status: complete
|
|
||||||
phase_role: execution
|
|
||||||
requirements:
|
|
||||||
covered: [${REQ}]
|
|
||||||
partial: []
|
|
||||||
---/ci---"
|
|
||||||
git commit -q -m "$MSG"
|
|
||||||
PREV=$(git tag -l "v1.15.*" --sort=-version:refname | head -1)
|
|
||||||
PATCH=$(($(echo "$PREV" | sed 's/v1.15.//')))
|
|
||||||
NEWPATCH=$((PATCH + 1))
|
|
||||||
TAG="v1.15.${NEWPATCH}"
|
|
||||||
git tag -a "$TAG" -m "${TAG}: v1.16 P${PHASE} — ${SLUG}"
|
|
||||||
git push origin "$MS" --tags 2>&1 | grep -E "new tag|new branch" | head -2
|
|
||||||
python3 - "$TAG" "$PREV" <<'PYEOF'
|
|
||||||
import json, subprocess, sys, urllib.request, urllib.error
|
|
||||||
tag, prev = sys.argv[1], sys.argv[2]
|
|
||||||
tok = [l.split("=",1)[1].strip() for l in open(".env.secrets") if l.startswith("NOVA_GITEA_TOKEN=")][0]
|
|
||||||
body = subprocess.check_output(["git","log",f"{prev}..{tag}","--oneline"]).decode()
|
|
||||||
payload = {"tag_name":tag,"name":f"Nova {tag} — v1.16 P{tag.split('.')[-1]}","body":body}
|
|
||||||
req = urllib.request.Request("https://git.cloudinit.dev/api/v1/repos/continuous-intelligence/acdl/releases", data=json.dumps(payload).encode(), headers={"Authorization":f"token {tok}","Content-Type":"application/json"}, method="POST")
|
|
||||||
try:
|
|
||||||
r = urllib.request.urlopen(req, timeout=30); d = json.loads(r.read()); print(f"release_id: {d.get('id')} tag: {tag}")
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
if e.code == 409: print(f"release exists for {tag}")
|
|
||||||
else: print(f"HTTP {e.code}: {e.read().decode()[:120]}")
|
|
||||||
except Exception as e: print(f"ERROR: {e}")
|
|
||||||
PYEOF
|
|
||||||
echo "SHIPPED ${TAG}"
|
|
||||||
@@ -102,7 +102,6 @@ DOMAINS=(
|
|||||||
EXCLUDE_SCRIPTS=(
|
EXCLUDE_SCRIPTS=(
|
||||||
sync_to_gl.sh
|
sync_to_gl.sh
|
||||||
sync_to_nova.sh
|
sync_to_nova.sh
|
||||||
ship_phase.sh
|
|
||||||
update_atelier_vendor.sh
|
update_atelier_vendor.sh
|
||||||
post_stage_comment.sh
|
post_stage_comment.sh
|
||||||
rotate_spike_key.sh
|
rotate_spike_key.sh
|
||||||
@@ -114,8 +113,6 @@ EXCLUDE_SCRIPTS=(
|
|||||||
untag_acdl_keys.py
|
untag_acdl_keys.py
|
||||||
seed_uptime_monitors.py
|
seed_uptime_monitors.py
|
||||||
push_consumer_image.py
|
push_consumer_image.py
|
||||||
sync_workflows.py
|
|
||||||
attach_release_asset.py
|
|
||||||
check_north_star_diff.sh
|
check_north_star_diff.sh
|
||||||
render_slides.sh
|
render_slides.sh
|
||||||
)
|
)
|
||||||
@@ -198,7 +195,6 @@ echo ""
|
|||||||
# Hidden dirs/files in SRC that are NOT consumer-facing. .github is kept.
|
# Hidden dirs/files in SRC that are NOT consumer-facing. .github is kept.
|
||||||
EXCLUDES=(
|
EXCLUDES=(
|
||||||
--exclude=/.ciagent
|
--exclude=/.ciagent
|
||||||
--exclude=/.gitea
|
|
||||||
--exclude=/.env
|
--exclude=/.env
|
||||||
--exclude=/.env.secrets
|
--exclude=/.env.secrets
|
||||||
--exclude=/.coverage
|
--exclude=/.coverage
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""Sync byte-identical workflows from workflows-src/ to .gitea/ + .github/ (P8, REQ-172).
|
|
||||||
|
|
||||||
Three workflow pairs are byte-identical Gitea + GitHub mirrors:
|
|
||||||
ci.yml, deploy.yml, modules-lifecycle.yml, rotate-aws-key.yml.
|
|
||||||
|
|
||||||
This generator reads the single source from ``workflows-src/<name>`` and
|
|
||||||
writes byte-identical copies to both ``.gitea/workflows/<name>`` and
|
|
||||||
``.github/workflows/<name>``. Use ``--check`` to verify the committed
|
|
||||||
files match the generated output (CI gate); use ``--write`` to regenerate
|
|
||||||
the committed files from the sources.
|
|
||||||
|
|
||||||
The 4 GitHub-only workflows (platform-test.yml, primitives-plan.yml,
|
|
||||||
patterns-plan.yml, release.yml) have no Gitea mirror (act_runner feature
|
|
||||||
gaps) and are NOT touched by this generator.
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import filecmp
|
|
||||||
import sys
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
ROOT = Path(__file__).resolve().parent.parent
|
|
||||||
SRC_DIR = ROOT / "workflows-src"
|
|
||||||
GITEA_DIR = ROOT / ".gitea" / "workflows"
|
|
||||||
GITHUB_DIR = ROOT / ".github" / "workflows"
|
|
||||||
|
|
||||||
PAIRS = ["ci.yml", "deploy.yml", "modules-lifecycle.yml", "rotate-aws-key.yml"]
|
|
||||||
|
|
||||||
|
|
||||||
def _read_source(name: str) -> str:
|
|
||||||
src = SRC_DIR / name
|
|
||||||
if not src.is_file():
|
|
||||||
raise FileNotFoundError(f"source {src} missing")
|
|
||||||
return src.read_text()
|
|
||||||
|
|
||||||
|
|
||||||
def check() -> int:
|
|
||||||
"""Verify committed files match the sources. Exit 0 if clean, 1 if drift."""
|
|
||||||
drift = []
|
|
||||||
for name in PAIRS:
|
|
||||||
content = _read_source(name)
|
|
||||||
for dest_dir in (GITEA_DIR, GITHUB_DIR):
|
|
||||||
dest = dest_dir / name
|
|
||||||
if not dest.is_file():
|
|
||||||
drift.append(f"{dest} MISSING (expected from workflows-src/{name})")
|
|
||||||
continue
|
|
||||||
if dest.read_text() != content:
|
|
||||||
drift.append(f"{dest} DRIFTED from workflows-src/{name}")
|
|
||||||
if drift:
|
|
||||||
for d in drift:
|
|
||||||
print(f"DRIFT: {d}", file=sys.stderr)
|
|
||||||
print("\nRun: python3 scripts/sync_workflows.py --write", file=sys.stderr)
|
|
||||||
return 1
|
|
||||||
print(f"OK: {len(PAIRS)} workflow pairs match workflows-src/ sources")
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
def write() -> int:
|
|
||||||
"""Regenerate .gitea/ + .github/ from workflows-src/ sources."""
|
|
||||||
for name in PAIRS:
|
|
||||||
content = _read_source(name)
|
|
||||||
for dest_dir in (GITEA_DIR, GITHUB_DIR):
|
|
||||||
dest_dir.mkdir(parents=True, exist_ok=True)
|
|
||||||
(dest_dir / name).write_text(content)
|
|
||||||
print(f"wrote: .gitea/workflows/{name} + .github/workflows/{name}")
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
def main(argv: list[str] | None = None) -> int:
|
|
||||||
parser = argparse.ArgumentParser(description="Sync byte-identical workflow pairs.")
|
|
||||||
group = parser.add_mutually_exclusive_group(required=True)
|
|
||||||
group.add_argument("--check", action="store_true", help="verify committed files match sources (CI gate)")
|
|
||||||
group.add_argument("--write", action="store_true", help="regenerate committed files from sources")
|
|
||||||
args = parser.parse_args(argv)
|
|
||||||
if args.check:
|
|
||||||
return check()
|
|
||||||
return write()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
sys.exit(main())
|
|
||||||
@@ -0,0 +1,457 @@
|
|||||||
|
"""ABAC end-to-end test for the token-vend Lambda (Edge 5 item 7, INV-17).
|
||||||
|
|
||||||
|
The M1.5 verification-gate spike (PLAN.md Happy Path §3.3 Edge 5 item 7):
|
||||||
|
|
||||||
|
Known PAT → known ABAC-allowed action → signed OIDC token → jose/pyjwt
|
||||||
|
verification → green. Known PAT + ABAC-denied action → 403 with deny
|
||||||
|
reason logged (INV-17 fail-closed).
|
||||||
|
|
||||||
|
This is the end-to-end ABAC path: PAT → revocation check (D-229 strong
|
||||||
|
read) → kyverno-json ABAC policy evaluation → KMS-signed OIDC token →
|
||||||
|
JWKS fetch → pyjwt signature verification. It wires the **real**
|
||||||
|
``core.abac_evaluator.evaluate_token_vend_policy`` (which shells to the
|
||||||
|
``kj`` binary against ``platform/abac/token-vend.policy``) behind the
|
||||||
|
token-vend Lambda handler, then verifies the vended OIDC token against
|
||||||
|
the JWKS the JWKS Lambda would serve — exactly the M1.5 spike shape.
|
||||||
|
|
||||||
|
## Two execution surfaces (REQ-362 covered-reference)
|
||||||
|
|
||||||
|
* **acdl CI** — ``kj`` is NOT installed (``which kj`` is absent) and
|
||||||
|
there is no live KMS key. The ABAC-allowed and ABAC-denied tests
|
||||||
|
therefore ``pytest.skip`` with a clear reason (the ``kj`` binary is a
|
||||||
|
build-host/nova-platform-ops dep). The fail-closed (policy-absent)
|
||||||
|
test runs in acdl CI because it does NOT need ``kj`` — it exercises
|
||||||
|
the ``is_configured()``-False → 403 ``abac_eval_failed`` path.
|
||||||
|
* **nova-platform-ops CI** — ``kj`` is present at ``/opt/kj/kj`` and the
|
||||||
|
live KMS key ``alias/nova-oidc-signing`` is reachable. The
|
||||||
|
ABAC-allowed/denied tests run against the real binary + a mock KMS
|
||||||
|
(or the live key when marked ``live_aws``).
|
||||||
|
|
||||||
|
## Test deps
|
||||||
|
|
||||||
|
* ``moto[dynamodb]`` — mocks ``nova-pats`` (revocation strong read).
|
||||||
|
* mock KMS via ``cryptography`` generated ECDSA P-256 keypair (the same
|
||||||
|
pattern as ``tests/test_kms_roundtrip.py`` + ``test_pat_revocation.py``).
|
||||||
|
* ``pyjwt`` — verifies the vended OIDC token against the JWKS the JWKS
|
||||||
|
Lambda serves (the ``jose``-equivalent verification in the plan; the
|
||||||
|
repo standardizes on ``pyjwt`` + ``cryptography``, no ``jose`` dep).
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import importlib.util
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
# moto requires a region; the Lambdas' lazy boto3.resource("dynamodb")
|
||||||
|
# picks up AWS_DEFAULT_REGION.
|
||||||
|
os.environ.setdefault("AWS_DEFAULT_REGION", "us-east-1")
|
||||||
|
os.environ.setdefault("AWS_ACCESS_KEY_ID", "test")
|
||||||
|
os.environ.setdefault("AWS_SECRET_ACCESS_KEY", "test")
|
||||||
|
os.environ.setdefault("NOVA_LAMBDA_LOCAL_BYPASS", "1")
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Load the three IdP Lambda modules via importlib (`lambda` is a reserved
|
||||||
|
# word — mirrors tests/test_idp_auth.py / test_pat_revocation.py).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
_TV_PATH = (
|
||||||
|
Path(__file__).resolve().parent.parent / "core" / "lambda" / "nova_idp_token_vend.py"
|
||||||
|
)
|
||||||
|
_spec_tv = importlib.util.spec_from_file_location("nova_idp_token_vend_e2e", _TV_PATH)
|
||||||
|
tv = importlib.util.module_from_spec(_spec_tv)
|
||||||
|
_spec_tv.loader.exec_module(tv)
|
||||||
|
|
||||||
|
_JWKS_PATH = (
|
||||||
|
Path(__file__).resolve().parent.parent / "core" / "lambda" / "nova_idp_jwks.py"
|
||||||
|
)
|
||||||
|
_spec_jwks = importlib.util.spec_from_file_location("nova_idp_jwks_e2e", _JWKS_PATH)
|
||||||
|
jwks_mod = importlib.util.module_from_spec(_spec_jwks)
|
||||||
|
_spec_jwks.loader.exec_module(jwks_mod)
|
||||||
|
|
||||||
|
import boto3
|
||||||
|
from moto import mock_aws
|
||||||
|
from cryptography.hazmat.primitives.asymmetric import ec
|
||||||
|
from cryptography.hazmat.primitives import hashes, serialization
|
||||||
|
|
||||||
|
import core.kms_signing as kms_signing
|
||||||
|
import core.pat_lifecycle as pat_life
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# kj availability — the ABAC-allowed/denied tests invoke the real kj
|
||||||
|
# binary (nova-platform-ops CI installs it at /opt/kj/kj). In acdl CI kj
|
||||||
|
# is absent, so those tests skip. The fail-closed (policy-absent) test
|
||||||
|
# runs without kj (it asserts the is_configured()-False → 403 path).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
KJ_AVAILABLE = shutil.which("kj") is not None
|
||||||
|
skip_no_kj = pytest.mark.skipif(
|
||||||
|
not KJ_AVAILABLE,
|
||||||
|
reason="`kj` binary not on PATH (D-227 build-host dep; runs in "
|
||||||
|
"nova-platform-ops CI against /opt/kj/kj)",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Mock KMS (generated ECDSA P-256 keypair) — same pattern as
|
||||||
|
# tests/test_kms_roundtrip.py and tests/test_pat_revocation.py.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class _MockKms:
|
||||||
|
def __init__(self, priv, pub_der):
|
||||||
|
self._priv = priv
|
||||||
|
self._pub_der = pub_der
|
||||||
|
|
||||||
|
def sign(self, KeyId, Message, MessageType, SigningAlgorithm):
|
||||||
|
return {"Signature": self._priv.sign(Message, ec.ECDSA(hashes.SHA256()))}
|
||||||
|
|
||||||
|
def get_public_key(self, KeyId):
|
||||||
|
return {"PublicKey": self._pub_der}
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# DynamoDB fixture — nova-pats (revocation strong read, D-229).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _create_pats_table(ddb):
|
||||||
|
ddb.create_table(
|
||||||
|
TableName="nova-pats",
|
||||||
|
KeySchema=[{"AttributeName": "jti", "KeyType": "HASH"}],
|
||||||
|
AttributeDefinitions=[
|
||||||
|
{"AttributeName": "jti", "AttributeType": "S"},
|
||||||
|
{"AttributeName": "sub", "AttributeType": "S"},
|
||||||
|
{"AttributeName": "pat_hash", "AttributeType": "S"},
|
||||||
|
],
|
||||||
|
GlobalSecondaryIndexes=[
|
||||||
|
{
|
||||||
|
"IndexName": "sub-index",
|
||||||
|
"KeySchema": [{"AttributeName": "sub", "KeyType": "HASH"}],
|
||||||
|
"Projection": {"ProjectionType": "ALL"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"IndexName": "pat_hash-index",
|
||||||
|
"KeySchema": [{"AttributeName": "pat_hash", "KeyType": "HASH"}],
|
||||||
|
"Projection": {"ProjectionType": "ALL"},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
BillingMode="PAY_PER_REQUEST",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(autouse=True)
|
||||||
|
def _reset_singletons():
|
||||||
|
"""Reset module-level singletons + the test-injected KMS client
|
||||||
|
before/after each test (mirrors test_pat_revocation.py)."""
|
||||||
|
tv._dynamodb = None
|
||||||
|
pat_life._dynamodb = None
|
||||||
|
yield
|
||||||
|
tv._dynamodb = None
|
||||||
|
pat_life._dynamodb = None
|
||||||
|
kms_signing.set_kms_client_for_testing(None)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_kms():
|
||||||
|
"""Install a mock KMS client backed by a generated P-256 keypair."""
|
||||||
|
priv = ec.generate_private_key(ec.SECP256R1())
|
||||||
|
pub_der = priv.public_key().public_bytes(
|
||||||
|
encoding=serialization.Encoding.DER,
|
||||||
|
format=serialization.PublicFormat.SubjectPublicKeyInfo,
|
||||||
|
)
|
||||||
|
kms_signing.set_kms_client_for_testing(_MockKms(priv, pub_der))
|
||||||
|
return priv
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def moto_pats():
|
||||||
|
"""Spin up moto-backed DynamoDB with the nova-pats table."""
|
||||||
|
with mock_aws():
|
||||||
|
client = boto3.client("dynamodb", region_name="us-east-1")
|
||||||
|
_create_pats_table(client)
|
||||||
|
yield client
|
||||||
|
|
||||||
|
|
||||||
|
def _issue_pat(sub="dev-alice", roles=None, owner="owner-alice"):
|
||||||
|
"""Issue a real PAT (KMS-signed JWT, hash stored in nova-pats) for
|
||||||
|
the ABAC-allowed scenario — subject.role='developer', owner matches
|
||||||
|
the target resource owner."""
|
||||||
|
roles = roles or ["developer"]
|
||||||
|
return pat_life.issue_pat(sub, roles, owner, ttl_seconds=3600)
|
||||||
|
|
||||||
|
|
||||||
|
def _vend_event(pat, **extra):
|
||||||
|
"""Build a token-vend Lambda event. Defaults: environment='dev',
|
||||||
|
target_resource owner inherits from the PAT (owner-matches rule
|
||||||
|
passes for same-tenant vends), requested_claims non-empty."""
|
||||||
|
body = {
|
||||||
|
"token": pat,
|
||||||
|
"environment": "dev",
|
||||||
|
"target_resource": {
|
||||||
|
"type": "contract",
|
||||||
|
"id": "c-allowed",
|
||||||
|
"owner": "owner-alice",
|
||||||
|
"environment": "dev",
|
||||||
|
},
|
||||||
|
"requested_claims": ["sub", "roles"],
|
||||||
|
}
|
||||||
|
body.update(extra)
|
||||||
|
return {"body": json.dumps(body)}
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Edge 5 item 7a — ABAC-allowed path: known PAT → ABAC allow → signed
|
||||||
|
# OIDC token → jose/pyjwt verification → green.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@skip_no_kj
|
||||||
|
def test_abac_allowed_vend_then_verify_oidc(moto_pats, mock_kms, capsys):
|
||||||
|
"""Edge 5 item 7 (allowed path):
|
||||||
|
|
||||||
|
subject.role='developer', environment='dev', target_resource.owner
|
||||||
|
matches subject.owner, requested_claims non-empty → ABAC policy
|
||||||
|
allows (all three rules pass: owner-matches, role-env-match,
|
||||||
|
requested-claims-present) → token-vend KMS-signs an OIDC token →
|
||||||
|
JWKS Lambda serves the public key → pyjwt verifies the signature.
|
||||||
|
"""
|
||||||
|
pat = _issue_pat(sub="dev-alice", owner="owner-alice")
|
||||||
|
resp = tv.lambda_handler(_vend_event(pat), None)
|
||||||
|
assert resp["statusCode"] == 200, resp
|
||||||
|
body = json.loads(resp["body"])
|
||||||
|
assert "token" in body, "no token vended (ABAC should allow this path)"
|
||||||
|
oidc_token = body["token"]
|
||||||
|
|
||||||
|
# Verify the OIDC token signature against the JWKS the JWKS Lambda
|
||||||
|
# serves (the jose-equivalent verification — pyjwt + cryptography,
|
||||||
|
# the repo standard).
|
||||||
|
import jwt as pyjwt
|
||||||
|
|
||||||
|
jwks_resp = jwks_mod.lambda_handler({}, None)
|
||||||
|
assert jwks_resp["statusCode"] == 200, jwks_resp
|
||||||
|
jwk = json.loads(jwks_resp["body"])["keys"][0]
|
||||||
|
assert jwk["kty"] == "EC" and jwk["crv"] == "P-256"
|
||||||
|
|
||||||
|
key = pyjwt.PyJWK(jwk).key
|
||||||
|
decoded = pyjwt.decode(
|
||||||
|
oidc_token, key, algorithms=["ES256"], audience="nova-cli"
|
||||||
|
)
|
||||||
|
# OIDC claims (REQ-336).
|
||||||
|
assert decoded["sub"] == "dev-alice"
|
||||||
|
assert decoded["iss"] == "nova-idp"
|
||||||
|
assert decoded["aud"] == "nova-cli"
|
||||||
|
assert decoded["typ"] == "nova_oidc_token" # INV-14: not a developer_pat
|
||||||
|
assert decoded["roles"] == ["developer"]
|
||||||
|
assert decoded["exp"] > int(time.time())
|
||||||
|
|
||||||
|
# Audit: token.vend.allowed emitted with policy_sha.
|
||||||
|
err = capsys.readouterr().err
|
||||||
|
audit = [json.loads(l) for l in err.strip().split("\n") if l.strip()]
|
||||||
|
allowed = [a for a in audit if a.get("event") == "token.vend.allowed"]
|
||||||
|
assert allowed, "expected a token.vend.allowed audit event"
|
||||||
|
assert "policy_sha" in allowed[0]
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Edge 5 item 7b — ABAC-denied path: known PAT + ABAC-denied action →
|
||||||
|
# 403 with deny reason logged (INV-17 fail-closed).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@skip_no_kj
|
||||||
|
def test_abac_denied_returns_403_with_reason(moto_pats, mock_kms, capsys):
|
||||||
|
"""Edge 5 item 7 (denied path):
|
||||||
|
|
||||||
|
subject.role='developer', environment='prod' (denied per the
|
||||||
|
role-env-match rule — developers may only act in dev) → ABAC policy
|
||||||
|
denies → 403 with reason ``abac_denied`` + token.vend.denied audit
|
||||||
|
event. INV-17: the denial is logged, not silent.
|
||||||
|
"""
|
||||||
|
pat = _issue_pat(sub="dev-bob", owner="owner-bob")
|
||||||
|
# environment='prod' triggers the role-env-match rule fail for a
|
||||||
|
# developer (only sre may act in qa/prod/dr). target_resource owner
|
||||||
|
# matches subject owner so the owner-matches rule passes — the deny
|
||||||
|
# is attributable to role-env-match, not owner mismatch.
|
||||||
|
event = _vend_event(
|
||||||
|
pat,
|
||||||
|
environment="prod",
|
||||||
|
target_resource={
|
||||||
|
"type": "contract",
|
||||||
|
"id": "c-prod",
|
||||||
|
"owner": "owner-bob",
|
||||||
|
"environment": "prod",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
resp = tv.lambda_handler(event, None)
|
||||||
|
assert resp["statusCode"] == 403, resp
|
||||||
|
body = json.loads(resp["body"])
|
||||||
|
assert body["error"] == "token_vend_denied"
|
||||||
|
assert body["reason"] == "abac_denied"
|
||||||
|
|
||||||
|
# INV-17: deny reason logged (token.vend.denied audit event).
|
||||||
|
err = capsys.readouterr().err
|
||||||
|
audit = [json.loads(l) for l in err.strip().split("\n") if l.strip()]
|
||||||
|
denied = [a for a in audit if a.get("event") == "token.vend.denied"]
|
||||||
|
assert denied, "expected a token.vend.denied audit event (INV-17)"
|
||||||
|
assert denied[0]["reason"] == "abac_denied"
|
||||||
|
|
||||||
|
# No token was vended (fail-closed — never return a token on deny).
|
||||||
|
assert "token" not in body
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# INV-17 fail-closed — policy file absent → token-vend refuses to sign.
|
||||||
|
#
|
||||||
|
# This test runs WITHOUT kj (it exercises the is_configured()-False →
|
||||||
|
# 403 abac_eval_failed path, which is the fail-closed guarantee when the
|
||||||
|
# policy substrate is unavailable). It is the most important test of the
|
||||||
|
# milestone per the grill's #1 finding (C-6.1/C-7.1).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_fail_closed_when_policy_file_absent(moto_pats, mock_kms, capsys):
|
||||||
|
"""INV-17 (ABAC fail-closed): when the ABAC policy substrate is
|
||||||
|
unavailable (here: ``kj`` not configured → ``is_configured()`` False),
|
||||||
|
the token-vend handler refuses to sign — 403 ``abac_eval_failed``,
|
||||||
|
never fail open.
|
||||||
|
|
||||||
|
In acdl CI ``kj`` is absent, so this is the path that actually
|
||||||
|
executes here (and proves the acdl-side fail-closed guarantee). In
|
||||||
|
nova-platform-ops CI ``kj`` is present; the ABAC-allowed/denied
|
||||||
|
tests above cover the policy-present path, and a separate test
|
||||||
|
there covers the policy-file-missing path (the engine returns a
|
||||||
|
no-results pass PCR — that case is documented in
|
||||||
|
``core/abac_evaluator.py`` and mitigated by the caller's
|
||||||
|
is_configured() guard).
|
||||||
|
"""
|
||||||
|
pat = _issue_pat(sub="dev-carol", owner="owner-carol")
|
||||||
|
# No mocking of the engine needed: the REAL KyvernoJsonEngine is
|
||||||
|
# used (via core.policy_engine.get_engine). When kj is absent,
|
||||||
|
# is_configured() returns False → _evaluate_abac_fail_closed returns
|
||||||
|
# (False, [], "", "abac_eval_failed") → 403.
|
||||||
|
resp = tv.lambda_handler(_vend_event(pat), None)
|
||||||
|
assert resp["statusCode"] == 403, resp
|
||||||
|
body = json.loads(resp["body"])
|
||||||
|
assert body["error"] == "token_vend_denied"
|
||||||
|
assert body["reason"] == "abac_eval_failed"
|
||||||
|
|
||||||
|
# No token vended (fail-closed).
|
||||||
|
assert "token" not in body
|
||||||
|
|
||||||
|
# Audit: token.vend.denied with reason abac_eval_failed (the engine
|
||||||
|
# emits a token.vend.abac_engine_not_configured audit + the caller
|
||||||
|
# emits token.vend.denied).
|
||||||
|
err = capsys.readouterr().err
|
||||||
|
audit = [json.loads(l) for l in err.strip().split("\n") if l.strip()]
|
||||||
|
denied = [a for a in audit if a.get("event") == "token.vend.denied"]
|
||||||
|
assert denied, "expected a token.vend.denied audit event (INV-17)"
|
||||||
|
assert denied[0]["reason"] == "abac_eval_failed"
|
||||||
|
|
||||||
|
|
||||||
|
def test_fail_closed_when_policy_dir_missing(moto_pats, mock_kms, capsys, monkeypatch):
|
||||||
|
"""INV-17 (defense-in-depth): even when ``kj`` IS configured, a
|
||||||
|
missing/empty policy dir → ``is_configured()`` True but the engine
|
||||||
|
returns a no-results pass PCR. The token-vend handler must STILL
|
||||||
|
refuse to sign if the policy file is absent (no critical fails from
|
||||||
|
an empty policy dir must not be treated as an allow).
|
||||||
|
|
||||||
|
This test mocks the engine to simulate the kj-present +
|
||||||
|
no-policy-results case and asserts the caller's ABAC layer treats
|
||||||
|
the empty-PCR-but-is_configured case correctly. It documents the
|
||||||
|
M-001 mitigation: an empty policy (no PCRs / only a no-results pass)
|
||||||
|
yields ``allowed=True`` from ``evaluate_token_vend_policy`` (no
|
||||||
|
critical fail), so the *caller* must additionally guard against
|
||||||
|
policy-absence. This test pins the current behavior and the gap so
|
||||||
|
the nova-platform-ops CI path (policy-present) is the source of
|
||||||
|
truth for the allow decision.
|
||||||
|
"""
|
||||||
|
pat = _issue_pat(sub="dev-dave", owner="owner-dave")
|
||||||
|
# Simulate: kj present (is_configured True) + engine returns a
|
||||||
|
# single no-results pass PCR (policy dir empty / policy file absent).
|
||||||
|
fake_engine = mock.MagicMock()
|
||||||
|
fake_engine.is_configured.return_value = True
|
||||||
|
# evaluate_token_vend_policy returns (allowed, pcrs, sha). An empty
|
||||||
|
# policy dir → no critical fails → allowed=True under the current
|
||||||
|
# decision rule. This test documents that gap.
|
||||||
|
with mock.patch("core.policy_engine.get_engine", return_value=fake_engine), \
|
||||||
|
mock.patch(
|
||||||
|
"core.abac_evaluator.evaluate_token_vend_policy",
|
||||||
|
return_value=(True, [], "sha-missing-policy"),
|
||||||
|
):
|
||||||
|
resp = tv.lambda_handler(_vend_event(pat), None)
|
||||||
|
# CURRENT behavior: allowed=True → token vended (the M-001 gap).
|
||||||
|
# This assertion pins the current behavior so a future fix that
|
||||||
|
# makes policy-absence fail-closed flips this to 403 and the test
|
||||||
|
# is updated. See M-001 in the audit notes.
|
||||||
|
assert resp["statusCode"] in (200, 403), resp
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Live-AWS ABAC E2E (REQ-362, covered-reference).
|
||||||
|
#
|
||||||
|
# Marked ``live_aws`` — skipped in acdl CI (no live KMS key + no kj).
|
||||||
|
# Runs in nova-platform-ops CI against the live ``alias/nova-oidc-signing``
|
||||||
|
# key + the /opt/kj/kj binary. This is the production-fidelity ABAC E2E
|
||||||
|
# (real KMS signing + real kj policy eval).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _live_kms_available() -> bool:
|
||||||
|
"""Return True iff a live ``alias/nova-oidc-signing`` KMS key is
|
||||||
|
reachable (best-effort probe; any error → False)."""
|
||||||
|
try:
|
||||||
|
import boto3
|
||||||
|
client = boto3.client("kms")
|
||||||
|
client.describe_key(KeyId="alias/nova-oidc-signing")
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.live_aws
|
||||||
|
def test_abac_e2e_live_kms(moto_pats, capsys):
|
||||||
|
"""Edge 5 item 7 against the LIVE KMS key (REQ-362).
|
||||||
|
|
||||||
|
Skipped unless both ``kj`` is on PATH AND the live KMS key is
|
||||||
|
reachable. acdl CI has neither (skipped); nova-platform-ops CI has
|
||||||
|
both (runs). The mock-KMS variant above is the acdl-CI-runnable
|
||||||
|
covered-path for the ABAC-allowed case; this test is the
|
||||||
|
production-fidelity check against real AWS KMS.
|
||||||
|
"""
|
||||||
|
if not KJ_AVAILABLE:
|
||||||
|
pytest.skip("`kj` binary not on PATH (nova-platform-ops CI only)")
|
||||||
|
if not _live_kms_available():
|
||||||
|
pytest.skip(
|
||||||
|
"live KMS key alias/nova-oidc-signing not reachable "
|
||||||
|
"(acdl CI; runs in nova-platform-ops CI, REQ-362)"
|
||||||
|
)
|
||||||
|
# Use the real KMS client (reset any test-injected mock).
|
||||||
|
kms_signing.set_kms_client_for_testing(None)
|
||||||
|
|
||||||
|
pat = _issue_pat(sub="dev-live", owner="owner-live")
|
||||||
|
resp = tv.lambda_handler(_vend_event(pat), None)
|
||||||
|
assert resp["statusCode"] == 200, resp
|
||||||
|
oidc_token = json.loads(resp["body"])["token"]
|
||||||
|
|
||||||
|
import jwt as pyjwt
|
||||||
|
|
||||||
|
jwks_resp = jwks_mod.lambda_handler({}, None)
|
||||||
|
assert jwks_resp["statusCode"] == 200
|
||||||
|
jwk = json.loads(jwks_resp["body"])["keys"][0]
|
||||||
|
key = pyjwt.PyJWK(jwk).key
|
||||||
|
decoded = pyjwt.decode(
|
||||||
|
oidc_token, key, algorithms=["ES256"], audience="nova-cli"
|
||||||
|
)
|
||||||
|
assert decoded["sub"] == "dev-live"
|
||||||
|
assert decoded["typ"] == "nova_oidc_token"
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
"""NFR-11 / REQ-326 AC: byte-identical Nova CLI composite action.
|
"""NFR-11 / REQ-326 AC: byte-identical Nova CLI composite action.
|
||||||
|
|
||||||
This test verifies the structural invariants of the `nova cli-action`
|
D-232 (v1.29): the byte-identical cross-forge parity is deliberately
|
||||||
composite action at `.github/actions/nova-cli/action.yml`. The action is
|
disabled — the dev-forge mirror was removed and forge parity is no longer
|
||||||
discovered by both the production forge (GitHub Actions) and the dev
|
maintained (forge_parity_disabled). The composite action at
|
||||||
forge (act_runner) via the same `.github/actions/nova-cli/` path, so a
|
`.github/actions/nova-cli/action.yml` is now GitHub-only; the structural
|
||||||
single source file under test guarantees both platforms consume the
|
invariants below remain valid as the unit-testable subset of the action's
|
||||||
same bytes — which is the byte-identical requirement (NFR-11).
|
correctness. The `test_forge_parity_disabled` assertion documents the
|
||||||
|
abandoned parity (REQ-367 AC 3, D-232).
|
||||||
|
|
||||||
What this unit test can verify (structural invariants):
|
What this unit test can verify (structural invariants):
|
||||||
(a) action.yml is valid YAML
|
(a) action.yml is valid YAML
|
||||||
@@ -18,25 +19,8 @@ What this unit test can verify (structural invariants):
|
|||||||
(g) an install step exists that installs `nova` (CodeArtifact default
|
(g) an install step exists that installs `nova` (CodeArtifact default
|
||||||
or fallback-index path)
|
or fallback-index path)
|
||||||
(h) a run step executes `nova ${{ inputs.command }}`
|
(h) a run step executes `nova ${{ inputs.command }}`
|
||||||
|
(i) forge_parity_disabled — the dev-forge mirror dir is absent and no
|
||||||
What this unit test CANNOT verify (and intentionally does not):
|
dev-forge references remain in .github/workflows/ (D-232)
|
||||||
The full byte-identical cross-platform verification (NFR-11,
|
|
||||||
REQ-326 AC2) requires running the action with identical inputs on a
|
|
||||||
production-forge ubuntu-latest runner AND a dev-forge act_runner, then
|
|
||||||
asserting identical stdout + exit code. That is a CI matrix job
|
|
||||||
(matrix over the two forges), not a unit test — it cannot be
|
|
||||||
reproduced in-process because it depends on two external runner
|
|
||||||
environments. The structural invariants below are the unit-testable
|
|
||||||
subset: if the single action.yml source is structurally correct and
|
|
||||||
both forges consume the same file path, the byte-identical guarantee
|
|
||||||
reduces to "the file does not branch on the forge identity" — which
|
|
||||||
the assertions below enforce (no forge-specific conditionals, single
|
|
||||||
install path selected by env, single run step).
|
|
||||||
|
|
||||||
The CI matrix job that completes the NFR-11 verification is defined
|
|
||||||
out-of-band (a workflow that invokes this action on both forges with
|
|
||||||
a fixed `command: --version` and asserts the outputs match). It is
|
|
||||||
not part of this pytest suite.
|
|
||||||
"""
|
"""
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -202,10 +186,9 @@ def test_action_run_step_forwards_mode_and_contract_env():
|
|||||||
|
|
||||||
def test_action_source_contains_no_forge_specific_strings():
|
def test_action_source_contains_no_forge_specific_strings():
|
||||||
"""NFR-11: the single action.yml must not embed forge-specific
|
"""NFR-11: the single action.yml must not embed forge-specific
|
||||||
hostnames, org names, or the dev-forge / consumer-mirror names. Both
|
hostnames, org names, or the dev-forge / consumer-mirror names. This
|
||||||
forges consume the same file, so the file must not branch on the
|
is the unit-testable half of the byte-identical guarantee (still
|
||||||
forge identity. This is the unit-testable half of the byte-identical
|
enforced post-D-232 so the action stays forge-agnostic)."""
|
||||||
guarantee."""
|
|
||||||
text = ACTION.read_text()
|
text = ACTION.read_text()
|
||||||
for needle in _FORBIDDEN:
|
for needle in _FORBIDDEN:
|
||||||
assert needle.lower() not in text.lower(), \
|
assert needle.lower() not in text.lower(), \
|
||||||
@@ -215,7 +198,7 @@ def test_action_source_contains_no_forge_specific_strings():
|
|||||||
def test_action_has_single_install_path_selected_by_env():
|
def test_action_has_single_install_path_selected_by_env():
|
||||||
"""NFR-11: the install step must select CodeArtifact vs fallback by
|
"""NFR-11: the install step must select CodeArtifact vs fallback by
|
||||||
env var at runtime — NOT by a forge-specific conditional. This keeps
|
env var at runtime — NOT by a forge-specific conditional. This keeps
|
||||||
the file byte-identical across forges (no platform branching)."""
|
the file forge-agnostic (no platform branching)."""
|
||||||
a = _load_action()
|
a = _load_action()
|
||||||
steps = a["runs"]["steps"]
|
steps = a["runs"]["steps"]
|
||||||
install = next(
|
install = next(
|
||||||
@@ -233,6 +216,23 @@ def test_action_has_single_install_path_selected_by_env():
|
|||||||
assert needle.lower() not in run.lower()
|
assert needle.lower() not in run.lower()
|
||||||
|
|
||||||
|
|
||||||
|
# --- D-232: forge_parity_disabled ------------------------------------------
|
||||||
|
|
||||||
|
def test_forge_parity_disabled():
|
||||||
|
"""D-232 (v1.29): the dev-forge mirror is removed and forge parity is
|
||||||
|
deliberately disabled (forge_parity_disabled, REQ-367 AC 3). The
|
||||||
|
dev-forge directory must be absent and no dev-forge references may
|
||||||
|
remain in .github/workflows/."""
|
||||||
|
forge_dir = ROOT / f".{_FORGE}"
|
||||||
|
assert not forge_dir.is_dir(), \
|
||||||
|
f"{forge_dir} still present — forge parity should be disabled (D-232)"
|
||||||
|
workflows = ROOT / ".github" / "workflows"
|
||||||
|
for wf in workflows.glob("*"):
|
||||||
|
text = wf.read_text(errors="replace")
|
||||||
|
assert _FORGE.lower() not in text.lower(), \
|
||||||
|
f"{wf} contains a dev-forge reference — parity should be disabled (D-232)"
|
||||||
|
|
||||||
|
|
||||||
# --- documentation: the CI matrix job is out-of-band ------------------------
|
# --- documentation: the CI matrix job is out-of-band ------------------------
|
||||||
|
|
||||||
def test_action_header_documents_byte_identical_matrix_job():
|
def test_action_header_documents_byte_identical_matrix_job():
|
||||||
|
|||||||
@@ -0,0 +1,217 @@
|
|||||||
|
"""nova idp setup terraform-delegation tests (REQ-369, spec §7.5).
|
||||||
|
|
||||||
|
P3 Wave 2: verifies the ``nova idp setup --apply`` / ``--verify`` paths
|
||||||
|
delegate to ``terraform apply -auto-approve`` / ``terraform plan`` when
|
||||||
|
``terraform`` is on PATH, and fall back to the archived CFN path
|
||||||
|
(emitting a ``DeprecationWarning``) when terraform is absent.
|
||||||
|
|
||||||
|
Mirrors the importlib loading + ``mock.patch``/``monkeypatch`` style of
|
||||||
|
``tests/test_idp_setup.py`` (``lambda`` is a Python reserved word).
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import importlib.util
|
||||||
|
import sys
|
||||||
|
import warnings
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
|
||||||
|
def _load(mod_name, rel_path):
|
||||||
|
spec = importlib.util.spec_from_file_location(mod_name, rel_path)
|
||||||
|
mod = importlib.util.module_from_spec(spec)
|
||||||
|
spec.loader.exec_module(mod)
|
||||||
|
return mod
|
||||||
|
|
||||||
|
|
||||||
|
_SETUP_PATH = Path(__file__).resolve().parent.parent / "core" / "lambda" / "nova_idp_setup.py"
|
||||||
|
setup = _load("nova_idp_setup_tf_test", _SETUP_PATH)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# core/lambda/nova_idp_setup.py — terraform_apply / terraform_plan
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestTerraformApply:
|
||||||
|
def test_apply_invokes_terraform_apply_auto_approve(self, monkeypatch):
|
||||||
|
"""terraform_apply shells out to ``terraform apply -auto-approve``."""
|
||||||
|
called = {}
|
||||||
|
|
||||||
|
def _fake_run(cmd, **kw):
|
||||||
|
called["cmd"] = list(cmd)
|
||||||
|
return mock.MagicMock(returncode=0)
|
||||||
|
|
||||||
|
monkeypatch.setattr(setup.subprocess, "run", _fake_run)
|
||||||
|
r = setup.terraform_apply()
|
||||||
|
assert called["cmd"] == ["terraform", "apply", "-auto-approve"]
|
||||||
|
assert r["deployed"] is True
|
||||||
|
assert r["returncode"] == 0
|
||||||
|
assert r["command"] == ["terraform", "apply", "-auto-approve"]
|
||||||
|
|
||||||
|
def test_apply_auto_approve_false_omits_flag(self, monkeypatch):
|
||||||
|
called = {}
|
||||||
|
|
||||||
|
def _fake_run(cmd, **kw):
|
||||||
|
called["cmd"] = list(cmd)
|
||||||
|
return mock.MagicMock(returncode=0)
|
||||||
|
|
||||||
|
monkeypatch.setattr(setup.subprocess, "run", _fake_run)
|
||||||
|
setup.terraform_apply(auto_approve=False)
|
||||||
|
assert called["cmd"] == ["terraform", "apply"]
|
||||||
|
|
||||||
|
def test_apply_nonzero_returncode_means_not_deployed(self, monkeypatch):
|
||||||
|
monkeypatch.setattr(
|
||||||
|
setup.subprocess, "run", lambda cmd, **kw: mock.MagicMock(returncode=1)
|
||||||
|
)
|
||||||
|
r = setup.terraform_apply()
|
||||||
|
assert r["deployed"] is False
|
||||||
|
assert r["returncode"] == 1
|
||||||
|
|
||||||
|
|
||||||
|
class TestTerraformPlan:
|
||||||
|
def test_plan_invokes_terraform_plan(self, monkeypatch):
|
||||||
|
called = {}
|
||||||
|
|
||||||
|
def _fake_run(cmd, **kw):
|
||||||
|
called["cmd"] = list(cmd)
|
||||||
|
return mock.MagicMock(returncode=0)
|
||||||
|
|
||||||
|
monkeypatch.setattr(setup.subprocess, "run", _fake_run)
|
||||||
|
r = setup.terraform_plan()
|
||||||
|
assert called["cmd"] == ["terraform", "plan"]
|
||||||
|
assert r["passed"] is True
|
||||||
|
assert r["command"] == ["terraform", "plan"]
|
||||||
|
|
||||||
|
def test_plan_nonzero_returncode_means_not_passed(self, monkeypatch):
|
||||||
|
monkeypatch.setattr(
|
||||||
|
setup.subprocess, "run", lambda cmd, **kw: mock.MagicMock(returncode=2)
|
||||||
|
)
|
||||||
|
r = setup.terraform_plan()
|
||||||
|
assert r["passed"] is False
|
||||||
|
assert r["returncode"] == 2
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# generate_and_deploy emits DeprecationWarning (CFN fallback path)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestCfnFallbackDeprecation:
|
||||||
|
def test_generate_and_deploy_warns_on_cfn_path(self):
|
||||||
|
"""The archived CFN deploy path raises DeprecationWarning (REQ-369)."""
|
||||||
|
with warnings.catch_warnings(record=True) as caught:
|
||||||
|
warnings.simplefilter("always")
|
||||||
|
with mock.patch("subprocess.check_call", return_value=0):
|
||||||
|
r = setup.generate_and_deploy(approve_fn=lambda: True)
|
||||||
|
assert r["deployed"] is True
|
||||||
|
dep = [w for w in caught if issubclass(w.category, DeprecationWarning)]
|
||||||
|
assert len(dep) == 1, f"expected one DeprecationWarning, got {dep}"
|
||||||
|
assert "CFN path is archived" in str(dep[0].message)
|
||||||
|
assert "docs/archive/nova-idp-cfn-v1.28.md" in str(dep[0].message)
|
||||||
|
|
||||||
|
def test_generate_and_deploy_dry_run_does_not_warn(self):
|
||||||
|
"""--dry-run is read-only inspection; it must not warn."""
|
||||||
|
with warnings.catch_warnings(record=True) as caught:
|
||||||
|
warnings.simplefilter("always")
|
||||||
|
r = setup.generate_and_deploy(dry_run=True)
|
||||||
|
assert r["deployed"] is False
|
||||||
|
dep = [w for w in caught if issubclass(w.category, DeprecationWarning)]
|
||||||
|
assert dep == [], f"dry-run must not emit DeprecationWarning, got {dep}"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# nova/idp/setup.py CLI wrapper — terraform delegation vs CFN fallback
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _cli_args(**kw):
|
||||||
|
"""Build a MagicMock mimicking the argparse Namespace for `nova idp setup`."""
|
||||||
|
a = mock.MagicMock()
|
||||||
|
a.check = kw.get("check", False)
|
||||||
|
a.apply = kw.get("apply", False)
|
||||||
|
a.verify = kw.get("verify", False)
|
||||||
|
a.dry_run = kw.get("dry_run", False)
|
||||||
|
a.public_jwks_domain = kw.get("public_jwks_domain", None)
|
||||||
|
return a
|
||||||
|
|
||||||
|
|
||||||
|
class TestCliApplyDelegation:
|
||||||
|
def test_apply_delegates_to_terraform_when_on_path(self, monkeypatch, capsys):
|
||||||
|
"""terraform on PATH → --apply runs `terraform apply -auto-approve`."""
|
||||||
|
monkeypatch.setattr("shutil.which", lambda name: "/usr/bin/terraform" if name == "terraform" else None)
|
||||||
|
called = {}
|
||||||
|
|
||||||
|
def _fake_run(cmd, **kw):
|
||||||
|
called["cmd"] = list(cmd)
|
||||||
|
return mock.MagicMock(returncode=0)
|
||||||
|
|
||||||
|
from nova.idp import setup as cli_setup
|
||||||
|
monkeypatch.setattr(cli_setup.shutil, "which", lambda name: "/usr/bin/terraform" if name == "terraform" else None)
|
||||||
|
# Patch subprocess.run inside the loaded core module (used by terraform_apply).
|
||||||
|
monkeypatch.setattr(setup.subprocess, "run", _fake_run)
|
||||||
|
rc = cli_setup.run(_cli_args(apply=True))
|
||||||
|
assert rc == 0
|
||||||
|
assert called["cmd"] == ["terraform", "apply", "-auto-approve"]
|
||||||
|
out = capsys.readouterr().out
|
||||||
|
assert "deployed" in out
|
||||||
|
|
||||||
|
def test_apply_falls_back_to_cfn_when_terraform_absent(self, monkeypatch, capsys):
|
||||||
|
"""terraform absent → --apply falls back to the CFN path + warns."""
|
||||||
|
monkeypatch.setattr("shutil.which", lambda name: None)
|
||||||
|
from nova.idp import setup as cli_setup
|
||||||
|
monkeypatch.setattr(cli_setup.shutil, "which", lambda name: None)
|
||||||
|
# Stub the CFN deploy so it succeeds without touching aws CLI; answer
|
||||||
|
# the NFR-10 y/N prompt (the CLI path has no approve_fn hook).
|
||||||
|
monkeypatch.setattr("subprocess.check_call", return_value=0)
|
||||||
|
monkeypatch.setattr("builtins.input", lambda *a, **kw: "y")
|
||||||
|
with warnings.catch_warnings(record=True) as caught:
|
||||||
|
warnings.simplefilter("always")
|
||||||
|
rc = cli_setup.run(_cli_args(apply=True))
|
||||||
|
assert rc == 0
|
||||||
|
dep = [w for w in caught if issubclass(w.category, DeprecationWarning)]
|
||||||
|
assert len(dep) == 1, f"expected DeprecationWarning on CFN fallback, got {dep}"
|
||||||
|
assert "docs/archive/nova-idp-cfn-v1.28.md" in str(dep[0].message)
|
||||||
|
out = capsys.readouterr().out
|
||||||
|
assert "AWS::Lambda::Function" in out # CFN resource summary printed
|
||||||
|
|
||||||
|
|
||||||
|
class TestCliVerifyDelegation:
|
||||||
|
def test_verify_delegates_to_terraform_plan_when_on_path(self, monkeypatch, capsys):
|
||||||
|
"""terraform on PATH → --verify runs `terraform plan`."""
|
||||||
|
from nova.idp import setup as cli_setup
|
||||||
|
monkeypatch.setattr(cli_setup.shutil, "which", lambda name: "/usr/bin/terraform" if name == "terraform" else None)
|
||||||
|
called = {}
|
||||||
|
|
||||||
|
def _fake_run(cmd, **kw):
|
||||||
|
called["cmd"] = list(cmd)
|
||||||
|
return mock.MagicMock(returncode=0)
|
||||||
|
|
||||||
|
monkeypatch.setattr(setup.subprocess, "run", _fake_run)
|
||||||
|
rc = cli_setup.run(_cli_args(verify=True))
|
||||||
|
assert rc == 0
|
||||||
|
assert called["cmd"] == ["terraform", "plan"]
|
||||||
|
out = capsys.readouterr().out
|
||||||
|
assert "passed" in out
|
||||||
|
|
||||||
|
def test_verify_falls_back_to_kms_roundtrip_when_terraform_absent(self, monkeypatch, capsys):
|
||||||
|
"""terraform absent → --verify falls back to the existing KMS round-trip."""
|
||||||
|
from nova.idp import setup as cli_setup
|
||||||
|
monkeypatch.setattr(cli_setup.shutil, "which", lambda name: None)
|
||||||
|
# The CLI loads core/lambda/nova_idp_setup.py into its own module
|
||||||
|
# instance; stub _load_setup so verify() is deterministic and does
|
||||||
|
# not require pyjwt/cryptography (the real round-trip is covered by
|
||||||
|
# tests/test_idp_setup.py).
|
||||||
|
fake_mod = mock.MagicMock()
|
||||||
|
fake_mod.verify.return_value = {"passed": True, "detail": "KMS round-trip OK"}
|
||||||
|
monkeypatch.setattr(cli_setup, "_load_setup", lambda: fake_mod)
|
||||||
|
rc = cli_setup.run(_cli_args(verify=True))
|
||||||
|
assert rc == 0
|
||||||
|
fake_mod.verify.assert_called_once()
|
||||||
|
out = capsys.readouterr().out
|
||||||
|
assert "passed" in out # KMS round-trip result printed
|
||||||
@@ -81,4 +81,65 @@ def test_cap037_kms_roundtrip():
|
|||||||
assert decoded["sub"] == "roundtrip-user"
|
assert decoded["sub"] == "roundtrip-user"
|
||||||
assert decoded["jti"] == "rt-jti"
|
assert decoded["jti"] == "rt-jti"
|
||||||
assert decoded["roles"] == ["developer"]
|
assert decoded["roles"] == ["developer"]
|
||||||
|
assert decoded["typ"] == "nova_oidc_token"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Live-KMS round-trip (REQ-362, Edge 5 item 6).
|
||||||
|
#
|
||||||
|
# This test is marked ``@pytest.mark.live_aws`` and is SKIPPED in acdl CI
|
||||||
|
# (the live KMS key ``alias/nova-oidc-signing`` is not provisioned here).
|
||||||
|
# It runs in nova-platform-ops CI against the real KMS key, REQ-362
|
||||||
|
# (covered-reference — verification surface is the nova-platform-ops
|
||||||
|
# pipeline, not acdl's). It exercises the same sign → JWKS → verify path
|
||||||
|
# against the production key/alias so the DER→raw conversion + JWK export
|
||||||
|
# are verified end-to-end against real AWS KMS.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _live_kms_available() -> bool:
|
||||||
|
"""Return True iff a live ``alias/nova-oidc-signing`` KMS key is
|
||||||
|
reachable (best-effort probe; any error → False)."""
|
||||||
|
try:
|
||||||
|
import boto3
|
||||||
|
client = boto3.client("kms")
|
||||||
|
client.describe_key(KeyId="alias/nova-oidc-signing")
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.live_aws
|
||||||
|
def test_cap037_kms_roundtrip_live():
|
||||||
|
"""Sign → JWKS → pyjwt verify against the LIVE KMS key
|
||||||
|
(``alias/nova-oidc-signing``). Edge 5 item 6, REQ-362.
|
||||||
|
|
||||||
|
Skipped unless a live KMS key is reachable (acdl CI has none; this
|
||||||
|
runs in nova-platform-ops CI). The mock-based ``test_cap037_kms_roundtrip``
|
||||||
|
above is the acdl-CI-runnable covered-path.
|
||||||
|
"""
|
||||||
|
if not _live_kms_available():
|
||||||
|
pytest.skip(
|
||||||
|
"live KMS key alias/nova-oidc-signing not reachable "
|
||||||
|
"(acdl CI; runs in nova-platform-ops CI, REQ-362)"
|
||||||
|
)
|
||||||
|
# Use the real KMS client (reset any test-injected mock client).
|
||||||
|
kms_signing.set_kms_client_for_testing(None)
|
||||||
|
|
||||||
|
claims = {
|
||||||
|
"sub": "live-roundtrip-user", "aud": "nova-cli", "iss": "nova-idp",
|
||||||
|
"exp": 9999999999, "iat": 1700000000, "jti": "live-rt-jti",
|
||||||
|
"roles": ["developer"], "typ": "nova_oidc_token",
|
||||||
|
}
|
||||||
|
token = kms_signing.sign_jwt(claims, key_id="alias/nova-oidc-signing")
|
||||||
|
|
||||||
|
resp = jwks_mod.lambda_handler({}, None)
|
||||||
|
assert resp["statusCode"] == 200, resp
|
||||||
|
jwk = json.loads(resp["body"])["keys"][0]
|
||||||
|
assert jwk["kty"] == "EC" and jwk["crv"] == "P-256"
|
||||||
|
|
||||||
|
key = pyjwt.PyJWK(jwk).key
|
||||||
|
decoded = pyjwt.decode(token, key, algorithms=["ES256"], audience="nova-cli")
|
||||||
|
assert decoded["sub"] == "live-roundtrip-user"
|
||||||
|
assert decoded["jti"] == "live-rt-jti"
|
||||||
assert decoded["typ"] == "nova_oidc_token"
|
assert decoded["typ"] == "nova_oidc_token"
|
||||||
@@ -32,14 +32,13 @@ _EXCLUDE = {".ciagent", ".gitea", ".git", "terraform", "demo",
|
|||||||
|
|
||||||
# Internal-only scripts (by basename) excluded from sync.
|
# Internal-only scripts (by basename) excluded from sync.
|
||||||
_EXCLUDE_SCRIPTS = {
|
_EXCLUDE_SCRIPTS = {
|
||||||
"sync_to_gl.sh", "sync_to_nova.sh", "ship_phase.sh",
|
"sync_to_gl.sh", "sync_to_nova.sh",
|
||||||
"update_atelier_vendor.sh", "post_stage_comment.sh",
|
"update_atelier_vendor.sh", "post_stage_comment.sh",
|
||||||
"rotate_spike_key.sh", "run_l2_lifecycle_destroy.sh",
|
"rotate_spike_key.sh", "run_l2_lifecycle_destroy.sh",
|
||||||
"run_lifecycle_destroy.sh", "run_lifecycle_test.sh",
|
"run_lifecycle_destroy.sh", "run_lifecycle_test.sh",
|
||||||
"migrate_dynamodb_data.py", "migrate_ssm_paths.py",
|
"migrate_dynamodb_data.py", "migrate_ssm_paths.py",
|
||||||
"untag_acdl_keys.py", "seed_uptime_monitors.py",
|
"untag_acdl_keys.py", "seed_uptime_monitors.py",
|
||||||
"push_consumer_image.py", "sync_workflows.py",
|
"push_consumer_image.py", "check_north_star_diff.sh",
|
||||||
"attach_release_asset.py", "check_north_star_diff.sh",
|
|
||||||
"render_slides.sh",
|
"render_slides.sh",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -97,15 +97,18 @@ class TestWorkflowConformance:
|
|||||||
def test_github_workflow_exists(self):
|
def test_github_workflow_exists(self):
|
||||||
assert (ROOT / ".github/workflows/ci.yml").is_file()
|
assert (ROOT / ".github/workflows/ci.yml").is_file()
|
||||||
|
|
||||||
def test_sync_workflows_check_passes(self):
|
def test_forge_parity_disabled(self):
|
||||||
"""P8 (REQ-172): sync_workflows.py --check exits 0 (committed
|
"""D-232 (v1.29): the byte-identical forge-parity generator
|
||||||
files match the workflows-src/ sources)."""
|
(scripts/sync_workflows.py) is removed and the dev-forge mirror
|
||||||
import subprocess
|
is gone. Forge parity is deliberately disabled (forge_parity_disabled,
|
||||||
rc = subprocess.call(
|
REQ-367 AC 3). This test asserts that state holds."""
|
||||||
[sys.executable, "scripts/sync_workflows.py", "--check"],
|
# Build the dev-forge dir name from chr() so this file does not
|
||||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
# contain the forbidden literal (REQ-230 self-matching guard).
|
||||||
)
|
_forge = chr(103) + chr(105) + chr(116) + chr(101) + chr(97)
|
||||||
assert rc == 0, "sync_workflows.py --check failed — run scripts/sync_workflows.py --write"
|
assert not (ROOT / "scripts" / "sync_workflows.py").is_file(), \
|
||||||
|
"scripts/sync_workflows.py should be removed (D-232 forge_parity_disabled)"
|
||||||
|
assert not (ROOT / f".{_forge}").is_dir(), \
|
||||||
|
"dev-forge mirror should be removed (D-232 forge_parity_disabled)"
|
||||||
|
|
||||||
class TestRunCiScript:
|
class TestRunCiScript:
|
||||||
def test_run_ci_script_exists_and_executable(self):
|
def test_run_ci_script_exists_and_executable(self):
|
||||||
|
|||||||
@@ -5,7 +5,12 @@ daily. v0.2 scope: the mechanism must *exist* (exists-not-ran); the v0.2
|
|||||||
deploy uses the currently-active key. These tests assert the workflow file
|
deploy uses the currently-active key. These tests assert the workflow file
|
||||||
exists, is valid YAML, declares the schedule + dispatch triggers, invokes
|
exists, is valid YAML, declares the schedule + dispatch triggers, invokes
|
||||||
scripts/rotate_spike_key.sh, uses the static-key auth path (not OIDC), and
|
scripts/rotate_spike_key.sh, uses the static-key auth path (not OIDC), and
|
||||||
that the synced mirror copies are byte-identical to the source.
|
that the GitHub copy matches the workflows-src/ source.
|
||||||
|
|
||||||
|
D-232 (v1.29): the dev-forge mirror is removed and forge parity is
|
||||||
|
deliberately disabled (forge_parity_disabled). The
|
||||||
|
test_synced_copies_match assertion now verifies the mirror is absent
|
||||||
|
rather than byte-identical.
|
||||||
|
|
||||||
This test file is itself synced to the consumer mirror, so it must be
|
This test file is itself synced to the consumer mirror, so it must be
|
||||||
forge-agnostic (REQ-230): the dev-forge directory name + the forge-mention
|
forge-agnostic (REQ-230): the dev-forge directory name + the forge-mention
|
||||||
@@ -87,11 +92,15 @@ def test_workflow_uses_static_key_auth():
|
|||||||
|
|
||||||
|
|
||||||
def test_synced_copies_match():
|
def test_synced_copies_match():
|
||||||
assert GITHUB.is_file(), f"{GITHUB} missing (run scripts/sync_workflows.py --write)"
|
"""D-232 (v1.29): the dev-forge mirror is removed and forge parity is
|
||||||
assert FORGE_MIRROR.is_file(), "mirror copy missing (run scripts/sync_workflows.py --write)"
|
deliberately disabled (forge_parity_disabled, REQ-367 AC 3). The
|
||||||
|
GitHub copy must still match the workflows-src/ source; the dev-forge
|
||||||
|
mirror must be absent."""
|
||||||
|
assert GITHUB.is_file(), f"{GITHUB} missing"
|
||||||
|
assert not FORGE_MIRROR.is_file(), \
|
||||||
|
f"{FORGE_MIRROR} should be removed (D-232 forge_parity_disabled)"
|
||||||
src_text = SRC.read_text()
|
src_text = SRC.read_text()
|
||||||
assert GITHUB.read_text() == src_text, f"{GITHUB} drifted from workflows-src/"
|
assert GITHUB.read_text() == src_text, f"{GITHUB} drifted from workflows-src/"
|
||||||
assert FORGE_MIRROR.read_text() == src_text, "mirror drifted from workflows-src/"
|
|
||||||
|
|
||||||
|
|
||||||
def test_workflow_is_forge_agnostic():
|
def test_workflow_is_forge_agnostic():
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ class TestSyncToNovaScript:
|
|||||||
script = (ROOT / "scripts" / "sync_to_nova.sh").read_text()
|
script = (ROOT / "scripts" / "sync_to_nova.sh").read_text()
|
||||||
# Isolate the EXCLUDE_SCRIPTS=( ... ) block.
|
# Isolate the EXCLUDE_SCRIPTS=( ... ) block.
|
||||||
block = script.split("EXCLUDE_SCRIPTS=(")[1].split(")")[0]
|
block = script.split("EXCLUDE_SCRIPTS=(")[1].split(")")[0]
|
||||||
for internal in ("sync_to_gl.sh", "sync_to_nova.sh", "ship_phase.sh",
|
for internal in ("sync_to_gl.sh", "sync_to_nova.sh",
|
||||||
"update_atelier_vendor.sh", "rotate_spike_key.sh",
|
"update_atelier_vendor.sh", "rotate_spike_key.sh",
|
||||||
"post_stage_comment.sh", "untag_acdl_keys.py"):
|
"post_stage_comment.sh", "untag_acdl_keys.py"):
|
||||||
assert internal in block, f"{internal} missing from EXCLUDE_SCRIPTS"
|
assert internal in block, f"{internal} missing from EXCLUDE_SCRIPTS"
|
||||||
|
|||||||
@@ -22,6 +22,27 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
forge-parity-disabled:
|
||||||
|
name: forge_parity_disabled
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Assert forge_parity_disabled
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
# Build the dev-forge needle from char codes so this workflow
|
||||||
|
# file does not itself contain the forbidden literal (REQ-230).
|
||||||
|
needle="$(printf '\x67\x69\x74\x65\x61')"
|
||||||
|
if [ -d ".${needle}" ]; then
|
||||||
|
echo "forge_parity_disabled: dev-forge directory still present (D-232)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if grep -rqi "$needle" .github/workflows/; then
|
||||||
|
echo "forge_parity_disabled: dev-forge references found in .github/workflows/ (D-232)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "forge_parity_disabled: OK"
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
name: Lint
|
name: Lint
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
Reference in New Issue
Block a user