artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 17:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(sg): resolve overwrite env ordering in sg (#63838)" (#63924)

Browse Source 
https://github.com/sourcegraph/sourcegraph/pull/63838 accidentally broke
the local-dev site configuration workflow (the site-configuration from
local dev was replaced with a stock configuration).

 Reverting this is probably the fastest way to resolve this. 

See https://sourcegraph.slack.com/archives/C07KZF47K/p1721329375844059
for more context.

## Test plan

CI

## Changelog

- The flawed env overwriting logic in sg from
https://github.com/sourcegraph/sourcegraph/pull/63838 has been reverted.
This commit is contained in:
Geoffrey Gilmore 2024-07-18 13:46:35 -07:00 committed by GitHub
parent fcdcfef706
commit 12570e4ee4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/sg/internal/run/BUILD.bazel
View File

@ -43,7 +43,6 @@ go_test(
srcs = [
"docker_command_test.go",
"logger_test.go",
"run_test.go",
],
embed = [":run"],
tags = [TAG_INFRA_DEVINFRA],

11
dev/sg/internal/run/command.go
View File

@ -265,7 +265,7 @@ type outputOptions struct {
}
func startSgCmd(ctx context.Context, cmd SGConfigCommand, parentEnv map[string]string) (*startedCmd, error) {
ex, err := cmd.GetExecCmd(ctx)
exec, err := cmd.GetExecCmd(ctx)
if err != nil {
return nil, err
}
@ -279,12 +279,9 @@ func startSgCmd(ctx context.Context, cmd SGConfigCommand, parentEnv map[string]s
}
opts := commandOptions{
name: conf.Name,
exec: ex,
// The ordering here is quite important because we want to allow the `parentEnv` and `secretsEnv`
// to override the config values for a command. This ensures env vars in the sg overwrite file
// are always the final authority.
env: makeEnv(conf.Env, parentEnv, secretsEnv),
name: conf.Name,
exec: exec,
env: makeEnv(parentEnv, secretsEnv, conf.Env),
dir: conf.RepositoryRoot,
stdout: outputOptions{ignore: conf.IgnoreStdout},
stderr: outputOptions{ignore: conf.IgnoreStderr},

56
dev/sg/internal/run/run_test.go
View File

@ -1,56 +0,0 @@
package run
import (
"os"
"testing"
)
func TestMakeEnvMap(t *testing.T) {
env1 := map[string]string{
"SRC_TEST_ENV_NAME": "SRC_TEST_ENV_VALUE",
}
env2 := map[string]string{
"SRC_TEST_ENV_NAME": "SRC_TEST_ENV_VALUE2",
}
env3 := map[string]string{
"SRC_TEST_ENV_NAME": "SRC_TEST_ENV_VALUE3",
}
testcases := []struct {
envs []map[string]string
want string
}{
{
envs: []map[string]string{env1},
want: "SRC_TEST_ENV_VALUE",
},
{
envs: []map[string]string{env1, env2},
want: "SRC_TEST_ENV_VALUE2",
},
{
envs: []map[string]string{env1, env2, env3},
want: "SRC_TEST_ENV_VALUE3",
},
}
t.Run("rightmost value takes precedence", func(t *testing.T) {
for _, tc := range testcases {
if got := makeEnvMap(tc.envs...); got["SRC_TEST_ENV_NAME"] != tc.want {
t.Errorf("makeEnvMap(%v) = %v, want %v", tc.envs, got, tc.want)
}
}
})
t.Run("os.Environ() is included and not overwritten", func(t *testing.T) {
if err := os.Setenv("SRC_TEST_ENV_NAME", "PROCESS_ENV_VALUE"); err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
os.Unsetenv("SRC_TEST_ENV_NAME")
})
if got := makeEnvMap(env1); got["SRC_TEST_ENV_NAME"] != "PROCESS_ENV_VALUE" {
t.Errorf("makeEnvMap(%v) = %v, want %v", env1, got, "PROCESS_ENV_VALUE")
}
})
}