summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2022-08-24 19:33:00 +0200
committerMiloslav Trmač <mitr@redhat.com>2022-08-25 00:35:59 +0200
commit4f68075306efb9381de3c5ea5762a3f843137b56 (patch)
treef6e8fcf00ffce56e5587d28537f3e004da5621f2
parent4c5366ee0306777d164dfa6ce02c97e29849d9f2 (diff)
downloadpodman-4f68075306efb9381de3c5ea5762a3f843137b56.tar.gz
podman-4f68075306efb9381de3c5ea5762a3f843137b56.tar.bz2
podman-4f68075306efb9381de3c5ea5762a3f843137b56.zip
Add a variable for scope
Only process the incoming args[] (which is a single-element array for some reason) once, and use a semantic variable name for the value we care about. Should not change behavior, the only caller already supposedly ensures that len(args) == 1. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r--pkg/domain/infra/abi/trust.go13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go
index cefe76da7..61bf03727 100644
--- a/pkg/domain/infra/abi/trust.go
+++ b/pkg/domain/infra/abi/trust.go
@@ -46,6 +46,11 @@ func (ir *ImageEngine) ShowTrust(ctx context.Context, args []string, options ent
}
func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options entities.SetTrustOptions) error {
+ if len(args) != 1 {
+ return fmt.Errorf("SetTrust called with unexpected %d args", len(args))
+ }
+ scope := args[0]
+
var (
policyContentStruct trust.PolicyContent
newReposContent []trust.RepoContent
@@ -81,7 +86,7 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti
} else {
newReposContent = append(newReposContent, trust.RepoContent{Type: trustType})
}
- if args[0] == "default" {
+ if scope == "default" {
policyContentStruct.Default = newReposContent
} else {
if len(policyContentStruct.Default) == 0 {
@@ -89,9 +94,9 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti
}
registryExists := false
for transport, transportval := range policyContentStruct.Transports {
- _, registryExists = transportval[args[0]]
+ _, registryExists = transportval[scope]
if registryExists {
- policyContentStruct.Transports[transport][args[0]] = newReposContent
+ policyContentStruct.Transports[transport][scope] = newReposContent
break
}
}
@@ -102,7 +107,7 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti
if policyContentStruct.Transports["docker"] == nil {
policyContentStruct.Transports["docker"] = make(map[string][]trust.RepoContent)
}
- policyContentStruct.Transports["docker"][args[0]] = append(policyContentStruct.Transports["docker"][args[0]], newReposContent...)
+ policyContentStruct.Transports["docker"][scope] = append(policyContentStruct.Transports["docker"][scope], newReposContent...)
}
}