Add max file size config param

Author: dhurley

internal/config/config.go

@@ -361,6 +361,12 @@ func registerClientFlags(fs *flag.FlagSet) {
 		DefFileChunkSize,
 		"File chunk size in bytes.",
 	)
+
+	fs.Uint32(
+		ClientGRPCMaxFileSizeKey,
+		DefMaxFileSize,
+		"Max file size in bytes.",
+	)
 }
 
 func registerCommandFlags(fs *flag.FlagSet) {
@@ -696,6 +702,7 @@ func resolveClient() *Client {
 			MaxMessageSize:        viperInstance.GetInt(ClientGRPCMaxMessageSizeKey),
 			MaxMessageReceiveSize: viperInstance.GetInt(ClientGRPCMaxMessageReceiveSizeKey),
 			MaxMessageSendSize:    viperInstance.GetInt(ClientGRPCMaxMessageSendSizeKey),
+			MaxFileSize:           viperInstance.GetUint32(ClientGRPCMaxFileSizeKey),
 			FileChunkSize:         viperInstance.GetUint32(ClientGRPCFileChunkSizeKey),
 		},
 		Backoff: &BackOff{

internal/config/config_test.go

@@ -105,6 +105,7 @@ func checkDefaultsClientValues(t *testing.T, viperInstance *viper.Viper) {
 	assert.Equal(t, DefMaxMessageRecieveSize, viperInstance.GetInt(ClientGRPCMaxMessageReceiveSizeKey))
 	assert.Equal(t, DefMaxMessageSendSize, viperInstance.GetInt(ClientGRPCMaxMessageSendSizeKey))
 	assert.Equal(t, DefFileChunkSize, viperInstance.GetUint32(ClientGRPCFileChunkSizeKey))
+	assert.Equal(t, DefMaxFileSize, viperInstance.GetUint32(ClientGRPCMaxFileSizeKey))
 	assert.Equal(t, make(map[string]string), viperInstance.GetStringMapString(LabelsRootKey))
 }
 
@@ -782,6 +783,7 @@ func createConfig() *Config {
 				MaxMessageSize:        1048575,
 				MaxMessageReceiveSize: 1048575,
 				MaxMessageSendSize:    1048575,
+				MaxFileSize:           485753,
 				FileChunkSize:         48575,
 			},
 			Backoff: &BackOff{

internal/config/defaults.go

@@ -30,6 +30,7 @@ const (
 	DefMaxMessageSize               = 0       // 0 = unset
 	DefMaxMessageRecieveSize        = 4194304 // default 4 MB
 	DefMaxMessageSendSize           = 4194304 // default 4 MB
+	DefMaxFileSize           uint32 = 3145728 // 3MB
 	DefFileChunkSize         uint32 = 2097152 // 2MB
 
 	// Client HTTP Settings

internal/config/flags.go

@@ -36,6 +36,7 @@ var (
 	ClientGRPCMaxMessageSendSizeKey    = pre(ClientRootKey) + "grpc_max_message_send_size"
 	ClientGRPCMaxMessageReceiveSizeKey = pre(ClientRootKey) + "grpc_max_message_receive_size"
 	ClientGRPCMaxMessageSizeKey        = pre(ClientRootKey) + "grpc_max_message_size"
+	ClientGRPCMaxFileSizeKey           = pre(ClientRootKey) + "grpc_max_file_size"
 	ClientGRPCFileChunkSizeKey         = pre(ClientRootKey) + "grpc_file_chunk_size"
 
 	ClientBackoffInitialIntervalKey     = pre(ClientRootKey) + "backoff_initial_interval"

internal/config/testdata/nginx-agent.conf

@@ -35,6 +35,7 @@ client:
        max_message_size: 1048575
        max_message_receive_size: 1048575
        max_message_send_size: 1048575
+       max_file_size: 485753
        file_chunk_size: 48575
     backoff:
         initial_interval: 200ms

internal/config/types.go

@@ -86,6 +86,7 @@ type (
 		MaxMessageSize        int    `yaml:"max_message_size"         mapstructure:"max_message_size"`
 		MaxMessageReceiveSize int    `yaml:"max_message_receive_size" mapstructure:"max_message_receive_size"`
 		MaxMessageSendSize    int    `yaml:"max_message_send_size"    mapstructure:"max_message_send_size"`
+		MaxFileSize           uint32 `yaml:"max_file_size"            mapstructure:"max_file_size"`
 		FileChunkSize         uint32 `yaml:"file_chunk_size"          mapstructure:"file_chunk_size"`
 	}
 

internal/file/file_manager_service.go

@@ -246,10 +246,10 @@ func (fms *FileManagerService) UpdateFile(
 
 	slog.DebugContext(ctx, "Checking file size",
 		"file_size", fileToUpdate.GetFileMeta().GetSize(),
-		"max_message_send_size", int64(fms.agentConfig.Client.Grpc.MaxMessageSendSize),
+		"max_file_size", int64(fms.agentConfig.Client.Grpc.MaxFileSize),
 	)
 
-	if fileToUpdate.GetFileMeta().GetSize() <= int64(fms.agentConfig.Client.Grpc.MaxMessageSendSize) {
+	if fileToUpdate.GetFileMeta().GetSize() <= int64(fms.agentConfig.Client.Grpc.MaxFileSize) {
 		return fms.sendUpdateFileRequest(ctx, fileToUpdate)
 	}
 
@@ -614,7 +614,7 @@ func (fms *FileManagerService) executeFileActions(ctx context.Context) error {
 
 func (fms *FileManagerService) fileUpdate(ctx context.Context, file *mpi.File) error {
 	slog.DebugContext(ctx, "Updating file", "file", file.GetFileMeta().GetName())
-	if file.GetFileMeta().GetSize() <= int64(fms.agentConfig.Client.Grpc.MaxMessageReceiveSize) {
+	if file.GetFileMeta().GetSize() <= int64(fms.agentConfig.Client.Grpc.MaxFileSize) {
 		return fms.file(ctx, file)
 	}
 

test/types/config.go

@@ -50,6 +50,7 @@ func AgentConfig() *config.Config {
 				},
 				MaxMessageReceiveSize: 1,
 				MaxMessageSendSize:    1,
+				MaxFileSize:           1,
 				FileChunkSize:         1,
 			},
 			Backoff: &config.BackOff{