PR feedback

Author: aphralG

internal/file/file_service_operator.go

@@ -79,10 +79,7 @@ func (fso *FileServiceOperator) File(
 	defer backoffCancel()
 
 	getFile := func() (*mpi.GetFileResponse, error) {
-		grpcCtx, cancel := context.WithTimeout(ctx, fso.agentConfig.Client.Grpc.ResponseTimeout)
-		defer cancel()
-
-		return fso.fileServiceClient.GetFile(grpcCtx, &mpi.GetFileRequest{
+		return fso.fileServiceClient.GetFile(ctx, &mpi.GetFileRequest{
 			MessageMeta: &mpi.MessageMeta{
 				MessageId:     id.GenerateMessageID(),
 				CorrelationId: logger.CorrelationID(ctx),
@@ -231,10 +228,7 @@ func (fso *FileServiceOperator) ChunkedFile(
 ) error {
 	slog.DebugContext(ctx, "Getting chunked file", "file", file.GetFileMeta().GetName())
 
-	grpcCtx, cancel := context.WithTimeout(ctx, fso.agentConfig.Client.Grpc.ResponseTimeout)
-	defer cancel()
-
-	stream, err := fso.fileServiceClient.GetFileStream(grpcCtx, &mpi.GetFileRequest{
+	stream, err := fso.fileServiceClient.GetFileStream(ctx, &mpi.GetFileRequest{
 		MessageMeta: &mpi.MessageMeta{
 			MessageId:     id.GenerateMessageID(),
 			CorrelationId: logger.CorrelationID(ctx),
@@ -380,15 +374,12 @@ func (fso *FileServiceOperator) sendUpdateFileRequest(
 			return nil, errors.New("CreateConnection rpc has not being called yet")
 		}
 
-		grpcCtx, cancel := context.WithTimeout(ctx, fso.agentConfig.Client.Grpc.ResponseTimeout)
-		defer cancel()
-
-		response, updateError := fso.fileServiceClient.UpdateFile(grpcCtx, request)
+		response, updateError := fso.fileServiceClient.UpdateFile(ctx, request)
 
 		validatedError := internalgrpc.ValidateGrpcError(updateError)
 
 		if validatedError != nil {
-			slog.ErrorContext(grpcCtx, "Failed to send update file", "error", validatedError)
+			slog.ErrorContext(ctx, "Failed to send update file", "error", validatedError)
 
 			return nil, validatedError
 		}
@@ -418,10 +409,7 @@ func (fso *FileServiceOperator) sendUpdateFileStream(
 		return errors.New("file chunk size must be greater than zero")
 	}
 
-	grpcCtx, cancel := context.WithTimeout(ctx, fso.agentConfig.Client.Grpc.ResponseTimeout)
-	defer cancel()
-
-	updateFileStreamClient, err := fso.fileServiceClient.UpdateFileStream(grpcCtx)
+	updateFileStreamClient, err := fso.fileServiceClient.UpdateFileStream(ctx)
 	if err != nil {
 		return err
 	}

nginx-agent.conf

@@ -17,7 +17,6 @@ allowed_directories:
     - /usr/share/nginx/modules
     - /var/run/nginx
     - /var/log/nginx
-    - /etc/test
 
 #
 # Command server settings to connect to a management plane server

test/mock/grpc/mock_management_command_service.go

@@ -113,6 +113,8 @@ func (cs *CommandService) CreateConnection(
 ) {
 	slog.DebugContext(ctx, "Create connection request", "request", request)
 
+	// This checks if this is the first create connection call, this is done to test the logic in Agent where
+	// if Agent does not get a response to a request after a certain amount of time it will resend the request
 	if !cs.firstConnectionCallFlag {
 		cs.firstConnectionCallFlag = true
 		slog.DebugContext(ctx, "First CreateConnection call: blocking until second call")