Use protobuf functions and locks

Author: bjee19

internal/controller/nginx/agent/deployment.go

@@ -199,15 +199,21 @@ func (d *Deployment) SetFiles(files []File, volumeMounts []v1.VolumeMount) *broa
 		fileOverviews = append(fileOverviews, &pb.File{FileMeta: file.Meta})
 	}
 
-	volumeIgnoreFiles := make([]string, 0, len(d.latestFileNames))
-	for _, f := range d.latestFileNames {
-		for _, vm := range volumeMounts {
+	// To avoid duplicates, use a set for volume ignore files
+	volumeIgnoreSet := make(map[string]struct{}, len(d.latestFileNames))
+	for _, vm := range volumeMounts {
+		for _, f := range d.latestFileNames {
 			if strings.HasPrefix(f, vm.MountPath) {
-				volumeIgnoreFiles = append(volumeIgnoreFiles, f)
+				volumeIgnoreSet[f] = struct{}{}
 			}
 		}
 	}
 
+	volumeIgnoreFiles := make([]string, 0, len(volumeIgnoreSet))
+	for f := range volumeIgnoreSet {
+		volumeIgnoreFiles = append(volumeIgnoreFiles, f)
+	}
+
 	// add ignored files to the overview as 'unmanaged' so agent doesn't touch them
 	for _, f := range append(ignoreFiles, volumeIgnoreFiles...) {
 		meta := &pb.FileMeta{

internal/controller/nginx/agent/file.go

@@ -202,15 +202,17 @@ func (fs *fileService) UpdateOverview(
 		return &pb.UpdateOverviewResponse{}, status.Errorf(codes.NotFound, "deployment not found in store")
 	}
 
-	if req != nil && req.Overview != nil && req.Overview.Files != nil {
-		fileNames := make([]string, 0, len(req.Overview.Files))
-		for _, f := range req.Overview.Files {
-			fileNames = append(fileNames, f.FileMeta.GetName())
-		}
+	requestFiles := req.GetOverview().GetFiles()
 
-		deployment.latestFileNames = fileNames
+	fileNames := make([]string, 0, len(requestFiles))
+	for _, f := range requestFiles {
+		fileNames = append(fileNames, f.GetFileMeta().GetName())
 	}
 
+	deployment.FileLock.Lock()
+	deployment.latestFileNames = fileNames
+	deployment.FileLock.Unlock()
+
 	return &pb.UpdateOverviewResponse{}, nil
 }