Skip to content

Rename github.com/docker/swarmkit/agent/exec/container => .../dockerapi#1969

Merged
aaronlehmann merged 1 commit intomoby:masterfrom
ijc:renaming-container-to-dockerapi
Feb 22, 2017
Merged

Rename github.com/docker/swarmkit/agent/exec/container => .../dockerapi#1969
aaronlehmann merged 1 commit intomoby:masterfrom
ijc:renaming-container-to-dockerapi

Conversation

@ijc
Copy link
Copy Markdown
Contributor

@ijc ijc commented Feb 20, 2017

This reflects the true nature of the backend.

Signed-off-by: Ian Campbell ian.campbell@docker.com

As discussed in #1965 (comment) and followups.

This is just a single git mv agent/exec/{container,dockerapi} and a one line edit. Seems too easy. I wonder what I've missed...

@codecov-io
Copy link
Copy Markdown

codecov-io commented Feb 20, 2017

Codecov Report

Merging #1969 into master will increase coverage by 0.15%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1969      +/-   ##
==========================================
+ Coverage   53.47%   53.62%   +0.15%     
==========================================
  Files         109      109              
  Lines       18919    18919              
==========================================
+ Hits        10116    10146      +30     
+ Misses       7570     7533      -37     
- Partials     1233     1240       +7

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update be6e3d3...1894c42. Read the comment docs.

@AkihiroSuda
Copy link
Copy Markdown
Member

probably it is better to change package name as well

@ijc
Copy link
Copy Markdown
Contributor Author

ijc commented Feb 20, 2017

@AkihiroSuda I knew there would be something I missed ;-). I'm a bit surprised it even built...

@ijc ijc force-pushed the renaming-container-to-dockerapi branch from 9658a30 to e3c7f1d Compare February 20, 2017 13:30
@ijc
Copy link
Copy Markdown
Contributor Author

ijc commented Feb 20, 2017

A quick sed on the package lines opened up the sorts of errors I'd have expected (and should have been more suspicious of the absence of):

cmd/swarmd/main.go:14: imported and not used: "github.com/docker/swarmkit/agent/exec/dockerapi"
cmd/swarmd/main.go:154: undefined: container in container.NewExecutor

I also came to share these sentiments https://github.com/docker/swarmkit/blob/master/agent/exec/container/controller_test.go#L28...

Anyway, fixed.

@aaronlehmann
Copy link
Copy Markdown
Collaborator

LGTM

@stevvooe
Copy link
Copy Markdown
Contributor

LGTM

Looks like there is a rebase required.

This reflects the true nature of the backend.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
@ijc ijc force-pushed the renaming-container-to-dockerapi branch from e3c7f1d to 1894c42 Compare February 22, 2017 10:23
@ijc
Copy link
Copy Markdown
Contributor Author

ijc commented Feb 22, 2017

Rebased. Seeing as how this is a bulk rename it will likely conflict with any PR which touches agent/exec/container (at least the rebase is trivial), perhaps we should coordinate a time for a quick rebase + push + merge turnaround if this one doesn't survive long enough to get merged.

@aaronlehmann aaronlehmann merged commit 4dbc0a3 into moby:master Feb 22, 2017
@ijc ijc deleted the renaming-container-to-dockerapi branch February 23, 2017 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants