code fix for rebase

Author: Akshay2191

internal/config/config.go

@@ -658,7 +658,7 @@ func registerClientFlags(fs *flag.FlagSet) {
 		DefMaxFileSize,
 		"Max file size in bytes.",
 	)
-	
+
 	fs.Duration(
 		ClientFileDownloadTimeoutKey,
 		DefClientFileDownloadTimeout,

internal/file/file_manager_service.go

@@ -47,8 +47,6 @@ const (
 	executePerm = 0o111
 )
 
-const fileDownloadTimeout = 60 * time.Second
-
 type DownloadHeader struct {
 	ETag         string
 	LastModified string
@@ -131,16 +129,16 @@ func NewFileManagerService(fileServiceClient mpi.FileServiceClient, agentConfig
 	manifestLock *sync.RWMutex,
 ) *FileManagerService {
 	return &FileManagerService{
-		agentConfig:            agentConfig,
-		fileOperator:           NewFileOperator(manifestLock),
-		fileServiceOperator:    NewFileServiceOperator(agentConfig, fileServiceClient, manifestLock),
-		fileActions:            make(map[string]*model.FileCache),
-		currentFilesOnDisk:     make(map[string]*mpi.File),
-		previousManifestFiles:  make(map[string]*model.ManifestFile),
-		externalFileHeaders:    make(map[string]DownloadHeader),
-		rollbackManifest:       true,
-		manifestFilePath:       agentConfig.LibDir + "/manifest.json",
-		manifestLock:           manifestLock,
+		agentConfig:           agentConfig,
+		fileOperator:          NewFileOperator(manifestLock),
+		fileServiceOperator:   NewFileServiceOperator(agentConfig, fileServiceClient, manifestLock),
+		fileActions:           make(map[string]*model.FileCache),
+		currentFilesOnDisk:    make(map[string]*mpi.File),
+		previousManifestFiles: make(map[string]*model.ManifestFile),
+		externalFileHeaders:   make(map[string]DownloadHeader),
+		rollbackManifest:      true,
+		manifestFilePath:      agentConfig.LibDir + "/manifest.json",
+		manifestLock:          manifestLock,
 	}
 }
 
@@ -401,22 +399,27 @@ func (fms *FileManagerService) DetermineFileActions(
 	for _, modifiedFile := range modifiedFiles {
 		fileName := modifiedFile.File.GetFileMeta().GetName()
 		currentFile, ok := filesMap[fileName]
-		// default to unchanged action
 		modifiedFile.Action = model.Unchanged
 
-		// if file is unmanaged, action is set to unchanged so file is skipped when performing actions
+		// If file is unmanaged, action is set to unchanged so file is skipped when performing actions.
 		if modifiedFile.File.GetUnmanaged() {
 			slog.DebugContext(ctx, "Skipping unmanaged file updates", "file_name", fileName)
 			continue
 		}
 
-		// If either the modified file or the current file has an external data source,
-		// treat this as an ExternalFile skip the regular Add/Update checks. This
-		// ensures external files are downloaded/validated every single time.
+		// If it's external, we DON'T care about disk state or hashes here.
+		// We tag it as ExternalFile and let the downloader handle the rest.
+		if modifiedFile.File.GetExternalDataSource() != nil || (ok && currentFile.GetExternalDataSource() != nil) {
+			slog.DebugContext(ctx, "External file detected - flagging for fetch", "file_name", fileName)
+			modifiedFile.Action = model.ExternalFile
+			fileDiff[fileName] = modifiedFile
+
+			continue
+		}
+
 		// If file currently exists on disk, is being tracked in manifest and file hash is different.
 		// Treat it as a file update.
-		if (ok && modifiedFile.File.GetFileMeta().GetHash() != currentFile.GetFileMeta().GetHash()) ||
-			modifiedFile.File.GetExternalDataSource() != nil || currentFile.GetExternalDataSource() != nil {
+		if ok && modifiedFile.File.GetFileMeta().GetHash() != currentFile.GetFileMeta().GetHash() {
 			slog.DebugContext(ctx, "Tracked file requires updating", "file_name", fileName)
 			modifiedFile.Action = model.Update
 			fileDiff[fileName] = modifiedFile
@@ -641,8 +644,8 @@ func (fms *FileManagerService) downloadUpdatedFilesToTempLocation(ctx context.Co
 	for _, fileAction := range fms.fileActions {
 		if fileAction.Action == model.ExternalFile || fileAction.Action == model.Add ||
 			fileAction.Action == model.Update {
-				downloadFiles = append(downloadFiles, fileAction)
-			}
+			downloadFiles = append(downloadFiles, fileAction)
+		}
 	}
 
 	if len(downloadFiles) == 0 {
@@ -655,7 +658,7 @@ func (fms *FileManagerService) downloadUpdatedFilesToTempLocation(ctx context.Co
 	for _, fileAction := range downloadFiles {
 		errGroup.Go(func() error {
 			tempFilePath := tempFilePath(fileAction.File.GetFileMeta().GetName())
-			
+
 			switch fileAction.Action {
 			case model.ExternalFile:
 				return fms.downloadExternalFile(errGroupCtx, fileAction, tempFilePath)
@@ -684,7 +687,7 @@ actionsLoop:
 	for _, fileAction := range fms.fileActions {
 		var err error
 		fileMeta := fileAction.File.GetFileMeta()
-		tempFilePath := tempFilePath(fileAction.File.GetFileMeta().GetName())
+		tempFilePath := tempFilePath(fileMeta.GetName())
 		switch fileAction.Action {
 		case model.Delete:
 			slog.DebugContext(ctx, "Deleting file", "file", fileMeta.GetName())
@@ -901,25 +904,11 @@ func (fms *FileManagerService) downloadExternalFile(ctx context.Context, fileAct
 	fileName := fileAction.File.GetFileMeta().GetName()
 	fms.externalFileHeaders[fileName] = headers
 
-	updateErr := fms.writeContentToTempFile(ctx, contentToWrite, filePath, permission)
-
-	return updateErr
-}
-
-func (fms *FileManagerService) writeContentToTempFile(
-	ctx context.Context,
-	content []byte,
-	path string,
-	permission string,
-) error {
 	writeErr := fms.fileOperator.Write(
 		ctx,
 		contentToWrite,
 		filePath,
 		permission,
-		content,
-		path,
-		permission,
 	)
 
 	if writeErr != nil {
@@ -1001,7 +990,7 @@ func isDomainAllowed(downloadURL string, allowedDomains []string) bool {
 	if hostname == "" {
 		return false
 	}
-	
+
 	for _, domain := range allowedDomains {
 		if domain == "" {
 			continue

internal/model/config.go

@@ -52,10 +52,6 @@ type ManifestFileMeta struct {
 	Referenced bool `json:"referenced"`
 	// File is not managed by the agent
 	Unmanaged bool `json:"unmanaged"`
-	// ETag of the 3rd Party external file
-	ETag string `json:"etag"`
-	// Last modified time of the 3rd Party external file
-	LastModified string `json:"last_modified"`
 }
 type ConfigApplyMessage struct {
 	Error         error