cloudapi: add pulp upload target

Add the pulp.ostree upload target to the cloud API and enable it for edge/iot commits. Co-Authored-By: Achilleas Koutsou <[email protected]>
osbuild · Oct 26, 2023 · a1ae531 · a1ae531
1 parent 74a64aa
commit a1ae531
Show file tree

Hide file tree

Showing 4 changed files with 241 additions and 153 deletions.
diff --git a/internal/cloudapi/v2/handler.go b/internal/cloudapi/v2/handler.go
@@ -391,7 +391,12 @@ func targetResultToUploadStatus(t *target.TargetResult) (*UploadStatus, error) {
 		uploadOptions = OCIUploadStatus{
 			Url: ociOptions.URL,
 		}
-
+	case target.TargetNamePulpOSTree:
+		uploadType = UploadTypesPulp
+		pulpOSTreeOptions := t.Options.(*target.PulpOSTreeTargetResultOptions)
+		uploadOptions = PulpOSTreeUploadStatus{
+			RepoUrl: pulpOSTreeOptions.RepoURL,
+		}
 	default:
 		return nil, fmt.Errorf("unknown upload target: %s", t.Name)
 	}

diff --git a/internal/cloudapi/v2/imagerequest.go b/internal/cloudapi/v2/imagerequest.go
@@ -220,6 +220,35 @@ func newOCITarget(options UploadOptions, imageType distro.ImageType) (*target.Ta
 	return t, nil
 }
 
+func newPulpOSTreeTarget(options UploadOptions, imageType distro.ImageType) (*target.Target, error) {
+	var pulpUploadOptions PulpOSTreeUploadOptions
+	jsonUploadOptions, err := json.Marshal(options)
+	if err != nil {
+		return nil, HTTPError(ErrorJSONMarshallingError)
+	}
+	err = json.Unmarshal(jsonUploadOptions, &pulpUploadOptions)
+	if err != nil {
+		return nil, HTTPError(ErrorJSONUnMarshallingError)
+	}
+	serverAddress := ""
+	if pulpUploadOptions.ServerAddress != nil {
+		serverAddress = *pulpUploadOptions.ServerAddress
+	}
+	repository := ""
+	if pulpUploadOptions.Repository != nil {
+		repository = *pulpUploadOptions.Repository
+	}
+	t := target.NewPulpOSTreeTarget(&target.PulpOSTreeTargetOptions{
+		ServerAddress: serverAddress,
+		Repository:    repository,
+		BasePath:      pulpUploadOptions.Basepath,
+	})
+
+	t.ImageName = fmt.Sprintf("composer-api-%s", uuid.New().String())
+	t.OsbuildArtifact.ExportFilename = imageType.Filename()
+	return t, nil
+}
+
 // Returns the name of the default target for a given image type name or error
 // if the image type name is unknown.
 func getDefaultTarget(imageType ImageTypes) (UploadTargetType, error) {
@@ -321,6 +350,10 @@ func targetSupportMap() map[UploadTargetType]map[ImageTypes]bool {
 		UploadTargetTypeOrgOsbuildOci: {
 			ImageTypesOci: true,
 		},
+		UploadTargetTypeOrgOsbuildPulpOstree: {
+			ImageTypesEdgeCommit: true,
+			ImageTypesIotCommit:  true,
+		},
 	}
 }
 
@@ -379,6 +412,9 @@ func getTarget(targetType UploadTargetType, options UploadOptions, request *Comp
 	case UploadTargetTypeOrgOsbuildOci:
 		irTarget, err = newOCITarget(options, imageType)
 
+	case UploadTargetTypeOrgOsbuildPulpOstree:
+		irTarget, err = newPulpOSTreeTarget(options, imageType)
+
 	default:
 		return nil, HTTPError(ErrorInvalidUploadTarget)
 	}