From dd99c0cb784446d00eb59e866425ca3623f4bb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 12 Aug 2025 14:40:57 +0200 Subject: [PATCH] internal/weldr: remove support for `pulp.ostree` upload target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It turned out that the target was never adopted by the service, thus it is being deleted as part of upload code consolidation. Signed-off-by: Tomáš Hozza --- internal/weldr/upload.go | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/internal/weldr/upload.go b/internal/weldr/upload.go index 847ae5857..55bb41a69 100644 --- a/internal/weldr/upload.go +++ b/internal/weldr/upload.go @@ -110,16 +110,6 @@ type containerUploadSettings struct { func (containerUploadSettings) isUploadSettings() {} -type pulpOSTreeUploadSettings struct { - ServerAddress string `json:"server_address"` - Repository string `json:"repository"` - BasePath string `json:"basepath,omitempty"` - Username string `json:"username"` - Password string `json:"password"` -} - -func (pulpOSTreeUploadSettings) isUploadSettings() {} - type uploadRequest struct { Provider string `json:"provider"` ImageName string `json:"image_name"` @@ -159,8 +149,6 @@ func (u *uploadRequest) UnmarshalJSON(data []byte) error { settings = new(awsS3UploadSettings) case "container": settings = new(containerUploadSettings) - case "pulp.ostree": - settings = new(pulpOSTreeUploadSettings) default: return errors.New("unexpected provider name") } @@ -249,15 +237,6 @@ func targetsToUploadResponses(targets []*target.Target, state ComposeState) []up // AccessKeyID and SecretAccessKey are intentionally not included. } uploads = append(uploads, upload) - case *target.PulpOSTreeTargetOptions: - upload.ProviderName = "pulp.ostree" - upload.Settings = &pulpOSTreeUploadSettings{ - ServerAddress: options.ServerAddress, - Repository: options.Repository, - BasePath: options.BasePath, - // Username and Password are intentionally not included. - } - uploads = append(uploads, upload) } } @@ -389,10 +368,6 @@ func uploadRequestToTarget(u uploadRequest, imageType distro.ImageType) *target. TlsVerify: options.TlsVerify, } - case *pulpOSTreeUploadSettings: - t.Name = target.TargetNamePulpOSTree - convertedOptions := target.PulpOSTreeTargetOptions(*options) - t.Options = &convertedOptions } return &t