Use the full descriptionsOfPolicyRequirements for the default scope

... instead of taking a shortcut, e.g. not listing any keys if they are required.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

1 files changed, 15 insertions, 12 deletions

diff --git a/pkg/trust/registries.go b/pkg/trust/registries.go
index e179b61ac..0adc38232 100644
--- a/pkg/trust/registries.go
+++ b/pkg/trust/registries.go
@@ -102,21 +102,24 @@ func loadAndMergeConfig(dirPath string) (*registryConfiguration, error) {
 }
 
 // registriesDConfigurationForScope returns registries.d configuration for the provided scope.
+// scope can be "" to return only the global default configuration entry.
 func registriesDConfigurationForScope(registryConfigs *registryConfiguration, scope string) *registryNamespace {
 	searchScope := scope
-	if !strings.Contains(searchScope, "/") {
-		val, exists := registryConfigs.Docker[searchScope]
-		if exists {
-			return &val
-		}
-	}
-	for range strings.Split(scope, "/") {
-		val, exists := registryConfigs.Docker[searchScope]
-		if exists {
-			return &val
+	if searchScope != "" {
+		if !strings.Contains(searchScope, "/") {
+			val, exists := registryConfigs.Docker[searchScope]
+			if exists {
+				return &val
+			}
 		}
-		if strings.Contains(searchScope, "/") {
-			searchScope = searchScope[:strings.LastIndex(searchScope, "/")]
+		for range strings.Split(scope, "/") {
+			val, exists := registryConfigs.Docker[searchScope]
+			if exists {
+				return &val
+			}
+			if strings.Contains(searchScope, "/") {
+				searchScope = searchScope[:strings.LastIndex(searchScope, "/")]
+			}
 		}
 	}
 	return registryConfigs.DefaultDocker