Skip to content

Pin capi to upstream svc-creds commit, drop fork replace#5502

Merged
norman-abramovitz merged 3 commits into
cloudfoundry:developfrom
nabramovitz:chore/capi-pin-upstream-commit
Jun 26, 2026
Merged

Pin capi to upstream svc-creds commit, drop fork replace#5502
norman-abramovitz merged 3 commits into
cloudfoundry:developfrom
nabramovitz:chore/capi-pin-upstream-commit

Conversation

@nabramovitz

Copy link
Copy Markdown
Contributor

What

Move the jetstream fivetwenty-io/capi/v3 dependency off the norman-abramovitz/fw-capi fork and pin it directly to the upstream merge commit of fivetwenty-io/capi#12 via a Go pseudo-version.

- replace github.com/fivetwenty-io/capi/v3 => github.com/norman-abramovitz/fw-capi/v3 v3.222.3-svc-creds.1
- github.com/fivetwenty-io/capi/v3 v3.222.3
+ github.com/fivetwenty-io/capi/v3 v3.222.4-0.20260626183612-1ee59d2551b6

Why

capi#12 (ServiceInstances.GetCredentials + the parameters wire-format fix) is merged upstream but not tagged yet. This retires the fork replace now — the fork dependency is gone and the code builds against upstream — rather than waiting on the tag.

Follow-up

When the upstream tag containing #12 is cut, swap the pseudo-version for the clean tag (one-line change). No behavior change; this is purely the dependency source.

Verification

go build ./... passes; go mod tidy clean; go.sum reflects the upstream module hash, no fork references remain.

fivetwenty-io/capi#12 (ServiceInstances.GetCredentials + the parameters
wire-format fix) merged upstream but is not tagged yet. Move off the
norman-abramovitz/fw-capi fork replace and pin fivetwenty-io/capi
directly at the #12 merge commit via a pseudo-version
(v3.222.4-0.20260626183612-1ee59d2551b6).

Swap this pseudo-version for the clean upstream tag once Wayne cuts it;
the fork dependency is now gone. go build ./... passes; go.sum reflects
the upstream module hash.
Wayne tagged the svc-creds commit (1ee59d2551b6) as v3.222.4. Swap the
pseudo-version pin for the clean tag; same commit, no code change.

@norman-abramovitz norman-abramovitz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@norman-abramovitz norman-abramovitz merged commit 2d5fbbc into cloudfoundry:develop Jun 26, 2026
12 checks passed
@nabramovitz nabramovitz deleted the chore/capi-pin-upstream-commit branch June 26, 2026 23:30
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