[utils,iamclient] Use attr to check main node flag

* change defining if it is main node to checking main node attr instead of
  comparing to current node ID;

* make GetCurrentNodeInfo perform grpc call and get updated node info instead
  of cached.

Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@epam.com>

Author: al1img

utils/iamclient/iamclient.go

@@ -69,9 +69,9 @@ type Client struct {
 	cryptocontext           *cryptutils.CryptoContext
 	insecure                bool
 
-	nodeID          string
-	systemID        string
-	currentNodeInfo *cloudprotocol.NodeInfo
+	nodeID     string
+	systemID   string
+	isMainNode bool
 
 	publicConnection    *grpchelpers.GRPCConn
 	protectedConnection *grpc.ClientConn
@@ -165,28 +165,42 @@ func New(
 		return nil, aoserrors.Wrap(err)
 	}
 
-	if !insecure && localClient.isProtectedConnEnabled() {
-		var ch <-chan *pb.CertInfo
+	nodeInfo, err := localClient.GetCurrentNodeInfo()
+	if err != nil {
+		return nil, aoserrors.Wrap(err)
+	}
 
-		if ch, err = localClient.SubscribeCertChanged(certStorage); err != nil {
+	localClient.nodeID = nodeInfo.NodeID
+	localClient.isMainNode = nodeInfo.IsMainNode()
+
+	if localClient.isMainNode {
+		if localClient.systemID, err = localClient.getSystemID(); err != nil {
 			return nil, aoserrors.Wrap(err)
 		}
-
-		go localClient.processCertChange(ch)
 	}
 
-	var nodeInfo cloudprotocol.NodeInfo
+	if localClient.isMainNode {
+		if err = localClient.subscribeNodeInfoChange(); err != nil {
+			log.Error("Failed subscribe on NodeInfo change")
 
-	if nodeInfo, err = localClient.GetCurrentNodeInfo(); err != nil {
-		return nil, aoserrors.Wrap(err)
+			return nil, aoserrors.Wrap(err)
+		}
+
+		if err = localClient.subscribeUnitSubjectsChange(); err != nil {
+			log.Error("Failed subscribe on UnitSubject change")
+
+			return nil, aoserrors.Wrap(err)
+		}
 	}
 
-	localClient.nodeID = nodeInfo.NodeID
+	if !insecure && localClient.isProtectedConnEnabled() {
+		var ch <-chan *pb.CertInfo
 
-	if localClient.currentNodeInfo.IsMainNode() {
-		if localClient.systemID, err = localClient.getSystemID(); err != nil {
+		if ch, err = localClient.SubscribeCertChanged(certStorage); err != nil {
 			return nil, aoserrors.Wrap(err)
 		}
+
+		go localClient.processCertChange(ch)
 	}
 
 	return localClient, nil
@@ -323,11 +337,19 @@ func (client *Client) InstallCertificates(
 	// And IAM certificate for the main node should be send in the end. Otherwise IAM client/server
 	// restart will fail the following certificates to apply.
 	slices.SortStableFunc(certInfo, func(a, b cloudprotocol.IssuedCertData) int {
-		if a.NodeID == client.nodeID && a.Type == iamCertType {
+		if client.isMainNode && a.NodeID == client.nodeID && a.Type == iamCertType {
 			return 1
 		}
 
-		if b.NodeID == client.nodeID && b.Type == iamCertType {
+		if client.isMainNode && b.NodeID == client.nodeID && b.Type == iamCertType {
+			return -1
+		}
+
+		if client.isMainNode && a.NodeID == client.nodeID {
+			return 1
+		}
+
+		if client.isMainNode && b.NodeID == client.nodeID {
 			return -1
 		}
 
@@ -497,7 +519,7 @@ func (client *Client) Deprovision(nodeID, password string) (err error) {
 		}
 	}()
 
-	if nodeID == client.GetNodeID() {
+	if client.isMainNode && nodeID == client.nodeID {
 		err = aoserrors.New("Can't deprovision main node")
 		errorInfo = &cloudprotocol.ErrorInfo{
 			Message: err.Error(),
@@ -681,10 +703,6 @@ func (client *Client) GetCurrentNodeInfo() (cloudprotocol.NodeInfo, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), iamRequestTimeout)
 	defer cancel()
 
-	if client.currentNodeInfo != nil {
-		return *client.currentNodeInfo, nil
-	}
-
 	response, err := client.publicService.GetNodeInfo(ctx, &empty.Empty{})
 	if err != nil {
 		return cloudprotocol.NodeInfo{}, aoserrors.Wrap(err)
@@ -693,12 +711,9 @@ func (client *Client) GetCurrentNodeInfo() (cloudprotocol.NodeInfo, error) {
 	log.WithFields(log.Fields{
 		"nodeID":   response.GetNodeId(),
 		"nodeType": response.GetNodeType(),
-	}).Debug("Get node Info")
-
-	nodeInfo := pbconvert.NodeInfoFromPB(response)
-	client.currentNodeInfo = &nodeInfo
+	}).Debug("Get current node Info")
 
-	return *client.currentNodeInfo, nil
+	return pbconvert.NodeInfoFromPB(response), nil
 }
 
 // GetUnitSubjects returns unit subjects.
@@ -840,26 +855,6 @@ func (client *Client) openGRPCConnection() (err error) {
 	client.publicNodesService = pb.NewIAMPublicNodesServiceClient(client.publicConnection)
 	client.publicPermissionsService = pb.NewIAMPublicPermissionsServiceClient(client.publicConnection)
 
-	var nodeInfo cloudprotocol.NodeInfo
-
-	if nodeInfo, err = client.GetCurrentNodeInfo(); err != nil {
-		return aoserrors.Wrap(err)
-	}
-
-	if nodeInfo.IsMainNode() {
-		if err = client.subscribeNodeInfoChange(); err != nil {
-			log.Error("Failed subscribe on NodeInfo change")
-
-			return aoserrors.Wrap(err)
-		}
-
-		if err = client.subscribeUnitSubjectsChange(); err != nil {
-			log.Error("Failed subscribe on UnitSubject change")
-
-			return aoserrors.Wrap(err)
-		}
-	}
-
 	if err = client.restoreCertInfoSubs(); err != nil {
 		log.Error("Failed subscribe on CertInfo change")
 
@@ -881,6 +876,8 @@ func (client *Client) openGRPCConnection() (err error) {
 	client.nodesService = pb.NewIAMNodesServiceClient(client.protectedConnection)
 	client.permissionsService = pb.NewIAMPermissionsServiceClient(client.protectedConnection)
 
+	log.Debug("Connected to IAM")
+
 	return nil
 }
 

utils/iamclient/iamclient_test.go

@@ -1095,8 +1095,6 @@ func (server *testIAMPublicNodesServiceServer) GetNodeInfo(context context.Conte
 func (server *testIAMPublicNodesServiceServer) SubscribeNodeChanged(
 	empty *emptypb.Empty, stream pb.IAMPublicNodesService_SubscribeNodeChangedServer,
 ) error {
-	log.Error("testIAMPublicNodesServiceServer SubscribeNodeChanged")
-
 	nodeInfo := <-server.nodeInfo
 
 	return aoserrors.Wrap(stream.Send(nodeInfo))