Skip to content

Merge main into v2 - #2422

Merged
schnie merged 2 commits into
v2from
sync/main-into-v2-2026-10-23
Oct 23, 2026
Merged

schnie merged 2 commits into
v2from
sync/main-into-v2-2026-10-23

Conversation

@schnie

@schnie schnie commented Oct 23, 2026

Copy link
Copy Markdown
Member

Syncs main's one commit since #2416 into v2.

Merge with "Create a merge commit", not squash. Squash drops main as a parent (see #2374 and the five record PRs before it).

PR How v2 files
#2421 Return an error when deployment create has no app config Kept v2's code (conflict), took the test (clean) cmd/apc/deployment_test.go (+14): v2 already had the same errNoAppConfig guard and message, from 8a5a4f1; TestDeploymentCreateCommandNoAppConfig is coverage v2 lacked

Checks

  • git rev-list HEAD..origin/main is 0.
  • The diff against v2 is the one test and nothing else.
  • go test -race -shuffle=on ./cmd/apc/ passes, the new test included (its --label is v2's hidden 1.x alias for --name); golangci-lint v2.13.2 reports 0 issues on cmd/apc.

vjsairam and others added 2 commits October 23, 2026 15:15
When the CLI detects a platform version below 1.0.0, create has no
--cluster-id flag and reuses the app config fetched at startup. If that
lookup failed, deployment.Create panicked on the nil config. Return
errNoAppConfig instead, as v2 does.

Co-authored-by: Sai Ram <4089996+vjsairam@users.noreply.github.com>
Brings in #2421. v2 keeps its own cmd/apc/deployment.go, which already
has the same errNoAppConfig guard; #2421's test merges cleanly and is
coverage v2 lacked.

Co-Authored-By: Claude <noreply@anthropic.com>
@coveralls-official

Copy link
Copy Markdown

Coverage Report for CI Build 40010413077

Coverage increased (+0.003%) to 60.682%

Details

  • Coverage increased (+0.003%) from the base build.
  • Patch coverage: No coverable lines changed in this PR.
  • No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 68693
Covered Lines: 41684
Line Coverage: 60.68%
Coverage Strength: 411.59 hits per line

💛 - Coveralls

@schnie
schnie merged commit 3992d40 into v2 Oct 23, 2026
8 checks passed
@schnie
schnie deleted the sync/main-into-v2-2026-10-23 branch October 23, 2026 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants