Skip to content

Merge Release 3.4.2 back into main #1357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sean-breen merged 2 commits into from
Oct 24, 2025
Merged

Merge Release 3.4.2 back into main #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a3998
avoid deleting unmanaged files during config apply (#1338)
sean-breen Oct 17, 2025
2c18bfe
Update atomic writes logic to create hidden files in same directory a…
dhurley Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ permissions:

env:
NFPM_VERSION: 'v2.35.3'
GOPROXY: "direct"
GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"

jobs:
proxy-sanity-check:
Expand Down
24 changes: 24 additions & 0 deletions internal/datasource/config/nginx_config_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,29 @@ const (
locationDirective = "location"
)

var globFunction = func(path string) ([]string, error) {
matches, err := filepath.Glob(path)
if err != nil {
return nil, err
}

// Exclude hidden files unless the glob pattern itself starts with a dot
if !strings.HasPrefix(filepath.Base(path), ".") {
filteredMatches := make([]string, 0)

for _, match := range matches {
base := filepath.Base(match)
if !strings.HasPrefix(base, ".") {
filteredMatches = append(filteredMatches, match)
}
}

return filteredMatches, nil
}

return matches, nil
}

//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6@v6.8.1 -generate
//counterfeiter:generate . ConfigParser

Expand Down Expand Up @@ -95,6 +118,7 @@ func (ncp *NginxConfigParser) Parse(ctx context.Context, instance *mpi.Instance)
LexOptions: crossplane.LexOptions{
Lexers: []crossplane.RegisterLexer{lua.RegisterLexer()},
},
Glob: globFunction,
},
)
if err != nil {
Expand Down
113 changes: 53 additions & 60 deletions internal/file/file_manager_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"fmt"
"log/slog"
"os"
"path"
"path/filepath"
"strconv"
"sync"
Expand Down Expand Up @@ -82,7 +81,6 @@ type (
err error)
Rollback(ctx context.Context, instanceID string) error
ClearCache()
SetConfigPath(configPath string)
ConfigUpload(ctx context.Context, configUploadRequest *mpi.ConfigUploadRequest) error
ConfigUpdate(ctx context.Context, nginxConfigContext *model.NginxConfigContext)
UpdateCurrentFilesOnDisk(ctx context.Context, updateFiles map[string]*mpi.File, referenced bool) error
Expand All @@ -108,9 +106,6 @@ type FileManagerService struct {
currentFilesOnDisk map[string]*mpi.File // key is file path
previousManifestFiles map[string]*model.ManifestFile
manifestFilePath string
tempConfigDir string
tempRollbackDir string
tempConfigPath string
rollbackManifest bool
filesMutex sync.RWMutex
}
Expand All @@ -131,11 +126,6 @@ func NewFileManagerService(fileServiceClient mpi.FileServiceClient, agentConfig
}
}

func (fms *FileManagerService) SetConfigPath(configPath string) {
fms.tempConfigPath = fmt.Sprintf("%s/.agent-%s", filepath.Dir(configPath), fms.agentConfig.UUID)
fms.ClearCache()
}

func (fms *FileManagerService) ResetClient(ctx context.Context, fileServiceClient mpi.FileServiceClient) {
fms.fileServiceOperator.UpdateClient(ctx, fileServiceClient)
slog.DebugContext(ctx, "File manager service reset client successfully")
Expand All @@ -152,16 +142,14 @@ func (fms *FileManagerService) SetIsConnected(isConnected bool) {
func (fms *FileManagerService) ConfigApply(ctx context.Context,
configApplyRequest *mpi.ConfigApplyRequest,
) (status model.WriteStatus, err error) {
var configTempErr error
var rollbackTempErr error

fms.rollbackManifest = true
fileOverview := configApplyRequest.GetOverview()

if fileOverview == nil {
return model.Error, errors.New("fileOverview is nil")
}

// check if any file in request is outside the allowed directories
allowedErr := fms.checkAllowedDirectory(fileOverview.GetFiles())
if allowedErr != nil {
return model.Error, allowedErr
Expand All @@ -188,16 +176,6 @@ func (fms *FileManagerService) ConfigApply(ctx context.Context,

fms.fileActions = diffFiles

fms.tempConfigDir, configTempErr = fms.createTempConfigDirectory("config")
if configTempErr != nil {
return model.Error, configTempErr
}

fms.tempRollbackDir, rollbackTempErr = fms.createTempConfigDirectory("rollback")
if rollbackTempErr != nil {
return model.Error, rollbackTempErr
}

rollbackTempFilesErr := fms.backupFiles(ctx)
if rollbackTempFilesErr != nil {
return model.Error, rollbackTempFilesErr
Expand All @@ -219,14 +197,22 @@ func (fms *FileManagerService) ConfigApply(ctx context.Context,
}

func (fms *FileManagerService) ClearCache() {
slog.Debug("Clearing cache and temp files")
clear(fms.fileActions)
clear(fms.previousManifestFiles)
slog.Debug("Clearing cache and backup files")

configErr := os.RemoveAll(fms.tempConfigPath)
if configErr != nil && !os.IsNotExist(configErr) {
slog.Error("Error removing temp directory", "path", fms.tempConfigDir, "err", configErr)
for _, fileAction := range fms.fileActions {
if fileAction.Action == model.Update || fileAction.Action == model.Delete {
tempFilePath := tempBackupFilePath(fileAction.File.GetFileMeta().GetName())
if err := os.Remove(tempFilePath); err != nil && !os.IsNotExist(err) {
slog.Warn("Unable to delete backup file",
"file", fileAction.File.GetFileMeta().GetName(),
"error", err,
)
}
}
}

clear(fms.fileActions)
clear(fms.previousManifestFiles)
}

//nolint:revive,cyclop // cognitive-complexity of 13 max is 12, loop is needed cant be broken up
Expand Down Expand Up @@ -355,18 +341,28 @@ func (fms *FileManagerService) DetermineFileActions(
// if file is in manifestFiles but not in modified files, file has been deleted
// copy contents, set file action
for fileName, manifestFile := range filesMap {
_, exists := modifiedFiles[fileName]
_, existsInReq := modifiedFiles[fileName]

// allowed directories may have been updated since manifest file was written
// if file is outside allowed directories skip deletion and return error
if !fms.agentConfig.IsDirectoryAllowed(fileName) {
return nil, fmt.Errorf("error deleting file %s: file not in allowed directories", fileName)
}

// if file is unmanaged skip deletion
if manifestFile.GetUnmanaged() {
slog.DebugContext(ctx, "Skipping unmanaged file deletion", "file_name", fileName)
continue
}

// if file doesn't exist on disk skip deletion
if _, err := os.Stat(fileName); os.IsNotExist(err) {
slog.DebugContext(ctx, "File already deleted, skipping", "file", fileName)
continue
}

if !exists {
// go ahead and delete the file
if !existsInReq {
fileDiff[fileName] = &model.FileCache{
File: manifestFile,
Action: model.Delete,
Expand All @@ -382,6 +378,7 @@ func (fms *FileManagerService) DetermineFileActions(

// 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 file doesn't exist in the current files, file has been added
Expand Down Expand Up @@ -490,7 +487,7 @@ func (fms *FileManagerService) backupFiles(ctx context.Context) error {
continue
}

tempFilePath := filepath.Join(fms.tempRollbackDir, filePath)
tempFilePath := tempBackupFilePath(filePath)
slog.DebugContext(ctx, "Attempting to backup file content since file exists", "temp_path", tempFilePath)

moveErr := fms.fileOperator.MoveFile(ctx, filePath, tempFilePath)
Expand All @@ -507,7 +504,7 @@ func (fms *FileManagerService) restoreFiles(fileAction *model.FileCache) ([]byte
fileMeta := fileAction.File.GetFileMeta()
fileName := fileMeta.GetName()

tempFilePath := filepath.Join(fms.tempRollbackDir, fileName)
tempFilePath := tempBackupFilePath(fileName)

// Create parent directories for the target file if they don't exist
if err := os.MkdirAll(filepath.Dir(fileName), dirPerm); err != nil {
Expand Down Expand Up @@ -558,26 +555,24 @@ func (fms *FileManagerService) manifestFile() (map[string]*model.ManifestFile, m

func (fms *FileManagerService) executeFileActions(ctx context.Context) (actionError error) {
// Download files to temporary location
downloadError := fms.downloadUpdatedFilesToTempLocation(ctx, fms.tempConfigDir)
downloadError := fms.downloadUpdatedFilesToTempLocation(ctx)
if downloadError != nil {
return downloadError
}

// Remove temp files if there is a failure moving or deleting files
actionError = fms.moveOrDeleteFiles(ctx, fms.tempConfigDir, actionError)
actionError = fms.moveOrDeleteFiles(ctx, actionError)
if actionError != nil {
fms.deleteTempFiles(ctx, fms.tempConfigDir)
fms.deleteTempFiles(ctx)
}

return actionError
}

func (fms *FileManagerService) downloadUpdatedFilesToTempLocation(
ctx context.Context, tempDir string,
) (updateError error) {
func (fms *FileManagerService) downloadUpdatedFilesToTempLocation(ctx context.Context) (updateError error) {
for _, fileAction := range fms.fileActions {
if fileAction.Action == model.Add || fileAction.Action == model.Update {
tempFilePath := filepath.Join(tempDir, fileAction.File.GetFileMeta().GetName())
tempFilePath := tempFilePath(fileAction.File.GetFileMeta().GetName())

slog.DebugContext(
ctx,
Expand All @@ -596,7 +591,7 @@ func (fms *FileManagerService) downloadUpdatedFilesToTempLocation(
return updateError
}

func (fms *FileManagerService) moveOrDeleteFiles(ctx context.Context, tempDir string, actionError error) error {
func (fms *FileManagerService) moveOrDeleteFiles(ctx context.Context, actionError error) error {
actionsLoop:
for _, fileAction := range fms.fileActions {
switch fileAction.Action {
Expand All @@ -612,7 +607,8 @@ actionsLoop:
continue
case model.Add, model.Update:
fileMeta := fileAction.File.GetFileMeta()
err := fms.fileServiceOperator.RenameFile(ctx, fileMeta.GetHash(), fileMeta.GetName(), tempDir)
tempFilePath := tempFilePath(fileAction.File.GetFileMeta().GetName())
err := fms.fileServiceOperator.RenameFile(ctx, fileMeta.GetHash(), tempFilePath, fileMeta.GetName())
if err != nil {
actionError = err

Expand All @@ -626,11 +622,11 @@ actionsLoop:
return actionError
}

func (fms *FileManagerService) deleteTempFiles(ctx context.Context, tempDir string) {
func (fms *FileManagerService) deleteTempFiles(ctx context.Context) {
for _, fileAction := range fms.fileActions {
if fileAction.Action == model.Add || fileAction.Action == model.Update {
tempFile := path.Join(tempDir, fileAction.File.GetFileMeta().GetName())
if err := os.Remove(tempFile); err != nil && !os.IsNotExist(err) {
tempFilePath := tempFilePath(fileAction.File.GetFileMeta().GetName())
if err := os.Remove(tempFilePath); err != nil && !os.IsNotExist(err) {
slog.ErrorContext(
ctx, "Error deleting temp file",
"file", fileAction.File.GetFileMeta().GetName(),
Expand Down Expand Up @@ -729,6 +725,7 @@ func (fms *FileManagerService) convertToManifestFile(file *mpi.File, referenced
Size: file.GetFileMeta().GetSize(),
Hash: file.GetFileMeta().GetHash(),
Referenced: referenced,
Unmanaged: file.GetUnmanaged(),
},
}
}
Expand All @@ -750,24 +747,10 @@ func (fms *FileManagerService) convertToFile(manifestFile *model.ManifestFile) *
Hash: manifestFile.ManifestFileMeta.Hash,
Size: manifestFile.ManifestFileMeta.Size,
},
Unmanaged: manifestFile.ManifestFileMeta.Unmanaged,
}
}

func (fms *FileManagerService) createTempConfigDirectory(pattern string) (string, error) {
if _, err := os.Stat(fms.tempConfigPath); os.IsNotExist(err) {
mkdirErr := os.MkdirAll(fms.tempConfigPath, dirPerm)
if mkdirErr != nil {
return "", mkdirErr
}
}
tempDir, tempDirError := os.MkdirTemp(fms.tempConfigPath, pattern)
if tempDirError != nil {
return "", fmt.Errorf("failed creating temp config directory: %w", tempDirError)
}

return tempDir, nil
}

// ConvertToMapOfFiles converts a list of files to a map of file caches (file and action) with the file name as the key
func ConvertToMapOfFileCache(convertFiles []*mpi.File) map[string]*model.FileCache {
filesMap := make(map[string]*model.FileCache)
Expand All @@ -779,3 +762,13 @@ func ConvertToMapOfFileCache(convertFiles []*mpi.File) map[string]*model.FileCac

return filesMap
}

func tempFilePath(fileName string) string {
tempFileName := "." + filepath.Base(fileName) + ".agent.tmp"
return filepath.Join(filepath.Dir(fileName), tempFileName)
}

func tempBackupFilePath(fileName string) string {
tempFileName := "." + filepath.Base(fileName) + ".agent.backup"
return filepath.Join(filepath.Dir(fileName), tempFileName)
}
Loading
Loading