From 882a21596b515429dcf75be569034414edabb9c9 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Fri, 13 Nov 2026 03:51:42 +1100 Subject: [PATCH] feat(forge): report a close refused for open dependencies as a typed status (archie #1922) --- forge/gitea/client.go | 11 ++++++++--- go.mod | 2 +- sdk/forge/forge.go | 5 +++++ sdk/forge/server.go | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/forge/gitea/client.go b/forge/gitea/client.go index afb4b87..219a24a 100644 --- a/forge/gitea/client.go +++ b/forge/gitea/client.go @@ -433,10 +433,15 @@ func (c *GiteaClient) CloseIssue(ctx context.Context, owner, repo string, number } } state := gitea.StateClosed - if _, _, err := c.api(ctx).EditIssue(owner, repo, int64(number), gitea.EditIssueOption{State: &state}); err != nil { - return fmt.Errorf("close issue %s/%s#%d: %w", owner, repo, number, err) + _, resp, err := c.api(ctx).EditIssue(owner, repo, int64(number), gitea.EditIssueOption{State: &state}) + if err == nil { + return nil } - return nil + // Gitea answers 412 when an issue still has open dependencies. + if resp != nil && resp.StatusCode == http.StatusPreconditionFailed { + return fmt.Errorf("close issue %s/%s#%d: %w: %w", owner, repo, number, forge.ErrBlockedByDependencies, err) + } + return fmt.Errorf("close issue %s/%s#%d: %w", owner, repo, number, err) } // ClosePR closes a pull request without merging, with an optional final diff --git a/go.mod b/go.mod index c8ebe01..cce84fe 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/hashicorp/go-plugin v1.8.0 github.com/hashicorp/vault/api v1.23.0 golang.org/x/crypto v0.55.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800 google.golang.org/grpc v1.84.0 google.golang.org/protobuf v1.36.12 ) @@ -57,5 +58,4 @@ require ( golang.org/x/term v0.45.0 // indirect golang.org/x/text v0.41.0 // indirect golang.org/x/time v0.12.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800 // indirect ) diff --git a/sdk/forge/forge.go b/sdk/forge/forge.go index 6a4d940..26863f4 100644 --- a/sdk/forge/forge.go +++ b/sdk/forge/forge.go @@ -2,12 +2,17 @@ package forge import ( "context" + "errors" "fmt" "io" "strings" "time" ) +// ErrBlockedByDependencies is wrapped by a forge's CloseIssue when the forge +// refuses to close an issue that still has open dependencies. +var ErrBlockedByDependencies = errors.New("forge refused: open dependencies") + // Config is what the host hands a forge extension once, after launch. type Config struct { Host string diff --git a/sdk/forge/server.go b/sdk/forge/server.go index 2286c0b..fe555e1 100644 --- a/sdk/forge/server.go +++ b/sdk/forge/server.go @@ -7,6 +7,7 @@ import ( "sync" "sync/atomic" + "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" @@ -69,9 +70,24 @@ func fail(err error) error { if errors.Is(err, errors.ErrUnsupported) { return status.Error(codes.Unimplemented, err.Error()) } + if errors.Is(err, ErrBlockedByDependencies) { + return blockedByDependencies(err) + } return status.Error(codes.Unknown, err.Error()) } +// blockedByDependencies carries the refusal as a FailedPrecondition with an +// ErrorInfo detail, which the host reads to tell a dependency block from a +// generic failure. +func blockedByDependencies(err error) error { + st := status.New(codes.FailedPrecondition, err.Error()) + withDetails, derr := st.WithDetails(&errdetails.ErrorInfo{Reason: "BLOCKED_BY_DEPENDENCIES", Domain: "archie.forge"}) + if derr != nil { + return st.Err() + } + return withDetails.Err() +} + func issues(in []Issue) []*forgev1.Issue { out := make([]*forgev1.Issue, 0, len(in)) for _, i := range in {