docker-archive / deploykit

A toolkit for creating and managing declarative, self-healing infrastructure.
Apache License 2.0
2.25k stars 264 forks source link

Migrate vendor.conf to Dep #877

Closed johnmccabe closed 6 years ago

johnmccabe commented 6 years ago

This PR migrates the current Rancher Trash based vendor.conf dependency file to Dep.

Of note in the Gopkg.toml:

The bulk of the changes in the vendor dir are due to Dep pruning non-Go files more aggressively, it also now excludes Licensing related files from the prune where identifiable.

There has been some shift in the transitive dependencies being pulled in (with only google.golang.org/grpc requiring an override), and at this point all CI tests pass successfully.

export SKIP_TESTS=docker,etcd,terraform,rackhd,ssh,flaky
make ci
+ fmt
+ vet
+ lint
+ check-docs
find . -name '*.md' | grep -v vendor/ | blockcheck
./scripts/doc-source-check
Validating source checksum in ./docs/plugin/group.md: PASS
Validating source checksum in ./docs/plugin/flavor.md: PASS
Validating source checksum in ./docs/plugin/instance.md: PASS
+ coverage
ok      github.com/docker/infrakit/pkg/broker/client    3.248s  coverage: 75.9% of statements
ok      github.com/docker/infrakit/pkg/broker/server    3.857s  coverage: 69.2% of statements
ok      github.com/docker/infrakit/pkg/callable 1.180s  coverage: 57.1% of statements
?       github.com/docker/infrakit/pkg/callable/backend [no test files]
?       github.com/docker/infrakit/pkg/callable/backend/http    [no test files]
?       github.com/docker/infrakit/pkg/callable/backend/instance        [no test files]
?       github.com/docker/infrakit/pkg/callable/backend/print   [no test files]
?       github.com/docker/infrakit/pkg/callable/backend/sh      [no test files]
ok      github.com/docker/infrakit/pkg/callable/backend/ssh     1.034s  coverage: 1.4% of statements
?       github.com/docker/infrakit/pkg/callable/backend/stack   [no test files]
?       github.com/docker/infrakit/pkg/callable/backend/vmwscript       [no test files]
?       github.com/docker/infrakit/pkg/cli      [no test files]
ok      github.com/docker/infrakit/pkg/cli/playbook     1.091s  coverage: 46.2% of statements
?       github.com/docker/infrakit/pkg/cli/v0   [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/controller        [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/event     [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/flavor    [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/group     [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/instance  [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/loadbalancer      [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/manager   [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/metadata  [no test files]
?       github.com/docker/infrakit/pkg/cli/v0/resource  [no test files]
ok      github.com/docker/infrakit/pkg/controller       1.030s  coverage: 74.6% of statements
ok      github.com/docker/infrakit/pkg/controller/enrollment    1.103s  coverage: 58.0% of statements
ok      github.com/docker/infrakit/pkg/controller/enrollment/types      1.038s  coverage: 71.4% of statements
ok      github.com/docker/infrakit/pkg/controller/group 3.673s  coverage: 74.4% of statements
ok      github.com/docker/infrakit/pkg/controller/group/types   1.039s  coverage: 27.1% of statements
?       github.com/docker/infrakit/pkg/controller/group/util    [no test files]
ok      github.com/docker/infrakit/pkg/controller/ingress       1.560s  coverage: 49.8% of statements
ok      github.com/docker/infrakit/pkg/controller/ingress/swarm 1.062s  coverage: 77.3% of statements
ok      github.com/docker/infrakit/pkg/controller/ingress/types 1.039s  coverage: 70.4% of statements
?       github.com/docker/infrakit/pkg/controller/internal      [no test files]
ok      github.com/docker/infrakit/pkg/core     1.080s  coverage: 74.1% of statements
ok      github.com/docker/infrakit/pkg/discovery        1.034s  coverage: 20.0% of statements
ok      github.com/docker/infrakit/pkg/discovery/local  1.068s  coverage: 46.2% of statements
ok      github.com/docker/infrakit/pkg/discovery/remote 1.044s  coverage: 83.6% of statements
ok      github.com/docker/infrakit/pkg/fsm      16.198s coverage: 84.2% of statements
ok      github.com/docker/infrakit/pkg/launch   1.033s  coverage: 84.5% of statements
?       github.com/docker/infrakit/pkg/launch/inproc    [no test files]
ok      github.com/docker/infrakit/pkg/launch/os        1.544s  coverage: 85.2% of statements
ok      github.com/docker/infrakit/pkg/leader   1.028s  coverage: 84.2% of statements
ok      github.com/docker/infrakit/pkg/leader/etcd/v3   1.055s  coverage: 0.0% of statements
ok      github.com/docker/infrakit/pkg/leader/file      1.121s  coverage: 72.2% of statements
ok      github.com/docker/infrakit/pkg/leader/swarm     1.146s  coverage: 75.0% of statements
?       github.com/docker/infrakit/pkg/log      [no test files]
ok      github.com/docker/infrakit/pkg/manager  1.074s  coverage: 38.3% of statements
?       github.com/docker/infrakit/pkg/manager/discovery        [no test files]
?       github.com/docker/infrakit/pkg/mock     [no test files]
?       github.com/docker/infrakit/pkg/mock/docker/docker/client        [no test files]
?       github.com/docker/infrakit/pkg/mock/plugin/group        [no test files]
?       github.com/docker/infrakit/pkg/mock/spi/flavor  [no test files]
?       github.com/docker/infrakit/pkg/mock/spi/group   [no test files]
?       github.com/docker/infrakit/pkg/mock/spi/instance        [no test files]
?       github.com/docker/infrakit/pkg/mock/store       [no test files]
ok      github.com/docker/infrakit/pkg/plugin   1.034s  coverage: 70.7% of statements
ok      github.com/docker/infrakit/pkg/plugin/event/instance    1.141s  coverage: 93.8% of statements
?       github.com/docker/infrakit/pkg/plugin/event/tailer      [no test files]
ok      github.com/docker/infrakit/pkg/plugin/flavor/combo      1.031s  coverage: 57.9% of statements
ok      github.com/docker/infrakit/pkg/plugin/flavor/kubernetes 1.478s  coverage: 62.6% of statements
ok      github.com/docker/infrakit/pkg/plugin/flavor/swarm      1.112s  coverage: 66.9% of statements
ok      github.com/docker/infrakit/pkg/plugin/flavor/vanilla    1.044s  coverage: 85.7% of statements
ok      github.com/docker/infrakit/pkg/plugin/instance/file     1.032s  coverage: 69.7% of statements
?       github.com/docker/infrakit/pkg/plugin/instance/image    [no test files]
?       github.com/docker/infrakit/pkg/plugin/instance/image/gcp        [no test files]
ok      github.com/docker/infrakit/pkg/plugin/instance/selector 1.028s  coverage: 100.0% of statements
ok      github.com/docker/infrakit/pkg/plugin/instance/selector/internal        1.036s  coverage: 66.4% of statements
ok      github.com/docker/infrakit/pkg/plugin/instance/selector/spread  1.030s  coverage: 66.7% of statements
ok      github.com/docker/infrakit/pkg/plugin/instance/selector/tiered  1.041s  coverage: 87.1% of statements
ok      github.com/docker/infrakit/pkg/plugin/instance/selector/weighted        1.216s  coverage: 84.8% of statements
ok      github.com/docker/infrakit/pkg/plugin/metadata  1.057s  coverage: 73.3% of statements
ok      github.com/docker/infrakit/pkg/plugin/resource  1.099s  coverage: 90.0% of statements
?       github.com/docker/infrakit/pkg/provider/aws/experimental/bootstrap      [no test files]
?       github.com/docker/infrakit/pkg/provider/aws/experimental/bootstrap/cmd/infrakitctl      [no test files]
?       github.com/docker/infrakit/pkg/provider/aws/mock        [no test files]
?       github.com/docker/infrakit/pkg/provider/aws/mock/ec2    [no test files]
?       github.com/docker/infrakit/pkg/provider/aws/plugin      [no test files]
ok      github.com/docker/infrakit/pkg/provider/aws/plugin/instance     1.090s  coverage: 7.4% of statements
?       github.com/docker/infrakit/pkg/provider/aws/plugin/loadbalancer [no test files]
?       github.com/docker/infrakit/pkg/provider/aws/plugin/metadata     [no test files]
ok      github.com/docker/infrakit/pkg/provider/digitalocean/plugin/instance    1.052s  coverage: 94.7% of statements
ok      github.com/docker/infrakit/pkg/provider/digitalocean/plugin/instance/types      1.033s  coverage: 100.0% of statements
ok      github.com/docker/infrakit/pkg/provider/docker/plugin/instance  1.049s  coverage: 0.0% of statements
?       github.com/docker/infrakit/pkg/provider/google/mock     [no test files]
?       github.com/docker/infrakit/pkg/provider/google/mock/flavor      [no test files]
?       github.com/docker/infrakit/pkg/provider/google/mock/gcloud      [no test files]
?       github.com/docker/infrakit/pkg/provider/google/plugin   [no test files]
ok      github.com/docker/infrakit/pkg/provider/google/plugin/flavor    1.033s  coverage: 63.9% of statements
?       github.com/docker/infrakit/pkg/provider/google/plugin/flavor/cmd        [no test files]
ok      github.com/docker/infrakit/pkg/provider/google/plugin/gcloud    1.024s  coverage: 7.4% of statements
?       github.com/docker/infrakit/pkg/provider/google/plugin/group     [no test files]
?       github.com/docker/infrakit/pkg/provider/google/plugin/group/cmd [no test files]
ok      github.com/docker/infrakit/pkg/provider/google/plugin/instance  1.033s  coverage: 79.3% of statements
ok      github.com/docker/infrakit/pkg/provider/google/plugin/instance/types    1.030s  coverage: 15.8% of statements
ok      github.com/docker/infrakit/pkg/provider/google/plugin/instance/util     1.028s  coverage: 100.0% of statements
ok      github.com/docker/infrakit/pkg/provider/google/plugin/metadata  1.037s  coverage: 81.1% of statements
?       github.com/docker/infrakit/pkg/provider/hyperkit/plugin/instance        [no test files]
?       github.com/docker/infrakit/pkg/provider/ibmcloud/client [no test files]
ok      github.com/docker/infrakit/pkg/provider/ibmcloud/plugin/instance        1.039s  coverage: 100.0% of statements
?       github.com/docker/infrakit/pkg/provider/ibmcloud/plugin/loadbalancer    [no test files]
ok      github.com/docker/infrakit/pkg/provider/libvirt/plugin/instance 1.085s  coverage: 59.8% of statements
ok      github.com/docker/infrakit/pkg/provider/maas/plugin/instance    1.092s  coverage: 41.7% of statements
?       github.com/docker/infrakit/pkg/provider/oneview [no test files]
?       github.com/docker/infrakit/pkg/provider/oracle/client   [no test files]
?       github.com/docker/infrakit/pkg/provider/oracle/client/api       [no test files]
?       github.com/docker/infrakit/pkg/provider/oracle/client/bmc       [no test files]
?       github.com/docker/infrakit/pkg/provider/oracle/client/core      [no test files]
?       github.com/docker/infrakit/pkg/provider/oracle/client/loadbalancer      [no test files]
ok      github.com/docker/infrakit/pkg/provider/oracle/plugin/loadbalancer      1.024s  coverage: 0.0% of statements [no tests to run]
?       github.com/docker/infrakit/pkg/provider/packet/plugin/instance  [no test files]
?       github.com/docker/infrakit/pkg/provider/rackhd/plugin   [no test files]
ok      github.com/docker/infrakit/pkg/provider/rackhd/plugin/instance  1.470s  coverage: 0.0% of statements
?       github.com/docker/infrakit/pkg/provider/rackhd/plugin/instance/cmd      [no test files]
ok      github.com/docker/infrakit/pkg/provider/terraform/instance      15.355s coverage: 87.2% of statements
ok      github.com/docker/infrakit/pkg/provider/terraform/instance/cmd  1.056s  coverage: 29.5% of statements
ok      github.com/docker/infrakit/pkg/provider/terraform/instance/types        1.043s  coverage: 92.1% of statements
?       github.com/docker/infrakit/pkg/provider/ucs     [no test files]
?       github.com/docker/infrakit/pkg/provider/vagrant/plugin/instance [no test files]
?       github.com/docker/infrakit/pkg/provider/vsphere [no test files]
ok      github.com/docker/infrakit/pkg/rpc      1.033s  coverage: 5.7% of statements
ok      github.com/docker/infrakit/pkg/rpc/client       1.029s  coverage: 12.3% of statements
ok      github.com/docker/infrakit/pkg/rpc/controller   61.158s coverage: 85.7% of statements
?       github.com/docker/infrakit/pkg/rpc/event        [no test files]
ok      github.com/docker/infrakit/pkg/rpc/flavor       1.103s  coverage: 63.3% of statements
ok      github.com/docker/infrakit/pkg/rpc/group        1.099s  coverage: 73.6% of statements
ok      github.com/docker/infrakit/pkg/rpc/instance     1.136s  coverage: 79.8% of statements
?       github.com/docker/infrakit/pkg/rpc/internal     [no test files]
ok      github.com/docker/infrakit/pkg/rpc/loadbalancer 1.109s  coverage: 87.1% of statements
ok      github.com/docker/infrakit/pkg/rpc/manager      1.075s  coverage: 65.4% of statements
ok      github.com/docker/infrakit/pkg/rpc/metadata     1.179s  coverage: 38.3% of statements
ok      github.com/docker/infrakit/pkg/rpc/mux  1.084s  coverage: 46.3% of statements
ok      github.com/docker/infrakit/pkg/rpc/resource     1.063s  coverage: 85.1% of statements
ok      github.com/docker/infrakit/pkg/rpc/server       1.069s  coverage: 70.4% of statements
ok      github.com/docker/infrakit/pkg/rpc/testing      1.066s  coverage: 0.0% of statements
?       github.com/docker/infrakit/pkg/run      [no test files]
ok      github.com/docker/infrakit/pkg/run/depends      1.037s  coverage: 83.9% of statements
?       github.com/docker/infrakit/pkg/run/local        [no test files]
ok      github.com/docker/infrakit/pkg/run/manager      1.035s  coverage: 3.5% of statements
ok      github.com/docker/infrakit/pkg/run/scope        5.730s  coverage: 46.2% of statements
?       github.com/docker/infrakit/pkg/run/scope/local  [no test files]
?       github.com/docker/infrakit/pkg/run/template     [no test files]
?       github.com/docker/infrakit/pkg/run/v0/aws       [no test files]
?       github.com/docker/infrakit/pkg/run/v0/combo     [no test files]
?       github.com/docker/infrakit/pkg/run/v0/digitalocean      [no test files]
?       github.com/docker/infrakit/pkg/run/v0/docker    [no test files]
?       github.com/docker/infrakit/pkg/run/v0/enrollment        [no test files]
?       github.com/docker/infrakit/pkg/run/v0/file      [no test files]
?       github.com/docker/infrakit/pkg/run/v0/google    [no test files]
?       github.com/docker/infrakit/pkg/run/v0/group     [no test files]
?       github.com/docker/infrakit/pkg/run/v0/hyperkit  [no test files]
?       github.com/docker/infrakit/pkg/run/v0/ibmcloud  [no test files]
?       github.com/docker/infrakit/pkg/run/v0/image     [no test files]
?       github.com/docker/infrakit/pkg/run/v0/ingress   [no test files]
?       github.com/docker/infrakit/pkg/run/v0/kubernetes        [no test files]
?       github.com/docker/infrakit/pkg/run/v0/libvirt   [no test files]
?       github.com/docker/infrakit/pkg/run/v0/maas      [no test files]
?       github.com/docker/infrakit/pkg/run/v0/manager   [no test files]
?       github.com/docker/infrakit/pkg/run/v0/oneview   [no test files]
?       github.com/docker/infrakit/pkg/run/v0/oracle    [no test files]
?       github.com/docker/infrakit/pkg/run/v0/packet    [no test files]
?       github.com/docker/infrakit/pkg/run/v0/rackhd    [no test files]
?       github.com/docker/infrakit/pkg/run/v0/selector  [no test files]
?       github.com/docker/infrakit/pkg/run/v0/simulator [no test files]
?       github.com/docker/infrakit/pkg/run/v0/swarm     [no test files]
?       github.com/docker/infrakit/pkg/run/v0/tailer    [no test files]
?       github.com/docker/infrakit/pkg/run/v0/terraform [no test files]
?       github.com/docker/infrakit/pkg/run/v0/time      [no test files]
?       github.com/docker/infrakit/pkg/run/v0/ucs       [no test files]
?       github.com/docker/infrakit/pkg/run/v0/vagrant   [no test files]
?       github.com/docker/infrakit/pkg/run/v0/vanilla   [no test files]
?       github.com/docker/infrakit/pkg/run/v0/vars      [no test files]
?       github.com/docker/infrakit/pkg/run/v0/vsphere   [no test files]
?       github.com/docker/infrakit/pkg/spi      [no test files]
ok      github.com/docker/infrakit/pkg/spi/event        1.030s  coverage: 72.4% of statements
?       github.com/docker/infrakit/pkg/spi/flavor       [no test files]
?       github.com/docker/infrakit/pkg/spi/group        [no test files]
ok      github.com/docker/infrakit/pkg/spi/instance     1.032s  coverage: 83.9% of statements
ok      github.com/docker/infrakit/pkg/spi/loadbalancer 1.026s  coverage: 18.2% of statements
?       github.com/docker/infrakit/pkg/spi/metadata     [no test files]
?       github.com/docker/infrakit/pkg/spi/resource     [no test files]
?       github.com/docker/infrakit/pkg/spi/stack        [no test files]
?       github.com/docker/infrakit/pkg/store    [no test files]
ok      github.com/docker/infrakit/pkg/store/etcd/v3    1.057s  coverage: 0.0% of statements
ok      github.com/docker/infrakit/pkg/store/file       1.301s  coverage: 61.7% of statements
?       github.com/docker/infrakit/pkg/store/mem        [no test files]
ok      github.com/docker/infrakit/pkg/store/swarm      1.062s  coverage: 67.2% of statements
ok      github.com/docker/infrakit/pkg/template 2.026s  coverage: 60.6% of statements
?       github.com/docker/infrakit/pkg/testing  [no test files]
?       github.com/docker/infrakit/pkg/testing/controller       [no test files]
?       github.com/docker/infrakit/pkg/testing/event    [no test files]
?       github.com/docker/infrakit/pkg/testing/flavor   [no test files]
?       github.com/docker/infrakit/pkg/testing/group    [no test files]
?       github.com/docker/infrakit/pkg/testing/instance [no test files]
?       github.com/docker/infrakit/pkg/testing/loadbalancer     [no test files]
?       github.com/docker/infrakit/pkg/testing/manager  [no test files]
?       github.com/docker/infrakit/pkg/testing/metadata [no test files]
?       github.com/docker/infrakit/pkg/testing/resource [no test files]
ok      github.com/docker/infrakit/pkg/types    1.098s  coverage: 75.7% of statements
?       github.com/docker/infrakit/pkg/util/docker      [no test files]
ok      github.com/docker/infrakit/pkg/util/etcd/v3     1.060s  coverage: 40.0% of statements
ok      github.com/docker/infrakit/pkg/util/exec        11.149s coverage: 63.0% of statements
ok      github.com/docker/infrakit/pkg/util/ssh 1.041s  coverage: 0.8% of statements
ok      github.com/docker/infrakit/pkg/x/maxlife        9.541s  coverage: 88.0% of statements
ok      github.com/docker/infrakit/pkg/x/remoteboot     1.026s  coverage: 15.0% of statements
?       github.com/docker/infrakit/pkg/x/vmwscript      [no test files]
GordonTheTurtle commented 6 years ago

Please sign your commits following these rules: https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work The easiest way to do this is to amend the last commit:

$ git clone -b "use-dep" git@github.com:johnmccabe/infrakit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354247904
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

johnmccabe commented 6 years ago

@chungers this is the change I'd mentioned a few weeks ago

codecov[bot] commented 6 years ago

Codecov Report

Merging #877 into master will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #877   +/-   ##
=======================================
  Coverage   48.55%   48.55%           
=======================================
  Files          94       94           
  Lines        8448     8448           
=======================================
  Hits         4102     4102           
  Misses       3980     3980           
  Partials      366      366

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 3c87c8e...a0ef920. Read the comment docs.

johnmccabe commented 6 years ago

@chungers I'd already rebased against master, is that what that last merge was for (wondering if its some git-fu I've never seen)

edit ah nvm I'd not seen the recent commit