HMS-5390: omit null values in upload response

Author: xbhouse

pkg/api/uploads.go

@@ -25,12 +25,12 @@ type UploadChunkRequest struct {
 }
 
 type UploadResponse struct {
-	ArtifactHref       *string    `json:"artifact_href"`       // Artifact href if one exists (on create only)
-	CompletedChecksums []string   `json:"completed_checksums"` // A list of already completed checksums
-	UploadUuid         *string    `json:"upload_uuid"`         // Upload UUID
-	Created            *time.Time `json:"created"`             // Timestamp of creation
-	LastUpdated        *time.Time `json:"last_updated"`        // Timestamp of last update
-	Size               int64      `json:"size"`                // Size of the upload in bytes
-	Completed          *time.Time `json:"completed,omitempty"` // Timestamp when upload is committed
+	ArtifactHref       *string    `json:"artifact_href,omitempty"`       // Artifact href if one exists (on create only)
+	CompletedChecksums []string   `json:"completed_checksums,omitempty"` // A list of already completed checksums
+	UploadUuid         *string    `json:"upload_uuid"`                   // Upload UUID
+	Created            *time.Time `json:"created,omitempty"`             // Timestamp of creation
+	LastUpdated        *time.Time `json:"last_updated,omitempty"`        // Timestamp of last update
+	Size               int64      `json:"size"`                          // Size of the upload in bytes
+	Completed          *time.Time `json:"completed,omitempty"`           // Timestamp when upload is committed
 
 }

pkg/handler/repositories.go

@@ -609,6 +609,7 @@ func (rh *RepositoryHandler) createUpload(c echo.Context) error {
 	if artifactHref != nil {
 		resp := &api.UploadResponse{
 			ArtifactHref: artifactHref,
+			Size:         req.Size,
 		}
 
 		return c.JSON(http.StatusCreated, resp)
@@ -623,16 +624,14 @@ func (rh *RepositoryHandler) createUpload(c echo.Context) error {
 	if existingUUID != "" {
 		resp := &api.UploadResponse{
 			UploadUuid:         &existingUUID,
-			Size:               req.ChunkSize,
+			Size:               req.Size,
 			CompletedChecksums: completedChunks,
-			ArtifactHref:       utils.Ptr(""),
 		}
 
 		return c.JSON(http.StatusCreated, resp)
 	}
 
 	pulpResp, err := ph.createUploadInternal(c, req)
-
 	if err != nil {
 		return err
 	}
@@ -643,13 +642,11 @@ func (rh *RepositoryHandler) createUpload(c echo.Context) error {
 	}
 
 	resp := &api.UploadResponse{
-		UploadUuid:         &uploadUuid,
-		Created:            pulpResp.PulpCreated,
-		LastUpdated:        pulpResp.PulpLastUpdated,
-		Size:               pulpResp.Size,
-		Completed:          pulpResp.Completed,
-		ArtifactHref:       utils.Ptr(""),
-		CompletedChecksums: make([]string, 0),
+		UploadUuid:  &uploadUuid,
+		Created:     pulpResp.PulpCreated,
+		LastUpdated: pulpResp.PulpLastUpdated,
+		Size:        pulpResp.Size,
+		Completed:   pulpResp.Completed,
 	}
 
 	return c.JSON(http.StatusCreated, resp)