From fe840e1ddf7c3ed3a8ce8d42dd511aa8f8822c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 12 Aug 2025 10:30:10 +0200 Subject: [PATCH] Use VMWare upload implementation from osbuild/images (HMS-9026) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Delete the VMWare upload implementation from osbuild-composer and use the one from osbuild/images. Signed-off-by: Tomáš Hozza --- cmd/osbuild-worker/jobimpl-osbuild.go | 2 +- go.mod | 2 +- .../github.com/osbuild/images/pkg}/upload/vmware/vmware.go | 0 vendor/modules.txt | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename {internal => vendor/github.com/osbuild/images/pkg}/upload/vmware/vmware.go (100%) diff --git a/cmd/osbuild-worker/jobimpl-osbuild.go b/cmd/osbuild-worker/jobimpl-osbuild.go index 7f60fab7b..e67339552 100644 --- a/cmd/osbuild-worker/jobimpl-osbuild.go +++ b/cmd/osbuild-worker/jobimpl-osbuild.go @@ -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" ) diff --git a/go.mod b/go.mod index fe08a402c..c4121fe51 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/internal/upload/vmware/vmware.go b/vendor/github.com/osbuild/images/pkg/upload/vmware/vmware.go similarity index 100% rename from internal/upload/vmware/vmware.go rename to vendor/github.com/osbuild/images/pkg/upload/vmware/vmware.go diff --git a/vendor/modules.txt b/vendor/modules.txt index ebb51a1c3..3ed2c0629 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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