Merge pull request #8189 from chef/git_and_gems

Backport git resource fix in #8179 and update win32-certstore

2 files changed, 13 insertions, 3 deletions

diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb
index 5845f869d8..5a22da9e86 100644
--- a/lib/chef/provider/git.rb
+++ b/lib/chef/provider/git.rb
@@ -151,7 +151,7 @@ class Chef
       end
 
       def clone
-        converge_by("clone from #{new_resource.repository} into #{cwd}") do
+        converge_by("clone from #{repo_url} into #{cwd}") do
           remote = new_resource.remote
 
           clone_cmd = ["clone"]
@@ -161,7 +161,7 @@ class Chef
           clone_cmd << "\"#{new_resource.repository}\""
           clone_cmd << "\"#{cwd}\""
 
-          logger.info "#{new_resource} cloning repo #{new_resource.repository} to #{cwd}"
+          logger.info "#{new_resource} cloning repo #{repo_url} to #{cwd}"
           git clone_cmd
         end
       end
@@ -342,6 +342,16 @@ class Chef
         string =~ /^[0-9a-f]{40}$/
       end
 
+      # Returns a message for sensitive repository URL if sensitive is true otherwise
+      # repository URL is returned
+      # @return [String]
+      def repo_url
+        if new_resource.sensitive
+          "**Suppressed Sensitive URL**"
+        else
+          new_resource.repository
+        end
+      end
     end
   end
 end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 18a995ed40..c372f42004 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -318,7 +318,7 @@ GEM
     tomlrb (1.2.8)
     uuidtools (2.1.5)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.2.2)
+    win32-certstore (0.2.3)
       ffi
       mixlib-shellout
     win32-dir (0.5.1)