repro-lambda 0.5.2__tar.gz → 0.6.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.github/workflows/build.yml +75 -1
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/PKG-INFO +1 -1
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/pyproject.toml +1 -1
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/__init__.py +1 -1
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/cli.py +33 -4
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_promote.py +71 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/uv.lock +1 -1
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.github/workflows/ci.yml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.github/workflows/move-major-tag.yml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.github/workflows/promote.yml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.github/workflows/publish.yml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.gitignore +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/.pre-commit-config.yaml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/CHANGELOG.md +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/LICENSE +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/README.md +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/SETUP.md +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/__main__.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/build.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/catalog.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/docker_runner.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/git_guard.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/hasher.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/manifest.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/promote.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/s3_uploader.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/source_locker.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/source_stager.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/sources.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/verify.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/src/repro_lambda/zip_packager.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/__init__.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/conftest.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_nodejs_lambda/handler/index.js +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_nodejs_lambda/handler/package-lock.json +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_nodejs_lambda/handler/package.json +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_nodejs_lambda/lambdas.toml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_python_lambda/handler/app.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_python_lambda/handler/requirements.arm64.lock +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_python_lambda/handler/requirements.in +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_python_lambda/lambdas.toml +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_build_integration.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_build_nodejs.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_catalog.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_cli_build.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_cli_lock.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_cli_smoke.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_docker_runner.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_docker_runner_nodejs.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_e2e_nodejs_lambda.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_e2e_python_lambda.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_extra_files.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_git_guard.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_hasher.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_manifest.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_per_lambda_builder.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_python_byte_compat_regression.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_s3_uploader.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_source_locker.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_source_stager.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_sources.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_sources_hash.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_sources_schema.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_verify.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_zip_excludes.py +0 -0
- {repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/test_zip_packager.py +0 -0
|
@@ -25,6 +25,27 @@ on:
|
|
|
25
25
|
required: false
|
|
26
26
|
default: ""
|
|
27
27
|
description: S3 bucket name for prod Lambda artifacts (master push only).
|
|
28
|
+
promotion_repo:
|
|
29
|
+
type: string
|
|
30
|
+
required: false
|
|
31
|
+
default: ""
|
|
32
|
+
description: >-
|
|
33
|
+
owner/repo of the centralized promotion workflow. When set, the build Step
|
|
34
|
+
Summary renders a ready-to-run `gh workflow run` command per function. Generic
|
|
35
|
+
by design - the reusable workflow never hardcodes a promotion target; the caller
|
|
36
|
+
supplies it (keep this empty for public callers).
|
|
37
|
+
promotion_workflow:
|
|
38
|
+
type: string
|
|
39
|
+
required: false
|
|
40
|
+
default: promote-lambda.yml
|
|
41
|
+
description: Workflow file name dispatched by the promotion command in the Step Summary.
|
|
42
|
+
project:
|
|
43
|
+
type: string
|
|
44
|
+
required: false
|
|
45
|
+
default: ""
|
|
46
|
+
description: >-
|
|
47
|
+
Project key the promotion workflow expects (-f project=...). Defaults to the
|
|
48
|
+
caller repo name when empty.
|
|
28
49
|
secrets:
|
|
29
50
|
sources_token:
|
|
30
51
|
required: false
|
|
@@ -92,7 +113,60 @@ jobs:
|
|
|
92
113
|
env:
|
|
93
114
|
REPRO_LAMBDA_BUCKET: ${{ inputs.dev_bucket }}
|
|
94
115
|
REPRO_LAMBDA_SOURCES_TOKEN: ${{ secrets.sources_token }}
|
|
95
|
-
run: uvx --from repro-lambda repro-lambda build --manifest "${{ inputs.manifest_path }}" --arch "${{ matrix.arch }}"
|
|
116
|
+
run: uvx --from repro-lambda repro-lambda build --manifest "${{ inputs.manifest_path }}" --arch "${{ matrix.arch }}" --json-out "$RUNNER_TEMP/build-summary.json"
|
|
117
|
+
|
|
118
|
+
# Render the dev build's content shas + a copy-paste promotion command per function
|
|
119
|
+
# into the run's Step Summary (the build JSON is otherwise buried in step logs).
|
|
120
|
+
- name: Build summary (content shas + promote commands)
|
|
121
|
+
if: ${{ hashFiles(format('{0}/build-summary.json', runner.temp)) != '' }}
|
|
122
|
+
env:
|
|
123
|
+
SUMMARY_JSON: ${{ runner.temp }}/build-summary.json
|
|
124
|
+
PROMOTION_REPO: ${{ inputs.promotion_repo }}
|
|
125
|
+
PROMOTION_WORKFLOW: ${{ inputs.promotion_workflow }}
|
|
126
|
+
PROJECT: ${{ inputs.project != '' && inputs.project || github.event.repository.name }}
|
|
127
|
+
ARCH: ${{ matrix.arch }}
|
|
128
|
+
SRC_REPO: ${{ github.repository }}
|
|
129
|
+
SRC_COMMIT: ${{ github.sha }}
|
|
130
|
+
run: |
|
|
131
|
+
python3 - <<'PY'
|
|
132
|
+
import json, os
|
|
133
|
+
|
|
134
|
+
rows = json.load(open(os.environ["SUMMARY_JSON"]))
|
|
135
|
+
repo = os.environ["PROMOTION_REPO"]
|
|
136
|
+
wf = os.environ["PROMOTION_WORKFLOW"]
|
|
137
|
+
project = os.environ["PROJECT"]
|
|
138
|
+
arch = os.environ["ARCH"]
|
|
139
|
+
src = os.environ["SRC_REPO"]
|
|
140
|
+
commit = os.environ["SRC_COMMIT"]
|
|
141
|
+
|
|
142
|
+
out = [
|
|
143
|
+
f"## Lambda build ({arch})",
|
|
144
|
+
"",
|
|
145
|
+
f"Source: `{src}` @ `{commit[:12]}`",
|
|
146
|
+
"",
|
|
147
|
+
"| Function | Outcome | Content SHA | Dev key |",
|
|
148
|
+
"| --- | --- | --- | --- |",
|
|
149
|
+
]
|
|
150
|
+
for r in rows:
|
|
151
|
+
out.append(
|
|
152
|
+
f"| `{r['logical_name']}` | {r['outcome']} | `{r['sha256']}` | `{r['bucket_key']}` |"
|
|
153
|
+
)
|
|
154
|
+
out += ["", "### Promote to prod", ""]
|
|
155
|
+
for r in rows:
|
|
156
|
+
fn, sha = r["logical_name"], r["sha256"]
|
|
157
|
+
out += [f"**`{fn}`** prod pin: `{fn} = \"{sha}\"`", ""]
|
|
158
|
+
if repo:
|
|
159
|
+
out += [
|
|
160
|
+
"```bash",
|
|
161
|
+
f"gh workflow run {wf} --repo {repo} "
|
|
162
|
+
f"-f project={project} -f function={fn} -f sha={sha}",
|
|
163
|
+
"```",
|
|
164
|
+
"",
|
|
165
|
+
]
|
|
166
|
+
|
|
167
|
+
with open(os.environ["GITHUB_STEP_SUMMARY"], "a") as f:
|
|
168
|
+
f.write("\n".join(out) + "\n")
|
|
169
|
+
PY
|
|
96
170
|
|
|
97
171
|
- name: Verify reproducible (PR only)
|
|
98
172
|
if: github.event_name == 'pull_request'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: repro-lambda
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.6.0
|
|
4
4
|
Summary: Build reproducible AWS Lambda packages outside Terraform, optimized for terraform-aws-lambda by serverless.tf.
|
|
5
5
|
Project-URL: Homepage, https://github.com/antonbabenko/repro-lambda
|
|
6
6
|
Project-URL: Repository, https://github.com/antonbabenko/repro-lambda
|
|
@@ -70,6 +70,13 @@ def build(
|
|
|
70
70
|
"--arch", help="Only build lambdas with this arch (e.g. arm64, x86_64). Empty = all."
|
|
71
71
|
),
|
|
72
72
|
] = "",
|
|
73
|
+
json_out: Annotated[
|
|
74
|
+
Path | None,
|
|
75
|
+
typer.Option(
|
|
76
|
+
"--json-out",
|
|
77
|
+
help="Also write the build summary JSON array to this file (for CI Step Summary).",
|
|
78
|
+
),
|
|
79
|
+
] = None,
|
|
73
80
|
) -> None:
|
|
74
81
|
"""Build one lambda (or all) per manifest and upload to S3."""
|
|
75
82
|
import json
|
|
@@ -170,6 +177,9 @@ def build(
|
|
|
170
177
|
if not dry_run:
|
|
171
178
|
catalog.save(catalog_path)
|
|
172
179
|
|
|
180
|
+
if json_out is not None:
|
|
181
|
+
json_out.write_text(json.dumps(summary, indent=2))
|
|
182
|
+
|
|
173
183
|
typer.echo(json.dumps(summary, indent=2))
|
|
174
184
|
|
|
175
185
|
|
|
@@ -196,14 +206,25 @@ def promote(
|
|
|
196
206
|
help="Destination (prod) base bucket; us-east-1 variant auto-derived.",
|
|
197
207
|
),
|
|
198
208
|
] = "",
|
|
209
|
+
sha: Annotated[
|
|
210
|
+
str,
|
|
211
|
+
typer.Option(
|
|
212
|
+
"--sha",
|
|
213
|
+
help="Promote this exact 64-hex content sha instead of the catalog's current. "
|
|
214
|
+
"Requires a single lambda target (not 'all').",
|
|
215
|
+
),
|
|
216
|
+
] = "",
|
|
199
217
|
dry_run: Annotated[bool, typer.Option("--dry-run")] = False,
|
|
200
218
|
) -> None:
|
|
201
219
|
"""Copy built artifacts dev -> prod by content hash (no rebuild).
|
|
202
220
|
|
|
203
|
-
|
|
204
|
-
is exactly the one the source commit built and tested in dev.
|
|
221
|
+
By default the sha per lambda is read from builds/catalog.json, so the artifact
|
|
222
|
+
promoted is exactly the one the source commit built and tested in dev. Pass
|
|
223
|
+
``--sha`` to promote one explicit content sha (e.g. copy-pasted from a build run's
|
|
224
|
+
Step Summary), bypassing the catalog.
|
|
205
225
|
"""
|
|
206
226
|
import json
|
|
227
|
+
import re
|
|
207
228
|
|
|
208
229
|
from repro_lambda.manifest import load_manifest
|
|
209
230
|
from repro_lambda.promote import (
|
|
@@ -225,6 +246,14 @@ def promote(
|
|
|
225
246
|
typer.echo(f"no lambda named {target!r} in {manifest}", err=True)
|
|
226
247
|
raise typer.Exit(2)
|
|
227
248
|
|
|
249
|
+
if sha:
|
|
250
|
+
if target == "all" or len(selected) != 1:
|
|
251
|
+
typer.echo("--sha requires a single lambda target (not 'all')", err=True)
|
|
252
|
+
raise typer.Exit(2)
|
|
253
|
+
if not re.fullmatch(r"[a-f0-9]{64}", sha):
|
|
254
|
+
typer.echo(f"--sha must be 64 lowercase hex chars, got {sha!r}", err=True)
|
|
255
|
+
raise typer.Exit(2)
|
|
256
|
+
|
|
228
257
|
if not dry_run and (not dev_bucket or not prod_bucket):
|
|
229
258
|
typer.echo(
|
|
230
259
|
"--dev-bucket and --prod-bucket (or REPRO_LAMBDA_DEV_BUCKET / "
|
|
@@ -237,10 +266,10 @@ def promote(
|
|
|
237
266
|
summary = []
|
|
238
267
|
for spec in selected:
|
|
239
268
|
try:
|
|
240
|
-
|
|
269
|
+
resolved_sha = sha or sha_from_catalog(catalog_path, spec.logical_name)
|
|
241
270
|
outcome = promote_one(
|
|
242
271
|
spec=spec,
|
|
243
|
-
sha=
|
|
272
|
+
sha=resolved_sha,
|
|
244
273
|
dev_bucket=dev_bucket,
|
|
245
274
|
prod_bucket=prod_bucket,
|
|
246
275
|
dry_run=dry_run,
|
|
@@ -226,3 +226,74 @@ def test_cli_promote_unknown_target_exits_2(tmp_path: Path):
|
|
|
226
226
|
],
|
|
227
227
|
)
|
|
228
228
|
assert result.exit_code == 2
|
|
229
|
+
|
|
230
|
+
|
|
231
|
+
_EXPLICIT_SHA = "a" * 64 # 64-hex, deliberately NOT the catalog's "cafef00d"
|
|
232
|
+
|
|
233
|
+
|
|
234
|
+
def test_cli_promote_explicit_sha_bypasses_catalog(tmp_path: Path):
|
|
235
|
+
repo = _consumer(tmp_path)
|
|
236
|
+
with mock_aws():
|
|
237
|
+
c = boto3.client("s3", region_name="eu-west-1")
|
|
238
|
+
_make_bucket(c, DEV, "eu-west-1")
|
|
239
|
+
_make_bucket(c, PROD, "eu-west-1")
|
|
240
|
+
# Only the explicit-sha object exists; the catalog's current sha does not.
|
|
241
|
+
c.put_object(Bucket=DEV, Key=f"lambdas/app/{_EXPLICIT_SHA}.zip", Body=b"z")
|
|
242
|
+
|
|
243
|
+
result = runner.invoke(
|
|
244
|
+
app,
|
|
245
|
+
[
|
|
246
|
+
"promote",
|
|
247
|
+
"app",
|
|
248
|
+
"--manifest",
|
|
249
|
+
str(repo / "lambdas.toml"),
|
|
250
|
+
"--dev-bucket",
|
|
251
|
+
DEV,
|
|
252
|
+
"--prod-bucket",
|
|
253
|
+
PROD,
|
|
254
|
+
"--sha",
|
|
255
|
+
_EXPLICIT_SHA,
|
|
256
|
+
],
|
|
257
|
+
)
|
|
258
|
+
assert result.exit_code == 0, result.stdout
|
|
259
|
+
assert c.head_object(Bucket=PROD, Key=f"lambdas/app/{_EXPLICIT_SHA}.zip")
|
|
260
|
+
|
|
261
|
+
|
|
262
|
+
def test_cli_promote_sha_rejects_all_target(tmp_path: Path):
|
|
263
|
+
repo = _consumer(tmp_path)
|
|
264
|
+
result = runner.invoke(
|
|
265
|
+
app,
|
|
266
|
+
[
|
|
267
|
+
"promote",
|
|
268
|
+
"all",
|
|
269
|
+
"--manifest",
|
|
270
|
+
str(repo / "lambdas.toml"),
|
|
271
|
+
"--dev-bucket",
|
|
272
|
+
DEV,
|
|
273
|
+
"--prod-bucket",
|
|
274
|
+
PROD,
|
|
275
|
+
"--sha",
|
|
276
|
+
_EXPLICIT_SHA,
|
|
277
|
+
],
|
|
278
|
+
)
|
|
279
|
+
assert result.exit_code == 2 # --sha forbidden with 'all'
|
|
280
|
+
|
|
281
|
+
|
|
282
|
+
def test_cli_promote_sha_invalid_hex_exits_2(tmp_path: Path):
|
|
283
|
+
repo = _consumer(tmp_path)
|
|
284
|
+
result = runner.invoke(
|
|
285
|
+
app,
|
|
286
|
+
[
|
|
287
|
+
"promote",
|
|
288
|
+
"app",
|
|
289
|
+
"--manifest",
|
|
290
|
+
str(repo / "lambdas.toml"),
|
|
291
|
+
"--dev-bucket",
|
|
292
|
+
DEV,
|
|
293
|
+
"--prod-bucket",
|
|
294
|
+
PROD,
|
|
295
|
+
"--sha",
|
|
296
|
+
"not-a-valid-sha",
|
|
297
|
+
],
|
|
298
|
+
)
|
|
299
|
+
assert result.exit_code == 2 # not 64-hex
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_nodejs_lambda/handler/index.js
RENAMED
|
File without changes
|
|
File without changes
|
{repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_nodejs_lambda/handler/package.json
RENAMED
|
File without changes
|
|
File without changes
|
{repro_lambda-0.5.2 → repro_lambda-0.6.0}/tests/fixtures/sample_python_lambda/handler/app.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|