ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-08-07 17:34:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: trim whitespace from register inputs (#1147)

Browse Source 
Secrets often carry a trailing newline, for example from `echo "token" | base64`, which made `register --no-interactive` fail with `runner registration token not found`. The interactive path already trims typed values, this aligns the flag path.

Related to: https://gitea.com/gitea/runner/issues/727

Reviewed-on: https://gitea.com/gitea/runner/pulls/1147
Reviewed-by: techknowlogick <9+techknowlogick@noreply.gitea.com>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
silverwind
2026-08-06 15:50:16 +00:00
committed by silverwind
parent 1d6c6ffef9
commit 09b643bc14
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/cmd/register.go
View File

@@ -230,9 +230,9 @@ func initInputs(regArgs *registerArgs) (*registerInputs, error) {
token = envToken token = envToken
} }
inputs := &registerInputs{ inputs := &registerInputs{
InstanceAddr: regArgs.InstanceAddr, InstanceAddr: strings.TrimSpace(regArgs.InstanceAddr),
Token: token, Token: strings.TrimSpace(token),
RunnerName: regArgs.RunnerName, RunnerName: strings.TrimSpace(regArgs.RunnerName),
Ephemeral: regArgs.Ephemeral, Ephemeral: regArgs.Ephemeral,
} }
regArgs.Labels = strings.TrimSpace(regArgs.Labels) regArgs.Labels = strings.TrimSpace(regArgs.Labels)

6
internal/app/cmd/register_test.go
View File

@@ -185,8 +185,8 @@ func TestInitInputs(t *testing.T) {
t.Setenv(registerTokenEnvVar, "from-env") t.Setenv(registerTokenEnvVar, "from-env")
inputs, err := initInputs(&registerArgs{ inputs, err := initInputs(&registerArgs{
InstanceAddr: " http://localhost:3000 ", InstanceAddr: " http://localhost:3000 ",
Token: "from-plain-arg", Token: "from-plain-arg\n",
RunnerName: "runner", RunnerName: "runner\n",
Ephemeral: true, Ephemeral: true,
Labels: " ubuntu:host , ubuntu:docker://node:18 ", Labels: " ubuntu:host , ubuntu:docker://node:18 ",
}) })
@@ -203,7 +203,7 @@ func TestInitInputs(t *testing.T) {
tokenFile, createErr := os.CreateTemp(t.TempDir(), "from-file") tokenFile, createErr := os.CreateTemp(t.TempDir(), "from-file")
require.NoError(t, createErr) require.NoError(t, createErr)
defer tokenFile.Close() defer tokenFile.Close()
_, writeErr := tokenFile.WriteString("from-file") _, writeErr := tokenFile.WriteString("from-file\n")
require.NoError(t, writeErr) require.NoError(t, writeErr)
_ = tokenFile.Sync() _ = tokenFile.Sync()