From c11acddfb5c7415996b6b2e130be1bc86ca295b4 Mon Sep 17 00:00:00 2001 From: mmacy Date: Sun, 19 Aug 2018 17:57:04 -0700 Subject: [PATCH] [WIP] fix trust inspect typo 'AdminstrativeKeys' Signed-off-by: mmacy --- cli/command/trust/common.go | 8 ++++---- cli/command/trust/inspect.go | 8 ++++---- .../trust/testdata/trust-inspect-empty-repo.golden | 2 +- .../trust-inspect-full-repo-no-signers.golden | 2 +- .../trust-inspect-full-repo-with-signers.golden | 2 +- .../trust-inspect-multiple-repos-with-signers.golden | 4 ++-- .../testdata/trust-inspect-one-tag-no-signers.golden | 2 +- .../trust-inspect-unsigned-tag-with-signers.golden | 2 +- docs/reference/commandline/trust_inspect.md | 12 ++++++------ 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cli/command/trust/common.go b/cli/command/trust/common.go index 4cc876a121..0a5b54716a 100644 --- a/cli/command/trust/common.go +++ b/cli/command/trust/common.go @@ -31,10 +31,10 @@ type trustTagRow struct { // trustRepo represents consumable information about a trusted repository type trustRepo struct { - Name string - SignedTags []trustTagRow - Signers []trustSigner - AdminstrativeKeys []trustSigner + Name string + SignedTags []trustTagRow + Signers []trustSigner + AdministrativeKeys []trustSigner } // trustSigner represents a trusted signer in a trusted repository diff --git a/cli/command/trust/inspect.go b/cli/command/trust/inspect.go index 9f10878acc..d7370bd09d 100644 --- a/cli/command/trust/inspect.go +++ b/cli/command/trust/inspect.go @@ -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 }) return json.Marshal(trustRepo{ - Name: remote, - SignedTags: signatureRows, - Signers: signerList, - AdminstrativeKeys: adminList, + Name: remote, + SignedTags: signatureRows, + Signers: signerList, + AdministrativeKeys: adminList, }) } diff --git a/cli/command/trust/testdata/trust-inspect-empty-repo.golden b/cli/command/trust/testdata/trust-inspect-empty-repo.golden index ae6fd9c880..3aba7f3b2d 100644 --- a/cli/command/trust/testdata/trust-inspect-empty-repo.golden +++ b/cli/command/trust/testdata/trust-inspect-empty-repo.golden @@ -3,7 +3,7 @@ "Name": "reg/img:unsigned-tag", "SignedTags": [], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ diff --git a/cli/command/trust/testdata/trust-inspect-full-repo-no-signers.golden b/cli/command/trust/testdata/trust-inspect-full-repo-no-signers.golden index cda9b40e0e..23158f75bc 100644 --- a/cli/command/trust/testdata/trust-inspect-full-repo-no-signers.golden +++ b/cli/command/trust/testdata/trust-inspect-full-repo-no-signers.golden @@ -11,7 +11,7 @@ } ], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ diff --git a/cli/command/trust/testdata/trust-inspect-full-repo-with-signers.golden b/cli/command/trust/testdata/trust-inspect-full-repo-with-signers.golden index 496b312bdc..4901a7cca5 100644 --- a/cli/command/trust/testdata/trust-inspect-full-repo-with-signers.golden +++ b/cli/command/trust/testdata/trust-inspect-full-repo-with-signers.golden @@ -43,7 +43,7 @@ ] } ], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ diff --git a/cli/command/trust/testdata/trust-inspect-multiple-repos-with-signers.golden b/cli/command/trust/testdata/trust-inspect-multiple-repos-with-signers.golden index fd87979e5c..1958bb7eb4 100644 --- a/cli/command/trust/testdata/trust-inspect-multiple-repos-with-signers.golden +++ b/cli/command/trust/testdata/trust-inspect-multiple-repos-with-signers.golden @@ -43,7 +43,7 @@ ] } ], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ @@ -106,7 +106,7 @@ ] } ], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ diff --git a/cli/command/trust/testdata/trust-inspect-one-tag-no-signers.golden b/cli/command/trust/testdata/trust-inspect-one-tag-no-signers.golden index b1745d5c75..0fcefebbc9 100644 --- a/cli/command/trust/testdata/trust-inspect-one-tag-no-signers.golden +++ b/cli/command/trust/testdata/trust-inspect-one-tag-no-signers.golden @@ -11,7 +11,7 @@ } ], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ diff --git a/cli/command/trust/testdata/trust-inspect-unsigned-tag-with-signers.golden b/cli/command/trust/testdata/trust-inspect-unsigned-tag-with-signers.golden index 8c0a84eb29..82a3282fe6 100644 --- a/cli/command/trust/testdata/trust-inspect-unsigned-tag-with-signers.golden +++ b/cli/command/trust/testdata/trust-inspect-unsigned-tag-with-signers.golden @@ -20,7 +20,7 @@ ] } ], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [ diff --git a/docs/reference/commandline/trust_inspect.md b/docs/reference/commandline/trust_inspect.md index 4d1663d761..c8bcc558ef 100644 --- a/docs/reference/commandline/trust_inspect.md +++ b/docs/reference/commandline/trust_inspect.md @@ -53,7 +53,7 @@ $ docker trust inspect alpine:latest } ], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Repository", "Keys": [ @@ -131,7 +131,7 @@ $ docker trust inspect my-image:purple ] } ], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Repository", "Keys": [ @@ -170,7 +170,7 @@ $ docker trust inspect alpine:unsigned { "Name": "alpine:unsigned", "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Repository", "Keys": [ @@ -233,7 +233,7 @@ $ docker trust inspect alpine } ], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Repository", "Keys": [ @@ -304,7 +304,7 @@ $ docker trust inspect alpine notary } ], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Repository", "Keys": [ @@ -342,7 +342,7 @@ $ docker trust inspect alpine notary } ], "Signers": [], - "AdminstrativeKeys": [ + "AdministrativeKeys": [ { "Name": "Root", "Keys": [