Skip to content

Commit

Permalink
vsphere: Use a fork of vmware/vic (#97)
Browse files Browse the repository at this point in the history 
* vsphere: Use a fork of vmware/vic

Use a fork of github.com/vmware/vic that uses
github.com/sirupsen/logrus:
https://github.com/hashicorp/vic/commits/b15179225d21a06e2a9e7bfcfc6d2e9225c978fb
.

Incidentally, update the logrus dependency in vendor to v1.0.6 to match
the one used by go mod

Fixes: #94 .

* Update to use hashicorp/vic fork with updated master by commit ref instead of fake version tag that might collide one day...

* Fix merge conflicts
  • Loading branch information
@notnoop @banks
notnoop authored and banks committed Apr 3, 2019
1 parent 61771d8 commit 22221ed
Show file tree
Hide file tree
Showing 29 changed files with 24,218 additions and 241 deletions.
3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ require (
cloud.google.com/go v0.26.0 // indirect
github.com/Azure/azure-sdk-for-go v16.0.0+incompatible
github.com/Azure/go-autorest v10.7.0+incompatible
github.com/Sirupsen/logrus v1.0.6 // indirect
github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af // indirect
github.com/aws/aws-sdk-go v1.15.24
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -25,6 +24,7 @@ require (
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/hashicorp/go-multierror v1.0.0
github.com/hashicorp/mdns v1.0.0
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443
github.com/hpcloud/tail v1.0.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da // indirect
Expand All @@ -51,7 +51,6 @@ require (
github.com/stretchr/testify v1.2.2 // indirect
github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9 // indirect
github.com/vmware/govmomi v0.18.0
github.com/vmware/vic v1.4.1
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95
golang.org/x/text v0.3.0 // indirect
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ github.com/Azure/azure-sdk-for-go v16.0.0+incompatible h1:gr1qKY/Ll72VjFTZmaBwRK
github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest v10.7.0+incompatible h1:dB+dKSLGdJLEhU/FoZTSNSPMZuE5H4M5p5zgSct7qwM=
github.com/Azure/go-autorest v10.7.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Sirupsen/logrus v1.0.6 h1:HCAGQRk48dRVPA5Y+Yh0qdCSTzPOyU1tBJ7Q9YzotII=
github.com/Sirupsen/logrus v1.0.6/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af h1:DBNMBMuMiWYu0b+8KMJuWmfCkcxl09JwdlqwDZZ6U14=
github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw=
github.com/aws/aws-sdk-go v1.15.24 h1:xLAdTA/ore6xdPAljzZRed7IGqQgC+nY+ERS5vaj4Ro=
Expand Down Expand Up @@ -52,6 +50,8 @@ github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgj
github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
github.com/hashicorp/mdns v1.0.0 h1:WhIgCr5a7AaVH6jPUwjtRuuE7/RDufnUvzIr48smyxs=
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw=
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
Expand Down Expand Up @@ -108,8 +108,6 @@ github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9 h1:/Bsw4C+DEdqPj
github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod h1:RHkNRtSLfOK7qBTHaeSX1D6BNpI3qw7NTxsmNr4RvN8=
github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo=
github.com/vmware/govmomi v0.18.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
github.com/vmware/vic v1.4.1 h1:Cbvv5y2h1YlYebIYGuVp1Xk5imxPSDUF6c0O5oLdQ00=
github.com/vmware/vic v1.4.1/go.mod h1:AiTDrZuV13NkqRzseA5ZmF2QqLpTydaaGN75xgV6Ork=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3 h1:KYQXGkl6vs02hK7pK4eIbw0NpNPedieTSTEiJ//bwGs=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519 h1:x6rhz8Y9CjbgQkccRGmELH6K+LJj7tOoh3XWeC1yaQM=
Expand Down
24,135 changes: 24,135 additions & 0 deletions provider/vsphere/vendor/github.com/hashicorp/vic/LICENSE
View file

Large diffs are not rendered by default.

0 ...vmware/vic/pkg/vsphere/tags/categories.go → ...hicorp/vic/pkg/vsphere/tags/categories.go
View file
File renamed without changes.
0 ...mware/vic/pkg/vsphere/tags/rest_client.go → ...icorp/vic/pkg/vsphere/tags/rest_client.go
View file
File renamed without changes.
0 ...e/vic/pkg/vsphere/tags/tag_association.go → ...p/vic/pkg/vsphere/tags/tag_association.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...b.com/vmware/vic/pkg/vsphere/tags/tags.go → ...om/hashicorp/vic/pkg/vsphere/tags/tags.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...r/github.com/Sirupsen/logrus/CHANGELOG.md → ...r/github.com/sirupsen/logrus/CHANGELOG.md
View file
File renamed without changes.
0 ...vendor/github.com/Sirupsen/logrus/LICENSE → ...vendor/github.com/sirupsen/logrus/LICENSE
View file
File renamed without changes.
0 ...ndor/github.com/Sirupsen/logrus/README.md → ...ndor/github.com/sirupsen/logrus/README.md
View file
File renamed without changes.
0 ...or/github.com/Sirupsen/logrus/alt_exit.go → ...or/github.com/sirupsen/logrus/alt_exit.go
View file
File renamed without changes.
0 ...r/github.com/Sirupsen/logrus/appveyor.yml → ...r/github.com/sirupsen/logrus/appveyor.yml
View file
File renamed without changes.
0 .../vendor/github.com/Sirupsen/logrus/doc.go → .../vendor/github.com/sirupsen/logrus/doc.go
View file
File renamed without changes.
24 changes: 18 additions & 6 deletions ...endor/github.com/Sirupsen/logrus/entry.go → ...endor/github.com/sirupsen/logrus/entry.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions ...or/github.com/Sirupsen/logrus/exported.go → ...or/github.com/sirupsen/logrus/exported.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ...r/github.com/Sirupsen/logrus/formatter.go → ...r/github.com/sirupsen/logrus/formatter.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...endor/github.com/Sirupsen/logrus/hooks.go → ...endor/github.com/sirupsen/logrus/hooks.go
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions ...hub.com/Sirupsen/logrus/json_formatter.go → ...hub.com/sirupsen/logrus/json_formatter.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion ...ndor/github.com/Sirupsen/logrus/logger.go → ...ndor/github.com/sirupsen/logrus/logger.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ndor/github.com/Sirupsen/logrus/logrus.go → ...ndor/github.com/sirupsen/logrus/logrus.go
View file
File renamed without changes.
0 ...ithub.com/Sirupsen/logrus/terminal_bsd.go → ...ithub.com/sirupsen/logrus/terminal_bsd.go
View file
File renamed without changes.
0 ...rupsen/logrus/terminal_check_appengine.go → ...rupsen/logrus/terminal_check_appengine.go
View file
File renamed without changes.
0 ...sen/logrus/terminal_check_notappengine.go → ...sen/logrus/terminal_check_notappengine.go
View file
File renamed without changes.
0 ...hub.com/Sirupsen/logrus/terminal_linux.go → ...hub.com/sirupsen/logrus/terminal_linux.go
View file
File renamed without changes.
23 changes: 16 additions & 7 deletions ...hub.com/Sirupsen/logrus/text_formatter.go → ...hub.com/sirupsen/logrus/text_formatter.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ndor/github.com/Sirupsen/logrus/writer.go → ...ndor/github.com/sirupsen/logrus/writer.go
View file
File renamed without changes.
Loading

0 comments on commit 22221ed

Please sign in to comment.