Update Docker dependencies #4957
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ import ( | |
| "github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/response" | ||
| v2 "github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v2" | ||
|
|
||
| "github.com/moby/moby/api/types/container" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -139,6 +139,6 @@ type NetworkInterfaceProperties struct { | |
|
|
||
| // StatsResponse is the v4 Stats response for a container. | ||
| type StatsResponse struct { | ||
| *container.StatsResponse | ||
|
Contributor
There was a problem hiding this comment. Since we're going from
Author
There was a problem hiding this comment. Oof, I just looked through the agent directory, it has an absolute ton of Much regret.
Contributor
There was a problem hiding this comment. Apologies for the delay, yes it'll take quite a lot of effort to migrate over. There's also the
Contributor
There was a problem hiding this comment. For reference, this is my branch off of these changes -> https://github.com/mye956/amazon-ecs-agent/tree/4957
Author
There was a problem hiding this comment. Feel free to use Thanks for the review feedback and getting these dependencies updated.
Contributor
There was a problem hiding this comment. Sounds good, thanks again for opening this PR. I'll reference both this PR and the github issue you've opened if I do. |
||
| Network_rate_stats *stats.NetworkStatsPerSec `json:"network_rate_stats,omitempty"` | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| This is a copy of https://github.com/moby/moby/tree/master/pkg/meminfo |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Package meminfo provides utilities to retrieve memory statistics of | ||
| // the host system. | ||
| package meminfo | ||
|
|
||
|
|
||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| //go:build linux || freebsd | ||
|
|
||
| package meminfo | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| // TestMemInfo tests parseMemInfo with a static meminfo string | ||
| func TestMemInfo(t *testing.T) { | ||
| const input = ` | ||
| MemTotal: 1 kB | ||
| MemFree: 2 kB | ||
| MemAvailable: 3 kB | ||
| SwapTotal: 4 kB | ||
| SwapFree: 5 kB | ||
| Malformed1: | ||
| Malformed2: 1 | ||
| Malformed3: 2 MB | ||
| Malformed4: X kB | ||
| ` | ||
|
|
||
| const KiB = 1024 | ||
|
|
||
| meminfo, err := parseMemInfo(strings.NewReader(input)) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if meminfo.MemTotal != 1*KiB { | ||
| t.Fatalf("Unexpected MemTotal: %d", meminfo.MemTotal) | ||
| } | ||
| if meminfo.MemFree != 3*KiB { | ||
| t.Fatalf("Unexpected MemFree: %d", meminfo.MemFree) | ||
| } | ||
| if meminfo.SwapTotal != 4*KiB { | ||
| t.Fatalf("Unexpected SwapTotal: %d", meminfo.SwapTotal) | ||
| } | ||
| if meminfo.SwapFree != 5*KiB { | ||
| t.Fatalf("Unexpected SwapFree: %d", meminfo.SwapFree) | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.