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

many: switch to osbuild/images/pkg/upload for azure

Browse source 
This is part of consolidating all the upload code in images.
This commit is contained in:
Sanne Raymaekers 2025-07-29 11:13:50 +02:00 • committed by Achilleas Koutsou
parent 26ab15b1c9
commit 0e2daa201f
11 changed files with 59 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/osbuild-upload-azure/main.go
View file

@ -8,7 +8,7 @@ import (
"path"
"strings"
"github.com/osbuild/osbuild-composer/internal/upload/azure"
"github.com/osbuild/images/pkg/upload/azure"
)
func checkStringNotEmpty(variable string, errorMessage string) {

2
cmd/osbuild-worker/config.go
View file

@ -6,7 +6,7 @@ import (
"time"
"github.com/BurntSushi/toml"
"github.com/osbuild/osbuild-composer/internal/upload/azure"
"github.com/osbuild/images/pkg/upload/azure"
"github.com/sirupsen/logrus"
)

9
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -29,12 +29,12 @@ import (
"github.com/google/uuid"
"github.com/sirupsen/logrus"
"github.com/osbuild/images/pkg/upload/azure"
"github.com/osbuild/images/pkg/upload/koji"
"github.com/osbuild/osbuild-composer/internal/cloud/awscloud"
"github.com/osbuild/osbuild-composer/internal/cloud/gcp"
"github.com/osbuild/osbuild-composer/internal/osbuildexecutor"
"github.com/osbuild/osbuild-composer/internal/target"
"github.com/osbuild/osbuild-composer/internal/upload/azure"
"github.com/osbuild/osbuild-composer/internal/upload/vmware"
"github.com/osbuild/osbuild-composer/internal/worker"
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
@ -978,16 +978,19 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
}
logWithId.Info("[Azure] 📝 Registering the image")
hyperVGen := azure.HyperVGenV1
if targetOptions.HyperVGeneration == target.HyperVGenV2 {
hyperVGen = azure.HyperVGenV2
}
err = c.RegisterImage(
ctx,
targetOptions.SubscriptionID,
targetOptions.ResourceGroup,
storageAccount,
storageContainer,
blobName,
jobTarget.ImageName,
location,
targetOptions.HyperVGeneration,
hyperVGen,
)
if err != nil {
targetResult.TargetError = clienterrors.New(clienterrors.ErrorImportingImage, fmt.Sprintf("registering the image failed: %v", err), nil)

2
cmd/osbuild-worker/main.go
View file

@ -21,9 +21,9 @@ import (
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/upload/azure"
"github.com/osbuild/images/pkg/upload/koji"
"github.com/osbuild/osbuild-composer/internal/cloud/awscloud"
"github.com/osbuild/osbuild-composer/internal/upload/azure"
"github.com/osbuild/osbuild-composer/internal/upload/oci"
"github.com/osbuild/osbuild-composer/internal/worker"
)