Fix missed conversions from OpenStruct to Hash

zendesk · Mar 12, 2020 · 7214f9b · 7214f9b
1 parent bf386d1
commit 7214f9b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/models/git_repository.rb b/app/models/git_repository.rb
@@ -187,7 +187,6 @@ def capture_stdout(*command, dir: repo_cache_dir)
       *command,
       whitelist_env: ['HOME', 'PATH'],
       timeout: 30.minutes,
-      err: '/dev/null',
       dir: dir
     )
     unless result[:status]

diff --git a/plugins/gcloud/lib/samson_gcloud/tag_resolver.rb b/plugins/gcloud/lib/samson_gcloud/tag_resolver.rb
@@ -17,7 +17,7 @@ def resolve_docker_image_tag(image)
           whitelist_env: ["PATH"]
         )
         raise "GCLOUD ERROR: unable to resolve #{image}\n#{result[:error]}" unless result[:status]
-        digest = JSON.parse(result.output).dig_fetch("image_summary", "digest")
+        digest = JSON.parse(result[:output]).dig_fetch("image_summary", "digest")
 
         base = image.split(":", 2).first
         "#{base}@#{digest}"

diff --git a/test/lib/samson/command_executor_test.rb b/test/lib/samson/command_executor_test.rb
@@ -23,7 +23,7 @@
 
     it "runs in specified directory" do
       Dir.mktmpdir("foobar") do |dir|
-        Samson::CommandExecutor.execute("pwd", timeout: 1, dir: dir).output.must_include dir
+        Samson::CommandExecutor.execute("pwd", timeout: 1, dir: dir)[:output].must_include dir
       end
     end
 
@@ -101,7 +101,7 @@
     it "does not allow env access" do
       with_env FOO: 'bar' do
         Samson::CommandExecutor.execute("printenv", "FOO", timeout: 1).must_equal(status: false, error: "", output: "")
-      end
+      end 
     end
 
     it "can set env" do