entitlements-gitrepo-auditor-plugin 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 455dd4cda4e2c0ff4a773fcbcd338ad6740c8a95c3b9a8ac0d83b74fabc5b66d
-  data.tar.gz: 403c4a015ec1194ec2893d9cda6e08899ff7c3f4b8e18204a5fee5bf997d1bfd
+  metadata.gz: cec2139fc013bc07143df36a94c202b19885c321a865dc04f4cc4b7fcd89ff84
+  data.tar.gz: 322e32c601936b2c92e5e0fd75eba4d45e47f9f6c71a288615dd9a190f7cf935
 SHA512:
-  metadata.gz: c3658fb94cc8688456e4ff749c9c632657afffc0a2522e53a7c5d4fd79ef93dad35f303d8ed14e3d2fe08fdce391ac914b2220e4ac9b63bba0b6aac978599b72
-  data.tar.gz: 3c4d4c59d9d335017255f9db3cb72467b5573b870ed10218c36d2213216901cf01a7200d9aa0c749626d96aedb7113292433206812aa1db3819601e78a92abcf
+  metadata.gz: d8c2c6cba3b20be04281e9841ecee40fe64489d1e359aa79fdadaf3fec3c5c578b11a5141696f0560a27a9891a6f24c5ac3ceda6ddc4a5ad2c95322abb43c002
+  data.tar.gz: 7a38198735a8e682a562ed4f711d0c9e8e8167b9b8d543930e51bafce3c0fba4ebb0286799ce28f8c5246abc2c1bf785aa3e98bbfca5344107f73c1e748f582d

data/lib/entitlements/auditor/gitrepo.rb

@@ -26,7 +26,7 @@ module Entitlements
         @repo = Entitlements::Util::GitRepo.new(
           repo: config["repo"],
           sshkey: Base64.decode64(config["sshkey"]),
-          logger: logger
+          logger:
         )
         @repo.github = config["github_override"] if config["github_override"]
         @repo.send(operation, checkout_directory)
@@ -59,10 +59,10 @@ module Entitlements
         %w[update_files delete_files].each do |m|
           send(
             m.to_sym,
-            action_hash: action_hash,
-            successful_actions: successful_actions,
-            sync_changes: sync_changes,
-            valid_changes: valid_changes
+            action_hash:,
+            successful_actions:,
+            sync_changes:,
+            valid_changes:
           )
         end
 

data/lib/entitlements/util/gitrepo.rb

@@ -38,6 +38,7 @@ module Entitlements
         @repo = repo
         @sshkey = sshkey
         @github = "git@github.com:"
+        @tmpdir_prefix = ENV.fetch("ENTITLEMENTS_TMPDIR_PREFIX", "/data/entitlements_deploys")
       end
 
       # Run "git add" on a file.
@@ -79,7 +80,11 @@ module Entitlements
       Contract String, String => nil
       def commit(dir, commit_message)
         validate_git_repository!(dir)
-        git(dir, ["commit", "-m", commit_message])
+        begin
+          git(dir, ["commit", "-m", commit_message])
+        rescue Entitlements::Util::GitRepo::CommandError
+          logger.info "No changes to git repository"
+        end
         nil
       end
 
@@ -202,7 +207,11 @@ module Entitlements
           # 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"

data/lib/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Entitlements
+  module Version
+    VERSION = "0.3.0"
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: entitlements-gitrepo-auditor-plugin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - GitHub, Inc. Security Ops
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: entitlements
+  name: contracts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
-  name: contracts
+  name: entitlements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +192,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.4.2
-description: ''
+description: Entitlements plugin for a robust audit log
 email: opensource+entitlements-app@github.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- VERSION
 - lib/entitlements/auditor/gitrepo.rb
 - lib/entitlements/util/gitrepo.rb
+- lib/version.rb
 homepage: https://github.com/github/entitlements-gitrepo-auditor-plugin
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Entitlements GitRepo Auditor
 test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.2.0