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.

Sign up for GitHub

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

Jump to bottom

chore: Merge master into mainline in preparation for upcoming branch change. #1072

Merged
merged 16 commits into from
Jul 2, 2020
Merged

chore: Merge master into mainline in preparation for upcoming branch change. #1072

merged 16 commits into from
Jul 2, 2020

Conversation

bvtujo
Copy link
Contributor

@bvtujo bvtujo commented Jun 25, 2020

Merges master into mainline.

Enter [N/A] in the box, if an item is not applicable to your change.

Testing

  • Unit tests passed
  • Integration tests passed
  • Unit tests added for new functionality
  • Listed manual checks and their outputs in the comments (example)
  • Link to issue or PR for the integration tests:

Documentation

  • Contacted our doc writer
  • Updated our README

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

SoManyHs and others added 16 commits June 16, 2020 15:39
@SoManyHs
chore: automerge dependabot PRs with mergify (#1045)
fcdff9d
@dependabot-preview
Bump gopkg.in/yaml.v2 from v2.2.2 to 2.3.0 in /ecs-cli (#1034)
99df536 
Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from v2.2.2 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](go-yaml/yaml@v2.2.2...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/pkg/errors in /ecs-cli (#1048)
530f87a 
Bumps [github.com/pkg/errors](https://github.com/pkg/errors) from 248dadf4e9068a0b3e79f02ed0a610d935de5302 to 0.9.1. This release includes the previously tagged commit.
- [Release notes](https://github.com/pkg/errors/releases)
- [Commits](pkg/errors@248dadf...v0.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview
Bump github.com/sirupsen/logrus from 1.0.4 to 1.6.0 in /ecs-cli (#1032)
6207fb3 
Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.0.4 to 1.6.0.
- [Release notes](https://github.com/sirupsen/logrus/releases)
- [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md)
- [Commits](sirupsen/logrus@v1.0.4...v1.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@dependabot-preview
Bump github.com/fsouza/go-dockerclient in /ecs-cli (#1033)
7eb4462 
Bumps [github.com/fsouza/go-dockerclient](https://github.com/fsouza/go-dockerclient) from 4a934a8fd3ec3d4f84d9dcd8b47e7b277918c366 to 1.6.5. This release includes the previously tagged commit.
- [Release notes](https://github.com/fsouza/go-dockerclient/releases)
- [Commits](fsouza/go-dockerclient@4a934a8...v1.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@dependabot-preview
Bump github.com/go-ini/ini from 1.56.0 to 1.57.0 in /ecs-cli (#1052)
a6f065c 
Bumps [github.com/go-ini/ini](https://github.com/go-ini/ini) from 1.56.0 to 1.57.0.
- [Release notes](https://github.com/go-ini/ini/releases)
- [Commits](go-ini/ini@v1.56.0...v1.57.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/stretchr/testify from 1.5.1 to 1.6.1 in /ecs-cli (#1059)
d36e64f 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.5.1 to 1.6.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.5.1...v1.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/aws/aws-sdk-go from 1.31.5 to 1.32.1 in /ecs-cli (#1063)
bb04294 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.31.5 to 1.32.1.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-go@v1.31.5...v1.32.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/docker/cli from 19.03.9 to 19.03.11 in /ecs-cli (#1061)
a2d99af 
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 19.03.9 to 19.03.11.
- [Release notes](https://github.com/docker/cli/releases)
- [Commits](docker/cli@v19.03.9...v19.03.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/docker/docker in /ecs-cli (#1060)
055a8a2 
Bumps [github.com/docker/docker](https://github.com/moby/moby) from 8e435b8279f2af3e0cebd73fa9e25ca1bb26004e to 19.03.11. This release includes the previously tagged commit.
- [Release notes](https://github.com/moby/moby/releases)
- [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md)
- [Commits](moby/moby@8e435b8...v19.03.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/urfave/cli in /ecs-cli (#1049)
bf1426b 
Bumps [github.com/urfave/cli](https://github.com/urfave/cli) from 2526b57c56f30b50466c96c4133b1a4ad0f0191f to 1.22.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/urfave/cli/releases)
- [Changelog](https://github.com/urfave/cli/blob/master/docs/CHANGELOG.md)
- [Commits](urfave/cli@2526b57...v1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@bvtujo @tatsuya-ogawa @mergify
feat(compose): Add EFS support for task workflows (#1076)
c91e48e 
* Add EFS volume support to ECS Params for task.

* Add EFS volume support to ECS Params for task.

* Add consistent checks for service & task

* Adds additional check in service to ensure that there can be no panic
  if ecsParams is not specified
* Adds launchType check in task to ensure that PV is never unnecessarily
  set for EC2 launch types.

* refactor ecs-params helper function in test

* Add tests for task workflow

* Address feedback

* Refactor ecsParamsWithEFSVolume() helper function to take no arguments
* Change EFSVolumes check in task.go to be > 0, not != 0.

* constantize platform versions

* Fix formatting bug in task

Co-authored-by: Tatsuya Ogawa <togawa83@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@bvtujo @mergify
Replace error from --enable-service-discovery flag with warning (#1071)
e39b08b 
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/aws/aws-sdk-go from 1.32.1 to 1.32.11 in /ecs-cli (#1075
315e705 
)

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.32.1 to 1.32.11.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-go@v1.32.1...v1.32.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/docker/docker from 19.03.11 to 19.03.12 in /ecs-cli (#…
df58262 
…1073)

Bumps [github.com/docker/docker](https://github.com/moby/moby) from 19.03.11 to 19.03.12.
- [Release notes](https://github.com/moby/moby/releases)
- [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md)
- [Commits](moby/moby@v19.03.11...v19.03.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@dependabot-preview @mergify
Bump github.com/docker/cli from 19.03.11 to 19.03.12 in /ecs-cli (#1074)
43558b0 
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 19.03.11 to 19.03.12.
- [Release notes](https://github.com/docker/cli/releases)
- [Commits](docker/cli@v19.03.11...v19.03.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@bvtujo bvtujo merged commit 43558b0 into mainline Jul 2, 2020
@SoManyHs SoManyHs deleted the master branch September 15, 2020 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bvtujo @SoManyHs