Skip to content

Conversation

@tiborvass
Copy link
Collaborator

@tiborvass tiborvass commented Jan 26, 2019

Signed-off-by: Tonis Tiigi [email protected]
Signed-off-by: Tibor Vass [email protected]

@tiborvass tiborvass requested a review from vdemeester January 26, 2019 05:24
@tiborvass
Copy link
Collaborator Author

cc @tonistiigi

@tiborvass tiborvass force-pushed the better-dep-graph-auth-type branch from 9d07350 to 0d8485a Compare January 26, 2019 05:29
@tiborvass tiborvass changed the title config: refactor to untangle dependency graph Remove docker api dependency from cli/config Jan 26, 2019
@tiborvass tiborvass force-pushed the better-dep-graph-auth-type branch from 0d8485a to 2f04b24 Compare January 26, 2019 06:17
@codecov-io
Copy link

Codecov Report

Merging #1642 into master will increase coverage by <.01%.
The diff coverage is 68%.

@@            Coverage Diff             @@
##           master    #1642      +/-   ##
==========================================
+ Coverage   55.69%   55.69%   +<.01%     
==========================================
  Files         301      301              
  Lines       20470    20484      +14     
==========================================
+ Hits        11400    11409       +9     
- Misses       8250     8252       +2     
- Partials      820      823       +3

@codecov-io
Copy link

codecov-io commented Jan 26, 2019

Codecov Report

Merging #1642 into master will increase coverage by <.01%.
The diff coverage is 69.23%.

@@            Coverage Diff             @@
##           master    #1642      +/-   ##
==========================================
+ Coverage   56.11%   56.11%   +<.01%     
==========================================
  Files         306      306              
  Lines       20895    20909      +14     
==========================================
+ Hits        11725    11734       +9     
- Misses       8326     8328       +2     
- Partials      844      847       +3

// ParseProxyConfig computes proxy configuration by retrieving the config for the provided host and
// then checking this against any environment variables provided to the container
func (configFile *ConfigFile) ParseProxyConfig(host string, runOpts []string) map[string]*string {
func (configFile *ConfigFile) ParseProxyConfig(host string, runOpts map[string]*string) map[string]*string {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, funny, I was working on some refactoring for this a while back related to #1574 (I see I have two implementations, but trying to recall now what was the main difference; 24e1f96 and f0f3511 (master...thaJeztah:refactor_proxy_config and master...thaJeztah:refactor_proxy_config2)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, related to that; perhaps you could review #1573 😇

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think they are equivalent refactors. I'm trying to remove dependency of docker/docker from cli/config. It's not pretty but this is what I have :)

Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 💇‍♂️

@tonistiigi
Copy link
Member

@thaJeztah mergeable?

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

left two comments, but otherwise looks good

Signed-off-by: Tonis Tiigi <[email protected]>
Signed-off-by: Tibor Vass <[email protected]>
@tiborvass tiborvass force-pushed the better-dep-graph-auth-type branch from 2f04b24 to 27b2797 Compare January 31, 2019 21:25
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants