From 104f002a07360dc9340d15dfb6b2d044fd043754 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 28 Nov 2021 11:29:28 +0300 Subject: fix(ops/besadii): Trim whitespace of auth tokens This is causing failures when trying to update Sourcegraph at least, for good measure I've trimmed both. Change-Id: I40266ee83b4e266ffe50f16bb365eb2e51952513 --- ops/besadii/main.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ops/besadii/main.go') diff --git a/ops/besadii/main.go b/ops/besadii/main.go index f862757504..9a1befa023 100644 --- a/ops/besadii/main.go +++ b/ops/besadii/main.go @@ -25,6 +25,7 @@ import ( "os" "path" "regexp" + "strings" ) var branchRegexp = regexp.MustCompile(`^refs/heads/(.*)$`) @@ -259,24 +260,26 @@ func refUpdatedMain() { os.Exit(0) } - buildkiteToken, err := ioutil.ReadFile("/etc/secrets/buildkite-besadii") + buildkiteTokenBytes, err := ioutil.ReadFile("/etc/secrets/buildkite-besadii") if err != nil { log.Alert(fmt.Sprintf("buildkite token could not be read: %s", err)) os.Exit(1) } + buildkiteToken := strings.TrimSpace(string(buildkiteTokenBytes)) - sourcegraphToken, err := ioutil.ReadFile("/etc/secrets/sourcegraph-token") + sourcegraphTokenBytes, err := ioutil.ReadFile("/etc/secrets/sourcegraph-token") if err != nil { log.Alert(fmt.Sprintf("sourcegraph token could not be read: %s", err)) os.Exit(1) } + sourcegraphToken := strings.TrimSpace(string(sourcegraphTokenBytes)) - err = triggerBuild(log, string(buildkiteToken), update) + err = triggerBuild(log, buildkiteToken, update) if err != nil { log.Err(fmt.Sprintf("failed to trigger Buildkite build: %s", err)) } - err = triggerIndexUpdate(string(sourcegraphToken)) + err = triggerIndexUpdate(sourcegraphToken) if err != nil { log.Err(fmt.Sprintf("failed to trigger sourcegraph index update: %s", err)) } -- cgit 1.4.1