Skip to content

Remove docker api dependency from cli/config - #1642

Merged
thaJeztah merged 1 commit into
docker:masterfrom
tiborvass:better-dep-graph-auth-type
Jan 31, 2019
Merged

Remove docker api dependency from cli/config#1642
thaJeztah merged 1 commit into
docker:masterfrom
tiborvass:better-dep-graph-auth-type

Conversation

@tiborvass

@tiborvasstiborvass commented Jan 26, 2019•
edited
Loading

Copy link
Copy Markdown
Collaborator

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com
Signed-off-by: Tibor Vass tibor@docker.com

@tiborvass

tiborvass commented Jan 26, 2019

Copy link
Copy Markdown
CollaboratorAuthor

cc @tonistiigi

@tiborvass
tiborvassforce-pushed the better-dep-graph-auth-type branch from 9d07350 to 0d8485aCompareJanuary 26, 2019 05:29
@tiborvasstiborvass changed the title config: refactor to untangle dependency graphRemove docker api dependency from cli/configJan 26, 2019
@tiborvass
tiborvassforce-pushed the better-dep-graph-auth-type branch from 0d8485a to 2f04b24CompareJanuary 26, 2019 06:17
@codecov-io

codecov-io commented Jan 26, 2019

Copy link
Copy Markdown

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

codecov-io commented Jan 26, 2019•
edited
Loading

Copy link
Copy Markdown

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

@tiborvasstiborvass mentioned this pull request Jan 26, 2019
Merged
3 tasks
thaJeztah
thaJeztah reviewed Jan 29, 2019
View reviewed changes
Comment threadcli/config/configfile/file.go
// 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 {

@thaJeztahthaJeztahJan 29, 2019

Copy link
Copy Markdown
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)

@thaJeztahthaJeztahJan 29, 2019

Copy link
Copy Markdown
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 😇

@tiborvasstiborvassJan 29, 2019

Copy link
Copy Markdown
CollaboratorAuthor

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 :)

Comment threadcli/config/credentials/file_store.go
vdemeester
vdemeester approved these changes Jan 29, 2019
View reviewed changes

@vdemeestervdemeester left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM 💇‍♂️

@tonistiigi

tonistiigi commented Jan 30, 2019

Copy link
Copy Markdown
Member

@thaJeztah mergeable?

silvin-lubecki
silvin-lubecki approved these changes Jan 31, 2019
View reviewed changes

@silvin-lubeckisilvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

thaJeztah
thaJeztah requested changes Jan 31, 2019
View reviewed changes

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

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

Comment threadcli/command/container/run.go
Comment threadcli/config/credentials/file_store.go
@tonistiigiTibor Vass
Remove docker api dependency from cli/config
27b2797
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass
tiborvassforce-pushed the better-dep-graph-auth-type branch from 2f04b24 to 27b2797CompareJanuary 31, 2019 21:25
thaJeztah
thaJeztah approved these changes Jan 31, 2019
View reviewed changes

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

@thaJeztah
thaJeztah merged commit 2344627 into docker:masterJan 31, 2019
@GordonTheTurtleGordonTheTurtle added this to the 19.03.0 milestone Jan 31, 2019
@thaJeztahthaJeztah mentioned this pull request May 10, 2022
Merged
@thaJeztahthaJeztah mentioned this pull request Dec 12, 2022
Open
This was referenced Aug 25, 2025
Merged
Merged
This was referenced Sep 29, 2025
Merged
Merged
@thaJeztahthaJeztah mentioned this pull request Dec 4, 2025
Draft
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigitonistiigitonistiigi approved these changes
@thaJeztahthaJeztahthaJeztah approved these changes
@silvin-lubeckisilvin-lubeckisilvin-lubecki approved these changes
+1 more reviewer
@vdemeestervdemeestervdemeester approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

19.03.0

Development

Successfully merging this pull request may close these issues.

7 participants

@tiborvass@codecov-io@tonistiigi@vdemeester@thaJeztah@silvin-lubecki@GordonTheTurtle