PatchEnvelopes: URL exposed to app instance reflects API

Signed-off-by: Pavel Abramov <[email protected]>

pkg/pillar/cmd/zedrouter/metadata.go

@@ -31,6 +31,10 @@ const SignerMaxSize = 65535
 // DiagMaxSize is the max returned size for diag
 const DiagMaxSize = 65535
 
+// PatchEnvelopeHandler is route used for patch envelopes
+// it is used in URL composing of patch envelopes
+const PatchEnvelopeHandler = "/eve/v1/patch/"
+
 func (z *zedrouter) makeMetadataHandler() http.Handler {
 	r := chi.NewRouter()
 
@@ -87,7 +91,7 @@ func (z *zedrouter) makeMetadataHandler() http.Handler {
 	diagHandler := &diagHandler{zedrouter: z}
 	r.Get("/eve/v1/diag", diagHandler.ServeHTTP)
 
-	r.Route("/eve/v1/patch/", func(r chi.Router) {
+	r.Route(PatchEnvelopeHandler, func(r chi.Router) {
 		r.Use(WithPatchEnvelopesByIP(z))
 
 		r.Get("/description.json", HandlePatchDescription(z))

pkg/pillar/cmd/zedrouter/metadata_handlers.go

@@ -583,7 +583,7 @@ func HandlePatchDescription(z *zedrouter) func(http.ResponseWriter, *http.Reques
 		// WithPatchEnvelopesByIP middleware returns envelopes which are more than 0
 		envelopes := r.Context().Value(patchEnvelopesContextKey).(types.PatchEnvelopeInfoList)
 
-		b, err := PatchEnvelopesJSONForAppInstance(envelopes)
+		b, err := patchEnvelopesJSONFOrAppInstance(envelopes)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusUnprocessableEntity)
 			return

pkg/pillar/cmd/zedrouter/patchenvelopes.go

@@ -201,15 +201,30 @@ type peInfoToDisplay struct {
 	VolumeRefs  []types.BinaryBlobVolumeRef
 }
 
-// PatchEnvelopesJSONForAppInstance returns json representation
+const metadataIP = "169.254.169.254"
+
+// patchEnvelopesJSONFOrAppInstance returns json representation
 // of Patch Envelopes list which are shown to app instances
-func PatchEnvelopesJSONForAppInstance(pe types.PatchEnvelopeInfoList) ([]byte, error) {
+func patchEnvelopesJSONFOrAppInstance(pe types.PatchEnvelopeInfoList) ([]byte, error) {
 	toDisplay := make([]peInfoToDisplay, len(pe.Envelopes))
 
 	for i, envelope := range pe.Envelopes {
+
+		var binaryBlobs []types.BinaryBlobCompleted
+		binaryBlobs = nil
+		if envelope.BinaryBlobs != nil {
+			binaryBlobs = make([]types.BinaryBlobCompleted, len(envelope.BinaryBlobs))
+			copy(binaryBlobs, envelope.BinaryBlobs)
+		}
+
+		for j := range binaryBlobs {
+			url := fmt.Sprintf("http://%s%sdownload/%s/%s", metadataIP, PatchEnvelopeHandler, envelope.PatchID, binaryBlobs[j].FileName)
+			binaryBlobs[j].URL = url
+		}
+
 		toDisplay[i] = peInfoToDisplay{
 			PatchID:     envelope.PatchID,
-			BinaryBlobs: envelope.BinaryBlobs,
+			BinaryBlobs: binaryBlobs,
 			VolumeRefs:  envelope.VolumeRefs,
 		}
 	}

pkg/pillar/types/patchenvelopestypes_test.go

@@ -32,7 +32,7 @@ func TestPatchEnvelopeInfoList(t *testing.T) {
 
 	pe.Envelopes = append(pe.Envelopes, peInfo)
 
-	g.Expect(pe.Get(uuidString)).To(gomega.BeEquivalentTo([]types.PatchEnvelopeInfo{peInfo}))
+	g.Expect(pe.Get(uuidString).Envelopes).To(gomega.BeEquivalentTo([]types.PatchEnvelopeInfo{peInfo}))
 }
 
 func TestFindPatchEnvelopeById(t *testing.T) {