diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-10 08:42:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 08:42:16 -0400 |
| commit | 63468464e8365adefebee7127be888ea649edd8e (patch) | |
| tree | 1b4d8c8a9af7736f5f4cc813d7897341a3c2b27c /pkg/domain/infra/abi/trust.go | |
| parent | 9967f28339dc43c97966bc07345af53a374faf67 (diff) | |
| parent | 87718c4e676dc503f67ca6f283c4242cf19f9eb7 (diff) | |
| download | podman-63468464e8365adefebee7127be888ea649edd8e.tar.gz podman-63468464e8365adefebee7127be888ea649edd8e.tar.bz2 podman-63468464e8365adefebee7127be888ea649edd8e.zip | |
Merge pull request #6546 from rhatdan/lint
Turn on golint
Diffstat (limited to 'pkg/domain/infra/abi/trust.go')
| -rw-r--r-- | pkg/domain/infra/abi/trust.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go index 5b89c91d9..03986ad0e 100644 --- a/pkg/domain/infra/abi/trust.go +++ b/pkg/domain/infra/abi/trust.go @@ -112,8 +112,8 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti return ioutil.WriteFile(policyPath, data, 0644) } -func getPolicyShowOutput(policyContentStruct trust.PolicyContent, systemRegistriesDirPath string) ([]*trust.TrustPolicy, error) { - var output []*trust.TrustPolicy +func getPolicyShowOutput(policyContentStruct trust.PolicyContent, systemRegistriesDirPath string) ([]*trust.Policy, error) { + var output []*trust.Policy registryConfigs, err := trust.LoadAndMergeConfig(systemRegistriesDirPath) if err != nil { @@ -121,7 +121,7 @@ func getPolicyShowOutput(policyContentStruct trust.PolicyContent, systemRegistri } if len(policyContentStruct.Default) > 0 { - defaultPolicyStruct := trust.TrustPolicy{ + defaultPolicyStruct := trust.Policy{ Name: "* (default)", RepoName: "default", Type: trustTypeDescription(policyContentStruct.Default[0].Type), @@ -130,7 +130,7 @@ func getPolicyShowOutput(policyContentStruct trust.PolicyContent, systemRegistri } for _, transval := range policyContentStruct.Transports { for repo, repoval := range transval { - tempTrustShowOutput := trust.TrustPolicy{ + tempTrustShowOutput := trust.Policy{ Name: repo, RepoName: repo, Type: repoval[0].Type, |