Skip to content

fixed desired manifests response empty when using child app #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2022
Merged

fixed desired manifests response empty when using child app #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.14-cap-CR-commit-msg
2.1.14-cap-CR-fix-rename-file
10 changes: 5 additions & 5 deletions server/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,11 +1055,11 @@ func (s *Server) streamApplicationEvents(
actualState = &application.ApplicationResourceResponse{Manifest: ""}
}

var mr *apiclient.ManifestResponse = desiredManifests
if isApp(rs) {
app := &v1alpha1.Application{}
err = json.Unmarshal([]byte(actualState.Manifest), app)
if err != nil {
logWithAppStatus(a, logCtx, ts).WithError(err).Error("failed to get resource desired manifest")
if err := json.Unmarshal([]byte(actualState.Manifest), app); err != nil {
logWithAppStatus(a, logCtx, ts).WithError(err).Error("failed to unmarshal child application resource")
}
resourceDesiredManifests, err := s.GetManifests(ctx, &application.ApplicationManifestQuery{
Name: &rs.Name,
Expand All @@ -1068,11 +1068,11 @@ func (s *Server) streamApplicationEvents(
if err != nil {
logWithAppStatus(a, logCtx, ts).WithError(err).Error("failed to get resource desired manifest")
} else {
desiredManifests = resourceDesiredManifests
mr = resourceDesiredManifests
}
}

ev, err := getResourceEventPayload(a, &rs, es, actualState, desiredState, desiredManifests, appTree, manifestGenErr, ts)
ev, err := getResourceEventPayload(a, &rs, es, actualState, desiredState, mr, appTree, manifestGenErr, ts)
if err != nil {
logCtx.WithError(err).Error("failed to get event payload")
continue
Expand Down