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

Use VMWare upload implementation from osbuild/images (HMS-9026)

Browse source 
Delete the VMWare upload implementation from osbuild-composer and use
the one from osbuild/images.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-08-12 10:30:10 +02:00 • committed by Achilleas Koutsou
parent a75f2b95fd
commit fe840e1ddf
4 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,11 +34,11 @@ import (
"github.com/osbuild/images/pkg/cloud/azure"
"github.com/osbuild/images/pkg/platform"
"github.com/osbuild/images/pkg/upload/koji"
"github.com/osbuild/images/pkg/upload/vmware"
"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/vmware"
"github.com/osbuild/osbuild-composer/internal/worker"
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
)

2
go.mod
View file

@ -44,7 +44,6 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.10.0
github.com/vmware/govmomi v0.51.0
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
golang.org/x/oauth2 v0.30.0
golang.org/x/sync v0.16.0
@ -210,6 +209,7 @@ require (
github.com/vbatts/tar-split v0.12.1 // indirect
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
github.com/vmware/govmomi v0.51.0 // indirect
github.com/zeebo/errs v1.4.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect

0
internal/upload/vmware/vmware.go → vendor/github.com/osbuild/images/pkg/upload/vmware/vmware.go generated vendored
View file

1
vendor/modules.txt vendored
View file

@ -1016,6 +1016,7 @@ github.com/osbuild/images/pkg/rpmmd
github.com/osbuild/images/pkg/runner
github.com/osbuild/images/pkg/sbom
github.com/osbuild/images/pkg/upload/koji
github.com/osbuild/images/pkg/upload/vmware
# github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
## explicit; go 1.21
github.com/osbuild/osbuild-composer/pkg/splunk_logger