fix: resolve node platform CSA key at service start

Author: gheorghestrimtu

core/services/chainlink/node_platform.go

@@ -11,6 +11,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/timeutil"
 	commonv1 "github.com/smartcontractkit/chainlink-protos/node-platform/common/v1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/static"
 )
 
@@ -32,6 +33,7 @@ type NodePlatformBuildInfoService struct {
 type NodePlatformBuildInfoConfig struct {
 	Beat         time.Duration
 	Lggr         logger.Logger
+	CSAKeyStore  keystore.CSA
 	CSAPublicKey string
 	CommitSHA    string
 	DockerTag    string
@@ -40,18 +42,6 @@ type NodePlatformBuildInfoConfig struct {
 }
 
 func NewNodePlatformBuildInfoConfig(opts ApplicationOpts) NodePlatformBuildInfoConfig {
-	csaKey := ""
-	csaKeys, err := opts.KeyStore.CSA().GetAll()
-	if err != nil {
-		opts.Logger.Errorw("failed to get CSA keys for node-platform build info", "err", err)
-	}
-
-	if len(csaKeys) > 0 {
-		csaKey = csaKeys[0].PublicKeyString()
-	} else {
-		opts.Logger.Warn("no CSA key found for node-platform build info")
-	}
-
 	version := opts.Version
 	if version == "" {
 		version = static.Version
@@ -68,13 +58,13 @@ func NewNodePlatformBuildInfoConfig(opts ApplicationOpts) NodePlatformBuildInfoC
 	}
 
 	return NodePlatformBuildInfoConfig{
-		Beat:         opts.Config.Telemetry().HeartbeatInterval(),
-		Lggr:         opts.Logger,
-		CSAPublicKey: csaKey,
-		CommitSHA:    static.Sha,
-		DockerTag:    dockerTag,
-		VersionTag:   versionTag,
-		Version:      version,
+		Beat:        opts.Config.Telemetry().HeartbeatInterval(),
+		Lggr:        opts.Logger,
+		CSAKeyStore: opts.KeyStore.CSA(),
+		CommitSHA:   static.Sha,
+		DockerTag:   dockerTag,
+		VersionTag:  versionTag,
+		Version:     version,
 	}
 }
 
@@ -93,11 +83,26 @@ func NewNodePlatformBuildInfoService(cfg NodePlatformBuildInfoConfig) NodePlatfo
 	return s
 }
 
-func (s *NodePlatformBuildInfoService) start(_ context.Context) error {
+func (s *NodePlatformBuildInfoService) start(ctx context.Context) error {
+	s.resolveCSAPublicKey(ctx)
 	s.eng.GoTick(timeutil.NewTicker(s.GetBeat), s.emit)
 	return nil
 }
 
+func (s *NodePlatformBuildInfoService) resolveCSAPublicKey(ctx context.Context) {
+	if s.opts.CSAKeyStore == nil {
+		return
+	}
+
+	csaKey, err := keystore.GetDefault(ctx, s.opts.CSAKeyStore)
+	if err != nil {
+		s.eng.Errorw("failed to resolve CSA key for node-platform build info", "err", err)
+		return
+	}
+
+	s.opts.CSAPublicKey = csaKey.PublicKeyString()
+}
+
 func (s *NodePlatformBuildInfoService) emit(ctx context.Context) {
 	payloadBytes, err := proto.Marshal(&commonv1.NodeBuildInfo{
 		CsaPublicKey: s.opts.CSAPublicKey,

core/services/chainlink/node_platform_test.go

@@ -4,15 +4,19 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
+	"github.com/smartcontractkit/chainlink-common/keystore/corekeys/csakey"
 	"github.com/smartcontractkit/chainlink-common/pkg/beholder"
 	"github.com/smartcontractkit/chainlink-common/pkg/beholder/beholdertest"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	commonv1 "github.com/smartcontractkit/chainlink-protos/node-platform/common/v1"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
+	keystoremocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
 )
 
 func TestNodePlatformBuildInfo_EmitsNodeBuildInfo(t *testing.T) {
@@ -47,3 +51,30 @@ func TestNodePlatformBuildInfo_EmitsNodeBuildInfo(t *testing.T) {
 	require.Equal(t, "version-tag", payload.VersionTag)
 	require.Equal(t, "1.2.3", payload.Version)
 }
+
+func TestNodePlatformBuildInfo_ResolvesCSAKeyOnStart(t *testing.T) {
+	obs := beholdertest.NewObserver(t)
+	csaStore := &keystoremocks.CSA{}
+
+	csaStore.EXPECT().EnsureKey(mock.Anything).Return(nil).Once()
+	csaStore.EXPECT().GetAll().Return([]csakey.KeyV2{cltest.DefaultCSAKey}, nil).Once()
+
+	servicetest.Run(t, chainlink.NewNodePlatformBuildInfoService(chainlink.NodePlatformBuildInfoConfig{
+		Beat:        10 * time.Millisecond,
+		Lggr:        logger.TestLogger(t),
+		CSAKeyStore: csaStore,
+		CommitSHA:   "commit-sha",
+		DockerTag:   "docker-tag",
+		VersionTag:  "version-tag",
+		Version:     "1.2.3",
+	}))
+
+	require.Eventually(t, func() bool {
+		return obs.Len(t, beholder.AttrKeyEntity, "common.v1.NodeBuildInfo") > 0
+	}, time.Second, 10*time.Millisecond)
+
+	msg := obs.Messages(t, beholder.AttrKeyEntity, "common.v1.NodeBuildInfo")[0]
+	var payload commonv1.NodeBuildInfo
+	require.NoError(t, proto.Unmarshal(msg.Body, &payload))
+	require.Equal(t, cltest.DefaultCSAKey.PublicKeyString(), payload.CsaPublicKey)
+}