Merge pull request #12 from github/tmpdir-fixes

Entitlements `tmpdir` fixes

Author: GrantBirki

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    entitlements-gitrepo-auditor-plugin (0.2.1)
+    entitlements-gitrepo-auditor-plugin (0.2.2)
       contracts (= 0.17)
       entitlements (= 0.2.0)
 
@@ -28,16 +28,16 @@ GEM
       net-ldap (~> 0.17)
       octokit (~> 4.18)
       optimist (= 3.0.0)
-    faraday (2.5.2)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
     minitest (5.16.3)
-    net-ldap (0.17.1)
+    net-ldap (0.18.0)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)

VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

entitlements-gitrepo-auditor-plugin.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/github/entitlements-gitrepo-auditor-plugin"
   s.executables = %w[]
 
-  s.add_dependency "entitlements", "0.2.0"
   s.add_dependency "contracts", "0.17"
+  s.add_dependency "entitlements", "0.2.0"
 
   s.add_development_dependency "rake", "= 13.0.6"
   s.add_development_dependency "rspec", "= 3.8.0"

lib/entitlements/util/gitrepo.rb

@@ -38,6 +38,7 @@ def initialize(repo:, sshkey:, logger: Entitlements.logger)
         @repo = repo
         @sshkey = sshkey
         @github = "[email protected]:"
+        @tmpdir_prefix = ENV.fetch("ENTITLEMENTS_TMPDIR_PREFIX", "/data/entitlements_deploys")
       end
 
       # Run "git add" on a file.
@@ -206,7 +207,11 @@ def open3_git_execute(dir, commandline, ssh = false)
           # else custom that might be going on in the environment. Turn off prompts for the SSH key for
           # github.com being trusted or not, only use the provided key as the identity, and ignore any
           # ~/.ssh/config file the user running this might have set up.
-          tempdir = Dir.mktmpdir
+
+          # if the @tmpdir_prefix doesn't exist, create it
+          FileUtils.mkdir_p(@tmpdir_prefix) unless File.directory?(@tmpdir_prefix)
+          tempdir = Dir.mktmpdir(nil, @tmpdir_prefix)
+
           File.open(File.join(tempdir, "key"), "w") { |f| f.write(sshkey) }
           File.open(File.join(tempdir, "ssh"), "w") do |f|
             f.puts "#!/bin/sh"

spec/unit/entitlements/util/gitrepo_spec.rb

@@ -168,6 +168,9 @@
       allow(exitstatus).to receive(:exitstatus).and_return(0)
 
       begin
+        expect(FileUtils).to receive(:mkdir_p)
+          .and_return(true)
+
         tempdir = Dir.mktmpdir
         allow(Dir).to receive(:mktmpdir).and_return(tempdir)