particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

subscription: new package for subscription options

Browse source 
Move the subscription options from distro to its own package.
Now we can import the manifest package into the distro package (instead
of the other way around) so we can work with the manifest.Manifest type
in distro.
This commit is contained in:
Achilleas Koutsou 2023-04-12 19:52:27 +02:00 • committed by Simon de Vlieger
parent ea305d9c0f
commit 0f925c445c
16 changed files with 95 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/cloudapi/v2/handler.go
View file

@ -21,6 +21,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/osbuild"
"github.com/osbuild/osbuild-composer/internal/ostree"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/subscription"
"github.com/osbuild/osbuild-composer/internal/target"
"github.com/osbuild/osbuild-composer/internal/worker"
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
@ -446,7 +447,7 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
if request.Customizations.Subscription.Rhc != nil {
rhc = *request.Customizations.Subscription.Rhc
}
imageOptions.Subscription = &distro.SubscriptionImageOptions{
imageOptions.Subscription = &subscription.ImageOptions{
Organization: request.Customizations.Subscription.Organization,
ActivationKey: request.Customizations.Subscription.ActivationKey,
ServerUrl: request.Customizations.Subscription.ServerUrl,