Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Use dep #928

Closed
wants to merge 4 commits into from
Closed

[WIP] Use dep #928

wants to merge 4 commits into from

Conversation

petderek
Copy link
Contributor

Summary

Use dep instead of godep.

Implementation details

See agent/Gopkg.toml and agent/Gopkg.lock.

Testing

  • Builds on Linux (make release)
  • Builds on Windows (go build -out amazon-ecs-agent.exe ./agent)
  • Unit tests on Linux (make test) pass
  • Unit tests on Windows (go test -timeout=25s ./agent/...) pass
  • Integration tests on Linux (make run-integ-tests) pass
  • Integration tests on Windows (.\scripts\run-integ-tests.ps1) pass
  • Functional tests on Linux (make run-functional-tests) pass
  • Functional tests on Windows (.\scripts\run-functional-tests.ps1) pass

Licensing

This contribution is under the terms of the Apache 2.0 License: yes

Updating seelog and docker to make the dep migration work easier.
"dep init" expects versions to be locked to git tags (or master).
Changing dependency manager to 'dep'. Dep will eventually be a part
of the golang toolchain.

This was done by running:

'''
dep init
rm -r agent/Godeps
'''

More info: https://github.com/golang/dep
* Use older version of docker from our godep file (1.12.0-rc4)
* Use actual git tags for gorilla/websocket and stretchr/testify
@petderek petderek changed the title Use dep [WIP] Use dep Aug 16, 2017
@samuelkarp
Copy link
Contributor

agent\vendor\github.com\docker\docker\pkg\term\term_windows.go:12:2: case-insensitive import collision: "github.com/aws/amazon-ecs-agent/agent/vendor/github.com/Sirupsen/logrus" and "github.com/aws/amazon-ecs-agent/agent/vendor/github.com/sirupsen/logrus"

It looks like Gopkg.lock contains both:

[[projects]]
  name = "github.com/Sirupsen/logrus"
  packages = ["."]
  revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e"
  version = "v1.0.3"

# ...

[[projects]]
  name = "github.com/sirupsen/logrus"
  packages = ["."]
  revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e"
  version = "v1.0.3"

A number of projects have had issues with this, see sirupsen/logrus#570 (comment) for context.

* Add override in go-ansiterm to ensure build
@samuelkarp
Copy link
Contributor

More errors in AppVeyor:

agent\vendor\github.com\docker\docker\api\types\client.go:8:2: cannot find package "github.com/docker/docker/api/types/container"

@samuelkarp
Copy link
Contributor

I think (at least some of) the issues you were having converting from Godep should be resolved with v0.3.1 (see golang/dep#924 for context).

@petderek
Copy link
Contributor Author

petderek commented Oct 9, 2017

closing in favor of #1009

@petderek petderek closed this Oct 9, 2017
@petderek petderek deleted the godep-dep branch December 19, 2017 01:50
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.

2 participants