Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit db25844

Browse files
zappy-shuzappy-shu
committed
Print image inspect metadata fields in PascalCase
Prints the metadata fields in PascalCase when calling `app image inspect` to match the other fields. Fixed `FromBundle` func comment Signed-off-by: Nick Adcock <nick.adcock@docker.com>
1 parent 47e1e3a commit db25844

8 files changed

Lines changed: 44 additions & 44 deletions

‎e2e/testdata/app-inspect.golden‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"Metadata": {
3-
"version": "1.1.0-beta1",
4-
"name": "simple",
5-
"description": "new fancy webapp with microservices",
6-
"maintainers": [
3+
"Version": "1.1.0-beta1",
4+
"Name": "simple",
5+
"Description": "new fancy webapp with microservices",
6+
"Maintainers": [
77
{
8-
"name": "John Developer",
9-
"email": "john.dev@example.com"
8+
"Name": "John Developer",
9+
"Email": "john.dev@example.com"
1010
},
1111
{
12-
"name": "Jane Developer",
13-
"email": "jane.dev@example.com"
12+
"Name": "Jane Developer",
13+
"Email": "jane.dev@example.com"
1414
}
1515
]
1616
},

‎internal/inspect/testdata/inspect-bundle-json.golden‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"Metadata": {
3-
"version": "0.1.0",
4-
"name": "packing",
5-
"description": "hello",
6-
"maintainers": [
3+
"Version": "0.1.0",
4+
"Name": "packing",
5+
"Description": "hello",
6+
"Maintainers": [
77
{
8-
"name": "dev1",
9-
"email": "dev1@example.com"
8+
"Name": "dev1",
9+
"Email": "dev1@example.com"
1010
},
1111
{
12-
"name": "dev2",
13-
"email": "dev2@example.com"
12+
"Name": "dev2",
13+
"Email": "dev2@example.com"
1414
}
1515
]
1616
},

‎internal/inspect/testdata/inspect-full-json.golden‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"Metadata": {
3-
"version": "0.1.0",
4-
"name": "myapp",
5-
"description": "some description",
6-
"maintainers": [
3+
"Version": "0.1.0",
4+
"Name": "myapp",
5+
"Description": "some description",
6+
"Maintainers": [
77
{
8-
"name": "dev",
9-
"email": "dev@example.com"
8+
"Name": "dev",
9+
"Email": "dev@example.com"
1010
}
1111
]
1212
},

‎internal/inspect/testdata/inspect-no-description-json.golden‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"Metadata": {
3-
"version": "0.1.0",
4-
"name": "myapp",
5-
"maintainers": [
3+
"Version": "0.1.0",
4+
"Name": "myapp",
5+
"Maintainers": [
66
{
7-
"name": "dev",
8-
"email": "dev@example.com"
7+
"Name": "dev",
8+
"Email": "dev@example.com"
99
}
1010
]
1111
}

‎internal/inspect/testdata/inspect-no-maintainers-json.golden‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Metadata": {
3-
"version": "0.1.0",
4-
"name": "myapp"
3+
"Version": "0.1.0",
4+
"Name": "myapp"
55
}
66
}

‎internal/inspect/testdata/inspect-no-parameters-json.golden‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"Metadata": {
3-
"version": "0.1.0",
4-
"name": "myapp",
5-
"description": "some description",
6-
"maintainers": [
3+
"Version": "0.1.0",
4+
"Name": "myapp",
5+
"Description": "some description",
6+
"Maintainers": [
77
{
8-
"name": "dev",
9-
"email": "dev@example.com"
8+
"Name": "dev",
9+
"Email": "dev@example.com"
1010
}
1111
]
1212
}

‎internal/inspect/testdata/inspect-overridden-json.golden‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Metadata": {
3-
"version": "0.1.0",
4-
"name": "myapp"
3+
"Version": "0.1.0",
4+
"Name": "myapp"
55
},
66
"Services": [
77
{

‎types/metadata/metadata.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
// Maintainer represents one of the apps's maintainers
1010
type Maintainer struct {
11-
Name string `json:"name"`
12-
Email string `json:"email,omitempty"`
11+
Name string
12+
Email string `json:",omitempty"`
1313
}
1414

1515
// Maintainers is a list of maintainers
@@ -35,13 +35,13 @@ func (m Maintainer) String() string {
3535

3636
// AppMetadata is the format of the data found inside the metadata.yml file
3737
type AppMetadata struct {
38-
Version string `json:"version"`
39-
Name string `json:"name"`
40-
Description string `json:"description,omitempty"`
41-
Maintainers Maintainers `json:"maintainers,omitempty"`
38+
Version string
39+
Name string
40+
Description string `json:",omitempty"`
41+
Maintainers Maintainers `json:",omitempty"`
4242
}
4343

44-
// Metadata extracts the docker-app metadata from the bundle
44+
// FromBundle extracts the docker-app metadata from the bundle
4545
func FromBundle(bndl *bundle.Bundle) AppMetadata {
4646
meta := AppMetadata{
4747
Name: bndl.Name,

0 commit comments

Comments
 (0)