reporegistry: do not prepend repositories in confPaths

This commit breaks the API by changing the confPaths loading
in reporegistry to stop prepending `repositories/`. This makes
it easier to use this interface in e.g. `cmd/build`.

Note that this requires changes in the upstream projecs, notably
osbuild-composer and image-builder-cli.

pkg/reporegistry/reporegistry.go

@@ -17,7 +17,10 @@ type RepoRegistry struct {
 
 // New returns a new RepoRegistry instance with the data loaded from
 // the given repoConfigPaths and repoConfigFS instance. The order is
-// important here, first the paths are tried, then the FSes
+// important here, first the paths are tried, then the FSes.
+//
+// Note that the confPaths must point directly to the directory with
+// the json repo files.
 func New(repoConfigPaths []string, repoConfigFS []fs.FS) (*RepoRegistry, error) {
 	repositories, err := loadAllRepositories(repoConfigPaths, repoConfigFS)
 	if err != nil {

pkg/reporegistry/repository.go

@@ -18,7 +18,7 @@ func loadAllRepositories(confPaths []string, confFSes []fs.FS) (rpmmd.DistrosRep
 	var mergedFSes []fs.FS
 
 	for _, confPath := range confPaths {
-		mergedFSes = append(mergedFSes, os.DirFS(filepath.Join(confPath, "repositories")))
+		mergedFSes = append(mergedFSes, os.DirFS(confPath))
 	}
 	mergedFSes = append(mergedFSes, confFSes...)
 
@@ -90,9 +90,12 @@ func loadAllRepositoriesFromFS(confPaths []fs.FS) (rpmmd.DistrosRepoConfigs, err
 // If there are duplicate distro repositories definitions found in multiple paths, the first
 // encounter is preferred. For this reason, the order of paths in the passed list should
 // reflect the desired preference.
+//
+// Note that the confPaths must point directly to the directory with
+// the json repo files.
 func LoadRepositories(confPaths []string, distro string) (map[string][]rpmmd.RepoConfig, error) {
 	var repoConfigs map[string][]rpmmd.RepoConfig
-	path := "/repositories/" + distro + ".json"
+	path := distro + ".json"
 
 	for _, confPath := range confPaths {
 		var err error

pkg/reporegistry/repository_test.go

@@ -19,8 +19,8 @@ import (
 
 func getConfPaths(t *testing.T) []string {
 	confPaths := []string{
-		"./test/confpaths/priority1",
-		"./test/confpaths/priority2",
+		"./test/confpaths/priority1/repositories",
+		"./test/confpaths/priority2/repositories",
 	}
 	var absConfPaths []string