Merge pull request #938 from laverya/fix-ship-edit-headed-for-apps

fix 'ship edit' for replicated.app upstreams

pkg/lifecycle/daemon/routes_navcycle_getmetadata.go

@@ -2,6 +2,9 @@ package daemon
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/go-kit/kit/log"
+	"github.com/go-kit/kit/log/level"
+
 	"github.com/replicatedhq/ship/pkg/api"
 )
 
@@ -23,6 +26,9 @@ func (d *NavcycleRoutes) getMetadata(release *api.Release) gin.HandlerFunc {
 				"icon": release.Metadata.ChannelIcon,
 			})
 			return
+		default:
+			errorLog := level.Error(log.With(d.Logger, "method", "getMetadata"))
+			errorLog.Log("error", "release metadata type not recognized", "release.Metadata.Type", release.Metadata.Type)
 		}
 	}
 }

pkg/specs/replicatedapp/resolver.go

@@ -141,6 +141,12 @@ func (r *resolver) ResolveEditRelease(ctx context.Context) (*api.Release, error)
 		Metadata: *stateData.ReleaseMetadata(),
 	}
 
+	if r.Runbook == "" {
+		result.Metadata.Type = "replicated.app"
+	} else {
+		result.Metadata.Type = "runbook.replicated.app"
+	}
+
 	if err = yaml.Unmarshal([]byte(stateData.UpstreamContents().AppRelease.Spec), &result.Spec); err != nil {
 		return nil, errors.Wrapf(err, "decode spec from persisted release")
 	}