bee14bf392
jobimpl-osbuild --------------- Add GenericS3Creds to struct Add method to create AWS with Endpoint for Generic S3 (with its own credentials file) Move uploading to S3 and result handling to a separate method (along with the special VMDK handling) adjust the AWS S3 case to the new method Implement a new case for uploading to a generic S3 service awscloud -------- Add wrapper methods for endpoint support Set the endpoint to the AWS session Set s3ForcePathStyle to true if endpoint was set Target ------ Define a new target type for the GenericS3Target and Options Handle unmarshaling of the target options and result for the Generic S3 Weldr ----- Add support for only uploading to AWS S3 Define new structures for AWS S3 and Generic S3 (based on AWS S3) Handle unmarshaling of the providers settings' upload settings main ---- Add a section in the main config for the Generic S3 service for credentials If provided pass the credentials file name to the osbuild job implementation Upload Utility -------------- Add upload-generic-s3 utility Makefile ------ Do not fail if the bin directory already exists Tests ----- Add test cases for both AWS and a generic S3 server Add a generic s3_test.sh file for both test cases and add it to the tests RPM spec Adjust the libvirt test case script to support already created images GitLabCI - Extend the libvirt test case to include the two new tests
66 lines
1.5 KiB
Go
66 lines
1.5 KiB
Go
package target
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
)
|
|
|
|
type TargetResult struct {
|
|
Name string `json:"name"`
|
|
Options TargetResultOptions `json:"options"`
|
|
}
|
|
|
|
func newTargetResult(name string, options TargetResultOptions) *TargetResult {
|
|
return &TargetResult{
|
|
Name: name,
|
|
Options: options,
|
|
}
|
|
}
|
|
|
|
type TargetResultOptions interface {
|
|
isTargetResultOptions()
|
|
}
|
|
|
|
type rawTargetResult struct {
|
|
Name string `json:"name"`
|
|
Options json.RawMessage `json:"options"`
|
|
}
|
|
|
|
func (targetResult *TargetResult) UnmarshalJSON(data []byte) error {
|
|
var rawTR rawTargetResult
|
|
err := json.Unmarshal(data, &rawTR)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
options, err := UnmarshalTargetResultOptions(rawTR.Name, rawTR.Options)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
targetResult.Name = rawTR.Name
|
|
targetResult.Options = options
|
|
return nil
|
|
}
|
|
|
|
func UnmarshalTargetResultOptions(trName string, rawOptions json.RawMessage) (TargetResultOptions, error) {
|
|
var options TargetResultOptions
|
|
switch trName {
|
|
case "org.osbuild.aws":
|
|
options = new(AWSTargetResultOptions)
|
|
case "org.osbuild.aws.s3":
|
|
options = new(AWSS3TargetResultOptions)
|
|
case "org.osbuild.gcp":
|
|
options = new(GCPTargetResultOptions)
|
|
case "org.osbuild.azure.image":
|
|
options = new(AzureImageTargetResultOptions)
|
|
case "org.osbuild.oci":
|
|
options = new(OCITargetResultOptions)
|
|
case "org.osbuild.generic.s3":
|
|
options = new(GenericS3TargetResultOptions)
|
|
default:
|
|
return nil, fmt.Errorf("unexpected target result name: %s", trName)
|
|
}
|
|
err := json.Unmarshal(rawOptions, options)
|
|
|
|
return options, err
|
|
}
|