Skip to content

fix: improve import error output with detailed diff information #6298

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

Open
Ayush2k02 wants to merge 1 commit into
base: dev
Choose a base branch
from
+25 −4
Open

fix: improve import error output with detailed diff information #6298

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
29 changes: 25 additions & 4 deletions cmd/sst/mosaic/ui/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,19 +477,40 @@ func (u *UI) Event(unknown interface{}) {
u.println(TEXT_NORMAL.Render("\n\nSet the following:"))
}
for _, diff := range importDiffs {
value, _ := json.Marshal(diff.Old)
oldValue, _ := json.MarshalIndent(diff.Old, " ", " ")
newValue, _ := json.MarshalIndent(diff.New, " ", " ")
if diff.Old == nil {
value = []byte("undefined")
oldValue = []byte("undefined")
}
if diff.New == nil {
newValue = []byte("undefined")
}

// For simple values (not objects/arrays), show them on one line
oldStr := string(oldValue)
newStr := string(newValue)
isComplex := strings.Contains(oldStr, "\n") || strings.Contains(newStr, "\n")

u.print(TEXT_NORMAL.Render(" - "))
if isSSTComponent {
u.print(TEXT_INFO.Render("`args." + string(diff.Input) + " = " + string(value) + ";`"))
if isComplex {
u.println(TEXT_INFO.Render("`args." + string(diff.Input) + " = " + oldStr + ";`"))
u.println(TEXT_DIM.Render(" Trying to set: " + newStr))
} else {
u.println(TEXT_INFO.Render("`args." + string(diff.Input) + " = " + oldStr + ";`"))
}
}
if !isSSTComponent {
u.print(TEXT_INFO.Render("`" + string(diff.Input) + ": " + string(value) + ",`"))
if isComplex {
u.println(TEXT_INFO.Render("`" + string(diff.Input) + ": " + oldStr + ",`"))
u.println(TEXT_DIM.Render(" Trying to set: " + newStr))
} else {
u.println(TEXT_INFO.Render("`" + string(diff.Input) + ": " + oldStr + ",`"))
}
}
u.blank()
}
u.println(TEXT_DIM.Render(" For more details, check: .sst/log/pulumi.log"))
} else {
u.blank()
}
Expand Down