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

add Created field to images command #1653

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −24
Open

add Created field to images command #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
824e633
add Created field to images command
bramalho Feb 4, 2025
0f38ef5
add created to test commands
bramalho Feb 5, 2025
e19ea62
Merge branch 'main' into images_created_field
bramalho Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions commands/displayers/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ func (gi *Image) JSON(out io.Writer) error {

func (gi *Image) Cols() []string {
return []string{
"ID", "Name", "Type", "Distribution", "Slug", "Public", "MinDisk",
"ID", "Name", "Type", "Distribution", "Slug", "Public", "MinDisk", "Created",
}
}

func (gi *Image) ColMap() map[string]string {
return map[string]string{
"ID": "ID", "Name": "Name", "Type": "Type", "Distribution": "Distribution",
"Slug": "Slug", "Public": "Public", "MinDisk": "Min Disk",
"Slug": "Slug", "Public": "Public", "MinDisk": "Min Disk", "Created": "Created",
}
}

Expand All @@ -53,7 +53,7 @@ func (gi *Image) KV() []map[string]any {

o := map[string]any{
"ID": i.ID, "Name": i.Name, "Type": i.Type, "Distribution": i.Distribution,
"Slug": i.Slug, "Public": publicStatus, "MinDisk": i.MinDiskSize,
"Slug": i.Slug, "Public": publicStatus, "MinDisk": i.MinDiskSize, "Created": i.Created,
}

out = append(out, o)
Expand Down
2 changes: 1 addition & 1 deletion commands/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Currently, there are five types of images: snapshots, backups, custom images, di
cmdImagesList := CmdBuilder(cmd, RunImagesList, "list", "List images on your account", `Lists all private images on your account. To list public images, use the `+"`"+`--public`+"`"+` flag. This command returns the following information about each image:`+imageDetail, Writer,
aliasOpt("ls"), displayerType(&displayers.Image{}))
AddBoolFlag(cmdImagesList, doctl.ArgImagePublic, "", false, "Lists public images")
cmdImagesList.Example = `The following example lists all private images on your account and uses the ` + "`" + `--format` + "`" + ` flag to return only the ID, distribution, and slug for each image: doctl compute image list --format ID,Distribution,Slug`
cmdImagesList.Example = `The following example lists all private images on your account and uses the ` + "`" + `--format` + "`" + ` flag to return only the ID, distribution, slug and created for each image: doctl compute image list --format ID,Distribution,Slug,Created`

cmdImagesListDistribution := CmdBuilder(cmd, RunImagesListDistribution,
"list-distribution", "List available distribution images", `Lists the distribution images available from DigitalOcean. This command returns the following information about each image:`+imageDetail, Writer,
Expand Down
7 changes: 4 additions & 3 deletions integration/droplet_backups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ var _ = suite("compute/droplet/backups", func(t *testing.T, when spec.G, it spec

const (
dropletBackupsOutput = `
ID Name Type Distribution Slug Public Min Disk
4444 magic snapshot Fedora slimey false 25
ID Name Type Distribution Slug Public Min Disk Created
4444 magic snapshot Fedora slimey false 25 2018-09-20T19:28:00Z
`
dropletBackupsResponse = `
{"backups": [
Expand All @@ -79,7 +79,8 @@ ID Name Type Distribution Slug Public Min Disk
"distribution": "Fedora",
"type": "snapshot",
"slug": "slimey",
"min_disk_size": 25
"min_disk_size": 25,
"created_at": "2018-09-20T19:28:00Z"
}
]
}`
Expand Down
12 changes: 7 additions & 5 deletions integration/droplet_snapshots_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ var _ = suite("compute/droplet/snapshots", func(t *testing.T, when spec.G, it sp

const (
dropletSnapshotsOutput = `
ID Name Type Distribution Slug Public Min Disk
4444 magic snapshot Fedora slimey false 25
2222 other-magic snapshot Ubuntu slimey false 25
ID Name Type Distribution Slug Public Min Disk Created
4444 magic snapshot Fedora slimey false 25 2018-09-20T19:28:00Z
2222 other-magic snapshot Ubuntu slimey false 25 2018-09-20T19:28:00Z
`
dropletSnapshotsResponse = `
{"snapshots": [
Expand All @@ -80,15 +80,17 @@ ID Name Type Distribution Slug Public Min Disk
"distribution": "Fedora",
"type": "snapshot",
"slug": "slimey",
"min_disk_size": 25
"min_disk_size": 25,
"created_at": "2018-09-20T19:28:00Z"
},
{
"id": 2222,
"name": "other-magic",
"distribution": "Ubuntu",
"type": "snapshot",
"slug": "slimey",
"min_disk_size": 25
"min_disk_size": 25,
"created_at": "2018-09-20T19:28:00Z"
}
]}
`
Expand Down
4 changes: 2 additions & 2 deletions integration/image_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,6 @@ const imageCreateResponse = `{
}`

const imageCreateOutput = `
ID Name Type Distribution Slug Public Min Disk
38413969 ubuntu-18.04-minimal custom Ubuntu false 0
ID Name Type Distribution Slug Public Min Disk Created
38413969 ubuntu-18.04-minimal custom Ubuntu false 0 2018-09-20T19:28:00Z
`
5 changes: 3 additions & 2 deletions integration/image_get_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ var _ = suite("compute/image/get", func(t *testing.T, when spec.G, it spec.S) {

const (
imageGetOutput = `
ID Name Type Distribution Slug Public Min Disk
6918990 14.04 x64 Ubuntu ubuntu-16-04-x64 true 20`
ID Name Type Distribution Slug Public Min Disk Created
6918990 14.04 x64 Ubuntu ubuntu-16-04-x64 true 20 2014-10-17T20:24:33Z
`
imageGetResponse = `{
"image": {
"id": 6918990,
Expand Down
8 changes: 4 additions & 4 deletions integration/image_list_application_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ var _ = suite("compute/image/list-application", func(t *testing.T, when spec.G,

const (
imageListApplicationOutput = `
ID Name Type Distribution Slug Public Min Disk
6376601 Ruby on Rails on 14.04 (Nginx + Unicorn) Ubuntu ruby-on-rails true 20
6376602 Ruby on Rails on 14.04 (Nginx + Unicorn) Ubuntu ruby-on-rails false 20
`
ID Name Type Distribution Slug Public Min Disk Created
6376601 Ruby on Rails on 14.04 (Nginx + Unicorn) Ubuntu ruby-on-rails true 20 2014-09-26T20:20:24Z
6376602 Ruby on Rails on 14.04 (Nginx + Unicorn) Ubuntu ruby-on-rails false 20 2014-09-26T20:20:24Z
`
imageListApplicationResponse = `{
"images": [
{
Expand Down
8 changes: 4 additions & 4 deletions integration/image_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@ var _ = suite("compute/image/list", func(t *testing.T, when spec.G, it spec.S) {

const (
imageListPrivateOutput = `
ID Name Type Distribution Slug Public Min Disk
6376602 Ruby on Rails on 14.04 (Nginx + Unicorn) Ubuntu ruby-on-rails false 20
`
ID Name Type Distribution Slug Public Min Disk Created
6376602 Ruby on Rails on 14.04 (Nginx + Unicorn) Ubuntu ruby-on-rails false 20 2014-09-26T20:20:24Z
`
imageListNoticeWithHeader = `
Notice: Listing private images. Use '--public' to include all images.
ID Name Type Distribution Slug Public Min Disk
ID Name Type Distribution Slug Public Min Disk Created
`
imageListNotice = `
Notice: Listing private images. Use '--public' to include all images.
Expand Down