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

internal/weldr: remove support for pulp.ostree upload target

Browse source 
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 <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-08-12 14:40:57 +02:00 • committed by Simon de Vlieger
parent 742633662d
commit dd99c0cb78
1 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
internal/weldr/upload.go
View file

@ -110,16 +110,6 @@ type containerUploadSettings struct {
func (containerUploadSettings) isUploadSettings() {} 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 { type uploadRequest struct {
Provider string `json:"provider"` Provider string `json:"provider"`
ImageName string `json:"image_name"` ImageName string `json:"image_name"`
@ -159,8 +149,6 @@ func (u *uploadRequest) UnmarshalJSON(data []byte) error {
settings = new(awsS3UploadSettings) settings = new(awsS3UploadSettings)
case "container": case "container":
settings = new(containerUploadSettings) settings = new(containerUploadSettings)
case "pulp.ostree":
settings = new(pulpOSTreeUploadSettings)
default: default:
return errors.New("unexpected provider name") 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. // AccessKeyID and SecretAccessKey are intentionally not included.
} }
uploads = append(uploads, upload) 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, TlsVerify: options.TlsVerify,
} }
case *pulpOSTreeUploadSettings:
t.Name = target.TargetNamePulpOSTree
convertedOptions := target.PulpOSTreeTargetOptions(*options)
t.Options = &convertedOptions
} }
return &t return &t