weldr: define the pulp.ostree upload settings
This commit is contained in:
parent
4edeab80e3
commit
3b8e595351
1 changed files with 25 additions and 0 deletions
|
|
@ -108,6 +108,16 @@ 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"`
|
||||||
|
|
@ -147,6 +157,8 @@ 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")
|
||||||
}
|
}
|
||||||
|
|
@ -235,6 +247,15 @@ 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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -363,6 +384,10 @@ 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
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue