Skip to content
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

Fix: Make the out flag print to one file using seperator #1541

Merged
merged 9 commits into from
Dec 1, 2022
Merged

Fix: Make the out flag print to one file using seperator #1541

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0c6d49b
fix: make the out flag print to one file using seperator
Nov 28, 2022
22b0abd
fix: comment an unused function
Nov 28, 2022
8ab8762
fix: update test script
Nov 28, 2022
c323c1d
fix: update output k8s
Nov 28, 2022
6a75d59
fix: update the json output error condition
Nov 28, 2022
66067b4
fix: update envvars interpolation tests
Nov 29, 2022
617ac34
chore: update e2e tests to support yaml generation instead of JSON fo…
Nov 30, 2022
e0b5d76
fix: update e2e tests according to ci environment
Nov 30, 2022
29c842c
fix: apply PR changes
Nov 30, 2022
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
Prev Previous commit
fix: apply PR changes
  • Loading branch information
AhmedGrati committed Nov 30, 2022
commit 29c842cf48fe8bb4faecc09fee3544d5184a46ee
14 changes: 2 additions & 12 deletions pkg/transformer/kubernetes/k8sutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,6 @@ func getDirName(opt kobject.ConvertOptions) string {
return dirName
}

// func objectToRaw(object runtime.Object) runtime.RawExtension {
// r := runtime.RawExtension{
// Object: object,
// }

// bytes, _ := json.Marshal(object)
// r.Raw = bytes

// return r
// }

// PrintList will take the data converted and decide on the commandline attributes given
func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
var f *os.File
Expand Down Expand Up @@ -209,10 +198,11 @@ func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
if err != nil {
return fmt.Errorf("error in marshalling the List: %v", err)
}
// this part add --- which unifies the file
data = []byte(fmt.Sprintf("---\n%s", data))
printVal, err := transformer.Print("", dirName, "", data, opt.ToStdout, opt.GenerateJSON, f, opt.Provider)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good, but you need to add comments "this part add --- which unifies the file", etc.

if err != nil {
return errors.Wrap(err, "transformer.Print failed")
return errors.Wrap(err, "transformer to print to one single file failed")
}
files = append(files, printVal)
}
Expand Down