From 38b459efada62d59d5dfdf35141f251605769199 Mon Sep 17 00:00:00 2001 From: Henri Maurer Date: Thu, 15 Sep 2022 10:09:46 +0000 Subject: [PATCH 1/2] Fix passing repo-token input in scan_pr script --- scripts/scan_pr | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/scan_pr b/scripts/scan_pr index 2189213..b9ef8c3 100755 --- a/scripts/scan_pr +++ b/scripts/scan_pr @@ -32,17 +32,23 @@ event_file = Tempfile.new event_file.write("{ \"pull_request\": #{pr.to_h.to_json}}") event_file.close -dev_cmd_env = { - "INPUT_REPO-TOKEN" => github_token, - "GITHUB_REPOSITORY" => repo_nwo, - "GITHUB_EVENT_NAME" => "pull_request", - "GITHUB_EVENT_PATH" => event_file.path +action_inputs = { + "repo-token" => github_token } -dev_cmd = "./node_modules/.bin/nodemon --exec \"node -r esbuild-register\" src/main.ts" +dev_cmd_env = { + "GITHUB_REPOSITORY" => repo_nwo, + "GITHUB_EVENT_NAME" => "pull_request", + "GITHUB_EVENT_PATH" => event_file.path, + "GITHUB_STEP_SUMMARY" => "/dev/null" +} + +action_inputs_env_str = action_inputs.map { |name, value| "\"INPUT_#{name.upcase}=#{value}\"" }.join(" ") + +dev_cmd = "./node_modules/.bin/nodemon --exec \"env #{action_inputs_env_str} node -r esbuild-register\" src/main.ts" Open3.popen2e(dev_cmd_env, dev_cmd) do |stdin, out| while line = out.gets - puts line + puts line.gsub(github_token, "") end end From 5da34621524690f9e7c2a98c9badd1132787c3d6 Mon Sep 17 00:00:00 2001 From: Federico Builes Date: Fri, 16 Sep 2022 13:47:16 +0200 Subject: [PATCH 2/2] Explain why we mangle dashed variables. --- scripts/scan_pr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/scan_pr b/scripts/scan_pr index b9ef8c3..c2293ca 100755 --- a/scripts/scan_pr +++ b/scripts/scan_pr @@ -43,8 +43,10 @@ dev_cmd_env = { "GITHUB_STEP_SUMMARY" => "/dev/null" } +# bash does not like variable names with dashes like the ones Actions +# uses (e.g. INPUT_REPO-TOKEN). Passing them through `env` instead of +# manually setting them does the job. action_inputs_env_str = action_inputs.map { |name, value| "\"INPUT_#{name.upcase}=#{value}\"" }.join(" ") - dev_cmd = "./node_modules/.bin/nodemon --exec \"env #{action_inputs_env_str} node -r esbuild-register\" src/main.ts" Open3.popen2e(dev_cmd_env, dev_cmd) do |stdin, out|