Merge branch 'bugfix/10.5.20/update-agent-hostname' of github.com:utmstack/UTMStack into bugfix/10.5.20/update-agent-hostname

Author: Kbayero

backend/pom.xml

@@ -74,7 +74,7 @@
         <sonar-maven-plugin.version>3.9.0.2155</sonar-maven-plugin.version>
         <!-- jhipster-needle-maven-property -->
         <io.grpc.version>1.55.1</io.grpc.version>
-        <protoc.version>3.23.2</protoc.version>
+        <protoc.version>4.29.3</protoc.version>
         <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <annotation-api.version>1.2</annotation-api.version>
@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.23.2</version>
+            <version>${protoc.version}</version>
         </dependency>
 
         <dependency>

backend/src/main/java/com/park/utmstack/service/agent_manager/AgentGrpcService.java

@@ -1,11 +1,9 @@
 package com.park.utmstack.service.agent_manager;
 
 import com.park.utmstack.security.SecurityUtils;
-import com.park.utmstack.service.dto.agent_manager.AgentCommandDTO;
-import com.park.utmstack.service.dto.agent_manager.AgentDTO;
-import com.park.utmstack.service.dto.agent_manager.ListAgentsCommandsResponseDTO;
-import com.park.utmstack.service.dto.agent_manager.ListAgentsResponseDTO;
+import com.park.utmstack.service.dto.agent_manager.*;
 import com.park.utmstack.service.grpc.*;
+import com.park.utmstack.web.rest.vm.AgentRequestVM;
 import io.grpc.*;
 import io.grpc.Status;
 import io.grpc.stub.MetadataUtils;
@@ -48,8 +46,8 @@ public ListAgentsResponseDTO mapToListAgentsResponseDTO(ListAgentsResponse respo
             ListAgentsResponseDTO dto = new ListAgentsResponseDTO();
 
             List<AgentDTO> agentDTOs = response.getRowsList().stream()
-                .map(this::protoToDTOAgent)
-                .collect(Collectors.toList());
+                    .map(this::protoToDTOAgent)
+                    .collect(Collectors.toList());
 
             dto.setAgents(agentDTOs);
             dto.setTotal(response.getTotal());
@@ -66,8 +64,8 @@ public ListAgentsCommandsResponseDTO mapToListAgentsCommandsResponseDTO(ListAgen
             ListAgentsCommandsResponseDTO dto = new ListAgentsCommandsResponseDTO();
 
             List<AgentCommandDTO> agentCommandDTOs = response.getRowsList().stream()
-                .map(this::protoToDTOAgentCommand)
-                .collect(Collectors.toList());
+                    .map(this::protoToDTOAgentCommand)
+                    .collect(Collectors.toList());
 
             dto.setAgentCommands(agentCommandDTOs);
             dto.setTotal(response.getTotal());
@@ -87,6 +85,32 @@ public AgentDTO protoToDTOAgent(Agent agent) {
         return new AgentDTO(agent);
     }
 
+    public AuthResponseDTO protoToDTOAuthResponse(AuthResponse auth) {
+        return new AuthResponseDTO(auth);
+    }
+
+    public AuthResponseDTO updateAgentAttributes(AgentRequestVM agentRequestVM) throws Exception {
+        final String ctx = CLASSNAME + ".updateAgentAttributes";
+        try {
+            AgentRequest req = agentRequestVM.getAgentRequest();
+            Metadata customHeaders = new Metadata();
+            customHeaders.put(Metadata.Key.of("key", Metadata.ASCII_STRING_MARSHALLER), agentRequestVM.getAgentKey());
+            customHeaders.put(Metadata.Key.of("id", Metadata.ASCII_STRING_MARSHALLER), String.valueOf(agentRequestVM.getId()));
+
+            Channel intercept = ClientInterceptors.intercept(grpcManagedChannel, MetadataUtils.newAttachHeadersInterceptor(customHeaders));
+            AgentServiceGrpc.AgentServiceBlockingStub newStub = AgentServiceGrpc.newBlockingStub(intercept);
+            AuthResponse authResponse = newStub.updateAgent(req);
+            if (authResponse != null) {
+                return protoToDTOAuthResponse(authResponse);
+            } else {
+                throw new Exception("The agent manager didn't respond to the request, probably is down !!!");
+            }
+        } catch (NullPointerException e) {
+            throw new Exception("The agent manager didn't respond to the request, probably is down !!!");
+        } catch (Exception e) {
+            throw new Exception(ctx + ": " + e.getMessage());
+        }
+    }
 
     public AgentDTO updateAgentType(AgentTypeUpdate newType) throws Exception {
         final String ctx = CLASSNAME + ".updateAgentType";

backend/src/main/java/com/park/utmstack/service/dto/agent_manager/AuthResponseDTO.java

@@ -0,0 +1,30 @@
+package com.park.utmstack.service.dto.agent_manager;
+
+
+import com.park.utmstack.service.grpc.AuthResponse;
+
+public class AuthResponseDTO {
+    private int id;
+    private String key;
+
+    public AuthResponseDTO(AuthResponse authResponse) {
+        this.id = authResponse.getId();
+        this.key = authResponse.getKey();
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}