Add multi-file support to podman kube play/down
#27292
+277
−35
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| package kube | ||
|
|
||
| import ( | ||
| "io" | ||
| "os" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| var configMapYAML = strings.Join([]string{ | ||
| "apiVersion: v1", | ||
| "kind: ConfigMap", | ||
| "metadata:", | ||
| " name: my-config", | ||
| "data:", | ||
| " key: value", | ||
| }, "\n") | ||
|
|
||
| var podYAML = strings.Join([]string{ | ||
| "apiVersion: v1", | ||
| "kind: Pod", | ||
| "metadata:", | ||
| " name: my-pod", | ||
| }, "\n") | ||
|
|
||
| var serviceYAML = strings.Join([]string{ | ||
| "apiVersion: v1", | ||
| "kind: Service", | ||
| "metadata:", | ||
| " name: my-service", | ||
| }, "\n") | ||
|
|
||
| var secretYAML = strings.Join([]string{ | ||
| "apiVersion: v1", | ||
| "kind: Secret", | ||
| "metadata:", | ||
| " name: my-secret", | ||
| }, "\n") | ||
|
|
||
| var namespaceYAML = strings.Join([]string{ | ||
| "apiVersion: v1", | ||
| "kind: Namespace", | ||
| "metadata:", | ||
| " name: my-namespace", | ||
| }, "\n") | ||
|
|
||
| // createTempFile writes content to a temp file and returns its path. | ||
| func createTempFile(t *testing.T, content string) string { | ||
| t.Helper() | ||
|
|
||
| tmp, err := os.CreateTemp(t.TempDir(), "testfile-*.yaml") | ||
| if err != nil { | ||
| t.Fatalf("failed to create temp file: %v", err) | ||
| } | ||
|
|
||
| if _, err := tmp.WriteString(content); err != nil { | ||
| t.Fatalf("failed to write to temp file: %v", err) | ||
| } | ||
|
|
||
| if err := tmp.Close(); err != nil { | ||
| t.Fatalf("failed to close temp file: %v", err) | ||
| } | ||
|
|
||
| return tmp.Name() | ||
| } | ||
|
|
||
| func TestReaderFromArgs(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| files []string // file contents | ||
| expected string // expected concatenated output | ||
| }{ | ||
| { | ||
| name: "single file", | ||
| files: []string{configMapYAML}, | ||
| expected: configMapYAML, | ||
| }, | ||
| { | ||
| name: "two files", | ||
| files: []string{ | ||
| podYAML, | ||
| serviceYAML, | ||
| }, | ||
| expected: podYAML + "\n---\n" + serviceYAML, | ||
| }, | ||
| { | ||
| name: "empty file and normal file", | ||
| files: []string{ | ||
| "", | ||
| secretYAML, | ||
| }, | ||
| expected: "---\n" + secretYAML, | ||
| }, | ||
| { | ||
| name: "files with only whitespace", | ||
| files: []string{ | ||
| "\n \n", | ||
| namespaceYAML, | ||
| }, | ||
| expected: "---\n" + namespaceYAML, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| var paths []string | ||
| for _, content := range tt.files { | ||
| path := createTempFile(t, content) | ||
| defer os.Remove(path) | ||
| paths = append(paths, path) | ||
| } | ||
|
|
||
| reader, err := readerFromArgsWithStdin(paths, nil) | ||
| if err != nil { | ||
| t.Fatalf("readerFromArgsWithStdin failed: %v", err) | ||
| } | ||
|
|
||
| output, err := io.ReadAll(reader) | ||
| if err != nil { | ||
| t.Fatalf("failed to read result: %v", err) | ||
| } | ||
|
|
||
| got := strings.TrimSpace(string(output)) | ||
| want := strings.TrimSpace(tt.expected) | ||
|
|
||
| if got != want { | ||
| t.Errorf("unexpected output:\n--- got ---\n%s\n--- want ---\n%s", got, want) | ||
|
There was a problem hiding this comment. another nit: we already depend on assert so might as well use the nicer test hallper such as assert.Equal(), etc... |
||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestReaderFromArgs_Stdin(t *testing.T) { | ||
| stdinReader := strings.NewReader(namespaceYAML) | ||
|
|
||
| reader, err := readerFromArgsWithStdin([]string{"-"}, stdinReader) | ||
| if err != nil { | ||
| t.Fatalf("readerFromArgsWithStdin failed: %v", err) | ||
| } | ||
|
|
||
| data, err := io.ReadAll(reader) | ||
| if err != nil { | ||
| t.Fatalf("failed to read from stdin: %v", err) | ||
| } | ||
|
|
||
| if got := string(data); got != namespaceYAML { | ||
| t.Errorf("unexpected stdin result:\n--- got ---\n%s\n--- want ---\n%s", got, namespaceYAML) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: this is quite ugly, go supports multi line strings just fine with the backtick escapes which would make this more readable, but not worth to push again just for this