Skip to content

avoids panic in org resolver loop when impl is nil #1606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrickhuie19 merged 2 commits into from
Oct 10, 2025
Merged

avoids panic in org resolver loop when impl is nil #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85fa202
avoids panic in org resolver loop when impl is nil
patrickhuie19 Oct 10, 2025
238dd93
Merge branch 'main' into fix/org-resolver-panic
patrickhuie19 Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/loop/internal/core/services/capability/standard/standard_capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
oracleFactory := dependencies.OracleFactory
gatewayConnector := dependencies.GatewayConnector
p2pKeystore := dependencies.P2PKeystore
orgResolver := dependencies.OrgResolver
telemetryID, telemetryRes, err := c.ServeNew("Telemetry", func(s *grpc.Server) {
pb.RegisterTelemetryServer(s, telemetry.NewTelemetryServer(telemetryService))
})
Expand Down Expand Up @@ -158,7 +159,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
resources = append(resources, gatewayConnectorRes)

orgResolverID, orgResolverRes, err := c.ServeNew("OrgResolver", func(s *grpc.Server) {
pb.RegisterOrgResolverServer(s, orgresolver.NewServer(dependencies.OrgResolver))
pb.RegisterOrgResolverServer(s, orgresolver.NewServer(orgResolver))
})
if err != nil {
c.CloseAll(resources...)
Expand Down
5 changes: 5 additions & 0 deletions pkg/loop/internal/core/services/orgresolver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package orgresolver

import (
"context"
"fmt"

"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb"
"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
Expand All @@ -19,6 +20,10 @@ func NewServer(impl orgresolver.OrgResolver) *Server {
}

func (s *Server) Get(ctx context.Context, req *pb.GetOrganizationRequest) (*pb.GetOrganizationResponse, error) {
if s.impl == nil {
// Return error when orgResolver implementation is nil
return nil, fmt.Errorf("orgResolver implementation is nil - service may not be configured")
}
orgID, err := s.impl.Get(ctx, req.Owner)
if err != nil {
return nil, err
Expand Down
Loading