Skip to content

Commit a94cb15

Browse files
aphralGaphralG
committed
tests
1 parent 810f132 commit a94cb15

File tree

3 files changed

+67
-68
lines changed

3 files changed

+67
-68
lines changed

‎internal/file/file_manager_service.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ func (fms *FileManagerService) DetermineFileActions(
484484
fileContents := make(map[string][]byte) // contents of the file, key is file name
485485

486486
manifestFiles, filesMap, manifestFileErr := fms.manifestFile()
487+
slog.Info("DetermineFileActions - Manifest files: ", "", manifestFiles)
487488

488489
if manifestFileErr != nil {
489490
if errors.Is(manifestFileErr, os.ErrNotExist) {
@@ -597,6 +598,8 @@ func (fms *FileManagerService) UpdateManifestFile(currentFiles map[string]*mpi.F
597598

598599
manifestFiles := fms.convertToManifestFileMap(currentFiles, referenced)
599600

601+
slog.Info("Current Manifest Files", "", currentManifestFiles)
602+
600603
// During a config apply every file is set to unreferenced
601604
// When a new NGINX config context is detected
602605
// we update the files in the manifest by setting the referenced bool to true

‎internal/file/file_manager_service_test.go‎

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,6 @@ func TestFileManagerService_DetermineFileActions(t *testing.T) {
497497
unmanagedErr := os.WriteFile(unmanagedFile.Name(), unmanagedFileContent, 0o600)
498498
require.NoError(t, unmanagedErr)
499499

500-
manifestDirPath = tempDir
501-
manifestFilePath = manifestDirPath + "/manifest.json"
502-
503500
tests := []struct {
504501
expectedError error
505502
modifiedFiles map[string]*model.FileCache
@@ -508,69 +505,69 @@ func TestFileManagerService_DetermineFileActions(t *testing.T) {
508505
expectedContent map[string][]byte
509506
name string
510507
}{
511-
// {
512-
// name: "Test 1: Add, Update & Delete Files",
513-
// modifiedFiles: map[string]*model.FileCache{
514-
// addTestFileName: {
515-
// File: &mpi.File{
516-
// FileMeta: protos.FileMeta(addTestFileName, files.GenerateHash(fileContent)),
517-
// Unmanaged: false,
518-
// },
519-
// },
520-
// updateTestFile.Name(): {
521-
// File: &mpi.File{
522-
// FileMeta: protos.FileMeta(updateTestFile.Name(), files.GenerateHash(updatedFileContent)),
523-
// Unmanaged: false,
524-
// },
525-
// },
526-
// unmanagedFile.Name(): {
527-
// File: &mpi.File{
528-
// FileMeta: protos.FileMeta(unmanagedFile.Name(), files.GenerateHash(unmanagedFileContent)),
529-
// Unmanaged: true,
530-
// },
531-
// },
532-
// },
533-
// currentFiles: map[string]*mpi.File{
534-
// deleteTestFile.Name(): {
535-
// FileMeta: protos.FileMeta(deleteTestFile.Name(), files.GenerateHash(fileContent)),
536-
// },
537-
// updateTestFile.Name(): {
538-
// FileMeta: protos.FileMeta(updateTestFile.Name(), files.GenerateHash(fileContent)),
539-
// },
540-
// unmanagedFile.Name(): {
541-
// FileMeta: protos.FileMeta(unmanagedFile.Name(), files.GenerateHash(fileContent)),
542-
// Unmanaged: true,
543-
// },
544-
// },
545-
// expectedCache: map[string]*model.FileCache{
546-
// deleteTestFile.Name(): {
547-
// File: &mpi.File{
548-
// FileMeta: protos.ManifestFileMeta(deleteTestFile.Name(), files.GenerateHash(fileContent)),
549-
// Unmanaged: false,
550-
// },
551-
// Action: model.Delete,
552-
// },
553-
// updateTestFile.Name(): {
554-
// File: &mpi.File{
555-
// FileMeta: protos.FileMeta(updateTestFile.Name(), files.GenerateHash(updatedFileContent)),
556-
// Unmanaged: false,
557-
// },
558-
// Action: model.Update,
559-
// },
560-
// addTestFileName: {
561-
// File: &mpi.File{
562-
// FileMeta: protos.FileMeta(addTestFileName, files.GenerateHash(fileContent)),
563-
// Unmanaged: false,
564-
// },
565-
// Action: model.Add,
566-
// },
567-
// },
568-
// expectedContent: map[string][]byte{
569-
// deleteTestFile.Name(): fileContent,
570-
// updateTestFile.Name(): updatedFileContent,
571-
// },
572-
// expectedError: nil,
573-
// },
508+
{
509+
name: "Test 1: Add, Update & Delete Files",
510+
modifiedFiles: map[string]*model.FileCache{
511+
addTestFileName: {
512+
File: &mpi.File{
513+
FileMeta: protos.FileMeta(addTestFileName, files.GenerateHash(fileContent)),
514+
Unmanaged: false,
515+
},
516+
},
517+
updateTestFile.Name(): {
518+
File: &mpi.File{
519+
FileMeta: protos.FileMeta(updateTestFile.Name(), files.GenerateHash(updatedFileContent)),
520+
Unmanaged: false,
521+
},
522+
},
523+
unmanagedFile.Name(): {
524+
File: &mpi.File{
525+
FileMeta: protos.FileMeta(unmanagedFile.Name(), files.GenerateHash(unmanagedFileContent)),
526+
Unmanaged: true,
527+
},
528+
},
529+
},
530+
currentFiles: map[string]*mpi.File{
531+
deleteTestFile.Name(): {
532+
FileMeta: protos.FileMeta(deleteTestFile.Name(), files.GenerateHash(fileContent)),
533+
},
534+
updateTestFile.Name(): {
535+
FileMeta: protos.FileMeta(updateTestFile.Name(), files.GenerateHash(fileContent)),
536+
},
537+
unmanagedFile.Name(): {
538+
FileMeta: protos.FileMeta(unmanagedFile.Name(), files.GenerateHash(fileContent)),
539+
Unmanaged: true,
540+
},
541+
},
542+
expectedCache: map[string]*model.FileCache{
543+
deleteTestFile.Name(): {
544+
File: &mpi.File{
545+
FileMeta: protos.ManifestFileMeta(deleteTestFile.Name(), files.GenerateHash(fileContent)),
546+
Unmanaged: false,
547+
},
548+
Action: model.Delete,
549+
},
550+
updateTestFile.Name(): {
551+
File: &mpi.File{
552+
FileMeta: protos.FileMeta(updateTestFile.Name(), files.GenerateHash(updatedFileContent)),
553+
Unmanaged: false,
554+
},
555+
Action: model.Update,
556+
},
557+
addTestFileName: {
558+
File: &mpi.File{
559+
FileMeta: protos.FileMeta(addTestFileName, files.GenerateHash(fileContent)),
560+
Unmanaged: false,
561+
},
562+
Action: model.Add,
563+
},
564+
},
565+
expectedContent: map[string][]byte{
566+
deleteTestFile.Name(): fileContent,
567+
updateTestFile.Name(): updatedFileContent,
568+
},
569+
expectedError: nil,
570+
},
574571
{
575572
name: "Test 2: Files same as on disk",
576573
modifiedFiles: map[string]*model.FileCache{

‎test/helpers/os_utils.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package helpers
77

88
import (
99
"errors"
10-
"log/slog"
1110
"os"
1211
"regexp"
1312
"strings"
@@ -42,7 +41,7 @@ func CreateManifestDirWithErrorCheck(t testing.TB, dir, manifestFileName string)
4241
t.Helper()
4342

4443
if _, err := os.Stat(dir + manifestFileName); !errors.Is(err, os.ErrNotExist) {
45-
slog.Info("Manifest file exists, deleting", "", dir+manifestFileName)
44+
t.Logf("Manifest file exists, deleting: %s", dir+manifestFileName)
4645
removeErr := os.Remove(dir + manifestFileName)
4746
require.NoError(t, removeErr)
4847
}

0 commit comments

Comments
 (0)