This repository has been archived by the owner on Jun 13, 2021. It is now read-only.
Added created date to app images #735
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -6,14 +6,16 @@ import ( | |
| "io" | ||
| "strings" | ||
| "text/tabwriter" | ||
| "time" | ||
|
|
||
| "github.com/docker/app/internal/packager" | ||
| "github.com/docker/app/internal/relocated" | ||
| "github.com/docker/app/internal/store" | ||
| "github.com/docker/cli/cli/command" | ||
| "github.com/docker/cli/cli/config" | ||
| "github.com/docker/distribution/reference" | ||
| "github.com/docker/docker/pkg/stringid" | ||
| units "github.com/docker/go-units" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
|
|
@@ -177,6 +179,16 @@ func getImageListColumns(options imageListOption) []imageListColumn { | |
| imageListColumn{"APP NAME", func(p pkg) string { | ||
| return p.bundle.Name | ||
| }}, | ||
| imageListColumn{"CREATED", func(p pkg) string { | ||
| payload, err := packager.CustomPayload(p.bundle.Bundle) | ||
| if err != nil { | ||
| return "" | ||
| } | ||
| if createdPayload, ok := payload.(packager.CustomPayloadCreated); ok { | ||
| return units.HumanDuration(time.Now().UTC().Sub(createdPayload.CreatedTime())) + " ago" | ||
| } | ||
| return "" | ||
|
There was a problem hiding this comment. I wonder if it should be empty There was a problem hiding this comment. Ideally, would use a go template, which would allow setting There was a problem hiding this comment. Yep right, we're fixing it in a follow-up, thanks @thaJeztah 😸 |
||
| }}, | ||
| ) | ||
| return columns | ||
| } | ||
|
|
||
This file contains 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 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 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 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,84 @@ | ||
| package packager | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "time" | ||
|
|
||
| "github.com/deislabs/cnab-go/bundle" | ||
| "github.com/docker/app/internal" | ||
| ) | ||
|
|
||
| const ( | ||
| // DockerAppCustomVersion1_0_0 is the custom payload version 1.0.0 | ||
| DockerAppCustomVersion1_0_0 = "1.0.0" | ||
|
|
||
| // DockerAppCustomVersionCurrent the current payload version | ||
| DockerAppCustomVersionCurrent = DockerAppCustomVersion1_0_0 | ||
| ) | ||
|
|
||
| // DockerAppCustom contains extension custom data that docker app injects | ||
| // in the bundle. | ||
| type DockerAppCustom struct { | ||
| Version string `json:"version,omitempty"` | ||
| Payload json.RawMessage `json:"payload,omitempty"` | ||
| } | ||
|
|
||
| // CustomPayloadCreated is a custom payload with a created time | ||
| type CustomPayloadCreated interface { | ||
| CreatedTime() time.Time | ||
| } | ||
|
|
||
| type payloadV1_0 struct { | ||
| Created time.Time `json:"created"` | ||
| } | ||
|
|
||
| func (p payloadV1_0) CreatedTime() time.Time { | ||
| return p.Created | ||
| } | ||
|
|
||
| func newCustomPayload() (json.RawMessage, error) { | ||
| p := payloadV1_0{Created: time.Now().UTC()} | ||
| j, err := json.Marshal(&p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return j, nil | ||
| } | ||
|
|
||
| // CustomPayload parses and returns the bundle's custom payload | ||
| func CustomPayload(b *bundle.Bundle) (interface{}, error) { | ||
| custom, err := parseCustomPayload(b) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| switch version := custom.Version; version { | ||
| case DockerAppCustomVersion1_0_0: | ||
| var payload payloadV1_0 | ||
| if err := json.Unmarshal(custom.Payload, &payload); err != nil { | ||
| return nil, err | ||
| } | ||
| return payload, nil | ||
| default: | ||
| return nil, nil | ||
| } | ||
| } | ||
|
|
||
| func parseCustomPayload(b *bundle.Bundle) (DockerAppCustom, error) { | ||
| customMap, ok := b.Custom[internal.CustomDockerAppName] | ||
| if !ok { | ||
| return DockerAppCustom{}, nil | ||
| } | ||
|
|
||
| customJSON, err := json.Marshal(customMap) | ||
| if err != nil { | ||
| return DockerAppCustom{}, err | ||
| } | ||
|
|
||
| var custom DockerAppCustom | ||
| if err = json.Unmarshal(customJSON, &custom); err != nil { | ||
| return DockerAppCustom{}, err | ||
| } | ||
|
|
||
| return custom, nil | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess the error could be asserted here.