Fix home dir detection on windows

puppetlabs · Apr 11, 2024 · 2e03f72 · 2e03f72
1 parent f1d9f4d
commit 2e03f72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
@@ -734,11 +734,11 @@ def exec_git(*args)
     exec_args = {
       failonfail: true,
       combine: true,
-      custom_environment: { 'HOME' => Etc.getpwuid(Process.uid).dir }
+      custom_environment: { 'HOME' => Dir.home },
     }
 
     if @resource.value(:user) && @resource.value(:user) != Facter['id'].value
-      exec_args[:custom_environment] = { 'HOME' => Etc.getpwnam(@resource.value(:user)).dir }
+      exec_args[:custom_environment] = { 'HOME' => Dir.home(@resource.value(:user)) }
       exec_args[:uid] = @resource.value(:user)
     end
     withumask do

diff --git a/metadata.json b/metadata.json
@@ -7,10 +7,17 @@
   "source": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
   "project_page": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
   "issues_url": "https://github.com/puppetlabs/puppetlabs-vcsrepo/issues",
-  "dependencies": [
-
-  ],
+  "dependencies": [],
   "operatingsystem_support": [
+    {
+      "operatingsystem": "Windows",
+      "operatingsystemrelease": [
+        "10",
+        "11",
+        "2019",
+        "2022"
+      ]
+    },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [

diff --git a/spec/acceptance/clone_repo_spec.rb b/spec/acceptance/clone_repo_spec.rb
@@ -216,6 +216,8 @@
     pp = <<-MANIFEST
     user { 'vagrant':
       ensure => present,
+      groups => 'vagrant',
+      password => 'CorrectHorseBatteryStaple0!',
     }
     MANIFEST
 
@@ -369,6 +371,7 @@
       user { 'testuser':
         ensure => present,
         groups => 'testuser',
+        password => 'CorrectHorseBatteryStaple0!',
       }
       MANIFEST