review comments update

Author: Akshay2191

internal/config/config.go

@@ -1622,6 +1622,7 @@ func resolveExternalDataSource() *ExternalDataSource {
 	}
 
 	if err := validateAllowedDomains(externalDataSource.AllowedDomains); err != nil {
+		slog.Error("External data source not configured due to invalid configuration", "error", err)
 		return nil
 	}
 
@@ -1636,7 +1637,6 @@ func validateAllowedDomains(domains []string) error {
 	for _, domain := range domains {
 		// Validating syntax using the RFC-compliant regex
 		if !domainRegex.MatchString(domain) || domain == "" {
-			slog.Error("domain specified in allowed_domains is invalid", "domain", domain)
 			return errors.New("invalid domain found in allowed_domains")
 		}
 	}

internal/file/external_file_operator.go

@@ -45,7 +45,7 @@ func (efo *ExternalFileOperator) DownloadExternalFile(ctx context.Context, fileA
 	permission := fileAction.File.GetFileMeta().GetPermissions()
 	fileName := fileAction.File.GetFileMeta().GetName()
 
-	slog.InfoContext(ctx, "Downloading external file from", "location", location)
+	slog.InfoContext(ctx, "Downloading external file", "location", location)
 
 	var contentToWrite []byte
 	var downloadErr, updateError error
@@ -150,7 +150,8 @@ func (efo *ExternalFileOperator) downloadFileContent(ctx context.Context, file *
 		headers.ETag = resp.Header.Get("ETag")
 		headers.LastModified = resp.Header.Get("Last-Modified")
 	case http.StatusNotModified:
-		slog.DebugContext(ctx, "File content unchanged (304 Not Modified)", "file_name", fileName)
+		slog.InfoContext(ctx, "Received 304 status code in response from external data source, "+
+			"file has not been modified", "file_name", fileName)
 		// return empty content but preserve headers if present
 		header := DownloadHeader{
 			ETag:         resp.Header.Get("ETag"),

internal/file/file_manager_service.go

@@ -703,7 +703,7 @@ actionsLoop:
 		tempFilePath := tempFilePath(fileMeta.GetName())
 		switch fileAction.Action {
 		case model.Delete:
-			slog.DebugContext(ctx, "Deleting file", "file", fileMeta.GetName())
+			slog.InfoContext(ctx, "Deleting file", "file", fileMeta.GetName())
 			if err = os.Remove(fileMeta.GetName()); err != nil && !os.IsNotExist(err) {
 				actionError = fmt.Errorf("error deleting file: %s error: %w",
 					fileMeta.GetName(), err)

internal/file/file_plugin.go

@@ -7,6 +7,7 @@ package file
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"sync"
@@ -352,14 +353,16 @@ func (fp *FilePlugin) handleConfigApplyRequest(ctx context.Context, msg *bus.Mes
 		if rollbackErr != nil {
 			// include both the original apply error and the rollback error so the management plane
 			// receives actionable information about what failed during apply and what failed during rollback
-			combinedErr := fmt.Sprintf("apply error: %s; rollback error: %s", err.Error(), rollbackErr.Error())
+			applyErr := fmt.Errorf("config apply error: %w", err)
+			rbErr := fmt.Errorf("rollback error: %w", rollbackErr)
+			combinedErr := errors.Join(applyErr, rbErr)
 
 			rollbackResponse := fp.createDataPlaneResponse(
 				correlationID,
 				mpi.CommandResponse_COMMAND_STATUS_FAILURE,
 				"Config apply failed, rollback failed",
 				instanceID,
-				combinedErr,
+				combinedErr.Error(),
 			)
 
 			fp.messagePipe.Process(ctx, &bus.Message{Topic: bus.ConfigApplyCompleteTopic, Data: rollbackResponse})