Org Resolver in Initialise Depenencies loop wiring (#1599)

* adding org resolver to initialis
e request

* adding org resolver grpc wiring

* using protoc v5.29.3

* use services helper in loop implementor

Co-authored-by: Jordan Krage <[email protected]>

* fixing build issue

* other build issues

---------

Co-authored-by: Jordan Krage <[email protected]>

Author: patrickhuie19

pkg/capabilities/pb/capabilities.pb.go

@@ -169,6 +169,7 @@ message InitialiseRequest {
   uint32 oracle_factory_id = 8;
   uint32 gateway_connector_id = 9;
   uint32 keystore_id = 10;
+  uint32 org_resolver_id = 11;
 }
 
 message CapabilityInfosReply {

pkg/capabilities/pb/capabilities.proto

@@ -16,6 +16,7 @@ import (
 	keystoreservice "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keystore"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keyvalue"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/oraclefactory"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/orgresolver"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/goplugin"
@@ -156,6 +157,15 @@ 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))
+	})
+	if err != nil {
+		c.CloseAll(resources...)
+		return fmt.Errorf("failed to serve org resolver: %w", err)
+	}
+	resources = append(resources, orgResolverRes)
+
 	_, err = c.StandardCapabilitiesClient.Initialise(ctx, &capabilitiespb.InitialiseRequest{
 		Config:             config,
 		ErrorLogId:         errorLogID,
@@ -167,6 +177,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
 		OracleFactoryId:    oracleFactoryID,
 		GatewayConnectorId: gatewayConnectorID,
 		KeystoreId:         keyStoreID,
+		OrgResolverId:      orgResolverID,
 	})
 
 	if err != nil {
@@ -310,6 +321,14 @@ func (s *standardCapabilitiesServer) Initialise(ctx context.Context, request *ca
 	resources = append(resources, net.Resource{Closer: gatewayConnectorConn, Name: "GatewayConnector"})
 	gatewayConnector := gateway.NewGatewayConnectorClient(gatewayConnectorConn, s.BrokerExt)
 
+	orgResolverConn, err := s.Dial(request.OrgResolverId)
+	if err != nil {
+		s.CloseAll(resources...)
+		return nil, net.ErrConnDial{Name: "OrgResolver", ID: request.OrgResolverId, Err: err}
+	}
+	resources = append(resources, net.Resource{Closer: orgResolverConn, Name: "OrgResolver"})
+	orgResolver := orgresolver.NewClient(s.Logger, orgResolverConn)
+
 	dependencies := core.StandardCapabilitiesDependencies{
 		Config:             request.Config,
 		TelemetryService:   telemetry,
@@ -321,6 +340,7 @@ func (s *standardCapabilitiesServer) Initialise(ctx context.Context, request *ca
 		OracleFactory:      oracleFactory,
 		GatewayConnector:   gatewayConnector,
 		P2PKeystore:        keyStore,
+		OrgResolver:        orgResolver,
 	}
 
 	if err = s.impl.Initialise(ctx, dependencies); err != nil {

pkg/loop/internal/core/services/capability/standard/standard_capabilities.go

@@ -0,0 +1,31 @@
+package orgresolver
+
+import (
+	"context"
+
+	"google.golang.org/grpc"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
+)
+
+var _ orgresolver.OrgResolver = (*Client)(nil)
+
+type Client struct {
+	services.Service
+	grpc pb.OrgResolverClient
+}
+
+func (c *Client) Get(ctx context.Context, owner string) (string, error) {
+	resp, err := c.grpc.Get(ctx, &pb.GetOrganizationRequest{Owner: owner})
+	if err != nil {
+		return "", err
+	}
+	return resp.OrganizationId, nil
+}
+
+func NewClient(lggr logger.Logger, cc grpc.ClientConnInterface) *Client {
+	return &Client{Service: services.Config{Name: "OrgResolverClient"}.NewService(lggr), grpc: pb.NewOrgResolverClient(cc)}
+}

pkg/loop/internal/core/services/orgresolver/client.go

@@ -0,0 +1,27 @@
+package orgresolver
+
+import (
+	"context"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
+)
+
+var _ pb.OrgResolverServer = (*Server)(nil)
+
+type Server struct {
+	pb.UnimplementedOrgResolverServer
+	impl orgresolver.OrgResolver
+}
+
+func NewServer(impl orgresolver.OrgResolver) *Server {
+	return &Server{impl: impl}
+}
+
+func (s *Server) Get(ctx context.Context, req *pb.GetOrganizationRequest) (*pb.GetOrganizationResponse, error) {
+	orgID, err := s.impl.Get(ctx, req.Owner)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.GetOrganizationResponse{OrganizationId: orgID}, nil
+}

pkg/loop/internal/core/services/orgresolver/server.go

@@ -10,4 +10,5 @@
 //go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative pipeline_runner.proto
 //go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative keyvalue_store.proto
 //go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative validate_config.proto
+//go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative orgresolver.proto
 package pb

pkg/loop/internal/pb/generate.go

@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+option go_package = "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb";
+
+package loop;
+
+import "google/protobuf/empty.proto";
+
+message GetOrganizationRequest {
+  string owner = 1;
+}
+
+message GetOrganizationResponse {
+  string organization_id = 1;
+}
+
+service OrgResolver {
+  rpc Get(GetOrganizationRequest) returns (GetOrganizationResponse);
+}