625b1578fa
Update the osbuild/images to the version which introduces "dot notation" for distro release versions. - Replace all uses of distroregistry by distrofactory. - Delete local version of reporegistry and use the one from the osbuild/images. - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single `createTestWeldrAPI()` function`. - store/fixture: rework fixtures to allow overriding the host distro name and host architecture name. A cleanup function to restore the host distro and arch names is always part of the fixture struct. - Delete `distro_mock` package, since it is no longer used. - Bump the required version of osbuild to 98, because the OSCAP customization is using the 'compress_results' stage option, which is not available in older versions of osbuild. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
29 lines
587 B
Go
29 lines
587 B
Go
package cloudapi
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/osbuild/images/pkg/distrofactory"
|
|
"github.com/osbuild/osbuild-composer/internal/worker"
|
|
|
|
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
|
|
)
|
|
|
|
type Server struct {
|
|
v2 *v2.Server
|
|
}
|
|
|
|
func NewServer(workers *worker.Server, distros *distrofactory.Factory, config v2.ServerConfig) *Server {
|
|
server := &Server{
|
|
v2: v2.NewServer(workers, distros, config),
|
|
}
|
|
return server
|
|
}
|
|
|
|
func (server *Server) V2(path string) http.Handler {
|
|
return server.v2.Handler(path)
|
|
}
|
|
|
|
func (server *Server) Shutdown() {
|
|
server.v2.Shutdown()
|
|
}
|