Rename to targetDir and tmpDir

Author: tchap

pkg/operator/staticpod/certsyncpod/certsync_controller.go

@@ -262,7 +262,7 @@ var realFS = fileSystem{
 func writeFiles[C string | []byte](
 	fs *fileSystem, eventRecorder events.Recorder,
 	typeName string, o metav1.ObjectMeta,
-	contentDir string, files map[string]C, filePerm os.FileMode,
+	targetDir string, files map[string]C, filePerm os.FileMode,
 ) error {
 	// We are doing to prepare a tmp directory and write all files into that directory.
 	// Then we are going to atomically swap the new data directory for the old one.
@@ -276,28 +276,28 @@ func writeFiles[C string | []byte](
 	// This would all just increase complexity and require atomic swap on the OS level anyway.
 
 	// In case the target directory does not exist, create it so that the directory not existing is not a special case.
-	klog.Infof("Ensuring target directory %q exists ...", contentDir)
-	if err := fs.MkdirAll(contentDir, 0755); err != nil && !os.IsExist(err) {
+	klog.Infof("Ensuring target directory %q exists ...", targetDir)
+	if err := fs.MkdirAll(targetDir, 0755); err != nil && !os.IsExist(err) {
 		eventRecorder.Warningf("CertificateUpdateFailed", "Failed creating content directory for %s: %s/%s: %v", typeName, o.Namespace, o.Name, err)
 		return err
 	}
 
 	// Create a tmp source directory to be swapped.
-	klog.Infof("Ensuring source directory %q exists ...", contentDir)
-	srcDir, err := fs.MkdirTemp(filepath.Dir(contentDir), filepath.Base(contentDir)+"-*")
+	klog.Infof("Ensuring source directory %q exists ...", targetDir)
+	tmpDir, err := fs.MkdirTemp(filepath.Dir(targetDir), filepath.Base(targetDir)+"-*")
 	if err != nil {
-		eventRecorder.Warningf("CertificateUpdateFailed", "Failed to create source directory for %s: %s/%s: %v", typeName, o.Namespace, o.Name, err)
+		eventRecorder.Warningf("CertificateUpdateFailed", "Failed to create temporary directory for %s: %s/%s: %v", typeName, o.Namespace, o.Name, err)
 		return err
 	}
 	defer func() {
-		if err := fs.RemoveAll(srcDir); err != nil {
-			klog.Errorf("Failed to remove source directory %q during cleanup: %v", srcDir, err)
+		if err := fs.RemoveAll(tmpDir); err != nil {
+			klog.Errorf("Failed to remove temporary directory %q during cleanup: %v", tmpDir, err)
 		}
 	}()
 
 	// Populate the tmp directory with files.
 	for filename, content := range files {
-		fullFilename := filepath.Join(srcDir, filename)
+		fullFilename := filepath.Join(tmpDir, filename)
 		klog.Infof("Writing %s manifest %q ...", typeName, fullFilename)
 
 		if err := fs.WriteFile(fullFilename, []byte(content), filePerm); err != nil {
@@ -307,9 +307,9 @@ func writeFiles[C string | []byte](
 	}
 
 	// Swap directories atomically.
-	klog.Infof("Atomically swapping target directory %q with source directory %q for %s: %s/%s ...", contentDir, srcDir, typeName, o.Namespace, o.Name)
-	if err := fs.SwapDirectoriesAtomic(contentDir, srcDir); err != nil {
-		eventRecorder.Warningf("CertificateUpdateFailed", "Failed to swap target directory %q with source directory %q for %s: %s/%s: %v", contentDir, srcDir, typeName, o.Namespace, o.Name, err)
+	klog.Infof("Atomically swapping target directory %q with temporary directory %q for %s: %s/%s ...", targetDir, tmpDir, typeName, o.Namespace, o.Name)
+	if err := fs.SwapDirectoriesAtomic(targetDir, tmpDir); err != nil {
+		eventRecorder.Warningf("CertificateUpdateFailed", "Failed to swap target directory %q with temporary directory %q for %s: %s/%s: %v", targetDir, tmpDir, typeName, o.Namespace, o.Name, err)
 		return err
 	}