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

vdemeester · web-flow · commit 3f7c6c820036 · 2018-08-20T10:08:45.000+02:00
Fix 'trust inspect' typo: "AdminstrativeKeys"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": [

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"Name": "reg/img:unsigned-tag",`
`4`	`4`	`"SignedTags": [],`
`5`	`5`	`"Signers": [],`
`6`		`- "AdminstrativeKeys": [`
	`6`	`+ "AdministrativeKeys": [`
`7`	`7`	`{`
`8`	`8`	`"Name": "Root",`
`9`	`9`	`"Keys": [`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`],`
`13`	`13`	`"Signers": [],`
`14`		`- "AdminstrativeKeys": [`
	`14`	`+ "AdministrativeKeys": [`
`15`	`15`	`{`
`16`	`16`	`"Name": "Root",`
`17`	`17`	`"Keys": [`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`]`
`44`	`44`	`}`
`45`	`45`	`],`
`46`		`- "AdminstrativeKeys": [`
	`46`	`+ "AdministrativeKeys": [`
`47`	`47`	`{`
`48`	`48`	`"Name": "Root",`
`49`	`49`	`"Keys": [`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`	`],`
`23`		`- "AdminstrativeKeys": [`
	`23`	`+ "AdministrativeKeys": [`
`24`	`24`	`{`
`25`	`25`	`"Name": "Root",`
`26`	`26`	`"Keys": [`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ $ docker trust inspect alpine:latest`
`53`	`53`	`}`
`54`	`54`	`],`
`55`	`55`	`"Signers": [],`
`56`		`- "AdminstrativeKeys": [`
	`56`	`+ "AdministrativeKeys": [`
`57`	`57`	`{`
`58`	`58`	`"Name": "Repository",`
`59`	`59`	`"Keys": [`
`@@ -131,7 +131,7 @@ $ docker trust inspect my-image:purple`
`131`	`131`	`]`
`132`	`132`	`}`
`133`	`133`	`],`
`134`		`- "AdminstrativeKeys": [`
	`134`	`+ "AdministrativeKeys": [`
`135`	`135`	`{`
`136`	`136`	`"Name": "Repository",`
`137`	`137`	`"Keys": [`
`@@ -170,7 +170,7 @@ $ docker trust inspect alpine:unsigned`
`170`	`170`	`{`
`171`	`171`	`"Name": "alpine:unsigned",`
`172`	`172`	`"Signers": [],`
`173`		`- "AdminstrativeKeys": [`
	`173`	`+ "AdministrativeKeys": [`
`174`	`174`	`{`
`175`	`175`	`"Name": "Repository",`
`176`	`176`	`"Keys": [`
`@@ -233,7 +233,7 @@ $ docker trust inspect alpine`
`233`	`233`	`}`
`234`	`234`	`],`
`235`	`235`	`"Signers": [],`
`236`		`- "AdminstrativeKeys": [`
	`236`	`+ "AdministrativeKeys": [`
`237`	`237`	`{`
`238`	`238`	`"Name": "Repository",`
`239`	`239`	`"Keys": [`
`@@ -304,7 +304,7 @@ $ docker trust inspect alpine notary`
`304`	`304`	`}`
`305`	`305`	`],`
`306`	`306`	`"Signers": [],`
`307`		`- "AdminstrativeKeys": [`
	`307`	`+ "AdministrativeKeys": [`
`308`	`308`	`{`
`309`	`309`	`"Name": "Repository",`
`310`	`310`	`"Keys": [`
`@@ -342,7 +342,7 @@ $ docker trust inspect alpine notary`
`342`	`342`	`}`
`343`	`343`	`],`
`344`	`344`	`"Signers": [],`
`345`		`- "AdminstrativeKeys": [`
	`345`	`+ "AdministrativeKeys": [`
`346`	`346`	`{`
`347`	`347`	`"Name": "Root",`
`348`	`348`	`"Keys": [`