Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1300 from mmacy/1299-trust-inspect-typo 

Fix 'trust inspect' typo: "AdminstrativeKeys"
This commit is contained in:
Vincent Demeester 2018-08-20 10:08:45 +02:00 committed by GitHub
parent 5706f9518a c11acddfb5
commit 3f7c6c8200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/command/trust/common.go
View File

@ -31,10 +31,10 @@ type trustTagRow struct {
// trustRepo represents consumable information about a trusted repository // trustRepo represents consumable information about a trusted repository
type trustRepo struct { type trustRepo struct {
Name string Name string
SignedTags []trustTagRow SignedTags []trustTagRow
Signers []trustSigner Signers []trustSigner
AdminstrativeKeys []trustSigner AdministrativeKeys []trustSigner
} }
// trustSigner represents a trusted signer in a trusted repository // trustSigner represents a trusted signer in a trusted repository

8
cli/command/trust/inspect.go
View File

@ -107,9 +107,9 @@ func getRepoTrustInfo(cli command.Cli, remote string) ([]byte, error) {
sort.Slice(adminList, func(i, j int) bool { return adminList[i].Name > adminList[j].Name }) sort.Slice(adminList, func(i, j int) bool { return adminList[i].Name > adminList[j].Name })
return json.Marshal(trustRepo{ return json.Marshal(trustRepo{
Name: remote, Name: remote,
SignedTags: signatureRows, SignedTags: signatureRows,
Signers: signerList, Signers: signerList,
AdminstrativeKeys: adminList, AdministrativeKeys: adminList,
}) })
} }

2
cli/command/trust/testdata/trust-inspect-empty-repo.golden vendored
View File

@ -3,7 +3,7 @@
"Name": "reg/img:unsigned-tag", "Name": "reg/img:unsigned-tag",
"SignedTags": [], "SignedTags": [],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [

2
cli/command/trust/testdata/trust-inspect-full-repo-no-signers.golden vendored
View File

@ -11,7 +11,7 @@
} }
], ],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [

2
cli/command/trust/testdata/trust-inspect-full-repo-with-signers.golden vendored
View File

@ -43,7 +43,7 @@
] ]
} }
], ],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [

4
cli/command/trust/testdata/trust-inspect-multiple-repos-with-signers.golden vendored
View File

@ -43,7 +43,7 @@
] ]
} }
], ],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [
@ -106,7 +106,7 @@
] ]
} }
], ],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [

2
cli/command/trust/testdata/trust-inspect-one-tag-no-signers.golden vendored
View File

@ -11,7 +11,7 @@
} }
], ],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [

2
cli/command/trust/testdata/trust-inspect-unsigned-tag-with-signers.golden vendored
View File

@ -20,7 +20,7 @@
] ]
} }
], ],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [

12
docs/reference/commandline/trust_inspect.md
View File

@ -53,7 +53,7 @@ $ docker trust inspect alpine:latest
} }
], ],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Repository", "Name": "Repository",
"Keys": [ "Keys": [
@ -131,7 +131,7 @@ $ docker trust inspect my-image:purple
] ]
} }
], ],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Repository", "Name": "Repository",
"Keys": [ "Keys": [
@ -170,7 +170,7 @@ $ docker trust inspect alpine:unsigned
{ {
"Name": "alpine:unsigned", "Name": "alpine:unsigned",
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Repository", "Name": "Repository",
"Keys": [ "Keys": [
@ -233,7 +233,7 @@ $ docker trust inspect alpine
} }
], ],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Repository", "Name": "Repository",
"Keys": [ "Keys": [
@ -304,7 +304,7 @@ $ docker trust inspect alpine notary
} }
], ],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Repository", "Name": "Repository",
"Keys": [ "Keys": [
@ -342,7 +342,7 @@ $ docker trust inspect alpine notary
} }
], ],
"Signers": [], "Signers": [],
"AdminstrativeKeys": [ "AdministrativeKeys": [
{ {
"Name": "Root", "Name": "Root",
"Keys": [ "Keys": [