fix: pass git auth config read from environment through server (#6540)

ammario · web-flow · commit 50432b89bec7 · 2023-03-09T20:27:54.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -650,8 +650,9 @@ flags, and YAML configuration. The precedence is as follows:
 				return xerrors.Errorf("read git auth providers from env: %w", err)
 			}
 
+			cfg.GitAuthProviders.Value = append(cfg.GitAuthProviders.Value, gitAuthEnv...)
 			gitAuthConfigs, err := gitauth.ConvertConfig(
-				append(cfg.GitAuthProviders.Value, gitAuthEnv...),
+				cfg.GitAuthProviders.Value,
 				cfg.AccessURL.Value(),
 			)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -650,8 +650,9 @@ flags, and YAML configuration. The precedence is as follows:`
`650`	`650`	`return xerrors.Errorf("read git auth providers from env: %w", err)`
`651`	`651`	`}`
`652`	`652`
	`653`	`+ cfg.GitAuthProviders.Value = append(cfg.GitAuthProviders.Value, gitAuthEnv...)`
`653`	`654`	`gitAuthConfigs, err := gitauth.ConvertConfig(`
`654`		`- append(cfg.GitAuthProviders.Value, gitAuthEnv...),`
	`655`	`+ cfg.GitAuthProviders.Value,`
`655`	`656`	`cfg.AccessURL.Value(),`
`656`	`657`	`)`
`657`	`658`	`if err != nil {`