Refactor checking directory permissions

snowflakedb · Jan 30, 2024 · 59945da · 59945da
1 parent 6524998
commit 59945da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Snowflake.Data.Tests/UnitTests/Session/EasyLoggingStarterTest.cs b/Snowflake.Data.Tests/UnitTests/Session/EasyLoggingStarterTest.cs
@@ -125,7 +125,7 @@ public void TestThatThrowsErrorWhenLogPathIsNotSetAndHomeDirectoryThrowsAnExcept
         }
 
         [Test]
-        public void TestThatDoesNotFailWhenDirectoryPermissionIsNot600Or700()
+        public void TestThatDoesNotFailWhenExistingDirectoryContainsUnexpectedPermissions()
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
@@ -137,8 +137,8 @@ public void TestThatDoesNotFailWhenDirectoryPermissionIsNot600Or700()
                 .Setup(provider => provider.ProvideConfig(ConfigPath))
                 .Returns(s_configWithInfoLevel);
             t_directoryOperations
-                .Setup(dir => dir.Exists(ConfigPath))
-                .Returns(false);
+                .Setup(dir => dir.Exists(s_expectedLogPath))
+                .Returns(true);
             t_unixOperations
                 .Setup(unix => unix.GetDirPermissions(s_expectedLogPath))
                 .Returns(FileAccessPermissions.AllPermissions);
@@ -148,7 +148,7 @@ public void TestThatDoesNotFailWhenDirectoryPermissionIsNot600Or700()
 
             // assert
             t_unixOperations.Verify(u => u.CreateDirectoryWithPermissions(s_expectedLogPath,
-                FilePermissions.S_IRUSR | FilePermissions.S_IWUSR | FilePermissions.S_IXUSR), Times.Once);
+                FilePermissions.S_IRUSR | FilePermissions.S_IWUSR | FilePermissions.S_IXUSR), Times.Never);
         }
 
         [Test]

diff --git a/Snowflake.Data/Core/Session/EasyLoggingStarter.cs b/Snowflake.Data/Core/Session/EasyLoggingStarter.cs
@@ -135,9 +135,12 @@ private string GetLogPath(string logPath)
                     }
                     _unixOperations.CreateDirectoryWithPermissions(pathWithDotnetSubdirectory,
                         FilePermissions.S_IRUSR | FilePermissions.S_IWUSR | FilePermissions.S_IXUSR);
-                    CheckDirPermissionsOnlyAllowUser(pathWithDotnetSubdirectory);
                 }
             }
+            else
+            {
+                CheckDirPermissionsOnlyAllowUser(pathWithDotnetSubdirectory);
+            }
 
             return pathWithDotnetSubdirectory;
         }