-
Notifications
You must be signed in to change notification settings - Fork 356
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* go.sum addition * pass proxy env variables to agent container * clarifying some comments * updating comments * proxy vars from agent config * formatting files * linting and documentation * proxy vars do not override existing vars * added friendlier formatting and code cleanup
- Loading branch information
Showing
7 changed files
with
145 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package internal | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/docker/docker/api/types/container" | ||
| "github.com/golang-collections/collections/set" | ||
| ) | ||
|
|
||
| func TestNoAddProxy(t *testing.T) { | ||
| inputEnv := container.Config{} | ||
| testAgent := agent{} | ||
|
|
||
| inputEnv.Env = []string{ | ||
| "FIRST_VAR=1", | ||
| } | ||
|
|
||
| // InputEnv should not change because we didn't set any environment variables. | ||
| ans := append([]string{}, inputEnv.Env...) | ||
|
|
||
| testAgent.addProxy(&inputEnv) | ||
|
|
||
| if !compareSlices(inputEnv.Env, ans) { | ||
| t.Errorf("Expected: %v But got: %v", ans, inputEnv.Env) | ||
| } | ||
| } | ||
|
|
||
| func TestAddProxy(t *testing.T) { | ||
| inputEnv := container.Config{} | ||
| testAgent := agent{} | ||
|
|
||
| inputEnv.Env = []string{ | ||
| "FIRST_VAR=1", | ||
| } | ||
|
|
||
| testAgent.Options.HTTPProxy = "192.168.1.1" | ||
| testAgent.Options.HTTPSProxy = "192.168.1.2" | ||
| testAgent.Options.FTPProxy = "192.168.1.3" | ||
| testAgent.Options.NoProxy = "*.test.com" | ||
|
|
||
| ans := append(inputEnv.Env, []string{ | ||
| "HTTP_PROXY=192.168.1.1", | ||
| "HTTPS_PROXY=192.168.1.2", | ||
| "FTP_PROXY=192.168.1.3", | ||
| "NO_PROXY=*.test.com", | ||
| }...) | ||
|
|
||
| testAgent.addProxy(&inputEnv) | ||
|
|
||
| if !compareSlices(inputEnv.Env, ans) { | ||
| t.Errorf("Expected: %v But got: %v", ans, inputEnv.Env) | ||
| } | ||
| } | ||
|
|
||
| func TestAlreadyAddedProxy(t *testing.T) { | ||
| inputEnv := container.Config{} | ||
| testAgent := agent{} | ||
|
|
||
| inputEnv.Env = []string{ | ||
| "FIRST_VAR=1", | ||
| "HTTP_PROXY=10.0.0.1", | ||
| } | ||
|
|
||
| testAgent.Options.HTTPProxy = "10.0.0.2" | ||
|
|
||
| // InputEnv should not change because existing config should not be overridden | ||
| ans := append([]string{}, inputEnv.Env...) | ||
|
|
||
| testAgent.addProxy(&inputEnv) | ||
|
|
||
| if !compareSlices(inputEnv.Env, ans) { | ||
| t.Errorf("Expected: %v But got: %v", ans, inputEnv.Env) | ||
| } | ||
| } | ||
|
|
||
| func compareSlices(env []string, ans []string) bool { | ||
| output := set.New() | ||
| correct := set.New() | ||
|
|
||
| for _, v := range env { | ||
| output.Insert(v) | ||
| } | ||
|
|
||
| for _, v := range ans { | ||
| correct.Insert(v) | ||
| } | ||
|
|
||
| if diff := output.Difference(correct); diff.Len() != 0 { | ||
| return false | ||
| } | ||
| return true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters